depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-29 13:42:37 +00:00
Code Issues Releases Wiki Activity

[viki] Fix description extraction (closes #6339)

Browse source
This commit is contained in:
Yen Chi Hsuan 2015-07-23 13:39:19 +08:00
parent b37317d8b0
commit 41597d9bed
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
youtube_dl/extractor/viki.py
View file

@ -173,6 +173,19 @@ class VikiIE(VikiBaseIE):
}, { }, {
'url': 'http://www.viki.com/player/44699v', 'url': 'http://www.viki.com/player/44699v',
'only_matching': True, 'only_matching': True,
}, {
# non-English description
'url': 'http://www.viki.com/videos/158036v-love-in-magic',
'md5': '1713ae35df5a521b31f6dc40730e7c9c',
'info_dict': {
'id': '158036v',
'ext': 'mp4',
'uploader': 'I Planet Entertainment',
'upload_date': '20111122',
'timestamp': 1321985454,
'description': 'md5:44b1e46619df3a072294645c770cef36',
'title': 'Love In Magic',
},
}] }]
def _real_extract(self, url): def _real_extract(self, url):
@ -192,8 +205,12 @@ class VikiIE(VikiBaseIE):
container_title = container_titles.get('en') or container_titles[container_titles.keys()[0]] container_title = container_titles.get('en') or container_titles[container_titles.keys()[0]]
title = '%s - %s' % (container_title, title) title = '%s - %s' % (container_title, title)
descriptions = video.get('descriptions') descriptions = video.get('descriptions', {})
description = descriptions.get('en') or descriptions[titles.keys()[0]] if descriptions else None description = descriptions.get('en')
if description is None:
filtered_descriptions = list(filter(None, [descriptions.get(k) for k in titles.keys()]))
if filtered_descriptions:
description = filtered_descriptions[0]
duration = int_or_none(video.get('duration')) duration = int_or_none(video.get('duration'))
timestamp = parse_iso8601(video.get('created_at')) timestamp = parse_iso8601(video.get('created_at'))