projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b6e760
)
[francetv:site] Relax video id regex and update test (closes #20268)
author
Sergey M․
<dstftw@gmail.com>
Fri, 8 Mar 2019 16:26:59 +0000
(23:26 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Fri, 8 Mar 2019 16:28:24 +0000
(23:28 +0700)
youtube_dl/extractor/francetv.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/francetv.py
b/youtube_dl/extractor/francetv.py
index 3c4ef08a833361d9a9dd82f186637fcec26a7348..6101fb6bdfcc3640cf727b2b7babe024f6dbf3d3 100644
(file)
--- a/
youtube_dl/extractor/francetv.py
+++ b/
youtube_dl/extractor/francetv.py
@@
-215,7
+215,7
@@
class FranceTVSiteIE(FranceTVBaseInfoExtractor):
_TESTS = [{
'url': 'https://www.france.tv/france-2/13h15-le-dimanche/140921-les-mysteres-de-jesus.html',
'info_dict': {
_TESTS = [{
'url': 'https://www.france.tv/france-2/13h15-le-dimanche/140921-les-mysteres-de-jesus.html',
'info_dict': {
- 'id': '
162311093
',
+ 'id': '
ec217ecc-0733-48cf-ac06-af1347b849d1
',
'ext': 'mp4',
'title': '13h15, le dimanche... - Les mystères de Jésus',
'description': 'md5:75efe8d4c0a8205e5904498ffe1e1a42',
'ext': 'mp4',
'title': '13h15, le dimanche... - Les mystères de Jésus',
'description': 'md5:75efe8d4c0a8205e5904498ffe1e1a42',
@@
-271,7
+271,7
@@
class FranceTVSiteIE(FranceTVBaseInfoExtractor):
catalogue = None
video_id = self._search_regex(
catalogue = None
video_id = self._search_regex(
- r'(?:data-main-video\s*=|videoId
\s*:
)\s*(["\'])(?P<id>(?:(?!\1).)+)\1',
+ r'(?:data-main-video\s*=|videoId
["\']?\s*[:=]
)\s*(["\'])(?P<id>(?:(?!\1).)+)\1',
webpage, 'video id', default=None, group='id')
if not video_id:
webpage, 'video id', default=None, group='id')
if not video_id: