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

add option to return item keys in findAnnotation

Browse source
This commit is contained in:
j 2015-02-16 16:10:45 +00:00
parent 2e246dd06e
commit 484b33e39d
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pandora/annotation/models.py
View file

@ -215,6 +215,11 @@ class Annotation(models.Model):
from entity.models import Entity from entity.models import Entity
return Entity.get(self.value) return Entity.get(self.value)
annotation_keys = (
'id', 'in', 'out', 'value', 'created', 'modified',
'duration', 'layer', 'item', 'videoRatio', 'languages',
'entity', 'event', 'place'
)
def json(self, layer=False, keys=None, user=None): def json(self, layer=False, keys=None, user=None):
j = { j = {
'user': self.user.username, 'user': self.user.username,
@ -269,6 +274,13 @@ 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
for key in keys:
if key not in self.annotation_keys and key not in j:
value = self.item.get(key) or self.item.json.get(key)
if not value and hasattr(self.item.sort, key):
value = getattr(self.item.sort, key)
if value != None:
j[key] = value
subtitles = get_by_key(settings.CONFIG['layers'], 'isSubtitles', True) subtitles = get_by_key(settings.CONFIG['layers'], 'isSubtitles', True)
if subtitles: if subtitles:
if 'id' in j and self.layer == subtitles['id'] and not self.value: if 'id' in j and self.layer == subtitles['id'] and not self.value: