projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[teamfourstar] Simplify _VALID_URL and relax regexes
[youtube-dl]
/
youtube_dl
/
extractor
/
twitch.py
diff --git
a/youtube_dl/extractor/twitch.py
b/youtube_dl/extractor/twitch.py
index af6d890b0ed965220232392ac85d3739a5353dd2..77414a242d68f2309985235f0418d47c77194417 100644
(file)
--- a/
youtube_dl/extractor/twitch.py
+++ b/
youtube_dl/extractor/twitch.py
@@
-247,6
+247,7
@@
class TwitchVodIE(TwitchItemBaseIE):
# m3u8 download
'skip_download': True,
},
# m3u8 download
'skip_download': True,
},
+ 'skip': 'HTTP Error 404: Not Found',
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-397,14
+398,11
@@
class TwitchStreamIE(TwitchBaseIE):
channel_id = self._match_id(url)
stream = self._call_api(
channel_id = self._match_id(url)
stream = self._call_api(
- 'kraken/streams/%s' % channel_id, channel_id,
+ 'kraken/streams/%s
?stream_type=all
' % channel_id, channel_id,
'Downloading stream JSON').get('stream')
'Downloading stream JSON').get('stream')
- # Fallback on profile extraction if stream is offline
if not stream:
if not stream:
- return self.url_result(
- 'http://www.twitch.tv/%s/profile' % channel_id,
- 'TwitchProfile', channel_id)
+ raise ExtractorError('%s is offline' % channel_id, expected=True)
# Channel name may be typed if different case than the original channel name
# (e.g. http://www.twitch.tv/TWITCHPLAYSPOKEMON) that will lead to constructing
# Channel name may be typed if different case than the original channel name
# (e.g. http://www.twitch.tv/TWITCHPLAYSPOKEMON) that will lead to constructing
@@
-419,6
+417,7
@@
class TwitchStreamIE(TwitchBaseIE):
query = {
'allow_source': 'true',
'allow_audio_only': 'true',
query = {
'allow_source': 'true',
'allow_audio_only': 'true',
+ 'allow_spectre': 'true',
'p': random.randint(1000000, 10000000),
'player': 'twitchweb',
'segment_preference': '4',
'p': random.randint(1000000, 10000000),
'player': 'twitchweb',
'segment_preference': '4',