R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[tumblr] Don't make assumptions about video resolution, cleaner handling of no HD version available

Browse Source
This commit is contained in:
Oli Allen 2015-10-02 11:13:51 +01:00
parent 27a4d7baa1
commit c70e57bdc2
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
youtube_dl/extractor/tumblr.py
View File

@ -5,8 +5,6 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import RegexNotFoundError
class TumblrIE(InfoExtractor): class TumblrIE(InfoExtractor):
_VALID_URL = r'http://(?P<blog_name>.*?)\.tumblr\.com/(?:post|video)/(?P<id>[0-9]+)(?:$|[/?#])' _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="([^"]+)"', sd_video_url = self._search_regex(r'<source src="([^"]+)"',
iframe, 'sd video url') iframe, 'sd video url')
format_id = sd_video_url.split("/")[-1] + 'p' resolution_id = sd_video_url.split("/")[-1] + 'p'
if len(format_id) != 4: if len(resolution_id) != 4:
format_id = "480p" resolution_id = None
video_urls.append({ video_urls.append({
'ext': 'mp4', 'ext': 'mp4',
'format_id': 'sd', 'format_id': 'sd',
'url': sd_video_url, 'url': sd_video_url,
'resolution': format_id, 'resolution': resolution_id,
}) })
try: hd_video_url = self._search_regex(r'hdUrl":"([^"]+)"', iframe,
hd_video_url = self._search_regex(r'hdUrl":"([^"]+)"', 'hd video url', default=None)
iframe, 'hd video url') if hd_video_url:
hd_video_url = hd_video_url.replace("\\", "") hd_video_url = hd_video_url.replace("\\", "")
format_id = hd_video_url.split("/")[-1] + 'p' resolution_id = hd_video_url.split("/")[-1] + 'p'
if len(format_id) != 4: if len(resolution_id) != 4:
format_id = "720p" resolution_id = None
video_urls.append({ video_urls.append({
'ext': 'mp4', 'ext': 'mp4',
'format_id': 'hd', 'format_id': 'hd',
'url': hd_video_url, '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, # The only place where you can get a title, it's not complete,
# but searching in other places doesn't work for all videos # but searching in other places doesn't work for all videos