R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Rutube] Reworked URL filtering

Browse Source
This commit is contained in:
luceatnobis 2017-07-08 19:47:11 +02:00
parent 2f05373b47
commit 52c3b5a3db
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
youtube_dl/extractor/rutube.py
View File

@ -50,7 +50,8 @@ class RutubeIE(InfoExtractor):
@classmethod @classmethod
def suitable(cls, url): def suitable(cls, url):
return False if RutubePlaylistIE.suitable(url) else super(RutubeIE, cls).suitable(url) parts = compat_urllib_parse_urlparse(url)
return super(RutubeIE, cls).suitable(url) and not parts.query
@staticmethod @staticmethod
def _extract_urls(webpage): def _extract_urls(webpage):
@ -220,7 +221,8 @@ class RutubePlaylistIE(InfoExtractor):
@staticmethod @staticmethod
def suitable(url): def suitable(url):
params = compat_parse_qs(compat_urllib_parse_urlparse(url).query) params = compat_parse_qs(compat_urllib_parse_urlparse(url).query)
return params.get('pl_id') and params['pl_id'][0].isdigit() return params.get('pl_id') and int_or_none(params['pl_id'][0]) \
and params.get('pl_type')
def _real_extract(self, url): def _real_extract(self, url):
playlist_id = self._match_id(url) playlist_id = self._match_id(url)