0x2620/cablegates
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cuts are not layers, use subtitles.value

Browse source
This commit is contained in:
j 2011-01-28 15:00:32 +05:30
commit d172ef85e2
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pandora/archive/models.py
View file

@ -195,7 +195,7 @@ class File(models.Model):
srts = re.compile('(\d\d:\d\d:\d\d[,.]\d\d\d)\s*-->\s*(\d\d:\d\d:\d\d[,.]\d\d\d)\s*(.+?)\n\n', re.DOTALL)
for s in srts.findall(data):
_s = {'in': parseTime(s[0]), 'out': parseTime(s[1]), 'text': s[2].strip()}
_s = {'in': parseTime(s[0]), 'out': parseTime(s[1]), 'value': s[2].strip()}
srt.append(_s)
return srt

2
pandora/item/models.py
View file

@ -339,8 +339,6 @@ class Item(models.Model):
def get_layers(self):
layers = {}
layers['cuts'] = self.data.get('cuts', {})
layers['subtitles'] = []
#FIXME: should subtitles be stored in Annotation?
qs = self.files.filter(is_subtitle=True, is_main=True, available=True)