From f2cbc96c3ea3f0c3b447b50b445de736e535d63f Mon Sep 17 00:00:00 2001 From: Naglis Jonaitis Date: Wed, 14 Jan 2015 00:51:48 +0200 Subject: [PATCH] [lnkgo] Make more robust --- youtube_dl/extractor/lnkgo.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/youtube_dl/extractor/lnkgo.py b/youtube_dl/extractor/lnkgo.py index cfae60154..a8e357859 100644 --- a/youtube_dl/extractor/lnkgo.py +++ b/youtube_dl/extractor/lnkgo.py @@ -62,16 +62,18 @@ def _real_extract(self, url): title = self._og_search_title(webpage) description = self._og_search_description(webpage) - thumbnail = self._og_search_thumbnail(webpage) thumbnail_w = int_or_none( self._og_search_property('image:width', webpage, 'thumbnail width', fatal=False)) thumbnail_h = int_or_none( self._og_search_property('image:height', webpage, 'thumbnail height', fatal=False)) - thumbnails = [{ - 'url': thumbnail, - 'width': thumbnail_w, - 'height': thumbnail_h, - }] + thumbnail = { + 'url': self._og_search_thumbnail(webpage), + } + if thumbnail_w and thumbnail_h: + thumbnail.update({ + 'width': thumbnail_w, + 'height': thumbnail_h, + }) upload_date = unified_strdate(self._search_regex( r'class="meta-item\sair-time">.*?([^<]+)', webpage, 'upload date', fatal=False)) @@ -80,7 +82,7 @@ def _real_extract(self, url): pg_rating = self._search_regex( r'pgrating="([^"]+)"', webpage, 'PG rating', fatal=False, default='') - age_limit = self._AGE_LIMITS.get(pg_rating, 0) + age_limit = self._AGE_LIMITS.get(pg_rating.upper(), 0) sources_js = self._search_regex( r'(?s)sources:\s(\[.*?\]),', webpage, 'sources') @@ -114,7 +116,7 @@ def _real_extract(self, url): 'display_id': display_id, 'title': title, 'formats': formats, - 'thumbnails': thumbnails, + 'thumbnails': [thumbnail], 'duration': duration, 'description': description, 'age_limit': age_limit,