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

use actuall stream extension in torrents

Browse source
This commit is contained in:
j 2014-11-16 12:04:19 +00:00
parent 573f034df2
commit 000912dd51
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pandora/item/models.py
View file

@ -1197,11 +1197,13 @@ class Item(models.Model):
size = 0 size = 0
duration = 0.0 duration = 0.0
if streams.count() == 1: if streams.count() == 1:
url = "%s/torrent/%s.webm" % (self.get_absolute_url(),
quote(filename.encode('utf-8')))
video = "%s.webm" % base
v = streams[0] v = streams[0]
media_path = v.media.path media_path = v.media.path
extension = media_path.split('.')[-1]
url = "%s/torrent/%s.%s" % (self.get_absolute_url(),
quote(filename.encode('utf-8')),
extension)
video = "%s.%s" % (base, extension)
if isinstance(media_path, unicode): if isinstance(media_path, unicode):
media_path = media_path.encode('utf-8') media_path = media_path.encode('utf-8')
if isinstance(video, unicode): if isinstance(video, unicode):
@ -1215,9 +1217,10 @@ class Item(models.Model):
part = 1 part = 1
ox.makedirs(base) ox.makedirs(base)
for v in streams: for v in streams:
video = "%s/%s.Part %d.webm" % (base, filename, part)
part += 1
media_path = v.media.path media_path = v.media.path
extension = media_path.split('.')[-1]
video = "%s/%s.Part %d.%s" % (base, filename, part, extension)
part += 1
if isinstance(media_path, unicode): if isinstance(media_path, unicode):
media_path = media_path.encode('utf-8') media_path = media_path.encode('utf-8')
if isinstance(video, unicode): if isinstance(video, unicode):