nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

downloadboob: code factorization

Browse source
This commit is contained in:
Florent 2015-09-20 16:56:43 +02:00
commit deaebc4942
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
contrib/downloadboob/downloadboob.py
View file

@ -131,6 +131,14 @@ class Downloadboob(object):
return re.search(id_regexp, video_id) is not None return re.search(id_regexp, video_id) is not None
return True return True
def get_downloaded_ext(self, video):
ext = video.ext
if not ext:
ext = 'avi'
elif ext == u'm3u8':
ext = 'mp4'
return ext
def get_filename(self, video, relative=False): def get_filename(self, video, relative=False):
if relative: if relative:
directory = os.path.join("..", DOWNLOAD_DIRECTORY, self.backend_name) directory = os.path.join("..", DOWNLOAD_DIRECTORY, self.backend_name)
@ -139,11 +147,7 @@ class Downloadboob(object):
if not os.path.exists(directory): if not os.path.exists(directory):
os.makedirs(directory) os.makedirs(directory)
ext = video.ext ext = self.get_downloaded_ext(video)
if not ext:
ext = 'avi'
if ext == u'm3u8':
ext = 'mp4'
return u"%s/%s.%s" % (directory, removeNonAscii(video.id), ext) return u"%s/%s.%s" % (directory, removeNonAscii(video.id), ext)
@ -151,11 +155,7 @@ class Downloadboob(object):
if not os.path.exists(self.links_directory): if not os.path.exists(self.links_directory):
os.makedirs(self.links_directory) os.makedirs(self.links_directory)
ext = video.ext ext = self.get_downloaded_ext(video)
if not ext:
ext = 'avi'
if ext == u'm3u8':
ext = 'mp4'
misc = video.date misc = video.date
if not misc: if not misc: