Prepare for upload.

[youtubedl] / youtube_dl / extractor / vice.py

diff --git a/youtube_dl/extractor/vice.py b/youtube_dl/extractor/vice.py
index 8a00c8fee17ee84ae0d8d0e1e7360ca67befc8b0..f0a7fd7397bd81670f993dbeb18553eb011bbd2a 100644 (file)
--- a/youtube_dl/extractor/vice.py
+++ b/youtube_dl/extractor/vice.py
@@ -70,10 +70,10 @@ class ViceBaseIE(AdobePassIE):
             'url': uplynk_preplay_url,
             'id': video_id,
             'title': title,
             'url': uplynk_preplay_url,
             'id': video_id,
             'title': title,

-            'description': base.get('body'),
+            'description': base.get('body') or base.get('display_body'),

             'thumbnail': watch_hub_data.get('cover-image') or watch_hub_data.get('thumbnail'),
             'thumbnail': watch_hub_data.get('cover-image') or watch_hub_data.get('thumbnail'),

-            'duration': parse_duration(video_data.get('video_duration') or watch_hub_data.get('video-duration')),
-            'timestamp': int_or_none(video_data.get('created_at')),
+            'duration': int_or_none(video_data.get('video_duration')) or parse_duration(watch_hub_data.get('video-duration')),
+            'timestamp': int_or_none(video_data.get('created_at'), 1000),

             'age_limit': parse_age_limit(video_data.get('video_rating')),
             'series': video_data.get('show_title') or watch_hub_data.get('show-title'),
             'episode_number': int_or_none(episode.get('episode_number') or watch_hub_data.get('episode')),
             'age_limit': parse_age_limit(video_data.get('video_rating')),
             'series': video_data.get('show_title') or watch_hub_data.get('show-title'),
             'episode_number': int_or_none(episode.get('episode_number') or watch_hub_data.get('episode')),