0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

refine logging

Browse source
This commit is contained in:
j 2016-02-13 15:38:56 +05:30
parent 0c5edb38ef
commit 44515eb031
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
oml/library.py
View file

@ -193,19 +193,18 @@ class Peer(object):
current = set([r[1] for r in state.db.session.execute(q)]) current = set([r[1] for r in state.db.session.execute(q)])
library = set(self.library.keys()) library = set(self.library.keys())
remove = list(current - library) remove = list(current - library)
logger.debug('remove %s', len(remove))
u = user.models.User.get(self.id) u = user.models.User.get(self.id)
listid = u.library.id listid = u.library.id
lists = [l.id for l in u.lists.all()] lists = [l.id for l in u.lists.all()]
getpreview = [] getpreview = []
t0 = time.time() t0 = time.time()
if remove: if remove:
logger.debug('remove %s items', len(remove))
q = item.models.user_items.delete().where(c_user_id.is_(self.id)).where(c_item_id.in_(remove)) q = item.models.user_items.delete().where(c_user_id.is_(self.id)).where(c_item_id.in_(remove))
state.db.session.execute(q) state.db.session.execute(q)
q = user.models.list_items.delete().where(l_list_id.in_(lists)).where(l_item_id.in_(remove)) q = user.models.list_items.delete().where(l_list_id.in_(lists)).where(l_item_id.in_(remove))
state.db.session.execute(q) state.db.session.execute(q)
add = list(library - current) add = list(library - current)
logger.debug('add %s', len(add))
listitems = {} listitems = {}
q = user.models.list_items.select().where(l_list_id.in_(lists)) q = user.models.list_items.select().where(l_list_id.in_(lists))
for row in state.db.session.execute(q): for row in state.db.session.execute(q):
@ -214,6 +213,7 @@ class Peer(object):
listitems[row['list_id']].add(row['item_id']) listitems[row['list_id']].add(row['item_id'])
t0 = maybe_commit(t0) t0 = maybe_commit(t0)
if add: if add:
logger.debug('add %s items', len(add))
t0 = time.time() t0 = time.time()
q = item.models.user_items.select().where(c_user_id.is_(self.id)) q = item.models.user_items.select().where(c_user_id.is_(self.id))
useritems = {r['item_id'] for r in state.db.session.execute(q)} useritems = {r['item_id'] for r in state.db.session.execute(q)}
@ -256,8 +256,8 @@ class Peer(object):
t0 = time.time() t0 = time.time()
for l in u.lists.all(): for l in u.lists.all():
if l.name: if l.name:
logger.debug('update list %s', l.name)
if l.name in remove: if l.name in remove:
logger.debug('remove list %s', l.name)
l.remove(commit=False) l.remove(commit=False)
else: else:
if l.id in listitems: if l.id in listitems:
@ -268,9 +268,12 @@ class Peer(object):
update_items = list(set(update_items) - set(ladd)) update_items = list(set(update_items) - set(ladd))
if lremove: if lremove:
l.remove_items(lremove, commit=False) l.remove_items(lremove, commit=False)
if ladd or lremove:
logger.debug('update list %s', l.name)
else: else:
l.add_items(self.info['lists'][l.name], commit=False) l.add_items(self.info['lists'][l.name], commit=False)
update_items = list(set(update_items) - set(self.info['lists'][l.name])) update_items = list(set(update_items) - set(self.info['lists'][l.name]))
logger.debug('update list %s', l.name)
if state.shutdown: if state.shutdown:
break break
t0 = maybe_commit(t0) t0 = maybe_commit(t0)
@ -286,9 +289,9 @@ class Peer(object):
update_items = list(set(update_items) - set(self.info['lists'][name])) update_items = list(set(update_items) - set(self.info['lists'][name]))
if state.shutdown: if state.shutdown:
break break
logger.debug('update %s', len(update_items))
t0 = time.time() t0 = time.time()
if update_items: if update_items:
logger.debug('update %s items', len(update_items))
for i in item.models.Item.query.filter(item.models.Item.id.in_(update_items)): for i in item.models.Item.query.filter(item.models.Item.id.in_(update_items)):
i.update(commit=False) i.update(commit=False)
t0 = maybe_commit(t0) t0 = maybe_commit(t0)