diff options
author | Filippo Valsorda <filippo.valsorda@gmail.com> | 2013-06-17 19:25:35 +0200 |
---|---|---|
committer | Filippo Valsorda <filippo.valsorda@gmail.com> | 2013-06-17 19:25:35 +0200 |
commit | af44c9486255f16ab180a9e45aaab06a6b38bdde (patch) | |
tree | 36c4854e6b5dab97b0129352c9d8c7da6ce47ab5 | |
parent | ee55fcbe121baa0dacc9f87b9aa3abd974291355 (diff) |
use _search_regex in GenericIE
-rwxr-xr-x | youtube_dl/InfoExtractors.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 24e9c4cc7..3c95012b1 100755 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -1430,16 +1430,12 @@ class GenericIE(InfoExtractor): # Site Name | Video Title # Video Title - Tagline | Site Name # and so on and so forth; it's just not practical - mobj = re.search(r'<title>(.*)</title>', webpage) - if mobj is None: - raise ExtractorError(u'Unable to extract title') - video_title = mobj.group(1) + video_title = self._html_search_regex(r'<title>(.*)</title>', + webpage, u'video title') # video uploader is domain name - mobj = re.match(r'(?:https?://)?([^/]*)/.*', url) - if mobj is None: - raise ExtractorError(u'Unable to extract title') - video_uploader = mobj.group(1) + video_uploader = self._search_regex(r'(?:https?://)?([^/]*)/.*', + url, u'video uploader') return [{ 'id': video_id, |