projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #7322 from remitamine/vgtv
[youtube-dl]
/
youtube_dl
/
extractor
/
youtube.py
diff --git
a/youtube_dl/extractor/youtube.py
b/youtube_dl/extractor/youtube.py
index d63aa5f4e6e2eb78c100723f00d21f5648f1ca1e..4aac2cc03a0b10886c997d18e0607a54a0d0447f 100644
(file)
--- a/
youtube_dl/extractor/youtube.py
+++ b/
youtube_dl/extractor/youtube.py
@@
-26,7
+26,7
@@
from ..compat import (
from ..utils import (
clean_html,
encode_dict,
from ..utils import (
clean_html,
encode_dict,
- error_to_str,
+ error_to_
compat_
str,
ExtractorError,
float_or_none,
get_element_by_attribute,
ExtractorError,
float_or_none,
get_element_by_attribute,
@@
-904,7
+904,7
@@
class YoutubeIE(YoutubeBaseInfoExtractor):
'https://video.google.com/timedtext?hl=en&type=list&v=%s' % video_id,
video_id, note=False)
except ExtractorError as err:
'https://video.google.com/timedtext?hl=en&type=list&v=%s' % video_id,
video_id, note=False)
except ExtractorError as err:
- self._downloader.report_warning('unable to download video subtitles: %s' % error_to_str(err))
+ self._downloader.report_warning('unable to download video subtitles: %s' % error_to_
compat_
str(err))
return {}
sub_lang_list = {}
return {}
sub_lang_list = {}
@@
-1775,6
+1775,10
@@
class YoutubeChannelIE(YoutubePlaylistBaseInfoExtractor):
},
}]
},
}]
+ @classmethod
+ def suitable(cls, url):
+ return False if YoutubePlaylistsIE.suitable(url) else super(YoutubeChannelIE, cls).suitable(url)
+
def _real_extract(self, url):
channel_id = self._match_id(url)
def _real_extract(self, url):
channel_id = self._match_id(url)
@@
-1848,10
+1852,10
@@
class YoutubeUserIE(YoutubeChannelIE):
return super(YoutubeUserIE, cls).suitable(url)
return super(YoutubeUserIE, cls).suitable(url)
-class Youtube
User
PlaylistsIE(YoutubePlaylistsBaseInfoExtractor):
- IE_DESC = 'YouTube.com user playlists'
- _VALID_URL = r'https?://(?:\w+\.)?youtube\.com/
user
/(?P<id>[^/]+)/playlists'
- IE_NAME = 'youtube:
user:
playlists'
+class YoutubePlaylistsIE(YoutubePlaylistsBaseInfoExtractor):
+ IE_DESC = 'YouTube.com user
/channel
playlists'
+ _VALID_URL = r'https?://(?:\w+\.)?youtube\.com/
(?:user|channel)
/(?P<id>[^/]+)/playlists'
+ IE_NAME = 'youtube:playlists'
_TESTS = [{
'url': 'http://www.youtube.com/user/ThirstForScience/playlists',
_TESTS = [{
'url': 'http://www.youtube.com/user/ThirstForScience/playlists',
@@
-1868,6
+1872,13
@@
class YoutubeUserPlaylistsIE(YoutubePlaylistsBaseInfoExtractor):
'id': 'igorkle1',
'title': 'Игорь Клейнер',
},
'id': 'igorkle1',
'title': 'Игорь Клейнер',
},
+ }, {
+ 'url': 'https://www.youtube.com/channel/UCiU1dHvZObB2iP6xkJ__Icw/playlists',
+ 'playlist_mincount': 17,
+ 'info_dict': {
+ 'id': 'UCiU1dHvZObB2iP6xkJ__Icw',
+ 'title': 'Chem Player',
+ },
}]
}]