From f7c20b236c967e6241b48a430c14a6e97681cefd Mon Sep 17 00:00:00 2001 From: David Zhuang Date: Tue, 17 May 2016 15:28:33 -0400 Subject: [PATCH 1/2] [MGTV]Fix some video cannot be downloaded in full length --- src/you_get/extractors/mgtv.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/you_get/extractors/mgtv.py b/src/you_get/extractors/mgtv.py index a3b7a06e..aeb42490 100644 --- a/src/you_get/extractors/mgtv.py +++ b/src/you_get/extractors/mgtv.py @@ -7,6 +7,7 @@ from ..extractor import VideoExtractor from json import loads from urllib.parse import urlsplit from os.path import dirname +import re class MGTV(VideoExtractor): name = "芒果 (MGTV)" @@ -67,6 +68,7 @@ class MGTV(VideoExtractor): if s['video_profile'] in stream_available.keys(): quality_id = self.id_dic[s['video_profile']] url = stream_available[s['video_profile']] + url = re.sub( r'(\&arange\=\d+)', '', url) #Un-Hum segment_list_this = self.get_mgtv_real_url(url) container_this_stream = '' From b9431422d8cdd0e74c55bbaf02b79d1f75c16bd8 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Sat, 28 May 2016 04:19:25 +0200 Subject: [PATCH 2/2] [twitter] support scribe_playlist_url (vine) --- src/you_get/extractors/twitter.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/you_get/extractors/twitter.py b/src/you_get/extractors/twitter.py index b0c89189..09956141 100644 --- a/src/you_get/extractors/twitter.py +++ b/src/you_get/extractors/twitter.py @@ -69,8 +69,14 @@ def twitter_download(url, output_dir='.', merge=True, info_only=False, **kwargs) vmap = get_content(vmap_url) source = r1(r'\s*', vmap) if not item_id: page_title = i['tweet_id'] + elif 'scribe_playlist_url' in i: + scribe_playlist_url = i['scribe_playlist_url'] + return vine_download(scribe_playlist_url, output_dir, merge=merge, info_only=info_only) - urls = extract_m3u(source) + if source.endswith('.mp4'): + urls = [source] + else: + urls = extract_m3u(source) size = urls_size(urls) mime, ext = 'video/mp4', 'mp4'