mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-14 20:38:11 -05:00
b827ee921f
* [scrippsnetworks] Add new extractor(closes #19857)(closes #22981) * [teachable] Improve locked lessons detection (#23528) * [teachable] Fail with error message if no video URL found * [extractors] add missing import for ScrippsNetworksIE * [brightcove] cache brightcove player policy keys * [prosiebensat1] improve geo restriction handling(closes #23571) * [soundcloud] automatically update client id on failing requests * [spankbang] Fix extraction (closes #23307, closes #23423, closes #23444) * [spankbang] Improve removed video detection (#23423) * [brightcove] update policy key on failing requests * [pornhub] Fix extraction and add support for m3u8 formats (closes #22749, closes #23082) * [pornhub] Improve locked videos detection (closes #22449, closes #22780) * [brightcove] invalidate policy key cache on failing requests * [soundcloud] fix client id extraction for non fatal requests * [ChangeLog] Actualize [ci skip] * [devscripts/create-github-release] Switch to using PAT for authentication Basic authentication will be deprecated soon * release 2020.01.01 * [redtube] Detect private videos (#23518) * [vice] improve extraction(closes #23631) * [devscripts/create-github-release] Remove unused import * [wistia] improve format extraction and extract subtitles(closes #22590) * [nrktv:seriebase] Fix extraction (closes #23625) (#23537) * [discovery] fix anonymous token extraction(closes #23650) * [scrippsnetworks] add support for www.discovery.com videos * [scrippsnetworks] correct test case URL * [dctp] fix format extraction(closes #23656) * [pandatv] Remove extractor (#23630) * [naver] improve extraction - improve geo-restriction handling - extract automatic captions - extract uploader metadata - extract VLive HLS formats * [naver] improve metadata extraction * [cloudflarestream] improve extraction - add support for bytehighway.net domain - add support for signed URLs - extract thumbnail * [cloudflarestream] import embed URL extraction * [lego] fix extraction and extract subtitle(closes #23687) * [safari] Fix kaltura session extraction (closes #23679) (#23670) * [orf:fm4] Fix extraction (#23599) * [orf:radio] Clean description and improve extraction * [twitter] add support for promo_video_website cards(closes #23711) * [vodplatform] add support for embed.kwikmotion.com domain * [ndr:base:embed] Improve thumbnails extraction (closes #23731) * [canvas] Add support for new API endpoint and update tests (closes #17680, closes #18629) * [travis] Add flake8 job (#23720) * [yourporn] Fix extraction (closes #21645, closes #22255, closes #23459) * [ChangeLog] Actualize [ci skip] * release 2020.01.15 * [soundcloud] Restore previews extraction (closes #23739) * [orf:tvthek] Improve geo restricted videos detection (closes #23741) * [zype] improve extraction - extract subtitles(closes #21258) - support URLs with alternative keys/tokens(#21258) - extract more metadata * [americastestkitchen] fix extraction * [nbc] add support for nbc multi network URLs(closes #23049) * [ard] improve extraction(closes #23761) - simplify extraction - extract age limit and series - bypass geo-restriction * [ivi:compilation] Fix entries extraction (closes #23770) * [24video] Add support for 24video.vip (closes #23753) * [businessinsider] Fix jwplatform id extraction (closes #22929) (#22954) * [ard] add a missing condition * [azmedien] fix extraction(closes #23783) * [voicerepublic] fix extraction * [stretchinternet] fix extraction(closes #4319) * [youtube] Fix sigfunc name extraction (closes #23819) * [ChangeLog] Actualize [ci skip] * release 2020.01.24 * [soundcloud] imporve private playlist/set tracks extraction https://github.com/ytdl-org/youtube-dl/issues/3707#issuecomment-577873539 * [svt] fix article extraction(closes #22897)(closes #22919) * [svt] fix series extraction(closes #22297) * [viewlift] improve extraction - fix extraction(closes #23851) - add add support for authentication - add support for more domains * [vimeo] fix album extraction(closes #23864) * [tva] Relax _VALID_URL (closes #23903) * [tv5mondeplus] Fix extraction (closes #23907, closes #23911) * [twitch:stream] Lowercase channel id for stream request (closes #23917) * [sportdeutschland] Update to new sportdeutschland API They switched to SSL, but under a different host AND path... Remove the old test cases because these videos have become unavailable. * [popcorntimes] Add extractor (closes #23949) * [thisoldhouse] fix extraction(closes #23951) * [toggle] Add support for mewatch.sg (closes #23895) (#23930) * [compat] Introduce compat_realpath (refs #23991) * [update] Fix updating via symlinks (closes #23991) * [nytimes] improve format sorting(closes #24010) * [abc:iview] Support 720p (#22907) (#22921) * [nova:embed] Fix extraction (closes #23672) * [nova:embed] Improve (closes #23690) * [nova] Improve extraction (refs #23690) * [jpopsuki] Remove extractor (closes #23858) * [YoutubeDL] Fix playlist entry indexing with --playlist-items (closes #10591, closes #10622) * [test_YoutubeDL] Fix get_ids * [test_YoutubeDL] Add tests for #10591 (closes #23873) * [24video] Add support for porn.24video.net (closes #23779, closes #23784) * [npr] Add support for streams (closes #24042) * [ChangeLog] Actualize [ci skip] * release 2020.02.16 * [tv2dk:bornholm:play] Fix extraction (#24076) * [imdb] Fix extraction (closes #23443) * [wistia] Add support for multiple generic embeds (closes #8347, closes #11385) * [teachable] Add support for multiple videos per lecture (closes #24101) * [pornhd] Fix extraction (closes #24128) * [options] Remove duplicate short option -v for --version (#24162) * [extractor/common] Convert ISM manifest to unicode before processing on python 2 (#24152) * [YoutubeDL] Force redirect URL to unicode on python 2 * Remove no longer needed compat_str around geturl * [youjizz] Fix extraction (closes #24181) * [test_subtitles] Remove obsolete test * [zdf:channel] Fix tests * [zapiks] Fix test * [xtube] Fix metadata extraction (closes #21073, closes #22455) * [xtube:user] Fix test * [telecinco] Fix extraction (refs #24195) * [telecinco] Add support for article opening videos * [franceculture] Fix extraction (closes #24204) * [xhamster] Fix extraction (closes #24205) * [ChangeLog] Actualize [ci skip] * release 2020.03.01 * [vimeo] Fix subtitles URLs (#24209) * [servus] Add support for new URL schema (closes #23475, closes #23583, closes #24142) * [youtube:playlist] Fix tests (closes #23872) (#23885) * [peertube] Improve extraction * [peertube] Fix issues and improve extraction (closes #23657) * [pornhub] Improve title extraction (closes #24184) * [vimeo] fix showcase password protected video extraction(closes #24224) * [youtube] Fix age-gated videos support without login (closes #24248) * [youtube] Fix tests * [ChangeLog] Actualize [ci skip] * release 2020.03.06 * [nhk] update API version(closes #24270) * [youtube] Improve extraction in 429 error conditions (closes #24283) * [youtube] Improve age-gated videos extraction in 429 error conditions (refs #24283) * [youtube] Remove outdated code Additional get_video_info requests don't seem to provide any extra itags any longer * [README.md] Clarify 429 error * [pornhub] Add support for pornhubpremium.com (#24288) * [utils] Add support for cookies with spaces used instead of tabs * [ChangeLog] Actualize [ci skip] * release 2020.03.08 * Revert "[utils] Add support for cookies with spaces used instead of tabs" According to [1] TABs must be used as separators between fields. Files produces by some tools with spaces as separators are considered malformed. 1. https://curl.haxx.se/docs/http-cookies.html This reverts commitcff99c91d1
. * [utils] Add reference to cookie file format * Revert "[vimeo] fix showcase password protected video extraction(closes #24224)" This reverts commit12ee431676
. * [nhk] Relax _VALID_URL (#24329) * [nhk] Remove obsolete rtmp formats (closes #24329) * [nhk] Update m3u8 URL and use native hls (#24329) * [ndr] Fix extraction (closes #24326) * [xtube] Fix formats extraction (closes #24348) * [xtube] Fix typo * [hellporno] Fix extraction (closes #24399) * [cbc:watch] Add support for authentication * [cbc:watch] Fix authenticated device token caching (closes #19160) * [soundcloud] fix download url extraction(closes #24394) * [limelight] remove disabled API requests(closes #24255) * [bilibili] Add support for new URL schema with BV ids (closes #24439, closes #24442) * [bilibili] Add support for player.bilibili.com (closes #24402) * [teachable] Extract chapter metadata (closes #24421) * [generic] Look for teachable embeds before wistia * [teachable] Update upskillcourses domain New version does not use teachable platform any longer * [teachable] Update gns3 domain * [teachable] Update test * [ChangeLog] Actualize [ci skip] * [ChangeLog] Actualize [ci skip] * release 2020.03.24 * [spankwire] Fix extraction (closes #18924, closes #20648) * [spankwire] Add support for generic embeds (refs #24633) * [youporn] Add support form generic embeds * [mofosex] Add support for generic embeds (closes #24633) * [tele5] Fix extraction (closes #24553) * [extractor/common] Skip malformed ISM manifest XMLs while extracting ISM formats (#24667) * [tv4] Fix ISM formats extraction (closes #24667) * [twitch:clips] Extend _VALID_URL (closes #24290) (#24642) * [motherless] Fix extraction (closes #24699) * [nova:embed] Fix extraction (closes #24700) * [youtube] Skip broken multifeed videos (closes #24711) * [soundcloud] Extract AAC format * [soundcloud] Improve AAC format extraction (closes #19173, closes #24708) * [thisoldhouse] Fix video id extraction (closes #24548) Added support for: with of without "www." and either ".chorus.build" or ".com" It now validated correctly on older URL's ``` <iframe src="https://thisoldhouse.chorus.build/videos/zype/5e33baec27d2e50001d5f52f ``` and newer ones ``` <iframe src="https://www.thisoldhouse.com/videos/zype/5e2b70e95216cc0001615120 ``` * [thisoldhouse] Improve video id extraction (closes #24549) * [youtube] Fix DRM videos detection (refs #24736) * [options] Clarify doc on --exec command (closes #19087) (#24883) * [prosiebensat1] Improve extraction and remove 7tv.de support (#24948) * [prosiebensat1] Extract series metadata * [tenplay] Relax _VALID_URL (closes #25001) * [tvplay] fix Viafree extraction(closes #15189)(closes #24473)(closes #24789) * [yahoo] fix GYAO Player extraction and relax title URL regex(closes #24178)(closes #24778) * [youtube] Use redirected video id if any (closes #25063) * [youtube] Improve player id extraction and add tests * [extractor/common] Extract multiple JSON-LD entries * [crunchyroll] Fix and improve extraction (closes #25096, closes #25060) * [ChangeLog] Actualize [ci skip] * release 2020.05.03 * [puhutv] Remove no longer available HTTP formats (closes #25124) * [utils] Improve cookie files support + Add support for UTF-8 in cookie files * Skip malformed cookie file entries instead of crashing (invalid entry len, invalid expires at) * [dailymotion] Fix typo * [compat] Introduce compat_cookiejar_Cookie * [extractor/common] Use compat_cookiejar_Cookie for _set_cookie (closes #23256, closes #24776) To always ensure cookie name and value are bytestrings on python 2. * [orf] Add support for more radio stations (closes #24938) (#24968) * [uol] fix extraction(closes #22007) * [downloader/http] Finish downloading once received data length matches expected Always do this if possible, i.e. if Content-Length or expected length is known, not only in test. This will save unnecessary last extra loop trying to read 0 bytes. * [downloader/http] Request last data block of exact remaining size Always request last data block of exact size remaining to download if possible not the current block size. * [iprima] Improve extraction (closes #25138) * [youtube] Improve signature cipher extraction (closes #25188) * [ChangeLog] Actualize [ci skip] * release 2020.05.08 * [spike] fix Bellator mgid extraction(closes #25195) * [bbccouk] PEP8 * [mailru] Fix extraction (closes #24530) (#25239) * [README.md] flake8 HTTPS URL (#25230) * [youtube] Add support for yewtu.be (#25226) * [soundcloud] reduce API playlist page limit(closes #25274) * [vimeo] improve format extraction and sorting(closes #25285) * [redtube] Improve title extraction (#25208) * [indavideo] Switch to HTTPS for API request (#25191) * [utils] Fix file permissions in write_json_file (closes #12471) (#25122) * [redtube] Improve formats extraction and extract m3u8 formats (closes #25311, closes #25321) * [ard] Improve _VALID_URL (closes #25134) (#25198) * [giantbomb] Extend _VALID_URL (#25222) * [postprocessor/ffmpeg] Embed series metadata with --add-metadata * [youtube] Add support for more invidious instances (#25417) * [ard:beta] Extend _VALID_URL (closes #25405) * [ChangeLog] Actualize [ci skip] * release 2020.05.29 * [jwplatform] Improve embeds extraction (closes #25467) * [periscope] Fix untitled broadcasts (#25482) * [twitter:broadcast] Add untitled periscope broadcast test * [malltv] Add support for sk.mall.tv (#25445) * [brightcove] Fix subtitles extraction (closes #25540) * [brightcove] Sort imports * [twitch] Pass v5 accept header and fix thumbnails extraction (closes #25531) * [twitch:stream] Fix extraction (closes #25528) * [twitch:stream] Expect 400 and 410 HTTP errors from API * [tele5] Prefer jwplatform over nexx (closes #25533) * [jwplatform] Add support for bypass geo restriction * [tele5] Bypass geo restriction * [ChangeLog] Actualize [ci skip] * release 2020.06.06 * [kaltura] Add support for multiple embeds on a webpage (closes #25523) * [youtube] Extract chapters from JSON (closes #24819) * [facebook] Support single-video ID links I stumbled upon this at https://www.facebook.com/bwfbadminton/posts/10157127020046316 . No idea how prevalent it is yet. * [youtube] Fix playlist and feed extraction (closes #25675) * [youtube] Fix thumbnails extraction and remove uploader id extraction warning (closes #25676) * [youtube] Fix upload date extraction * [youtube] Improve view count extraction * [youtube] Fix uploader id and uploader URL extraction * [ChangeLog] Actualize [ci skip] * release 2020.06.16 * [youtube] Fix categories and improve tags extraction * [youtube] Force old layout (closes #25682, closes #25683, closes #25680, closes #25686) * [ChangeLog] Actualize [ci skip] * release 2020.06.16.1 * [brightcove] Improve embed detection (closes #25674) * [bellmedia] add support for cp24.com clip URLs(closes #25764) * [youtube:playlists] Extend _VALID_URL (closes #25810) * [youtube] Prevent excess HTTP 301 (#25786) * [wistia] Restrict embed regex (closes #25969) * [youtube] Improve description extraction (closes #25937) (#25980) * [youtube] Fix sigfunc name extraction (closes #26134, closes #26135, closes #26136, closes #26137) * [ChangeLog] Actualize [ci skip] * release 2020.07.28 * [xhamster] Extend _VALID_URL (closes #25789) (#25804) * [xhamster] Fix extraction (closes #26157) (#26254) * [xhamster] Extend _VALID_URL (closes #25927) Co-authored-by: Remita Amine <remitamine@gmail.com> Co-authored-by: Sergey M․ <dstftw@gmail.com> Co-authored-by: nmeum <soeren+github@soeren-tempel.net> Co-authored-by: Roxedus <me@roxedus.dev> Co-authored-by: Singwai Chan <c.singwai@gmail.com> Co-authored-by: cdarlint <cdarlint@users.noreply.github.com> Co-authored-by: Johannes N <31795504+jonolt@users.noreply.github.com> Co-authored-by: jnozsc <jnozsc@gmail.com> Co-authored-by: Moritz Patelscheck <moritz.patelscheck@campus.tu-berlin.de> Co-authored-by: PB <3854688+uno20001@users.noreply.github.com> Co-authored-by: Philipp Hagemeister <phihag@phihag.de> Co-authored-by: Xaver Hellauer <software@hellauer.bayern> Co-authored-by: d2au <d2au.dev@gmail.com> Co-authored-by: Jan 'Yenda' Trmal <jtrmal@gmail.com> Co-authored-by: jxu <7989982+jxu@users.noreply.github.com> Co-authored-by: Martin Ström <name@my-domain.se> Co-authored-by: The Hatsune Daishi <nao20010128@gmail.com> Co-authored-by: tsia <github@tsia.de> Co-authored-by: 3risian <59593325+3risian@users.noreply.github.com> Co-authored-by: Tristan Waddington <tristan.waddington@gmail.com> Co-authored-by: Devon Meunier <devon.meunier@gmail.com> Co-authored-by: Felix Stupp <felix.stupp@outlook.com> Co-authored-by: tom <tomster954@gmail.com> Co-authored-by: AndrewMBL <62922222+AndrewMBL@users.noreply.github.com> Co-authored-by: willbeaufoy <will@willbeaufoy.net> Co-authored-by: Philipp Stehle <anderschwiedu@googlemail.com> Co-authored-by: hh0rva1h <61889859+hh0rva1h@users.noreply.github.com> Co-authored-by: comsomisha <shmelev1996@mail.ru> Co-authored-by: TotalCaesar659 <14265316+TotalCaesar659@users.noreply.github.com> Co-authored-by: Juan Francisco Cantero Hurtado <iam@juanfra.info> Co-authored-by: Dave Loyall <dave@the-good-guys.net> Co-authored-by: tlsssl <63866177+tlsssl@users.noreply.github.com> Co-authored-by: Rob <ankenyr@gmail.com> Co-authored-by: Michael Klein <github@a98shuttle.de> Co-authored-by: JordanWeatherby <47519158+JordanWeatherby@users.noreply.github.com> Co-authored-by: striker.sh <19488257+strikersh@users.noreply.github.com> Co-authored-by: Matej Dujava <mdujava@gmail.com> Co-authored-by: Glenn Slayden <5589855+glenn-slayden@users.noreply.github.com> Co-authored-by: MRWITEK <mrvvitek@gmail.com> Co-authored-by: JChris246 <43832407+JChris246@users.noreply.github.com> Co-authored-by: TheRealDude2 <the.real.dude@gmx.de>
500 lines
21 KiB
Python
500 lines
21 KiB
Python
# coding: utf-8
|
|
from __future__ import unicode_literals
|
|
|
|
import re
|
|
|
|
from hashlib import sha1
|
|
from .common import InfoExtractor
|
|
from ..compat import compat_str
|
|
from ..utils import (
|
|
ExtractorError,
|
|
determine_ext,
|
|
float_or_none,
|
|
int_or_none,
|
|
merge_dicts,
|
|
unified_strdate,
|
|
)
|
|
|
|
|
|
class ProSiebenSat1BaseIE(InfoExtractor):
|
|
_GEO_BYPASS = False
|
|
_ACCESS_ID = None
|
|
_SUPPORTED_PROTOCOLS = 'dash:clear,hls:clear,progressive:clear'
|
|
_V4_BASE_URL = 'https://vas-v4.p7s1video.net/4.0/get'
|
|
|
|
def _extract_video_info(self, url, clip_id):
|
|
client_location = url
|
|
|
|
video = self._download_json(
|
|
'http://vas.sim-technik.de/vas/live/v2/videos',
|
|
clip_id, 'Downloading videos JSON', query={
|
|
'access_token': self._TOKEN,
|
|
'client_location': client_location,
|
|
'client_name': self._CLIENT_NAME,
|
|
'ids': clip_id,
|
|
})[0]
|
|
|
|
if video.get('is_protected') is True:
|
|
raise ExtractorError('This video is DRM protected.', expected=True)
|
|
|
|
formats = []
|
|
if self._ACCESS_ID:
|
|
raw_ct = self._ENCRYPTION_KEY + clip_id + self._IV + self._ACCESS_ID
|
|
protocols = self._download_json(
|
|
self._V4_BASE_URL + 'protocols', clip_id,
|
|
'Downloading protocols JSON',
|
|
headers=self.geo_verification_headers(), query={
|
|
'access_id': self._ACCESS_ID,
|
|
'client_token': sha1((raw_ct).encode()).hexdigest(),
|
|
'video_id': clip_id,
|
|
}, fatal=False, expected_status=(403,)) or {}
|
|
error = protocols.get('error') or {}
|
|
if error.get('title') == 'Geo check failed':
|
|
self.raise_geo_restricted(countries=['AT', 'CH', 'DE'])
|
|
server_token = protocols.get('server_token')
|
|
if server_token:
|
|
urls = (self._download_json(
|
|
self._V4_BASE_URL + 'urls', clip_id, 'Downloading urls JSON', query={
|
|
'access_id': self._ACCESS_ID,
|
|
'client_token': sha1((raw_ct + server_token + self._SUPPORTED_PROTOCOLS).encode()).hexdigest(),
|
|
'protocols': self._SUPPORTED_PROTOCOLS,
|
|
'server_token': server_token,
|
|
'video_id': clip_id,
|
|
}, fatal=False) or {}).get('urls') or {}
|
|
for protocol, variant in urls.items():
|
|
source_url = variant.get('clear', {}).get('url')
|
|
if not source_url:
|
|
continue
|
|
if protocol == 'dash':
|
|
formats.extend(self._extract_mpd_formats(
|
|
source_url, clip_id, mpd_id=protocol, fatal=False))
|
|
elif protocol == 'hls':
|
|
formats.extend(self._extract_m3u8_formats(
|
|
source_url, clip_id, 'mp4', 'm3u8_native',
|
|
m3u8_id=protocol, fatal=False))
|
|
else:
|
|
formats.append({
|
|
'url': source_url,
|
|
'format_id': protocol,
|
|
})
|
|
if not formats:
|
|
source_ids = [compat_str(source['id']) for source in video['sources']]
|
|
|
|
client_id = self._SALT[:2] + sha1(''.join([clip_id, self._SALT, self._TOKEN, client_location, self._SALT, self._CLIENT_NAME]).encode('utf-8')).hexdigest()
|
|
|
|
sources = self._download_json(
|
|
'http://vas.sim-technik.de/vas/live/v2/videos/%s/sources' % clip_id,
|
|
clip_id, 'Downloading sources JSON', query={
|
|
'access_token': self._TOKEN,
|
|
'client_id': client_id,
|
|
'client_location': client_location,
|
|
'client_name': self._CLIENT_NAME,
|
|
})
|
|
server_id = sources['server_id']
|
|
|
|
def fix_bitrate(bitrate):
|
|
bitrate = int_or_none(bitrate)
|
|
if not bitrate:
|
|
return None
|
|
return (bitrate // 1000) if bitrate % 1000 == 0 else bitrate
|
|
|
|
for source_id in source_ids:
|
|
client_id = self._SALT[:2] + sha1(''.join([self._SALT, clip_id, self._TOKEN, server_id, client_location, source_id, self._SALT, self._CLIENT_NAME]).encode('utf-8')).hexdigest()
|
|
urls = self._download_json(
|
|
'http://vas.sim-technik.de/vas/live/v2/videos/%s/sources/url' % clip_id,
|
|
clip_id, 'Downloading urls JSON', fatal=False, query={
|
|
'access_token': self._TOKEN,
|
|
'client_id': client_id,
|
|
'client_location': client_location,
|
|
'client_name': self._CLIENT_NAME,
|
|
'server_id': server_id,
|
|
'source_ids': source_id,
|
|
})
|
|
if not urls:
|
|
continue
|
|
if urls.get('status_code') != 0:
|
|
raise ExtractorError('This video is unavailable', expected=True)
|
|
urls_sources = urls['sources']
|
|
if isinstance(urls_sources, dict):
|
|
urls_sources = urls_sources.values()
|
|
for source in urls_sources:
|
|
source_url = source.get('url')
|
|
if not source_url:
|
|
continue
|
|
protocol = source.get('protocol')
|
|
mimetype = source.get('mimetype')
|
|
if mimetype == 'application/f4m+xml' or 'f4mgenerator' in source_url or determine_ext(source_url) == 'f4m':
|
|
formats.extend(self._extract_f4m_formats(
|
|
source_url, clip_id, f4m_id='hds', fatal=False))
|
|
elif mimetype == 'application/x-mpegURL':
|
|
formats.extend(self._extract_m3u8_formats(
|
|
source_url, clip_id, 'mp4', 'm3u8_native',
|
|
m3u8_id='hls', fatal=False))
|
|
elif mimetype == 'application/dash+xml':
|
|
formats.extend(self._extract_mpd_formats(
|
|
source_url, clip_id, mpd_id='dash', fatal=False))
|
|
else:
|
|
tbr = fix_bitrate(source['bitrate'])
|
|
if protocol in ('rtmp', 'rtmpe'):
|
|
mobj = re.search(r'^(?P<url>rtmpe?://[^/]+)/(?P<path>.+)$', source_url)
|
|
if not mobj:
|
|
continue
|
|
path = mobj.group('path')
|
|
mp4colon_index = path.rfind('mp4:')
|
|
app = path[:mp4colon_index]
|
|
play_path = path[mp4colon_index:]
|
|
formats.append({
|
|
'url': '%s/%s' % (mobj.group('url'), app),
|
|
'app': app,
|
|
'play_path': play_path,
|
|
'player_url': 'http://livepassdl.conviva.com/hf/ver/2.79.0.17083/LivePassModuleMain.swf',
|
|
'page_url': 'http://www.prosieben.de',
|
|
'tbr': tbr,
|
|
'ext': 'flv',
|
|
'format_id': 'rtmp%s' % ('-%d' % tbr if tbr else ''),
|
|
})
|
|
else:
|
|
formats.append({
|
|
'url': source_url,
|
|
'tbr': tbr,
|
|
'format_id': 'http%s' % ('-%d' % tbr if tbr else ''),
|
|
})
|
|
self._sort_formats(formats)
|
|
|
|
return {
|
|
'duration': float_or_none(video.get('duration')),
|
|
'formats': formats,
|
|
}
|
|
|
|
|
|
class ProSiebenSat1IE(ProSiebenSat1BaseIE):
|
|
IE_NAME = 'prosiebensat1'
|
|
IE_DESC = 'ProSiebenSat.1 Digital'
|
|
_VALID_URL = r'''(?x)
|
|
https?://
|
|
(?:www\.)?
|
|
(?:
|
|
(?:beta\.)?
|
|
(?:
|
|
prosieben(?:maxx)?|sixx|sat1(?:gold)?|kabeleins(?:doku)?|the-voice-of-germany|advopedia
|
|
)\.(?:de|at|ch)|
|
|
ran\.de|fem\.com|advopedia\.de|galileo\.tv/video
|
|
)
|
|
/(?P<id>.+)
|
|
'''
|
|
|
|
_TESTS = [
|
|
{
|
|
# Tests changes introduced in https://github.com/ytdl-org/youtube-dl/pull/6242
|
|
# in response to fixing https://github.com/ytdl-org/youtube-dl/issues/6215:
|
|
# - malformed f4m manifest support
|
|
# - proper handling of URLs starting with `https?://` in 2.0 manifests
|
|
# - recursive child f4m manifests extraction
|
|
'url': 'http://www.prosieben.de/tv/circus-halligalli/videos/218-staffel-2-episode-18-jahresrueckblick-ganze-folge',
|
|
'info_dict': {
|
|
'id': '2104602',
|
|
'ext': 'mp4',
|
|
'title': 'CIRCUS HALLIGALLI - Episode 18 - Staffel 2',
|
|
'description': 'md5:8733c81b702ea472e069bc48bb658fc1',
|
|
'upload_date': '20131231',
|
|
'duration': 5845.04,
|
|
'series': 'CIRCUS HALLIGALLI',
|
|
'season_number': 2,
|
|
'episode': 'Episode 18 - Staffel 2',
|
|
'episode_number': 18,
|
|
},
|
|
},
|
|
{
|
|
'url': 'http://www.prosieben.de/videokatalog/Gesellschaft/Leben/Trends/video-Lady-Umstyling-f%C3%BCr-Audrina-Rebekka-Audrina-Fergen-billig-aussehen-Battal-Modica-700544.html',
|
|
'info_dict': {
|
|
'id': '2570327',
|
|
'ext': 'mp4',
|
|
'title': 'Lady-Umstyling für Audrina',
|
|
'description': 'md5:4c16d0c17a3461a0d43ea4084e96319d',
|
|
'upload_date': '20131014',
|
|
'duration': 606.76,
|
|
},
|
|
'params': {
|
|
# rtmp download
|
|
'skip_download': True,
|
|
},
|
|
'skip': 'Seems to be broken',
|
|
},
|
|
{
|
|
'url': 'http://www.prosiebenmaxx.de/tv/experience/video/144-countdown-fuer-die-autowerkstatt-ganze-folge',
|
|
'info_dict': {
|
|
'id': '2429369',
|
|
'ext': 'mp4',
|
|
'title': 'Countdown für die Autowerkstatt',
|
|
'description': 'md5:809fc051a457b5d8666013bc40698817',
|
|
'upload_date': '20140223',
|
|
'duration': 2595.04,
|
|
},
|
|
'params': {
|
|
# rtmp download
|
|
'skip_download': True,
|
|
},
|
|
'skip': 'This video is unavailable',
|
|
},
|
|
{
|
|
'url': 'http://www.sixx.de/stars-style/video/sexy-laufen-in-ugg-boots-clip',
|
|
'info_dict': {
|
|
'id': '2904997',
|
|
'ext': 'mp4',
|
|
'title': 'Sexy laufen in Ugg Boots',
|
|
'description': 'md5:edf42b8bd5bc4e5da4db4222c5acb7d6',
|
|
'upload_date': '20140122',
|
|
'duration': 245.32,
|
|
},
|
|
'params': {
|
|
# rtmp download
|
|
'skip_download': True,
|
|
},
|
|
'skip': 'This video is unavailable',
|
|
},
|
|
{
|
|
'url': 'http://www.sat1.de/film/der-ruecktritt/video/im-interview-kai-wiesinger-clip',
|
|
'info_dict': {
|
|
'id': '2906572',
|
|
'ext': 'mp4',
|
|
'title': 'Im Interview: Kai Wiesinger',
|
|
'description': 'md5:e4e5370652ec63b95023e914190b4eb9',
|
|
'upload_date': '20140203',
|
|
'duration': 522.56,
|
|
},
|
|
'params': {
|
|
# rtmp download
|
|
'skip_download': True,
|
|
},
|
|
'skip': 'This video is unavailable',
|
|
},
|
|
{
|
|
'url': 'http://www.kabeleins.de/tv/rosins-restaurants/videos/jagd-auf-fertigkost-im-elsthal-teil-2-ganze-folge',
|
|
'info_dict': {
|
|
'id': '2992323',
|
|
'ext': 'mp4',
|
|
'title': 'Jagd auf Fertigkost im Elsthal - Teil 2',
|
|
'description': 'md5:2669cde3febe9bce13904f701e774eb6',
|
|
'upload_date': '20141014',
|
|
'duration': 2410.44,
|
|
},
|
|
'params': {
|
|
# rtmp download
|
|
'skip_download': True,
|
|
},
|
|
'skip': 'This video is unavailable',
|
|
},
|
|
{
|
|
'url': 'http://www.ran.de/fussball/bundesliga/video/schalke-toennies-moechte-raul-zurueck-ganze-folge',
|
|
'info_dict': {
|
|
'id': '3004256',
|
|
'ext': 'mp4',
|
|
'title': 'Schalke: Tönnies möchte Raul zurück',
|
|
'description': 'md5:4b5b271d9bcde223b54390754c8ece3f',
|
|
'upload_date': '20140226',
|
|
'duration': 228.96,
|
|
},
|
|
'params': {
|
|
# rtmp download
|
|
'skip_download': True,
|
|
},
|
|
'skip': 'This video is unavailable',
|
|
},
|
|
{
|
|
'url': 'http://www.the-voice-of-germany.de/video/31-andreas-kuemmert-rocket-man-clip',
|
|
'info_dict': {
|
|
'id': '2572814',
|
|
'ext': 'mp4',
|
|
'title': 'The Voice of Germany - Andreas Kümmert: Rocket Man',
|
|
'description': 'md5:6ddb02b0781c6adf778afea606652e38',
|
|
'timestamp': 1382041620,
|
|
'upload_date': '20131017',
|
|
'duration': 469.88,
|
|
},
|
|
'params': {
|
|
'skip_download': True,
|
|
},
|
|
},
|
|
{
|
|
'url': 'http://www.fem.com/videos/beauty-lifestyle/kurztrips-zum-valentinstag',
|
|
'info_dict': {
|
|
'id': '2156342',
|
|
'ext': 'mp4',
|
|
'title': 'Kurztrips zum Valentinstag',
|
|
'description': 'Romantischer Kurztrip zum Valentinstag? Nina Heinemann verrät, was sich hier wirklich lohnt.',
|
|
'duration': 307.24,
|
|
},
|
|
'params': {
|
|
'skip_download': True,
|
|
},
|
|
},
|
|
{
|
|
'url': 'http://www.prosieben.de/tv/joko-gegen-klaas/videos/playlists/episode-8-ganze-folge-playlist',
|
|
'info_dict': {
|
|
'id': '439664',
|
|
'title': 'Episode 8 - Ganze Folge - Playlist',
|
|
'description': 'md5:63b8963e71f481782aeea877658dec84',
|
|
},
|
|
'playlist_count': 2,
|
|
'skip': 'This video is unavailable',
|
|
},
|
|
{
|
|
# title in <h2 class="subtitle">
|
|
'url': 'http://www.prosieben.de/stars/oscar-award/videos/jetzt-erst-enthuellt-das-geheimnis-von-emma-stones-oscar-robe-clip',
|
|
'info_dict': {
|
|
'id': '4895826',
|
|
'ext': 'mp4',
|
|
'title': 'Jetzt erst enthüllt: Das Geheimnis von Emma Stones Oscar-Robe',
|
|
'description': 'md5:e5ace2bc43fadf7b63adc6187e9450b9',
|
|
'upload_date': '20170302',
|
|
},
|
|
'params': {
|
|
'skip_download': True,
|
|
},
|
|
'skip': 'geo restricted to Germany',
|
|
},
|
|
{
|
|
# geo restricted to Germany
|
|
'url': 'http://www.kabeleinsdoku.de/tv/mayday-alarm-im-cockpit/video/102-notlandung-im-hudson-river-ganze-folge',
|
|
'only_matching': True,
|
|
},
|
|
{
|
|
# geo restricted to Germany
|
|
'url': 'http://www.sat1gold.de/tv/edel-starck/video/11-staffel-1-episode-1-partner-wider-willen-ganze-folge',
|
|
'only_matching': True,
|
|
},
|
|
{
|
|
# geo restricted to Germany
|
|
'url': 'https://www.galileo.tv/video/diese-emojis-werden-oft-missverstanden',
|
|
'only_matching': True,
|
|
},
|
|
{
|
|
'url': 'http://www.sat1gold.de/tv/edel-starck/playlist/die-gesamte-1-staffel',
|
|
'only_matching': True,
|
|
},
|
|
{
|
|
'url': 'http://www.advopedia.de/videos/lenssen-klaert-auf/lenssen-klaert-auf-folge-8-staffel-3-feiertage-und-freie-tage',
|
|
'only_matching': True,
|
|
},
|
|
]
|
|
|
|
_TOKEN = 'prosieben'
|
|
_SALT = '01!8d8F_)r9]4s[qeuXfP%'
|
|
_CLIENT_NAME = 'kolibri-2.0.19-splec4'
|
|
|
|
_ACCESS_ID = 'x_prosiebenmaxx-de'
|
|
_ENCRYPTION_KEY = 'Eeyeey9oquahthainoofashoyoikosag'
|
|
_IV = 'Aeluchoc6aevechuipiexeeboowedaok'
|
|
|
|
_CLIPID_REGEXES = [
|
|
r'"clip_id"\s*:\s+"(\d+)"',
|
|
r'clipid: "(\d+)"',
|
|
r'clip[iI]d=(\d+)',
|
|
r'clip[iI][dD]\s*=\s*["\'](\d+)',
|
|
r"'itemImageUrl'\s*:\s*'/dynamic/thumbnails/full/\d+/(\d+)",
|
|
r'proMamsId"\s*:\s*"(\d+)',
|
|
r'proMamsId"\s*:\s*"(\d+)',
|
|
]
|
|
_TITLE_REGEXES = [
|
|
r'<h2 class="subtitle" itemprop="name">\s*(.+?)</h2>',
|
|
r'<header class="clearfix">\s*<h3>(.+?)</h3>',
|
|
r'<!-- start video -->\s*<h1>(.+?)</h1>',
|
|
r'<h1 class="att-name">\s*(.+?)</h1>',
|
|
r'<header class="module_header">\s*<h2>([^<]+)</h2>\s*</header>',
|
|
r'<h2 class="video-title" itemprop="name">\s*(.+?)</h2>',
|
|
r'<div[^>]+id="veeseoTitle"[^>]*>(.+?)</div>',
|
|
r'<h2[^>]+class="subtitle"[^>]*>([^<]+)</h2>',
|
|
]
|
|
_DESCRIPTION_REGEXES = [
|
|
r'<p itemprop="description">\s*(.+?)</p>',
|
|
r'<div class="videoDecription">\s*<p><strong>Beschreibung</strong>: (.+?)</p>',
|
|
r'<div class="g-plusone" data-size="medium"></div>\s*</div>\s*</header>\s*(.+?)\s*<footer>',
|
|
r'<p class="att-description">\s*(.+?)\s*</p>',
|
|
r'<p class="video-description" itemprop="description">\s*(.+?)</p>',
|
|
r'<div[^>]+id="veeseoDescription"[^>]*>(.+?)</div>',
|
|
]
|
|
_UPLOAD_DATE_REGEXES = [
|
|
r'<span>\s*(\d{2}\.\d{2}\.\d{4} \d{2}:\d{2}) \|\s*<span itemprop="duration"',
|
|
r'<footer>\s*(\d{2}\.\d{2}\.\d{4}) \d{2}:\d{2} Uhr',
|
|
r'<span style="padding-left: 4px;line-height:20px; color:#404040">(\d{2}\.\d{2}\.\d{4})</span>',
|
|
r'(\d{2}\.\d{2}\.\d{4}) \| \d{2}:\d{2} Min<br/>',
|
|
]
|
|
_PAGE_TYPE_REGEXES = [
|
|
r'<meta name="page_type" content="([^"]+)">',
|
|
r"'itemType'\s*:\s*'([^']*)'",
|
|
]
|
|
_PLAYLIST_ID_REGEXES = [
|
|
r'content[iI]d=(\d+)',
|
|
r"'itemId'\s*:\s*'([^']*)'",
|
|
]
|
|
_PLAYLIST_CLIP_REGEXES = [
|
|
r'(?s)data-qvt=.+?<a href="([^"]+)"',
|
|
]
|
|
|
|
def _extract_clip(self, url, webpage):
|
|
clip_id = self._html_search_regex(
|
|
self._CLIPID_REGEXES, webpage, 'clip id')
|
|
title = self._html_search_regex(
|
|
self._TITLE_REGEXES, webpage, 'title',
|
|
default=None) or self._og_search_title(webpage)
|
|
info = self._extract_video_info(url, clip_id)
|
|
description = self._html_search_regex(
|
|
self._DESCRIPTION_REGEXES, webpage, 'description', default=None)
|
|
if description is None:
|
|
description = self._og_search_description(webpage)
|
|
thumbnail = self._og_search_thumbnail(webpage)
|
|
upload_date = unified_strdate(
|
|
self._html_search_meta('og:published_time', webpage,
|
|
'upload date', default=None)
|
|
or self._html_search_regex(self._UPLOAD_DATE_REGEXES,
|
|
webpage, 'upload date', default=None))
|
|
|
|
json_ld = self._search_json_ld(webpage, clip_id, default={})
|
|
|
|
return merge_dicts(info, {
|
|
'id': clip_id,
|
|
'title': title,
|
|
'description': description,
|
|
'thumbnail': thumbnail,
|
|
'upload_date': upload_date,
|
|
}, json_ld)
|
|
|
|
def _extract_playlist(self, url, webpage):
|
|
playlist_id = self._html_search_regex(
|
|
self._PLAYLIST_ID_REGEXES, webpage, 'playlist id')
|
|
playlist = self._parse_json(
|
|
self._search_regex(
|
|
r'var\s+contentResources\s*=\s*(\[.+?\]);\s*</script',
|
|
webpage, 'playlist'),
|
|
playlist_id)
|
|
entries = []
|
|
for item in playlist:
|
|
clip_id = item.get('id') or item.get('upc')
|
|
if not clip_id:
|
|
continue
|
|
info = self._extract_video_info(url, clip_id)
|
|
info.update({
|
|
'id': clip_id,
|
|
'title': item.get('title') or item.get('teaser', {}).get('headline'),
|
|
'description': item.get('teaser', {}).get('description'),
|
|
'thumbnail': item.get('poster'),
|
|
'duration': float_or_none(item.get('duration')),
|
|
'series': item.get('tvShowTitle'),
|
|
'uploader': item.get('broadcastPublisher'),
|
|
})
|
|
entries.append(info)
|
|
return self.playlist_result(entries, playlist_id)
|
|
|
|
def _real_extract(self, url):
|
|
video_id = self._match_id(url)
|
|
webpage = self._download_webpage(url, video_id)
|
|
page_type = self._search_regex(
|
|
self._PAGE_TYPE_REGEXES, webpage,
|
|
'page type', default='clip').lower()
|
|
if page_type == 'clip':
|
|
return self._extract_clip(url, webpage)
|
|
elif page_type == 'playlist':
|
|
return self._extract_playlist(url, webpage)
|
|
else:
|
|
raise ExtractorError(
|
|
'Unsupported page type %s' % page_type, expected=True)
|