PublicMirrors/you-get
1
0
Fork 0
mirror of https://github.com/soimort/you-get.git synced 2025-02-03 08:43:58 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

[funshion] fix (partly) #1304 and close #1378

Browse Source
This commit is contained in:
Mort Yao 2016-08-30 12:42:50 +02:00
parent 5e612e870c
commit 44c09c542f
No known key found for this signature in database
GPG Key ID: 07DA00CB78203251
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/you_get/extractors/funshion.py
View File

@ -10,9 +10,9 @@ import json
def funshion_download(url, output_dir = '.', merge = False, info_only = False, **kwargs): def funshion_download(url, output_dir = '.', merge = False, info_only = False, **kwargs):
"""""" """"""
if re.match(r'http://www.fun.tv/vplay/v-(\w+)', url): #single video if re.match(r'http://www.fun.tv/vplay/v-(\w+)', url): #single video
funshion_download_by_url(url, output_dir = '.', merge = False, info_only = False) funshion_download_by_url(url, output_dir=output_dir, merge=merge, info_only=info_only)
elif re.match(r'http://www.fun.tv/vplay/g-(\w+)', url): #whole drama elif re.match(r'http://www.fun.tv/vplay/.*g-(\w+)', url): #whole drama
funshion_download_by_drama_url(url, output_dir = '.', merge = False, info_only = False) funshion_download_by_drama_url(url, output_dir=output_dir, merge=merge, info_only=info_only)
else: else:
return return
@ -25,7 +25,7 @@ def funshion_download_by_url(url, output_dir = '.', merge = False, info_only = F
if re.match(r'http://www.fun.tv/vplay/v-(\w+)', url): if re.match(r'http://www.fun.tv/vplay/v-(\w+)', url):
match = re.search(r'http://www.fun.tv/vplay/v-(\d+)(.?)', url) match = re.search(r'http://www.fun.tv/vplay/v-(\d+)(.?)', url)
vid = match.group(1) vid = match.group(1)
funshion_download_by_vid(vid, output_dir = '.', merge = False, info_only = False) funshion_download_by_vid(vid, output_dir=output_dir, merge=merge, info_only=info_only)
#---------------------------------------------------------------------- #----------------------------------------------------------------------
def funshion_download_by_vid(vid, output_dir = '.', merge = False, info_only = False): def funshion_download_by_vid(vid, output_dir = '.', merge = False, info_only = False):
@ -63,14 +63,11 @@ def funshion_download_by_drama_url(url, output_dir = '.', merge = False, info_on
"""str->None """str->None
url = 'http://www.fun.tv/vplay/g-95785/' url = 'http://www.fun.tv/vplay/g-95785/'
""" """
if re.match(r'http://www.fun.tv/vplay/g-(\w+)', url): id = r1(r'http://www.fun.tv/vplay/.*g-(\d+)', url)
match = re.search(r'http://www.fun.tv/vplay/g-(\d+)(.?)', url)
id = match.group(1)
video_list = funshion_drama_id_to_vid(id) video_list = funshion_drama_id_to_vid(id)
for video in video_list: for video in video_list:
funshion_download_by_id((video[0], id), output_dir = '.', merge = False, info_only = False) funshion_download_by_id((video[0], id), output_dir=output_dir, merge=merge, info_only=info_only)
# id is for drama, vid not the same as the ones used in single video # id is for drama, vid not the same as the ones used in single video
#---------------------------------------------------------------------- #----------------------------------------------------------------------