From: Jaime Marquínez Ferrándiz Date: Thu, 2 May 2013 11:12:41 +0000 (+0200) Subject: TumblrIE: fix title matching X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=104ccdb8b4acaf071c17b22bc8cb9561dff4ebe5;p=youtube-dl TumblrIE: fix title matching --- diff --git a/test/tests.json b/test/tests.json index 4eba27846..2765b5ba0 100644 --- 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 index 110ec834c..7e2992748 100755 --- 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'(.*?) - (?P<title>.*?)' - title = unescapeHTML(re.search(re_title, webpage).group('title')) + re_title = r'(?P<title>.*?)' + title = unescapeHTML(re.search(re_title, webpage, re.DOTALL).group('title')) return [{'id': video_id, 'url': video_url,