projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Fix extraction (closes #20758, closes #20759, closes #20761, closes #20762...
[youtube-dl]
/
youtube_dl
/
extractor
/
fivetv.py
diff --git
a/youtube_dl/extractor/fivetv.py
b/youtube_dl/extractor/fivetv.py
index 15736c9fe91e6d5a860641bcbd3be49636b83b47..9f9863746d3daacb8f008a36add7d237ea6ee12f 100644
(file)
--- a/
youtube_dl/extractor/fivetv.py
+++ b/
youtube_dl/extractor/fivetv.py
@@
-43,7
+43,7
@@
class FiveTVIE(InfoExtractor):
'info_dict': {
'id': 'glavnoe',
'ext': 'mp4',
'info_dict': {
'id': 'glavnoe',
'ext': 'mp4',
- 'title':
'Итоги недели с 8 по 14 июня 2015 года
',
+ 'title':
r're:^Итоги недели с \d+ по \d+ \w+ \d{4} года$
',
'thumbnail': r're:^https?://.*\.jpg$',
},
}, {
'thumbnail': r're:^https?://.*\.jpg$',
},
}, {
@@
-70,7
+70,8
@@
class FiveTVIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
video_url = self._search_regex(
webpage = self._download_webpage(url, video_id)
video_url = self._search_regex(
- r'<a[^>]+?href="([^"]+)"[^>]+?class="videoplayer"',
+ [r'<div[^>]+?class="flowplayer[^>]+?data-href="([^"]+)"',
+ r'<a[^>]+?href="([^"]+)"[^>]+?class="videoplayer"'],
webpage, 'video url')
title = self._og_search_title(webpage, default=None) or self._search_regex(
webpage, 'video url')
title = self._og_search_title(webpage, default=None) or self._search_regex(