From: Sergey M․ Date: Fri, 17 Jun 2016 22:37:53 +0000 (+0700) Subject: [pornhd] Improve formats extraction X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=e6fe993c318738fee5a4a2ce7a86c4512e42653a;p=youtube-dl [pornhd] Improve formats extraction --- diff --git a/youtube_dl/extractor/pornhd.py b/youtube_dl/extractor/pornhd.py index 33faf5e58..e7721b013 100644 --- a/youtube_dl/extractor/pornhd.py +++ b/youtube_dl/extractor/pornhd.py @@ -7,7 +7,6 @@ from .common import InfoExtractor from ..utils import ( int_or_none, js_to_json, - qualities, ) @@ -46,18 +45,19 @@ class PornHdIE(InfoExtractor): thumbnail = self._search_regex( r"'poster'\s*:\s*'([^']+)'", webpage, 'thumbnail', fatal=False) - quality = qualities(['sd', 'hd']) sources = json.loads(js_to_json(self._search_regex( r"(?s)'sources'\s*:\s*(\{.+?\})\s*\}[;,)]", webpage, 'sources'))) formats = [] - for qname, video_url in sources.items(): + for format_id, video_url in sources.items(): if not video_url: continue + height = int_or_none(self._search_regex( + r'^(\d+)[pP]', format_id, 'height', default=None)) formats.append({ 'url': video_url, - 'format_id': qname, - 'quality': quality(qname), + 'format_id': format_id, + 'height': height, }) self._sort_formats(formats)