Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[addanime] catch 'RegexNotFoundError'

pull/1660/head
Abdulelah Alfntokh 2013-10-27 13:36:43 +03:00
parent 14e10b2b6e
commit aee5e18c8f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/extractor/addanime.py
View File

@ -8,6 +8,7 @@ from ..utils import (
compat_urllib_parse_urlparse, compat_urllib_parse_urlparse,
ExtractorError, ExtractorError,
RegexNotFoundError,
) )
@ -60,11 +61,13 @@ 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)
video_url = self._search_regex(r"var hq_video_file = '(.*?)';", try:
webpage, u'video file URL') video_url = self._search_regex(r"var hq_video_file = '(.*?)';",
if not video_url: # if there's no hq_video_file, get normal_video_file webpage, u'video file URL')
except RegexNotFoundError:
video_url = self._search_regex(r"var normal_video_file = '(.*?)';", video_url = self._search_regex(r"var normal_video_file = '(.*?)';",
webpage, u'video file URL') 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)
video_description = self._og_search_description(webpage) video_description = self._og_search_description(webpage)