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

Merge branch 'print-color' of github.com:minghu6/you-get into print-color

Browse Source
This commit is contained in:
minghu6 2016-05-28 22:51:52 +08:00
commit d03edeab37
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/you_get/extractors/bilibili.py
View File

@ -11,7 +11,7 @@ from .youku import youku_download_by_vid
import hashlib import hashlib
import re import re
appkey='8e9fc618fbd41e28' appkey='f3bb208b3d081dc8'
def get_srt_xml(id): def get_srt_xml(id):
url = 'http://comment.bilibili.com/%s.xml' % id url = 'http://comment.bilibili.com/%s.xml' % id

2
src/you_get/extractors/mgtv.py
View File

@ -7,6 +7,7 @@ from ..extractor import VideoExtractor
from json import loads from json import loads
from urllib.parse import urlsplit from urllib.parse import urlsplit
from os.path import dirname from os.path import dirname
import re
class MGTV(VideoExtractor): class MGTV(VideoExtractor):
name = "芒果 (MGTV)" name = "芒果 (MGTV)"
@ -67,6 +68,7 @@ class MGTV(VideoExtractor):
if s['video_profile'] in stream_available.keys(): if s['video_profile'] in stream_available.keys():
quality_id = self.id_dic[s['video_profile']] quality_id = self.id_dic[s['video_profile']]
url = stream_available[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) segment_list_this = self.get_mgtv_real_url(url)
container_this_stream = '' container_this_stream = ''

8
src/you_get/extractors/twitter.py
View File

@ -69,8 +69,14 @@ def twitter_download(url, output_dir='.', merge=True, info_only=False, **kwargs)
vmap = get_content(vmap_url) vmap = get_content(vmap_url)
source = r1(r'<MediaFile>\s*<!\[CDATA\[(.*)\]\]>', vmap) source = r1(r'<MediaFile>\s*<!\[CDATA\[(.*)\]\]>', vmap)
if not item_id: page_title = i['tweet_id'] 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) size = urls_size(urls)
mime, ext = 'video/mp4', 'mp4' mime, ext = 'video/mp4', 'mp4'