projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #7045 from remitamine/ign
[youtube-dl]
/
youtube_dl
/
extractor
/
ruutu.py
diff --git
a/youtube_dl/extractor/ruutu.py
b/youtube_dl/extractor/ruutu.py
index 8ca6e56bbd100f6f54e4d4d101384dec20d51f02..e417bf66147a7d6d8dc9d604fd7fed09acb873ca 100644
(file)
--- a/
youtube_dl/extractor/ruutu.py
+++ b/
youtube_dl/extractor/ruutu.py
@@
-28,7
+28,7
@@
class RuutuIE(InfoExtractor):
},
},
{
},
},
{
- 'url': 'http://www.ruutu.fi/
ohjelmat/superpesis/superpesis-katso-koko-kausi-ruudussa
',
+ 'url': 'http://www.ruutu.fi/
video/2057306
',
'md5': '065a10ae4d5b8cfd9d0c3d332465e3d9',
'info_dict': {
'id': '2057306',
'md5': '065a10ae4d5b8cfd9d0c3d332465e3d9',
'info_dict': {
'id': '2057306',
@@
-57,16
+57,21
@@
class RuutuIE(InfoExtractor):
extract_formats(child)
elif child.tag.endswith('File'):
video_url = child.text
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':
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':
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':
else:
proto = compat_urllib_parse_urlparse(video_url).scheme
if not child.tag.startswith('HTTP') and proto != 'rtmp':
@@
-74,7
+79,7
@@
class RuutuIE(InfoExtractor):
preference = -1 if proto == 'rtmp' else 1
label = child.get('label')
tbr = int_or_none(child.get('bitrate'))
preference = -1 if proto == 'rtmp' else 1
label = child.get('label')
tbr = int_or_none(child.get('bitrate'))
- width, height = [int_or_none(x) for x in child.get('resolution', '
').split('x')
]
+ width, height = [int_or_none(x) for x in child.get('resolution', '
x').split('x')[:2]
]
formats.append({
'format_id': '%s-%s' % (proto, label if label else tbr),
'url': video_url,
formats.append({
'format_id': '%s-%s' % (proto, label if label else tbr),
'url': video_url,