youtube-dl

commit 104ccdb8b4acaf071c17b22bc8cb9561dff4ebe5
parent aed523ecc15febe787d919bba8f4ca3cb8c1abf2
Author: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date:   Thu,  2 May 2013 13:12:41 +0200

TumblrIE: fix title matching

Diffstat:
M
test/tests.json
 | 
2
+-
M
youtube_dl/InfoExtractors.py
 | 
4
++--

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/tests.json b/test/tests.json
@@ -344,7 +344,7 @@
     "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..."
     }
   },
   {
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
@@ -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,