projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c985664
)
[francetvinfo] Extend video id extraction (closes #20619) (#20740)
author
mtilbury
<26613468+mtilbury@users.noreply.github.com>
Sat, 4 May 2019 23:26:30 +0000
(16:26 -0700)
committer
Sergey M
<dstftw@gmail.com>
Sat, 4 May 2019 23:26:30 +0000
(06:26 +0700)
youtube_dl/extractor/francetv.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/francetv.py
b/youtube_dl/extractor/francetv.py
index 20f449c5c23ae96e49c8d5cede132cb347485e6c..81b468c7d1e030f7ba67fed2a7ef2562c8164c76 100644
(file)
--- a/
youtube_dl/extractor/francetv.py
+++ b/
youtube_dl/extractor/francetv.py
@@
-371,12
+371,13
@@
class FranceTVInfoIE(FranceTVBaseInfoExtractor):
self.url_result(dailymotion_url, DailymotionIE.ie_key())
for dailymotion_url in dailymotion_urls])
self.url_result(dailymotion_url, DailymotionIE.ie_key())
for dailymotion_url in dailymotion_urls])
- video_id, catalogue = self._search_regex(
- (r'id-video=([^@]+@[^"]+)',
+ video_id = self._search_regex(
+ (r'player\.load[^;]+src:\s*["\']([^"\']+)',
+ r'id-video=([^@]+@[^"]+)',
r'<a[^>]+href="(?:https?:)?//videos\.francetv\.fr/video/([^@]+@[^"]+)"'),
r'<a[^>]+href="(?:https?:)?//videos\.francetv\.fr/video/([^@]+@[^"]+)"'),
- webpage, 'video id')
.split('@')
+ webpage, 'video id')
- return self._make_url_result(video_id
, catalogue
)
+ return self._make_url_result(video_id)
class FranceTVInfoSportIE(FranceTVBaseInfoExtractor):
class FranceTVInfoSportIE(FranceTVBaseInfoExtractor):