[extractor/generic] Improve rtmp support (closes #11993)

pull/2/head
Sergey M․ 8 years ago
parent 7097bffba6
commit b7a8c1bcfa
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D

@ -29,6 +29,7 @@ from ..utils import (
UnsupportedError, UnsupportedError,
xpath_text, xpath_text,
) )
from .commonprotocols import RtmpIE
from .brightcove import ( from .brightcove import (
BrightcoveLegacyIE, BrightcoveLegacyIE,
BrightcoveNewIE, BrightcoveNewIE,
@ -2487,6 +2488,8 @@ class GenericIE(InfoExtractor):
def check_video(vurl): def check_video(vurl):
if YoutubeIE.suitable(vurl): if YoutubeIE.suitable(vurl):
return True return True
if RtmpIE.suitable(vurl):
return True
vpath = compat_urlparse.urlparse(vurl).path vpath = compat_urlparse.urlparse(vurl).path
vext = determine_ext(vpath) vext = determine_ext(vpath)
return '.' in vpath and vext not in ('swf', 'png', 'jpg', 'srt', 'sbv', 'sub', 'vtt', 'ttml', 'js') return '.' in vpath and vext not in ('swf', 'png', 'jpg', 'srt', 'sbv', 'sub', 'vtt', 'ttml', 'js')
@ -2584,6 +2587,10 @@ class GenericIE(InfoExtractor):
entries.append(self.url_result(video_url, 'Youtube')) entries.append(self.url_result(video_url, 'Youtube'))
continue continue
if RtmpIE.suitable(video_url):
entries.append(self.url_result(video_url, RtmpIE.ie_key()))
continue
# here's a fun little line of code for you: # here's a fun little line of code for you:
video_id = os.path.splitext(video_id)[0] video_id = os.path.splitext(video_id)[0]

Loading…
Cancel
Save