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

[vimeo]fix regex; do not panic if one id in a channel failed

Browse Source
This commit is contained in:
MaxwellGoblin 2017-07-09 20:39:13 +08:00
parent 8e40b66a7e
commit ee50695951
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,10 @@
__all__ = ['vimeo_download', 'vimeo_download_by_id', 'vimeo_download_by_channel', 'vimeo_download_by_channel_id'] __all__ = ['vimeo_download', 'vimeo_download_by_id', 'vimeo_download_by_channel', 'vimeo_download_by_channel_id']
from ..common import * from ..common import *
from ..util.log import *
from json import loads from json import loads
import urllib.error
access_token = 'f6785418277b72c7c87d3132c79eec24' #By Beining access_token = 'f6785418277b72c7c87d3132c79eec24' #By Beining
#---------------------------------------------------------------------- #----------------------------------------------------------------------
@ -25,7 +28,10 @@ def vimeo_download_by_channel_id(channel_id, output_dir='.', merge=False, info_o
id_list.append(match1(i['uri'], r'/videos/(\w+)')) id_list.append(match1(i['uri'], r'/videos/(\w+)'))
for id in id_list: for id in id_list:
try:
vimeo_download_by_id(id, None, output_dir, merge, info_only) vimeo_download_by_id(id, None, output_dir, merge, info_only)
except urllib.error.URLError as e:
log.w('{} failed with {}'.format(id, e))
def vimeo_download_by_id(id, title=None, output_dir='.', merge=True, info_only=False, **kwargs): def vimeo_download_by_id(id, title=None, output_dir='.', merge=True, info_only=False, **kwargs):
try: try:
@ -42,7 +48,7 @@ def vimeo_download_by_id(id, title=None, output_dir='.', merge=True, info_only=F
video_page = get_content('http://player.vimeo.com/video/%s' % id, headers=fake_headers) video_page = get_content('http://player.vimeo.com/video/%s' % id, headers=fake_headers)
title = r1(r'<title>([^<]+)</title>', video_page) title = r1(r'<title>([^<]+)</title>', video_page)
info = loads(match1(video_page, r'var t=(\{[^;]+\});')) info = loads(match1(video_page, r'var t=(\{.+?\});'))
streams = info['request']['files']['progressive'] streams = info['request']['files']['progressive']
streams = sorted(streams, key=lambda i: i['height']) streams = sorted(streams, key=lambda i: i['height'])