]> git.bitcoin.ninja Git - youtube-dl/commitdiff
TumblrIE: fix title matching
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Thu, 2 May 2013 11:12:41 +0000 (13:12 +0200)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Thu, 2 May 2013 11:12:41 +0000 (13:12 +0200)
test/tests.json
youtube_dl/InfoExtractors.py

index 4eba27846c9a7085406ab884c8494aab863b228f..2765b5ba0018cc9216436dddd57f47b7da996013 100644 (file)
     "file": "17258355236.mp4",
     "md5": "7c6a514d691b034ccf8567999e9e88a3",
     "info_dict": {
-        "title": "A sample video from LeeAnn. (If you need an idea..."
+        "title": "Calling all Pris! - A sample video from LeeAnn. (If you need an idea..."
     }
   },
   {
index 110ec834cfe34c060ab7a6163fc3108862070172..7e2992748c7269f0aa0c9101f1785e5b58f6cbd3 100755 (executable)
@@ -4267,8 +4267,8 @@ class TumblrIE(InfoExtractor):
 
         # The only place where you can get a title, it's not complete,
         # but searching in other places doesn't work for all videos
-        re_title = r'<title>(.*?) - (?P<title>.*?)</title>'
-        title = unescapeHTML(re.search(re_title, webpage).group('title'))
+        re_title = r'<title>(?P<title>.*?)</title>'
+        title = unescapeHTML(re.search(re_title, webpage, re.DOTALL).group('title'))
 
         return [{'id': video_id,
                  'url': video_url,