Merge tag 'upstream/2013.08.08'

[youtubedl] / youtube_dl / extractor / bliptv.py

diff --git a/youtube_dl/extractor/bliptv.py b/youtube_dl/extractor/bliptv.py
index df2ad4be2a454ff7f864e775586970e126787a37..08b28c994272e3461bba5d99856928ff6adb6cf3 100644 (file)
--- a/youtube_dl/extractor/bliptv.py
+++ b/youtube_dl/extractor/bliptv.py
@@ -24,6 +24,17 @@ class BlipTVIE(InfoExtractor):
     _VALID_URL = r'^(?:https?://)?(?:\w+\.)?blip\.tv/((.+/)|(play/)|(api\.swf#))(.+)$'
     _URL_EXT = r'^.*\.([a-z0-9]+)$'
     IE_NAME = u'blip.tv'
     _VALID_URL = r'^(?:https?://)?(?:\w+\.)?blip\.tv/((.+/)|(play/)|(api\.swf#))(.+)$'
     _URL_EXT = r'^.*\.([a-z0-9]+)$'
     IE_NAME = u'blip.tv'

+    _TEST = {
+        u'url': u'http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352',
+        u'file': u'5779306.m4v',
+        u'md5': u'80baf1ec5c3d2019037c1c707d676b9f',
+        u'info_dict': {
+            u"upload_date": u"20111205", 
+            u"description": u"md5:9bc31f227219cde65e47eeec8d2dc596", 
+            u"uploader": u"Comic Book Resources - CBR TV", 
+            u"title": u"CBR EXCLUSIVE: \"Gotham City Imposters\" Bats VS Jokerz Short 3"
+        }
+    }

 
     def report_direct_download(self, title):
         """Report information extraction."""
 
     def report_direct_download(self, title):
         """Report information extraction."""


@@ -92,7 +103,12 @@ class BlipTVIE(InfoExtractor):
                     data = json_data
 
                 upload_date = datetime.datetime.strptime(data['datestamp'], '%m-%d-%y %H:%M%p').strftime('%Y%m%d')
                     data = json_data
 
                 upload_date = datetime.datetime.strptime(data['datestamp'], '%m-%d-%y %H:%M%p').strftime('%Y%m%d')

-                video_url = data['media']['url']
+                if 'additionalMedia' in data:
+                    formats = sorted(data['additionalMedia'], key=lambda f: int(f['media_height']))
+                    best_format = formats[-1]
+                    video_url = best_format['url']
+                else:
+                    video_url = data['media']['url']

                 umobj = re.match(self._URL_EXT, video_url)
                 if umobj is None:
                     raise ValueError('Can not determine filename extension')
                 umobj = re.match(self._URL_EXT, video_url)
                 if umobj is None:
                     raise ValueError('Can not determine filename extension')


@@ -173,5 +189,5 @@ class BlipTVUserIE(InfoExtractor):
             pagenum += 1
 
         urls = [u'http://blip.tv/%s' % video_id for video_id in video_ids]
             pagenum += 1
 
         urls = [u'http://blip.tv/%s' % video_id for video_id in video_ids]

-        url_entries = [self.url_result(url, 'BlipTV') for url in urls]
+        url_entries = [self.url_result(vurl, 'BlipTV') for vurl in urls]

         return [self.playlist_result(url_entries, playlist_title = username)]
         return [self.playlist_result(url_entries, playlist_title = username)]