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

disambiguated id patterns using the slug

Browse Source
This commit is contained in:
Emmanuel Froissart 2019-06-12 23:27:04 +02:00
parent c0319bc4da
commit acda141738
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/extractor/tf1.py
View File

@ -61,8 +61,16 @@ class TF1IE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
slug = self._search_regex(
r'(?<=/)(?P<slug>[^/]+)(?=\.html$)',
url, 'slug', group='slug', default='')
wat_id = self._html_search_regex( wat_id = self._html_search_regex(
[r'(["\'])(?:https?:)?//www\.wat\.tv/embedframe/.*?(?P<id>\d{8})\1', [r'(["\'])(?:https?:)?//www\.wat\.tv/embedframe/.*?(?P<id>\d{8})\1',
r'(["\']?)streamId\1\s*:\s*["\']?(?P<id>\d+)'], r'(["\']?)streamId\1\s*:\s*(["\']?)(?P<id>\d+)\2\s*,[^}}]*(["\']?)slug\4\s*:\s*(["\']){}\5'
.format(slug),
r'(["\']?)slug\1\s*:\s*(["\']){}\2,[^}}]*(["\']?)streamId\3\s*:\s*(["\']?)(?P<id>\d+)\4'
.format(slug),
r'(["\']?)streamId\1\s*:\s*(["\']?)(?P<id>\d+)\2'
],
webpage, 'wat id', group='id') webpage, 'wat id', group='id')
return self.url_result('wat:%s' % wat_id, 'Wat') return self.url_result('wat:%s' % wat_id, 'Wat')