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

dont fail without cuts

Browse source
This commit is contained in:
j 2014-11-18 14:54:41 +00:00
parent 9c0206b2c4
commit 86ab36c6a6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/clip/models.py
View file

@ -81,7 +81,7 @@ class MetaClip:
if 'layers' in keys: if 'layers' in keys:
j['layers'] = self.get_layers() j['layers'] = self.get_layers()
if 'cuts' in keys: if 'cuts' in keys:
j['cuts'] = tuple([c for c in self.item.get('cuts') if c > self.start and c < self.end]) j['cuts'] = tuple([c for c in self.item.get('cuts', []) if c > self.start and c < self.end])
for key in keys: for key in keys:
if key not in self.clip_keys and key not in j: if key not in self.clip_keys and key not in j:
value = self.item.get(key) or self.item.json.get(key) value = self.item.get(key) or self.item.json.get(key)
@ -105,7 +105,7 @@ class MetaClip:
if value: if value:
data[key] = value data[key] = value
data['duration'] = data['out'] - data['in'] data['duration'] = data['out'] - data['in']
data['cuts'] = tuple([c for c in self.item.get('cuts') if c > self.start and c < self.end]) data['cuts'] = tuple([c for c in self.item.get('cuts', []) if c > self.start and c < self.end])
data['layers'] = self.get_layers(user) data['layers'] = self.get_layers(user)
return data return data