Browse Source

[addanime] better regex.

Abdulelah Alfntokh 12 years ago
parent
commit
198e370f23
1 changed files with 2 additions and 7 deletions
  1. 2 7
      youtube_dl/extractor/addanime.py

+ 2 - 7
youtube_dl/extractor/addanime.py

@@ -8,7 +8,6 @@ from ..utils import (
     compat_urllib_parse_urlparse,
     compat_urllib_parse_urlparse,
 
 
     ExtractorError,
     ExtractorError,
-    RegexNotFoundError,
 )
 )
 
 
 
 
@@ -61,12 +60,8 @@ class AddAnimeIE(InfoExtractor):
                 note=u'Confirming after redirect')
                 note=u'Confirming after redirect')
             webpage = self._download_webpage(url, video_id)
             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_url = self._search_regex(r"var (?:hq|normal)_video_file = '(.*?)';",
+                                       webpage, u'video file URL')
         
         
         video_extension = video_url[-3:]  # mp4 or flv ?
         video_extension = video_url[-3:]  # mp4 or flv ?
         video_title = self._og_search_title(webpage)
         video_title = self._og_search_title(webpage)