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

use peer.library in some places

Browse source
This commit is contained in:
j 2016-02-11 21:25:16 +05:30
commit 9a9185d3d5
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
oml/queryparser.py
View file

@ -124,8 +124,15 @@ class Parser(object):
u = self._user.query.filter_by(nickname=nickname).one()
else:
u = self._user.query.filter_by(id=settings.USER_ID).one()
l = self._list.query.filter_by(user_id=u.id, name=name).one()
ids = l.get_items().options(load_only('id'))
if nickname:
peer = utils.get_peer(u.id)
if name:
ids = peer.info['lists'].get(name, [])
else:
ids = list(peer.library.keys())
else:
l = self._list.query.filter_by(user_id=u.id, name=name).one()
ids = l.get_items().options(load_only('id'))
in_op = operators.notin_op if exclude else operators.in_op
q = in_op(self._model.id, ids)
return q