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

make api query more accessible in shell

Browse source
This commit is contained in:
j 2016-01-10 14:40:38 +05:30
parent 38779d2576
commit 8db9bdb9e2
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
oml/item/models.py
View file

@ -18,6 +18,7 @@ from db import MutableDict
import json_pickler import json_pickler
from .icons import icons from .icons import icons
from .person import get_sort_name from .person import get_sort_name
from queryparser import Parser
from settings import config from settings import config
from utils import remove_empty_folders from utils import remove_empty_folders
from websocket import trigger_event from websocket import trigger_event
@ -91,6 +92,10 @@ class Item(db.Model):
state.db.session.commit() state.db.session.commit()
return item return item
@classmethod
def find(cls, data):
return Parser(cls, user_items, Find, Sort).find(data)
def add_user(self, user): def add_user(self, user):
if not user in self.users: if not user in self.users:
self.users.append(user) self.users.append(user)
@ -514,7 +519,7 @@ class Find(db.Model):
id = sa.Column(sa.Integer(), primary_key=True) id = sa.Column(sa.Integer(), primary_key=True)
item_id = sa.Column(sa.String(32), sa.ForeignKey('item.id')) item_id = sa.Column(sa.String(32), sa.ForeignKey('item.id'))
item = sa.orm.relationship('Item', backref=sa.orm.backref('find', lazy='dynamic')) item = sa.orm.relationship('Item', backref=sa.orm.backref('find_', lazy='dynamic'))
key = sa.Column(sa.String(200), index=True) key = sa.Column(sa.String(200), index=True)
value = sa.Column(sa.Text()) value = sa.Column(sa.Text())
findvalue = sa.Column(sa.Text(), index=True) findvalue = sa.Column(sa.Text(), index=True)

3
oml/item/query.py
View file

@ -5,7 +5,6 @@
#does not work in sqlite #does not work in sqlite
#from sqlalchemy.sql.expression import nullslast #from sqlalchemy.sql.expression import nullslast
from queryparser import Parser
from . import models from . import models
import settings import settings
import utils import utils
@ -19,7 +18,7 @@ def parse(data):
if key in data: if key in data:
query[key] = data[key] query[key] = data[key]
#print data #print data
query['qs'] = Parser(models.Item, models.user_items).find(data) query['qs'] = models.Item.find(data)
if not 'group' in query: if not 'group' in query:
query['qs'] = order(query['qs'], query['sort']) query['qs'] = order(query['qs'], query['sort'])
return query return query

6
oml/queryparser.py
View file

@ -38,10 +38,10 @@ def get_operator(op, type='str'):
class Parser(object): class Parser(object):
def __init__(self, model, user_items): def __init__(self, model, user_items, find, sort):
self._model = model self._model = model
self._find = model.find.mapper.class_ self._find = find
self._sort = model.sort.mapper.class_ self._sort = sort
self._user = model.users.mapper.class_ self._user = model.users.mapper.class_
self._user_items = user_items self._user_items = user_items
self._list = model.lists.mapper.class_ self._list = model.lists.mapper.class_

5
oml/user/models.py
View file

@ -7,7 +7,6 @@ import sqlalchemy as sa
from changelog import Changelog from changelog import Changelog
from db import MutableDict from db import MutableDict
from queryparser import Parser
import db import db
import json_pickler import json_pickler
import settings import settings
@ -268,9 +267,9 @@ class List(db.Model):
self.user.clear_list_cache() self.user.clear_list_cache()
def get_items(self): def get_items(self):
from item.models import Item, user_items from item.models import Item
if self.type == 'smart': if self.type == 'smart':
return Parser(Item, user_items).find({'query': self._query}) return Item.find({'query': self._query})
else: else:
return self.user.items.join(Item.lists, aliased=True).filter(List.id == self.id) return self.user.items.join(Item.lists, aliased=True).filter(List.id == self.id)