mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-12-23 06:42:21 +00:00
Squashed commit of the following:
commit da982dec5a21f82bb799510cce5a5531d131cd98 Author: gfabiano <gfabiano40@gmail.com> Date: Mon Jul 30 01:21:27 2018 +0200 fix video_url variable commit 0b8229fd2c853619ca949e20b317c04e1cd32891 Author: gfabiano <gfabiano40@gmail.com> Date: Sun Jul 29 23:18:24 2018 +0200 improved loop commit 0c473a9912281be875f271d400ce6d30f1cc1b87 Author: gfabiano <gfabiano40@gmail.com> Date: Sun Jul 29 22:59:32 2018 +0200 improvement commit 61b58d4628020f54f75efa4e6fdaf856af779fda Author: gfabiano <gfabiano40@gmail.com> Date: Sun Jul 29 02:14:16 2018 +0200 [kickstarter] Added hls support
This commit is contained in:
parent
ec240a4369
commit
8fd2c48f39
@ -2,7 +2,12 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import smuggle_url
|
from ..utils import (
|
||||||
|
int_or_none,
|
||||||
|
smuggle_url,
|
||||||
|
unescapeHTML,
|
||||||
|
url_or_none,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class KickStarterIE(InfoExtractor):
|
class KickStarterIE(InfoExtractor):
|
||||||
@ -37,6 +42,15 @@ class KickStarterIE(InfoExtractor):
|
|||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Power Drive 2000',
|
'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):
|
def _real_extract(self, url):
|
||||||
@ -46,10 +60,35 @@ class KickStarterIE(InfoExtractor):
|
|||||||
title = self._html_search_regex(
|
title = self._html_search_regex(
|
||||||
r'<title>\s*(.*?)(?:\s*—\s*Kickstarter)?\s*</title>',
|
r'<title>\s*(.*?)(?:\s*—\s*Kickstarter)?\s*</title>',
|
||||||
webpage, 'title')
|
webpage, 'title')
|
||||||
video_url = self._search_regex(
|
|
||||||
|
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="(.*?)"',
|
r'data-video-url="(.*?)"',
|
||||||
webpage, 'video URL', default=None)
|
webpage, 'video URL', default=''
|
||||||
if video_url is None: # No native kickstarter, look for embedded videos
|
))
|
||||||
|
if video_url:
|
||||||
|
formats.append({'url': video_url})
|
||||||
|
|
||||||
|
if not formats: # No native kickstarter, look for embedded videos
|
||||||
return {
|
return {
|
||||||
'_type': 'url_transparent',
|
'_type': 'url_transparent',
|
||||||
'ie_key': 'Generic',
|
'ie_key': 'Generic',
|
||||||
@ -62,9 +101,11 @@ class KickStarterIE(InfoExtractor):
|
|||||||
thumbnail = self._html_search_regex(
|
thumbnail = self._html_search_regex(
|
||||||
r'<img[^>]+class="[^"]+\s*poster\s*[^"]+"[^>]+src="([^"]+)"',
|
r'<img[^>]+class="[^"]+\s*poster\s*[^"]+"[^>]+src="([^"]+)"',
|
||||||
webpage, 'thumbnail image', fatal=False)
|
webpage, 'thumbnail image', fatal=False)
|
||||||
|
|
||||||
|
self._sort_formats(formats)
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'url': video_url,
|
'formats': formats,
|
||||||
'title': title,
|
'title': title,
|
||||||
'description': self._og_search_description(webpage, default=None),
|
'description': self._og_search_description(webpage, default=None),
|
||||||
'thumbnail': thumbnail,
|
'thumbnail': thumbnail,
|
||||||
|
Loading…
Reference in New Issue
Block a user