decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

document folded annotations, include clip_id in annots

Browse source
This commit is contained in:
j 2019-11-12 11:40:14 +00:00
parent 05aa23166e
commit faeb2ddd2d
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/annotation/models.py
View file

@ -378,6 +378,8 @@ class Annotation(models.Model):
streams = self.item.streams() streams = self.item.streams()
if streams: if streams:
j['videoRatio'] = streams[0].aspect_ratio j['videoRatio'] = streams[0].aspect_ratio
if 'clip' in keys:
j[key] = self.clip.public_id
for key in keys: for key in keys:
if key not in j: if key not in j:
if key in self._clip_keys: if key in self._clip_keys:

2
pandora/clip/views.py
View file

@ -78,7 +78,7 @@ def findClips(request, data):
takes { takes {
query: object, // find clips, query object, see `find` query: object, // find clips, query object, see `find`
itemsQuery: object, // limit to matching items, query object, see `find` itemsQuery: object, // limit to matching items, query object, see `find`
keys: [string], // list of properties to return keys: [string], // list of properties to return, include 'annotations' to get all annotations for a clip
positions: [int], // list of positions positions: [int], // list of positions
range: [int, int], // range of results to return range: [int, int], // range of results to return
sort: [object] // list of sort objects, see `find` sort: [object] // list of sort objects, see `find`