X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Faddanime.py;h=a3a1b999df25da791617c46a793843b2fd6ddc99;hb=3ee52157fbade0dc5aab23c25db4c3d86f9d0dd3;hp=45aac15c328ba30b655178e860d9abcfbba0b682;hpb=aee5e18c8f4c4360216ab27a2b1362a2ce24881e;p=youtube-dl

diff --git a/youtube_dl/extractor/addanime.py b/youtube_dl/extractor/addanime.py
index 45aac15c3..a3a1b999d 100644
--- a/youtube_dl/extractor/addanime.py
+++ b/youtube_dl/extractor/addanime.py
@@ -8,18 +8,17 @@ from ..utils import (
     compat_urllib_parse_urlparse,
 
     ExtractorError,
-    RegexNotFoundError,
 )
 
 
 class AddAnimeIE(InfoExtractor):
 
-    _VALID_URL = r'^http://(?:\w+\.)?add-anime\.net/watch_video.php\?(?:.*?)v=(?P<video_id>[\w_]+)(?:.*)'
+    _VALID_URL = r'^http://(?:\w+\.)?add-anime\.net/watch_video\.php\?(?:.*?)v=(?P<video_id>[\w_]+)(?:.*)'
     IE_NAME = u'AddAnime'
     _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"
@@ -32,7 +31,8 @@ class AddAnimeIE(InfoExtractor):
             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')
@@ -61,22 +61,26 @@ class AddAnimeIE(InfoExtractor):
                 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
         }