projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Extract uploader_url (Closes #8724)
[youtube-dl]
/
youtube_dl
/
extractor
/
vrt.py
diff --git
a/youtube_dl/extractor/vrt.py
b/youtube_dl/extractor/vrt.py
index bbd3bbf7bad98c787c0840ed0f302198ebb7932a..2b6bae89bd2a450c9babe1ea77e299b806b752c1 100644
(file)
--- a/
youtube_dl/extractor/vrt.py
+++ b/
youtube_dl/extractor/vrt.py
@@
-8,7
+8,7
@@
from ..utils import float_or_none
class VRTIE(InfoExtractor):
class VRTIE(InfoExtractor):
- _VALID_URL = r'https?://(?:deredactie|sporza|cobra)\.be/cm/(?:[^/]+/)+(?P<id>[^/]+)/*'
+ _VALID_URL = r'https?://(?:deredactie|sporza|cobra
(?:\.canvas)?
)\.be/cm/(?:[^/]+/)+(?P<id>[^/]+)/*'
_TESTS = [
# deredactie.be
{
_TESTS = [
# deredactie.be
{
@@
-52,6
+52,10
@@
class VRTIE(InfoExtractor):
'duration': 661,
}
},
'duration': 661,
}
},
+ {
+ 'url': 'http://cobra.canvas.be/cm/cobra/videozone/rubriek/film-videozone/1.2377055',
+ 'only_matching': True,
+ }
]
def _real_extract(self, url):
]
def _real_extract(self, url):
@@
-69,11
+73,16
@@
class VRTIE(InfoExtractor):
if mobj:
formats.extend(self._extract_m3u8_formats(
'%s/%s' % (mobj.group('server'), mobj.group('path')),
if mobj:
formats.extend(self._extract_m3u8_formats(
'%s/%s' % (mobj.group('server'), mobj.group('path')),
- video_id, 'mp4'))
+ video_id, 'mp4'
, m3u8_id='hls', fatal=False
))
mobj = re.search(r'data-video-src="(?P<src>[^"]+)"', webpage)
if mobj:
formats.extend(self._extract_f4m_formats(
mobj = re.search(r'data-video-src="(?P<src>[^"]+)"', webpage)
if mobj:
formats.extend(self._extract_f4m_formats(
- '%s/manifest.f4m' % mobj.group('src'), video_id))
+ '%s/manifest.f4m' % mobj.group('src'),
+ video_id, f4m_id='hds', fatal=False))
+
+ if not formats and 'data-video-geoblocking="true"' in webpage:
+ self.raise_geo_restricted('This video is only available in Belgium')
+
self._sort_formats(formats)
title = self._og_search_title(webpage)
self._sort_formats(formats)
title = self._og_search_title(webpage)