]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
use _search_regex in GenericIE
authorFilippo Valsorda <filippo.valsorda@gmail.com>
Mon, 17 Jun 2013 17:25:35 +0000 (19:25 +0200)
committerFilippo Valsorda <filippo.valsorda@gmail.com>
Mon, 17 Jun 2013 17:25:35 +0000 (19:25 +0200)
youtube_dl/InfoExtractors.py

index 24e9c4cc7bc0fdecabf64fef0c6d6a18b7020590..3c95012b19ea45997b988341b466c09aff1a2776 100755 (executable)
@@ -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,