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

slightly faster json serialization of annotations

Browse source
This commit is contained in:
j 2015-08-02 16:22:45 +02:00
parent f3fdded07d
commit 819181726a
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pandora/annotation/models.py
View file

@ -213,20 +213,17 @@ class Annotation(models.Model):
'duration', 'layer', 'item', 'videoRatio', 'languages', 'duration', 'layer', 'item', 'videoRatio', 'languages',
'entity', 'event', 'place' 'entity', 'event', 'place'
) )
_clip_keys = ('hue', 'lightness', 'saturation', 'volume')
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,
'id': self.public_id,
'in': self.start,
'out': self.end,
'value': self.value,
'created': self.created,
'modified': self.modified,
} }
for key in ('id', 'in', 'out', 'value', 'created', 'modified'):
j[key] = getattr(self, {
'hue': 'clip__hue',
'id': 'public_id',
'in': 'start',
'lightness': 'clip__lightness',
'out': 'end',
'saturation': 'clip__saturation',
'volume': 'clip__volume',
}.get(key, key))
j['duration'] = abs(j['out'] - j['in']) j['duration'] = abs(j['out'] - j['in'])
if user: if user:
j['editable'] = self.editable(user) j['editable'] = self.editable(user)
@ -268,12 +265,15 @@ class Annotation(models.Model):
if streams: if streams:
j['videoRatio'] = streams[0].aspect_ratio j['videoRatio'] = streams[0].aspect_ratio
for key in keys: for key in keys:
if key not in self.annotation_keys and key not in j: if key not in j:
value = self.item.get(key) or self.item.json.get(key) if key in self._clip_keys:
if not value and hasattr(self.item.sort, key): j[key] = getattr(self.clip, key)
value = getattr(self.item.sort, key) elif key not in self.annotation_keys:
if value != None: value = self.item.get(key) or self.item.json.get(key)
j[key] = value 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: