|
|
@ -17,7 +17,7 @@ from ..utils import (
|
|
|
|
|
|
|
|
|
|
|
|
class MonikerIE(InfoExtractor):
|
|
|
|
class MonikerIE(InfoExtractor):
|
|
|
|
IE_DESC = 'allmyvideos.net and vidspot.net'
|
|
|
|
IE_DESC = 'allmyvideos.net and vidspot.net'
|
|
|
|
_VALID_URL = r'https?://(?:www\.)?(?:allmyvideos|vidspot)\.net/(?P<id>[a-zA-Z0-9_-]+)'
|
|
|
|
_VALID_URL = r'https?://(?:www\.)?(?:allmyvideos|vidspot)\.net/(?:(?:2|v)/v-)?(?P<id>[a-zA-Z0-9_-]+)'
|
|
|
|
|
|
|
|
|
|
|
|
_TESTS = [{
|
|
|
|
_TESTS = [{
|
|
|
|
'url': 'http://allmyvideos.net/jih3nce3x6wn',
|
|
|
|
'url': 'http://allmyvideos.net/jih3nce3x6wn',
|
|
|
@ -64,6 +64,17 @@ class MonikerIE(InfoExtractor):
|
|
|
|
raise ExtractorError(
|
|
|
|
raise ExtractorError(
|
|
|
|
'%s returned error: %s' % (self.IE_NAME, error), expected=True)
|
|
|
|
'%s returned error: %s' % (self.IE_NAME, error), expected=True)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
builtin_url = self._search_regex(
|
|
|
|
|
|
|
|
r'<iframe[^>]+src=(["\'])(?P<url>.+?/builtin-.+?)\1',
|
|
|
|
|
|
|
|
orig_webpage, 'builtin URL', default=None, group='url')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if builtin_url:
|
|
|
|
|
|
|
|
req = compat_urllib_request.Request(builtin_url)
|
|
|
|
|
|
|
|
req.add_header('Referer', url)
|
|
|
|
|
|
|
|
webpage = self._download_webpage(req, video_id, 'Downloading builtin page')
|
|
|
|
|
|
|
|
title = self._og_search_title(orig_webpage).strip()
|
|
|
|
|
|
|
|
description = self._og_search_description(orig_webpage).strip()
|
|
|
|
|
|
|
|
else:
|
|
|
|
fields = re.findall(r'type="hidden" name="(.+?)"\s* value="?(.+?)">', orig_webpage)
|
|
|
|
fields = re.findall(r'type="hidden" name="(.+?)"\s* value="?(.+?)">', orig_webpage)
|
|
|
|
data = dict(fields)
|
|
|
|
data = dict(fields)
|
|
|
|
|
|
|
|
|
|
|
@ -76,6 +87,7 @@ class MonikerIE(InfoExtractor):
|
|
|
|
req, video_id, note='Downloading video page ...')
|
|
|
|
req, video_id, note='Downloading video page ...')
|
|
|
|
|
|
|
|
|
|
|
|
title = os.path.splitext(data['fname'])[0]
|
|
|
|
title = os.path.splitext(data['fname'])[0]
|
|
|
|
|
|
|
|
description = None
|
|
|
|
|
|
|
|
|
|
|
|
# Could be several links with different quality
|
|
|
|
# Could be several links with different quality
|
|
|
|
links = re.findall(r'"file" : "?(.+?)",', webpage)
|
|
|
|
links = re.findall(r'"file" : "?(.+?)",', webpage)
|
|
|
@ -89,5 +101,6 @@ class MonikerIE(InfoExtractor):
|
|
|
|
return {
|
|
|
|
return {
|
|
|
|
'id': video_id,
|
|
|
|
'id': video_id,
|
|
|
|
'title': title,
|
|
|
|
'title': title,
|
|
|
|
|
|
|
|
'description': description,
|
|
|
|
'formats': formats,
|
|
|
|
'formats': formats,
|
|
|
|
}
|
|
|
|
}
|
|
|
|