depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-28 21:22:13 +00:00
Code Issues Releases Wiki Activity

[twitch:vod] Improve _VALID_URL (closes #11537)

Browse source
This commit is contained in:
Sergey M․ 2016-12-31 22:40:42 +07:00
parent 9a0f999585
commit 3f1ce16876
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
youtube_dl/extractor/twitch.py
View file

@ -206,8 +206,14 @@ class TwitchChapterIE(TwitchItemBaseIE):
class TwitchVodIE(TwitchItemBaseIE): class TwitchVodIE(TwitchItemBaseIE):
IE_NAME = 'twitch:vod' IE_NAME = 'twitch:vod'
_VALID_URL_BASE = r'https?://(?:www\.|player\.)?twitch\.tv' _VALID_URL = r'''(?x)
_VALID_URL = r'%s/(?:[^/]+/v/|\?video=v)(?P<id>\d+)' % _VALID_URL_BASE https?://
(?:
(?:www\.)?twitch\.tv/[^/]+/v/|
player\.twitch\.tv/\?.*?\bvideo=v
)
(?P<id>\d+)
'''
_ITEM_TYPE = 'vod' _ITEM_TYPE = 'vod'
_ITEM_SHORTCUT = 'v' _ITEM_SHORTCUT = 'v'
@ -230,26 +236,6 @@ class TwitchVodIE(TwitchItemBaseIE):
# m3u8 download # m3u8 download
'skip_download': True, 'skip_download': True,
}, },
}, {
# player.twitch.tv URL
'url': 'http://player.twitch.tv/?video=v6528877&t=5m10s',
'info_dict': {
'id': 'v6528877',
'ext': 'mp4',
'title': 'LCK Summer Split - Week 6 Day 1',
'thumbnail': 're:^https?://.*\.jpg$',
'duration': 17208,
'timestamp': 1435131709,
'upload_date': '20150624',
'uploader': 'Riot Games',
'uploader_id': 'riotgames',
'view_count': int,
'start_time': 310,
},
'params': {
# m3u8 download
'skip_download': True,
},
}, { }, {
# Untitled broadcast (title is None) # Untitled broadcast (title is None)
'url': 'http://www.twitch.tv/belkao_o/v/11230755', 'url': 'http://www.twitch.tv/belkao_o/v/11230755',
@ -270,6 +256,9 @@ class TwitchVodIE(TwitchItemBaseIE):
'skip_download': True, 'skip_download': True,
}, },
'skip': 'HTTP Error 404: Not Found', 'skip': 'HTTP Error 404: Not Found',
}, {
'url': 'http://player.twitch.tv/?t=5m10s&video=v6528877',
'only_matching': True,
}] }]
def _real_extract(self, url): def _real_extract(self, url):