diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-09-14 00:32:20 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-09-14 00:32:20 +0200 |
| commit | 2b3c2546782f84e0b3fe42b55d2030e5350cbe92 (patch) | |
| tree | eaf0b9b81e765074b09278761e5a6a1228082ed2 /youtube_dl/extractor/youtube.py | |
| parent | 287be8c615574f90f4fac5adad0b32b3102f621e (diff) | |
| download | youtube-dl-2b3c2546782f84e0b3fe42b55d2030e5350cbe92.tar.xz | |
[youtube:channel] Correct 404 handling
Previously, when we encountered a 404 - such as youtube-dl https://www.youtube.com/ohJeiboh8oorehai - we crashed with a regexp error. Instead, make sure to go on and eventually report a 404.
Diffstat (limited to 'youtube_dl/extractor/youtube.py')
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index abacdfaed..b252e36e1 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -1654,12 +1654,15 @@ class YoutubeChannelIE(InfoExtractor): channel_page = self._download_webpage( url + '?view=57', channel_id, 'Downloading channel page', fatal=False) - channel_playlist_id = self._html_search_meta( - 'channelId', channel_page, 'channel id', default=None) - if not channel_playlist_id: - channel_playlist_id = self._search_regex( - r'data-channel-external-id="([^"]+)"', - channel_page, 'channel id', default=None) + if channel_page is False: + channel_playlist_id = False + else: + channel_playlist_id = self._html_search_meta( + 'channelId', channel_page, 'channel id', default=None) + if not channel_playlist_id: + channel_playlist_id = self._search_regex( + r'data-channel-external-id="([^"]+)"', + channel_page, 'channel id', default=None) if channel_playlist_id and channel_playlist_id.startswith('UC'): playlist_id = 'UU' + channel_playlist_id[2:] return self.url_result( |