From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 27 Jun 2013 19:19:42 +0000 (+0200)
Subject: [tumblr] Fix title
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=3f223f7b2ea64cc958b0c37e06f90cc5196476e6;p=youtube-dl

[tumblr] Fix title
---

diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py
index 618199d6b..243f04bff 100644
--- a/youtube_dl/extractor/tumblr.py
+++ b/youtube_dl/extractor/tumblr.py
@@ -13,7 +13,7 @@ class TumblrIE(InfoExtractor):
         u'file': u'53364321212.mp4',
         u'md5': u'0716d3dd51baf68a28b40fdf1251494e',
         u'info_dict': {
-            u"title": u"Rafael Lemos | Tumblr"
+            u"title": u"Rafael Lemos"
         }
     }
 
@@ -38,7 +38,7 @@ 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
-        video_title = self._html_search_regex(r'<title>(?P<title>.*?)</title>',
+        video_title = self._html_search_regex(r'<title>(?P<title>.*?)(?: \| Tumblr)?</title>',
             webpage, u'title', flags=re.DOTALL)
 
         return [{'id': video_id,