diff options
author | remitamine <remitamine@gmail.com> | 2015-12-03 20:05:11 +0100 |
---|---|---|
committer | remitamine <remitamine@gmail.com> | 2015-12-03 20:05:11 +0100 |
commit | 640bb54e73779f4a941eae1f17e4be049ca575db (patch) | |
tree | ba0c50db3ad5bb0932a56cda66d4f386b145bb22 /youtube_dl/extractor/ruutu.py | |
parent | 497f5fd93fe1efd0df8dc58d518c328ed1409457 (diff) | |
parent | e0977d7686e5df524b1a024484e7a4bb9cfa261d (diff) | |
download | youtube-dl-640bb54e73779f4a941eae1f17e4be049ca575db.tar.xz |
Merge branch 'master' of https://github.com/rg3/youtube-dl into bilibili
Diffstat (limited to 'youtube_dl/extractor/ruutu.py')
-rw-r--r-- | youtube_dl/extractor/ruutu.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/youtube_dl/extractor/ruutu.py b/youtube_dl/extractor/ruutu.py index a16b73ff4..e417bf661 100644 --- a/youtube_dl/extractor/ruutu.py +++ b/youtube_dl/extractor/ruutu.py @@ -57,16 +57,21 @@ class RuutuIE(InfoExtractor): extract_formats(child) elif child.tag.endswith('File'): video_url = child.text - if not video_url or video_url in processed_urls or 'NOT_USED' in video_url: + if (not video_url or video_url in processed_urls or + any(p in video_url for p in ('NOT_USED', 'NOT-USED'))): return processed_urls.append(video_url) ext = determine_ext(video_url) if ext == 'm3u8': - formats.extend(self._extract_m3u8_formats( - video_url, video_id, 'mp4', m3u8_id='hls')) + m3u8_formats = self._extract_m3u8_formats( + video_url, video_id, 'mp4', m3u8_id='hls', fatal=False) + if m3u8_formats: + formats.extend(m3u8_formats) elif ext == 'f4m': - formats.extend(self._extract_f4m_formats( - video_url, video_id, f4m_id='hds')) + f4m_formats = self._extract_f4m_formats( + video_url, video_id, f4m_id='hds', fatal=False) + if f4m_formats: + formats.extend(f4m_formats) else: proto = compat_urllib_parse_urlparse(video_url).scheme if not child.tag.startswith('HTTP') and proto != 'rtmp': |