Merge remote-tracking branch 'hojel/slutload'

[youtube-dl] / youtube_dl / extractor / huffpost.py

diff --git a/youtube_dl/extractor/huffpost.py b/youtube_dl/extractor/huffpost.py
index b47114ab47f50f59f03eedd2c0781c9276eb441f..94e7cf79008aa0b2426f70a26ba70218f916d731 100644 (file)
--- a/youtube_dl/extractor/huffpost.py
+++ b/youtube_dl/extractor/huffpost.py
@@ -21,12 +21,14 @@ class HuffPostIE(InfoExtractor):
 
     _TEST = {
         'url': 'http://live.huffingtonpost.com/r/segment/legalese-it/52dd3e4b02a7602131000677',
-        'file': '52dd3e4b02a7602131000677.mp4',
-        'md5': 'TODO',
+        'md5': '55f5e8981c1c80a64706a44b74833de8',
         'info_dict': {
-            'title': 'TODO',
-            'description': 'TODO',
+            'id': '52dd3e4b02a7602131000677',
+            'ext': 'mp4',
+            'title': 'Legalese It! with @MikeSacksHP',
+            'description': 'This week on Legalese It, Mike talks to David Bosco about his new book on the ICC, "Rough Justice," he also discusses the Virginia AG\'s historic stance on gay marriage, the execution of Edgar Tamayo, the ICC\'s delay of Kenya\'s President and more.  ',
             'duration': 1549,
+            'upload_date': '20140124',
         }
     }
 
@@ -39,7 +41,8 @@ class HuffPostIE(InfoExtractor):
 
         video_title = data['title']
         duration = parse_duration(data['running_time'])
-        upload_date = unified_strdate(data['schedule']['started_at'])
+        upload_date = unified_strdate(data['schedule']['starts_at'])
+        description = data.get('description')
 
         thumbnails = []
         for url in data['images'].values():
@@ -58,11 +61,21 @@ class HuffPostIE(InfoExtractor):
             'url': url,
             'vcodec': 'none' if key.startswith('audio/') else None,
         } for key, url in data['sources']['live'].items()]
+        if data.get('fivemin_id'):
+            fid = data['fivemin_id']
+            fcat = str(int(fid) // 100 + 1)
+            furl = 'http://avideos.5min.com/2/' + fcat[-3:] + '/' + fcat + '/' + fid + '.mp4'
+            formats.append({
+                'format': 'fivemin',
+                'url': furl,
+                'preference': 1,
+            })
         self._sort_formats(formats)
 
         return {
             'id': video_id,
             'title': video_title,
+            'description': description,
             'formats': formats,
             'duration': duration,
             'upload_date': upload_date,