projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[drtuber] Add one more title regex
[youtube-dl]
/
youtube_dl
/
extractor
/
rtlnl.py
diff --git
a/youtube_dl/extractor/rtlnl.py
b/youtube_dl/extractor/rtlnl.py
index 0ab1eb69c8c82ae0bc04ec135971cd919b17a155..a3ca79f2ccfd2e00c09a4f9b2a9503fa85669b65 100644
(file)
--- a/
youtube_dl/extractor/rtlnl.py
+++ b/
youtube_dl/extractor/rtlnl.py
@@
-8,7
+8,7
@@
from ..utils import parse_duration
class RtlXlIE(InfoExtractor):
IE_NAME = 'rtlxl.nl'
class RtlXlIE(InfoExtractor):
IE_NAME = 'rtlxl.nl'
- _VALID_URL = r'https?://
www\.
rtlxl\.nl/#!/[^/]+/(?P<uuid>[^/?]+)'
+ _VALID_URL = r'https?://
(www\.)?
rtlxl\.nl/#!/[^/]+/(?P<uuid>[^/?]+)'
_TEST = {
'url': 'http://www.rtlxl.nl/#!/rtl-nieuws-132237/6e4203a6-0a5e-3596-8424-c599a59e0677',
_TEST = {
'url': 'http://www.rtlxl.nl/#!/rtl-nieuws-132237/6e4203a6-0a5e-3596-8424-c599a59e0677',
@@
-38,12
+38,13
@@
class RtlXlIE(InfoExtractor):
progname = info['abstracts'][0]['name']
subtitle = material['title'] or info['episodes'][0]['name']
progname = info['abstracts'][0]['name']
subtitle = material['title'] or info['episodes'][0]['name']
- videopath = material['videopath']
- f4m_url = 'http://manifest.us.rtl.nl' + videopath
+ # Use unencrypted m3u8 streams (See https://github.com/rg3/youtube-dl/issues/4118)
+ videopath = material['videopath'].replace('.f4m', '.m3u8')
+ m3u8_url = 'http://manifest.us.rtl.nl' + videopath
- formats = self._extract_
f4m_formats(f4m_url, uuid
)
+ formats = self._extract_
m3u8_formats(m3u8_url, uuid, ext='mp4'
)
- video_urlpart = videopath.split('/flash/')[1][:-
4
]
+ video_urlpart = videopath.split('/flash/')[1][:-
5
]
PG_URL_TEMPLATE = 'http://pg.us.rtl.nl/rtlxl/network/%s/progressive/%s.mp4'
formats.extend([
PG_URL_TEMPLATE = 'http://pg.us.rtl.nl/rtlxl/network/%s/progressive/%s.mp4'
formats.extend([
@@
-54,9
+55,12
@@
class RtlXlIE(InfoExtractor):
{
'url': PG_URL_TEMPLATE % ('a3m', video_urlpart),
'format_id': 'pg-hd',
{
'url': PG_URL_TEMPLATE % ('a3m', video_urlpart),
'format_id': 'pg-hd',
+ 'quality': 0,
}
])
}
])
+ self._sort_formats(formats)
+
return {
'id': uuid,
'title': '%s - %s' % (progname, subtitle),
return {
'id': uuid,
'title': '%s - %s' % (progname, subtitle),