From 8fd2c48f398b58e7b8a880dfb414112a31772691 Mon Sep 17 00:00:00 2001 From: gfabiano Date: Mon, 30 Jul 2018 01:29:12 +0200 Subject: [PATCH] Squashed commit of the following: commit da982dec5a21f82bb799510cce5a5531d131cd98 Author: gfabiano Date: Mon Jul 30 01:21:27 2018 +0200 fix video_url variable commit 0b8229fd2c853619ca949e20b317c04e1cd32891 Author: gfabiano Date: Sun Jul 29 23:18:24 2018 +0200 improved loop commit 0c473a9912281be875f271d400ce6d30f1cc1b87 Author: gfabiano Date: Sun Jul 29 22:59:32 2018 +0200 improvement commit 61b58d4628020f54f75efa4e6fdaf856af779fda Author: gfabiano Date: Sun Jul 29 02:14:16 2018 +0200 [kickstarter] Added hls support --- youtube_dl/extractor/kickstarter.py | 53 +++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 6 deletions(-) diff --git a/youtube_dl/extractor/kickstarter.py b/youtube_dl/extractor/kickstarter.py index d4da8f484..dfe792e70 100644 --- a/youtube_dl/extractor/kickstarter.py +++ b/youtube_dl/extractor/kickstarter.py @@ -2,7 +2,12 @@ from __future__ import unicode_literals from .common import InfoExtractor -from ..utils import smuggle_url +from ..utils import ( + int_or_none, + smuggle_url, + unescapeHTML, + url_or_none, +) class KickStarterIE(InfoExtractor): @@ -37,6 +42,15 @@ class KickStarterIE(InfoExtractor): 'ext': 'mp4', 'title': 'Power Drive 2000', }, + }, { # hls + 'url': 'https://www.kickstarter.com/projects/mccaskellgames/last-one-standing-the-battle-royale-board-game', + 'md5': 'fec77f16122b967e638b3de52b69ebe0', + 'info_dict': { + 'id': 'mccaskellgames', + 'ext': 'mp4', + 'title': 'Last One Standing: The Battle Royale Board Game by Brendan McCaskell', + 'description': 'Up to 8 players find themselves on an ever-shrinking map where they must shoot, move and loot to be the last one standing.', + }, }] def _real_extract(self, url): @@ -46,10 +60,35 @@ class KickStarterIE(InfoExtractor): title = self._html_search_regex( r'\s*(.*?)(?:\s*—\s*Kickstarter)?\s*', webpage, 'title') - video_url = self._search_regex( - r'data-video-url="(.*?)"', - webpage, 'video URL', default=None) - if video_url is None: # No native kickstarter, look for embedded videos + + video_data = self._parse_json(self._search_regex( + r'data-video="(.*?)"', + webpage, 'video URL', default='{}' + ), video_id, transform_source=unescapeHTML) + + formats = [] + if video_data: + hls_url = url_or_none(video_data.get('hls')) + if hls_url: + formats.extend(self._extract_m3u8_formats( + hls_url, video_id, 'mp4', 'm3u8_native', fatal=False) + ) + height = int_or_none(video_data.get('height')) + width = int_or_none(video_data.get('widht')) + for quality in ['base', 'high']: + video_url = url_or_none(video_data.get(quality)) + if video_url: + formats.append({'url': video_url, 'height': height, 'width': width}) + + if not formats: # fallback + video_url = url_or_none(self._search_regex( + r'data-video-url="(.*?)"', + webpage, 'video URL', default='' + )) + if video_url: + formats.append({'url': video_url}) + + if not formats: # No native kickstarter, look for embedded videos return { '_type': 'url_transparent', 'ie_key': 'Generic', @@ -62,9 +101,11 @@ class KickStarterIE(InfoExtractor): thumbnail = self._html_search_regex( r']+class="[^"]+\s*poster\s*[^"]+"[^>]+src="([^"]+)"', webpage, 'thumbnail image', fatal=False) + + self._sort_formats(formats) return { 'id': video_id, - 'url': video_url, + 'formats': formats, 'title': title, 'description': self._og_search_description(webpage, default=None), 'thumbnail': thumbnail,