0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

Merge branch 'master' of git.0x2620.org:/pandora

Browse source
This commit is contained in:
rlx 2016-08-09 15:29:42 +02:00
commit 225b7cedbd
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/archive/external.py
View file

@ -55,6 +55,8 @@ def get_info(url):
for k in info_keys
if k in i and i[k]
})
if not 'tags' in info[-1]:
info[-1]['tags'] = []
if 'upload_date' in i:
info[-1]['date'] = '-'.join([i['upload_date'][:4], i['upload_date'][4:6], i['upload_date'][6:]])
return info

6
pandora/config.padma.jsonc
View file

@ -135,6 +135,12 @@
{"id": "texts", "title": "Texts"},
{"id": "embeds", "title": "Embeds"}
],
"importMetadata": {
"date": "{date}",
"topic": "{tags}",
"summary": "{description}",
"title": "{title}"
},
/*
"itemKeys" defines the metadata associated with each item. Required keys
are "*", "id" and "title". Annotation layers can be referenced too, which

15
pandora/item/views.py
View file

@ -225,15 +225,18 @@ def find(request, data):
clips = qs
return [c.json(query['clip_keys'], query['clip_filter']) for c in clips]
sort_keys = {
'accessed', 'modified', 'timesaccessed',
'numberofannotations', 'numberoffiles', 'numberofdocuments'
}
def only_p_sums(m):
r = {}
for p in _p:
if p == 'accessed':
r[p] = m.sort.accessed or ''
elif p == 'modified':
r[p] = m.sort.modified
elif p == 'timesaccessed':
r[p] = m.sort.timesaccessed
elif p in sort_keys:
r[p] = getattr(m.sort, p)
else:
r[p] = m.json.get(p)
if 'clip_qs' in query:
@ -252,9 +255,7 @@ def find(request, data):
return r
qs = qs[query['range'][0]:query['range'][1]]
# response['data']['items'] = [m.get_json(_p) for m in qs]
if filter(lambda p: p in (
'accessed', 'modified', 'timesaccessed', 'viewed'
), _p):
if any(p for p in _p if p in sort_keys):
qs = qs.select_related()
response['data']['items'] = [only_p_sums(m) for m in qs]
else: