compat_urllib_parse_urlparse,
ExtractorError,
- RegexNotFoundError,
)
_TEST = {
u'url': u'http://www.add-anime.net/watch_video.php?v=24MR3YO5SAS9',
u'file': u'24MR3YO5SAS9.mp4',
- u'md5': u'3f8e232ad52163c87fa23897e736cb2c',
+ u'md5': u'72954ea10bc979ab5e2eb288b21425a0',
u'info_dict': {
u"description": u"One Piece 606",
u"title": u"One Piece 606"
video_id = mobj.group('video_id')
webpage = self._download_webpage(url, video_id)
except ExtractorError as ee:
- if not isinstance(ee.cause, compat_HTTPError):
+ if not isinstance(ee.cause, compat_HTTPError) or \
+ ee.cause.code != 503:
raise
redir_webpage = ee.cause.read().decode('utf-8')
note=u'Confirming after redirect')
webpage = self._download_webpage(url, video_id)
- try:
- video_url = self._search_regex(r"var hq_video_file = '(.*?)';",
- webpage, u'video file URL')
- except RegexNotFoundError:
- video_url = self._search_regex(r"var normal_video_file = '(.*?)';",
- webpage, u'video file URL')
-
- video_extension = video_url[-3:] # mp4 or flv ?
+ formats = []
+ for format_id in ('normal', 'hq'):
+ rex = r"var %s_video_file = '(.*?)';" % re.escape(format_id)
+ video_url = self._search_regex(rex, webpage, u'video file URLx',
+ fatal=False)
+ if not video_url:
+ continue
+ formats.append({
+ 'format_id': format_id,
+ 'url': video_url,
+ })
+ if not formats:
+ raise ExtractorError(u'Cannot find any video format!')
video_title = self._og_search_title(webpage)
video_description = self._og_search_description(webpage)
return {
'_type': 'video',
'id': video_id,
- 'url': video_url,
- 'ext': video_extension,
+ 'formats': formats,
'title': video_title,
'description': video_description
}