Merge branch 'develop' into print-color

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 = ''

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'<MediaFile>\s*<!\[CDATA\[(.*)\]\]>', 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'