From 65f8cec8e2668749a0684afbd1a50c61c4c22761 Mon Sep 17 00:00:00 2001 From: hellsof Date: Tue, 19 Dec 2017 18:53:16 +0800 Subject: [PATCH 1/9] fix json --- src/you_get/extractors/le.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/you_get/extractors/le.py b/src/you_get/extractors/le.py index 2cd5f161..19148104 100644 --- a/src/you_get/extractors/le.py +++ b/src/you_get/extractors/le.py @@ -67,7 +67,7 @@ def video_info(vid,**kwargs): else: print("Current Video Supports:") for i in support_stream_id: - print("\t--format",i,"") + # print("\t--format",i,"") if "1080p" in support_stream_id: stream_id = '1080p' elif "720p" in support_stream_id: From cb0dc09a01cb4f729f009992fb2a63f848502593 Mon Sep 17 00:00:00 2001 From: hellsof Date: Tue, 19 Dec 2017 18:56:16 +0800 Subject: [PATCH 2/9] fix json --- src/you_get/extractors/le.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/you_get/extractors/le.py b/src/you_get/extractors/le.py index 19148104..940b9b35 100644 --- a/src/you_get/extractors/le.py +++ b/src/you_get/extractors/le.py @@ -65,9 +65,6 @@ def video_info(vid,**kwargs): if "stream_id" in kwargs and kwargs["stream_id"].lower() in support_stream_id: stream_id = kwargs["stream_id"] else: - print("Current Video Supports:") - for i in support_stream_id: - # print("\t--format",i,"") if "1080p" in support_stream_id: stream_id = '1080p' elif "720p" in support_stream_id: From 1138f17bfb78e51fa8c82cb2242c74bd3f18687a Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Tue, 19 Dec 2017 18:05:28 +0100 Subject: [PATCH 3/9] [test] remove test_douyin --- tests/test.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/test.py b/tests/test.py index 36c699f5..699675f3 100644 --- a/tests/test.py +++ b/tests/test.py @@ -47,12 +47,6 @@ class YouGetTests(unittest.TestCase): 'https://www.bilibili.com/video/av13228063/', info_only=True ) - def test_douyin(self): - douyin.download( - 'https://www.douyin.com/share/video/6492273288897629454', - info_only=True - ) - if __name__ == '__main__': unittest.main() From 9d7c9f96510e53f2ca308da1a34e92d1dba52155 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Sat, 23 Dec 2017 14:12:56 +0100 Subject: [PATCH 4/9] [bilibili] new bangumi URL (fix #2543) --- src/you_get/extractors/bilibili.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/you_get/extractors/bilibili.py b/src/you_get/extractors/bilibili.py index 59b9b07e..57661766 100644 --- a/src/you_get/extractors/bilibili.py +++ b/src/you_get/extractors/bilibili.py @@ -165,7 +165,10 @@ class Bilibili(VideoExtractor): qq_download_by_vid(tc_flashvars, self.title, output_dir=kwargs['output_dir'], merge=kwargs['merge'], info_only=kwargs['info_only']) return - cid = re.search(r'cid=(\d+)', self.page).group(1) + try: + cid = re.search(r'cid=(\d+)', self.page).group(1) + except: + cid = re.search(r'"cid":(\d+)', self.page).group(1) if cid is not None: self.download_by_vid(cid, False, **kwargs) else: From 6baa80419c22bbbb906cb7d57e7712eb63018a12 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Sat, 23 Dec 2017 17:16:43 +0100 Subject: [PATCH 5/9] [youku] update ccode --- src/you_get/extractors/youku.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/you_get/extractors/youku.py b/src/you_get/extractors/youku.py index 0e0d7240..976ed447 100644 --- a/src/you_get/extractors/youku.py +++ b/src/you_get/extractors/youku.py @@ -78,7 +78,7 @@ class Youku(VideoExtractor): self.api_error_code = None self.api_error_msg = None - self.ccode = '0508' + self.ccode = '0512' self.utid = None def youku_ups(self): @@ -154,7 +154,7 @@ class Youku(VideoExtractor): log.wtf('Cannot fetch vid') if kwargs.get('src') and kwargs['src'] == 'tudou': - self.ccode = '0501' + self.ccode = '0512' if kwargs.get('password') and kwargs['password']: self.password_protected = True From c0c76915dc3e0c21972628927105abdb71f286cb Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Sat, 23 Dec 2017 18:27:08 +0100 Subject: [PATCH 6/9] version 0.4.1011 --- src/you_get/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/you_get/version.py b/src/you_get/version.py index 6301dbc8..e4420b84 100644 --- a/src/you_get/version.py +++ b/src/you_get/version.py @@ -1,4 +1,4 @@ #!/usr/bin/env python script_name = 'you-get' -__version__ = '0.4.995' +__version__ = '0.4.1011' From e7954c4149170d3ff42cdab69ac03931c5afa6c0 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Sat, 23 Dec 2017 22:02:11 +0100 Subject: [PATCH 7/9] [bilibili] warn when target URL is a playlist --- src/you_get/extractors/bilibili.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/you_get/extractors/bilibili.py b/src/you_get/extractors/bilibili.py index 57661766..76aad869 100644 --- a/src/you_get/extractors/bilibili.py +++ b/src/you_get/extractors/bilibili.py @@ -165,6 +165,10 @@ class Bilibili(VideoExtractor): qq_download_by_vid(tc_flashvars, self.title, output_dir=kwargs['output_dir'], merge=kwargs['merge'], info_only=kwargs['info_only']) return + has_plist = re.search(r' Date: Mon, 25 Dec 2017 18:39:10 +0800 Subject: [PATCH 8/9] fix https://v.qq.com/x/cover/9hpjiv5fhiyn86u/t0522x58xma.html --- src/you_get/extractors/qq.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/you_get/extractors/qq.py b/src/you_get/extractors/qq.py index 537dffd2..438c1f24 100644 --- a/src/you_get/extractors/qq.py +++ b/src/you_get/extractors/qq.py @@ -36,13 +36,18 @@ def qq_download_by_vid(vid, title, output_dir='.', merge=True, info_only=False): part_info = get_content(key_api) key_json = json.loads(match1(part_info, r'QZOutputJson=(.*)')[:-1]) if key_json.get('key') is None: + vkey = video_json['vl']['vi'][0]['fvkey'] + url = '{}{}?vkey={}'.format(video_json['vl']['vi'][0]['ul']['ui'][0]['url'], fn_pre + '.mp4', vkey) + else: + vkey = key_json['key'] + url = '{}{}?vkey={}'.format(host, filename, vkey) + if not vkey: if part == 1: log.wtf(key_json['msg']) else: log.w(key_json['msg']) break - vkey = key_json['key'] - url = '{}{}?vkey={}'.format(host, filename, vkey) + part_urls.append(url) _, ext, size = url_info(url) total_size += size @@ -140,9 +145,13 @@ def qq_download(url, output_dir='.', merge=True, info_only=False, **kwargs): else: content = get_content(url) #vid = parse_qs(urlparse(url).query).get('vid') #for links specified vid like http://v.qq.com/cover/p/ps6mnfqyrfo7es3.html?vid=q0181hpdvo5 - vid = url.split('/')[-1].split('.')[0] #https://v.qq.com/x/cover/ps6mnfqyrfo7es3/q0181hpdvo5.html? + rurl = match1(content, r'') #https://v.qq.com/x/cover/9hpjiv5fhiyn86u/t0522x58xma.html + vid = "" + if rurl: + vid = rurl.split('/')[-1].split('.')[0] + vid = vid if vid else url.split('/')[-1].split('.')[0] #https://v.qq.com/x/cover/ps6mnfqyrfo7es3/q0181hpdvo5.html? vid = vid if vid else match1(content, r'vid"*\s*:\s*"\s*([^"]+)"') #general fallback - if vid is None: + if not vid: vid = match1(content, r'id"*\s*:\s*"(.+?)"') title = match1(content,r''%vid) title = match1(content, r'title">([^"]+)

') if not title else title From 6e17b0c7f9499ba8b7467d5183a34835b2b10944 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Sat, 30 Dec 2017 20:44:31 +0100 Subject: [PATCH 9/9] [bilibili] enable bangumi API --- src/you_get/extractors/bilibili.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/you_get/extractors/bilibili.py b/src/you_get/extractors/bilibili.py index 76aad869..09e08ecb 100644 --- a/src/you_get/extractors/bilibili.py +++ b/src/you_get/extractors/bilibili.py @@ -174,7 +174,7 @@ class Bilibili(VideoExtractor): except: cid = re.search(r'"cid":(\d+)', self.page).group(1) if cid is not None: - self.download_by_vid(cid, False, **kwargs) + self.download_by_vid(cid, re.search('bangumi', self.url) is not None, **kwargs) else: # flashvars? flashvars = re.search(r'flashvars="([^"]+)"', self.page).group(1)