projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
15da37c
)
[5tv] Add another video URL pattern (closes #13354)
author
rrooij
<rrooij@users.noreply.github.com>
Fri, 14 Jul 2017 15:10:17 +0000
(17:10 +0200)
committer
Sergey M
<dstftw@gmail.com>
Fri, 14 Jul 2017 15:10:17 +0000
(22:10 +0700)
youtube_dl/extractor/fivetv.py
patch
|
blob
|
history
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(