[generic] detecting bittorrent manifest files
This commit is contained in:
parent
21c370bf29
commit
b36bfac24e
|
@ -2482,7 +2482,7 @@ class GenericIE(InfoExtractor):
|
||||||
|
|
||||||
# Check for direct link to a video
|
# Check for direct link to a video
|
||||||
content_type = head_response.headers.get('Content-Type', '').lower()
|
content_type = head_response.headers.get('Content-Type', '').lower()
|
||||||
m = re.match(r'^(?P<type>audio|video|application(?=/(?:ogg$|(?:vnd\.apple\.|x-)?mpegurl)))/(?P<format_id>[^;\s]+)', content_type)
|
m = re.match(r'^(?P<type>audio|video|application(?=/(?:ogg$|(?:vnd\.apple\.|x-)?(?:mpegurl|bittorrent))))/(?P<format_id>[^;\s]+)', content_type)
|
||||||
if m:
|
if m:
|
||||||
format_id = compat_str(m.group('format_id'))
|
format_id = compat_str(m.group('format_id'))
|
||||||
if format_id.endswith('mpegurl'):
|
if format_id.endswith('mpegurl'):
|
||||||
|
@ -2493,6 +2493,7 @@ class GenericIE(InfoExtractor):
|
||||||
formats = [{
|
formats = [{
|
||||||
'format_id': format_id,
|
'format_id': format_id,
|
||||||
'url': url,
|
'url': url,
|
||||||
|
'protocol': 'bittorrent' if format_id.endswith('bittorrent') else None,
|
||||||
'vcodec': 'none' if m.group('type') == 'audio' else None
|
'vcodec': 'none' if m.group('type') == 'audio' else None
|
||||||
}]
|
}]
|
||||||
info_dict['direct'] = True
|
info_dict['direct'] = True
|
||||||
|
@ -2526,6 +2527,20 @@ class GenericIE(InfoExtractor):
|
||||||
self._sort_formats(info_dict['formats'])
|
self._sort_formats(info_dict['formats'])
|
||||||
return info_dict
|
return info_dict
|
||||||
|
|
||||||
|
# Is it a BitTorrent manifest file?
|
||||||
|
if any(first_bytes.startswith(byt) for byt in (
|
||||||
|
b'd8:announce',
|
||||||
|
b'd13:announce-list',
|
||||||
|
b'd7:comment',
|
||||||
|
b'd4:info',
|
||||||
|
)):
|
||||||
|
info_dict['formats'] = [{
|
||||||
|
'url': url,
|
||||||
|
'protocol': 'bittorrent',
|
||||||
|
}]
|
||||||
|
# info_dict['direct'] = True
|
||||||
|
return info_dict
|
||||||
|
|
||||||
# Maybe it's a direct link to a video?
|
# Maybe it's a direct link to a video?
|
||||||
# Be careful not to download the whole thing!
|
# Be careful not to download the whole thing!
|
||||||
if not is_html(first_bytes):
|
if not is_html(first_bytes):
|
||||||
|
|
Loading…
Reference in a new issue