From 9694d45e740a6500d15d027dec8eddfde8149742 Mon Sep 17 00:00:00 2001
From: Oli Allen <oli@oliallen.com>
Date: Thu, 1 Oct 2015 22:50:12 +0100
Subject: [PATCH 1/4] [tumblr] Added support for HD video where available
 (#7036)

---
 youtube_dl/extractor/tumblr.py | 64 ++++++++++++++++++++++++++++++++--
 1 file changed, 61 insertions(+), 3 deletions(-)

diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py
index 3d3b635e4..8037decab 100644
--- a/youtube_dl/extractor/tumblr.py
+++ b/youtube_dl/extractor/tumblr.py
@@ -5,6 +5,7 @@ import re
 
 from .common import InfoExtractor
 
+from ..utils import RegexNotFoundError
 
 class TumblrIE(InfoExtractor):
     _VALID_URL = r'http://(?P<blog_name>.*?)\.tumblr\.com/(?:post|video)/(?P<id>[0-9]+)(?:$|[/?#])'
@@ -28,6 +29,34 @@ class TumblrIE(InfoExtractor):
             'description': 'md5:dba62ac8639482759c8eb10ce474586a',
             'thumbnail': 're:http://.*\.jpg',
         }
+    }, {
+        'url': 'http://larastonesbitch.tumblr.com/post/130035771559/honestlyiconic',
+        'md5': 'f0c88985bd7e85d13603771a8647f270',
+        'resolution': 'hd',
+        'info_dict': {
+            'id': '130035771559',
+            'ext': 'mp4',
+            'title': 'larastonesbitch',
+            'description': 'md5:d9184c8b9396bb5b027b3d8658a43de0',
+            'thumbnail': 're:http://.*\.jpg',
+        },
+        'params': {
+            'format': 'sd',
+        },
+    }, {
+        'url': 'http://larastonesbitch.tumblr.com/post/130035771559/honestlyiconic',
+        'md5': 'a88dea4c03a9cc208cf44eb2dd12248b',
+        'resolution': 'hd',
+        'info_dict': {
+            'id': '130035771559',
+            'ext': 'mp4',
+            'title': 'larastonesbitch',
+            'description': 'md5:d9184c8b9396bb5b027b3d8658a43de0',
+            'thumbnail': 're:http://.*\.jpg',
+        },
+        'params': {
+            'format': 'hd',
+        },
     }, {
         'url': 'http://naked-yogi.tumblr.com/post/118312946248/naked-smoking-stretching',
         'md5': 'de07e5211d60d4f3a2c3df757ea9f6ab',
@@ -57,6 +86,8 @@ class TumblrIE(InfoExtractor):
         video_id = m_url.group('id')
         blog = m_url.group('blog_name')
 
+        video_urls = []
+
         url = 'http://%s.tumblr.com/post/%s/' % (blog, video_id)
         webpage, urlh = self._download_webpage_handle(url, video_id)
 
@@ -68,8 +99,35 @@ class TumblrIE(InfoExtractor):
 
         iframe = self._download_webpage(iframe_url, video_id,
                                         'Downloading iframe page')
-        video_url = self._search_regex(r'<source src="([^"]+)"',
-                                       iframe, 'video url')
+
+        sd_video_url = self._search_regex(r'<source src="([^"]+)"',
+                                          iframe, 'sd video url')
+        format_id = sd_video_url.split("/")[-1] + 'p'
+        if len(format_id) != 4:
+            format_id = "480p"
+        video_urls.append({
+            'ext': 'mp4',
+            'format_id': 'sd',
+            'url': sd_video_url,
+            'resolution': format_id,
+        })
+
+        try:
+            hd_video_url = self._search_regex(r'hdUrl":"([^"]+)"',
+                                              iframe, 'hd video url')
+            hd_video_url = hd_video_url.replace("\\", "")
+            format_id = hd_video_url.split("/")[-1] + 'p'
+            if len(format_id) != 4:
+                format_id = "720p"
+            video_urls.append({
+                'ext': 'mp4',
+                'format_id': 'hd',
+                'url': hd_video_url,
+                'resolution': format_id,
+            })
+        except RegexNotFoundError:
+            # Not all videos will have HD versions
+            pass
 
         # The only place where you can get a title, it's not complete,
         # but searching in other places doesn't work for all videos
@@ -79,7 +137,7 @@ class TumblrIE(InfoExtractor):
 
         return {
             'id': video_id,
-            'url': video_url,
+            'formats': video_urls,
             'ext': 'mp4',
             'title': video_title,
             'description': self._og_search_description(webpage, default=None),

From 27a4d7baa14453585d251562b956b2c6b9b3956d Mon Sep 17 00:00:00 2001
From: Oli Allen <oli@oliallen.com>
Date: Fri, 2 Oct 2015 08:33:16 +0100
Subject: [PATCH 2/4] [tumblr] Replaced test URL for HD video as old one lead
 to 404

---
 youtube_dl/extractor/tumblr.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py
index 8037decab..6077a3076 100644
--- a/youtube_dl/extractor/tumblr.py
+++ b/youtube_dl/extractor/tumblr.py
@@ -7,6 +7,7 @@ from .common import InfoExtractor
 
 from ..utils import RegexNotFoundError
 
+
 class TumblrIE(InfoExtractor):
     _VALID_URL = r'http://(?P<blog_name>.*?)\.tumblr\.com/(?:post|video)/(?P<id>[0-9]+)(?:$|[/?#])'
     _TESTS = [{
@@ -30,28 +31,28 @@ class TumblrIE(InfoExtractor):
             'thumbnail': 're:http://.*\.jpg',
         }
     }, {
-        'url': 'http://larastonesbitch.tumblr.com/post/130035771559/honestlyiconic',
-        'md5': 'f0c88985bd7e85d13603771a8647f270',
+        'url': 'http://hdvideotest.tumblr.com/post/130323439814/test-description-for-my-hd-video',
+        'md5': '99a84522f60972bf064a0b80f87bcbb5',
         'resolution': 'hd',
         'info_dict': {
-            'id': '130035771559',
+            'id': '130323439814',
             'ext': 'mp4',
-            'title': 'larastonesbitch',
-            'description': 'md5:d9184c8b9396bb5b027b3d8658a43de0',
+            'title': 'HD Video Testing \u2014 Test description for my HD video',
+            'description': 'md5:97cc3ab5fcd27ee4af6356701541319c',
             'thumbnail': 're:http://.*\.jpg',
         },
         'params': {
             'format': 'sd',
         },
     }, {
-        'url': 'http://larastonesbitch.tumblr.com/post/130035771559/honestlyiconic',
-        'md5': 'a88dea4c03a9cc208cf44eb2dd12248b',
+        'url': 'http://hdvideotest.tumblr.com/post/130323439814/test-description-for-my-hd-video',
+        'md5': '7ae503065ad150122dc3089f8cf1546c',
         'resolution': 'hd',
         'info_dict': {
-            'id': '130035771559',
+            'id': '130323439814',
             'ext': 'mp4',
-            'title': 'larastonesbitch',
-            'description': 'md5:d9184c8b9396bb5b027b3d8658a43de0',
+            'title': 'HD Video Testing \u2014 Test description for my HD video',
+            'description': 'md5:97cc3ab5fcd27ee4af6356701541319c',
             'thumbnail': 're:http://.*\.jpg',
         },
         'params': {

From c70e57bdc2b4100c26dfa78da771652a9a7560f1 Mon Sep 17 00:00:00 2001
From: Oli Allen <oli@oliallen.com>
Date: Fri, 2 Oct 2015 11:13:51 +0100
Subject: [PATCH 3/4] [tumblr] Don't make assumptions about video resolution,
 cleaner handling of no HD version available

---
 youtube_dl/extractor/tumblr.py | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py
index 6077a3076..63b07d6fd 100644
--- a/youtube_dl/extractor/tumblr.py
+++ b/youtube_dl/extractor/tumblr.py
@@ -5,8 +5,6 @@ import re
 
 from .common import InfoExtractor
 
-from ..utils import RegexNotFoundError
-
 
 class TumblrIE(InfoExtractor):
     _VALID_URL = r'http://(?P<blog_name>.*?)\.tumblr\.com/(?:post|video)/(?P<id>[0-9]+)(?:$|[/?#])'
@@ -103,32 +101,29 @@ class TumblrIE(InfoExtractor):
 
         sd_video_url = self._search_regex(r'<source src="([^"]+)"',
                                           iframe, 'sd video url')
-        format_id = sd_video_url.split("/")[-1] + 'p'
-        if len(format_id) != 4:
-            format_id = "480p"
+        resolution_id = sd_video_url.split("/")[-1] + 'p'
+        if len(resolution_id) != 4:
+            resolution_id = None
         video_urls.append({
             'ext': 'mp4',
             'format_id': 'sd',
             'url': sd_video_url,
-            'resolution': format_id,
+            'resolution': resolution_id,
         })
 
-        try:
-            hd_video_url = self._search_regex(r'hdUrl":"([^"]+)"',
-                                              iframe, 'hd video url')
+        hd_video_url = self._search_regex(r'hdUrl":"([^"]+)"', iframe,
+                                          'hd video url', default=None)
+        if hd_video_url:
             hd_video_url = hd_video_url.replace("\\", "")
-            format_id = hd_video_url.split("/")[-1] + 'p'
-            if len(format_id) != 4:
-                format_id = "720p"
+            resolution_id = hd_video_url.split("/")[-1] + 'p'
+            if len(resolution_id) != 4:
+                resolution_id = None
             video_urls.append({
                 'ext': 'mp4',
                 'format_id': 'hd',
                 'url': hd_video_url,
-                'resolution': format_id,
+                'resolution': resolution_id,
             })
-        except RegexNotFoundError:
-            # Not all videos will have HD versions
-            pass
 
         # The only place where you can get a title, it's not complete,
         # but searching in other places doesn't work for all videos

From c90cd3930a44d35f95e8cc3b06cc540e642878ab Mon Sep 17 00:00:00 2001
From: Oli Allen <oli@oliallen.com>
Date: Sun, 4 Oct 2015 18:14:49 +0100
Subject: [PATCH 4/4] [tumblr] Removed extraneous resolution key in HD video
 tests

---
 youtube_dl/extractor/tumblr.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py
index 63b07d6fd..71cced562 100644
--- a/youtube_dl/extractor/tumblr.py
+++ b/youtube_dl/extractor/tumblr.py
@@ -31,7 +31,6 @@ class TumblrIE(InfoExtractor):
     }, {
         'url': 'http://hdvideotest.tumblr.com/post/130323439814/test-description-for-my-hd-video',
         'md5': '99a84522f60972bf064a0b80f87bcbb5',
-        'resolution': 'hd',
         'info_dict': {
             'id': '130323439814',
             'ext': 'mp4',
@@ -45,7 +44,6 @@ class TumblrIE(InfoExtractor):
     }, {
         'url': 'http://hdvideotest.tumblr.com/post/130323439814/test-description-for-my-hd-video',
         'md5': '7ae503065ad150122dc3089f8cf1546c',
-        'resolution': 'hd',
         'info_dict': {
             'id': '130323439814',
             'ext': 'mp4',