diff options
Diffstat (limited to 'atoidejouer/tools/storage.py')
| -rw-r--r-- | atoidejouer/tools/storage.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/atoidejouer/tools/storage.py b/atoidejouer/tools/storage.py index 2dad46b..a0d7437 100644 --- a/atoidejouer/tools/storage.py +++ b/atoidejouer/tools/storage.py @@ -252,6 +252,9 @@ def journal_query(query): # find in ds _results, _count = datastore.find(query, sorting='timestamp') for _r in _results: + if 'title' in query\ + and query['title'] != str(_r.metadata['title']): + continue yield _r @@ -270,13 +273,11 @@ def list_info_from_journal(mime_type=None): _titles = {} # return infos for _o in journal_query({'mime_type': mime_type}): - # get meta - _m = _o.get_metadata() # get title - _t = _m['title'] + _t = _o.metadata['title'] # ensure description - _d = _m['description'] if 'description' in _m else '' - _p = _m['preview'] if 'preview' in _m else None + _d = _o.metadata['description'] if 'description' in _o.metadata else '' + _p = _o.metadata['preview'] if 'preview' in _o.metadata else None # little check if _t in _titles: # udpate reg @@ -288,11 +289,13 @@ def list_info_from_journal(mime_type=None): _titles[_t] = 1 # ensure info yield { - 'activity_id' : _m['activity_id'], + 'activity_id' : _o.metadata['activity_id'], 'description' : _d, - 'timestamp' : _m['timestamp'], + 'timestamp' : _o.metadata['timestamp'], 'preview' : _p, 'title' : _t, + 'file_path' : _o.file_path, + 'mime_type' : mime_type } @@ -302,7 +305,7 @@ def list_files_from_journal(activity_name=None, mime_type=None): # return paths for _o in _objs: # TODO open the files - yield _o.get_file_path() + yield _o.file_path() def get_path_from_journal(timestamp, mime_type): |