[moniker] Support embed- URLs (#6450)

This commit is contained in:
Yen Chi Hsuan 2015-08-15 15:17:27 +08:00
parent 6be5e46994
commit d0d6c097fc

View File

@ -9,7 +9,10 @@ from ..compat import (
compat_urllib_parse, compat_urllib_parse,
compat_urllib_request, compat_urllib_request,
) )
from ..utils import ExtractorError from ..utils import (
ExtractorError,
remove_start,
)
class MonikerIE(InfoExtractor): class MonikerIE(InfoExtractor):
@ -24,6 +27,14 @@ class MonikerIE(InfoExtractor):
'ext': 'mp4', 'ext': 'mp4',
'title': 'youtube-dl test video', 'title': 'youtube-dl test video',
}, },
}, {
'url': 'http://allmyvideos.net/embed-jih3nce3x6wn',
'md5': '710883dee1bfc370ecf9fa6a89307c88',
'info_dict': {
'id': 'jih3nce3x6wn',
'ext': 'mp4',
'title': 'youtube-dl test video',
},
}, { }, {
'url': 'http://vidspot.net/l2ngsmhs8ci5', 'url': 'http://vidspot.net/l2ngsmhs8ci5',
'md5': '710883dee1bfc370ecf9fa6a89307c88', 'md5': '710883dee1bfc370ecf9fa6a89307c88',
@ -38,7 +49,10 @@ class MonikerIE(InfoExtractor):
}] }]
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) orig_video_id = self._match_id(url)
video_id = remove_start(orig_video_id, 'embed-')
url = url.replace(orig_video_id, video_id)
assert re.match(self._VALID_URL, url) is not None
orig_webpage = self._download_webpage(url, video_id) orig_webpage = self._download_webpage(url, video_id)
if '>File Not Found<' in orig_webpage: if '>File Not Found<' in orig_webpage: