projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
3540fe2
)
[twitch] Added support for player.twitch.tv URLs (closes #11535)
author
Robert Smith
<smithrobertlawrence@gmail.com>
Sun, 25 Dec 2016 22:44:10 +0000
(14:44 -0800)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 31 Dec 2016 15:32:49 +0000
(22:32 +0700)
youtube_dl/extractor/twitch.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/twitch.py
b/youtube_dl/extractor/twitch.py
index bbf071da3ae280f2c2de0b289ff92ac4afe75439..09efa505b4f4ab4e88820a02da5afe6463adb5aa 100644
(file)
--- a/
youtube_dl/extractor/twitch.py
+++ b/
youtube_dl/extractor/twitch.py
@@
-206,7
+206,8
@@
class TwitchChapterIE(TwitchItemBaseIE):
class TwitchVodIE(TwitchItemBaseIE):
IE_NAME = 'twitch:vod'
class TwitchVodIE(TwitchItemBaseIE):
IE_NAME = 'twitch:vod'
- _VALID_URL = r'%s/[^/]+/v/(?P<id>\d+)' % TwitchBaseIE._VALID_URL_BASE
+ _VALID_URL_BASE = r'https?://(?:www\.|player\.)?twitch\.tv'
+ _VALID_URL = r'%s/(?:[^/]+/v/|\?video=v)(?P<id>\d+)' % _VALID_URL_BASE
_ITEM_TYPE = 'vod'
_ITEM_SHORTCUT = 'v'
_ITEM_TYPE = 'vod'
_ITEM_SHORTCUT = 'v'
@@
-229,6
+230,26
@@
class TwitchVodIE(TwitchItemBaseIE):
# m3u8 download
'skip_download': True,
},
# m3u8 download
'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)
'url': 'http://www.twitch.tv/belkao_o/v/11230755',
}, {
# Untitled broadcast (title is None)
'url': 'http://www.twitch.tv/belkao_o/v/11230755',