X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftumblr.py;h=4f844706d365950d6e1d04e237a5c20df7a1cafc;hb=5633b4d39d178402c6d89146c8c9c34e3bf58619;hp=449ba29fa41b89caadf53e43e0987247862bd1f2;hpb=140ac7396542d92a8ddd53be6c35c7a79db16180;p=youtube-dl diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dl/extractor/tumblr.py index 449ba29fa..4f844706d 100644 --- a/youtube_dl/extractor/tumblr.py +++ b/youtube_dl/extractor/tumblr.py @@ -29,19 +29,6 @@ class TumblrIE(InfoExtractor): 'description': 'md5:dba62ac8639482759c8eb10ce474586a', 'thumbnail': 're:http://.*\.jpg', } - }, { - 'url': 'http://hdvideotest.tumblr.com/post/130323439814/test-description-for-my-hd-video', - 'md5': '99a84522f60972bf064a0b80f87bcbb5', - 'info_dict': { - 'id': '130323439814', - 'ext': 'mp4', - 'title': 'HD Video Testing \u2014 Test description for my HD video', - 'description': 'md5:97cc3ab5fcd27ee4af6356701541319c', - 'thumbnail': 're:http://.*\.jpg', - }, - 'params': { - 'format': 'sd', - }, }, { 'url': 'http://hdvideotest.tumblr.com/post/130323439814/test-description-for-my-hd-video', 'md5': '7ae503065ad150122dc3089f8cf1546c', @@ -64,6 +51,9 @@ class TumblrIE(InfoExtractor): 'title': 'naked smoking & stretching', 'upload_date': '20150506', 'timestamp': 1430931613, + 'age_limit': 18, + 'uploader_id': '1638622', + 'uploader': 'naked-yogi', }, 'add_ie': ['Vidme'], }, { @@ -134,7 +124,6 @@ class TumblrIE(InfoExtractor): return { 'id': video_id, - 'ext': 'mp4', 'title': video_title, 'description': self._og_search_description(webpage, default=None), 'thumbnail': self._og_search_thumbnail(webpage, default=None),