Merge branch 'twitter_download_fix' of https://github.com/Cphilo/you-get into Cphilo-twitter_download_fix

This commit is contained in:
Mort Yao 2017-10-13 15:12:49 +02:00
commit 103238188d
No known key found for this signature in database
GPG Key ID: 07DA00CB78203251

View File

@ -7,9 +7,9 @@ from .vine import vine_download
def extract_m3u(source): def extract_m3u(source):
r1 = get_content(source) r1 = get_content(source)
s1 = re.findall(r'(/ext_tw_video/.*)', r1) s1 = re.findall(r'(/amplify_video/.*)', r1)
r2 = get_content('https://video.twimg.com%s' % s1[-1]) r2 = get_content('https://video.twimg.com%s' % s1[-1])
s2 = re.findall(r'(/ext_tw_video/.*)', r2) s2 = re.findall(r'(/amplify_video/.*)', r2)
return ['https://video.twimg.com%s' % i for i in s2] return ['https://video.twimg.com%s' % i for i in s2]
def twitter_download(url, output_dir='.', merge=True, info_only=False, **kwargs): def twitter_download(url, output_dir='.', merge=True, info_only=False, **kwargs):