projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6afe044
)
[dcn] make m3u8 formats extraction non fatal
author
remitamine
<remitamine@gmail.com>
Mon, 28 Dec 2015 09:27:17 +0000
(10:27 +0100)
committer
remitamine
<remitamine@gmail.com>
Mon, 28 Dec 2015 09:27:17 +0000
(10:27 +0100)
youtube_dl/extractor/dcn.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/dcn.py
b/youtube_dl/extractor/dcn.py
index 3857ba334da265297ce99f1c57cfb1200a2a2cf9..d9485cd8677f296070e6b80859ff91da4267b389 100644
(file)
--- a/
youtube_dl/extractor/dcn.py
+++ b/
youtube_dl/extractor/dcn.py
@@
-54,10
+54,14
@@
class DCNBaseIE(InfoExtractor):
}
def _extract_video_formats(self, webpage, video_id, entry_protocol):
}
def _extract_video_formats(self, webpage, video_id, entry_protocol):
+ formats = []
m3u8_url = self._html_search_regex(
m3u8_url = self._html_search_regex(
- r'file\s*:\s*"([^"]+)', webpage, 'm3u8 url')
- formats = self._extract_m3u8_formats(
- m3u8_url, video_id, 'mp4', entry_protocol, m3u8_id='hls')
+ r'file\s*:\s*"([^"]+)', webpage, 'm3u8 url', fatal=False)
+ if m3u8_url:
+ m3u8_formats = self._extract_m3u8_formats(
+ m3u8_url, video_id, 'mp4', entry_protocol, m3u8_id='hls', fatal=None)
+ if m3u8_formats:
+ formats.extend(m3u8_formats)
rtsp_url = self._search_regex(
r'<a[^>]+href="(rtsp://[^"]+)"', webpage, 'rtsp url', fatal=False)
rtsp_url = self._search_regex(
r'<a[^>]+href="(rtsp://[^"]+)"', webpage, 'rtsp url', fatal=False)
@@
-117,21
+121,6
@@
class DCNVideoIE(DCNBaseIE):
class DCNLiveIE(DCNBaseIE):
IE_NAME = 'dcn:live'
_VALID_URL = r'https?://(?:www\.)?dcndigital\.ae/(?:#/)?live/(?P<id>\d+)'
class DCNLiveIE(DCNBaseIE):
IE_NAME = 'dcn:live'
_VALID_URL = r'https?://(?:www\.)?dcndigital\.ae/(?:#/)?live/(?P<id>\d+)'
- _TEST = {
- 'url': 'http://www.dcndigital.ae/#/live/6/dubai-tv',
- 'info_dict':
- {
- 'id': '6',
- 'ext': 'mp4',
- 'title': 're:^Dubai Al Oula [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
- 'thumbnail': 're:^https?://.*\.png$',
- 'is_live': True,
- },
- 'params': {
- # m3u8 download
- 'skip_download': True,
- },
- }
def _real_extract(self, url):
channel_id = self._match_id(url)
def _real_extract(self, url):
channel_id = self._match_id(url)