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

fix language

Browse source
This commit is contained in:
j 2014-09-27 19:44:09 +02:00
parent 5221a87c71
commit 94336ceda7
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pandora/archive/models.py
View file

@ -322,7 +322,6 @@ class File(models.Model):
def save_chunk_stream(self, chunk, offset, resolution, format, done): def save_chunk_stream(self, chunk, offset, resolution, format, done):
if not self.available: if not self.available:
config = settings.CONFIG['video']
stream, created = Stream.objects.get_or_create( stream, created = Stream.objects.get_or_create(
file=self, resolution=resolution, format=format) file=self, resolution=resolution, format=format)
name = stream.path(stream.name()) name = stream.path(stream.name())
@ -406,9 +405,7 @@ class File(models.Model):
return map(int, [pos/2, pos, pos+pos/2]) return map(int, [pos/2, pos, pos+pos/2])
if settings.CONFIG['media'].get('importFrames') and self.data: if settings.CONFIG['media'].get('importFrames') and self.data:
filename = self.data.path filename = self.data.path
prefix = os.path.dirname(filename)
info = self.info info = self.info
oshash = info['oshash']
for pos in video_frame_positions(info['duration']): for pos in video_frame_positions(info['duration']):
position = float(pos) position = float(pos)
@ -467,7 +464,7 @@ class File(models.Model):
for i, a in enumerate(audio[1:]): for i, a in enumerate(audio[1:]):
media = self.data.path media = self.data.path
info = ox.avinfo(media) info = ox.avinfo(media)
language = parse_language(a.get('language')) lang = language = parse_language(a.get('language'))
n = 2 n = 2
while language in languages: while language in languages:
language = '%s%d' % (lang, n) language = '%s%d' % (lang, n)