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>
402 lines
14 KiB
Python
402 lines
14 KiB
Python
# coding: utf-8
|
|
from __future__ import unicode_literals
|
|
|
|
import re
|
|
|
|
from .common import InfoExtractor
|
|
from ..utils import (
|
|
determine_ext,
|
|
int_or_none,
|
|
merge_dicts,
|
|
parse_iso8601,
|
|
qualities,
|
|
try_get,
|
|
urljoin,
|
|
)
|
|
|
|
|
|
class NDRBaseIE(InfoExtractor):
|
|
def _real_extract(self, url):
|
|
mobj = re.match(self._VALID_URL, url)
|
|
display_id = next(group for group in mobj.groups() if group)
|
|
webpage = self._download_webpage(url, display_id)
|
|
return self._extract_embed(webpage, display_id)
|
|
|
|
|
|
class NDRIE(NDRBaseIE):
|
|
IE_NAME = 'ndr'
|
|
IE_DESC = 'NDR.de - Norddeutscher Rundfunk'
|
|
_VALID_URL = r'https?://(?:www\.)?ndr\.de/(?:[^/]+/)*(?P<id>[^/?#]+),[\da-z]+\.html'
|
|
_TESTS = [{
|
|
# httpVideo, same content id
|
|
'url': 'http://www.ndr.de/fernsehen/Party-Poette-und-Parade,hafengeburtstag988.html',
|
|
'md5': '6515bc255dc5c5f8c85bbc38e035a659',
|
|
'info_dict': {
|
|
'id': 'hafengeburtstag988',
|
|
'display_id': 'Party-Poette-und-Parade',
|
|
'ext': 'mp4',
|
|
'title': 'Party, Pötte und Parade',
|
|
'description': 'md5:ad14f9d2f91d3040b6930c697e5f6b4c',
|
|
'uploader': 'ndrtv',
|
|
'timestamp': 1431108900,
|
|
'upload_date': '20150510',
|
|
'duration': 3498,
|
|
},
|
|
'params': {
|
|
'skip_download': True,
|
|
},
|
|
}, {
|
|
# httpVideo, different content id
|
|
'url': 'http://www.ndr.de/sport/fussball/40-Osnabrueck-spielt-sich-in-einen-Rausch,osna270.html',
|
|
'md5': '1043ff203eab307f0c51702ec49e9a71',
|
|
'info_dict': {
|
|
'id': 'osna272',
|
|
'display_id': '40-Osnabrueck-spielt-sich-in-einen-Rausch',
|
|
'ext': 'mp4',
|
|
'title': 'Osnabrück - Wehen Wiesbaden: Die Highlights',
|
|
'description': 'md5:32e9b800b3d2d4008103752682d5dc01',
|
|
'uploader': 'ndrtv',
|
|
'timestamp': 1442059200,
|
|
'upload_date': '20150912',
|
|
'duration': 510,
|
|
},
|
|
'params': {
|
|
'skip_download': True,
|
|
},
|
|
}, {
|
|
# httpAudio, same content id
|
|
'url': 'http://www.ndr.de/info/La-Valette-entgeht-der-Hinrichtung,audio51535.html',
|
|
'md5': 'bb3cd38e24fbcc866d13b50ca59307b8',
|
|
'info_dict': {
|
|
'id': 'audio51535',
|
|
'display_id': 'La-Valette-entgeht-der-Hinrichtung',
|
|
'ext': 'mp3',
|
|
'title': 'La Valette entgeht der Hinrichtung',
|
|
'description': 'md5:22f9541913a40fe50091d5cdd7c9f536',
|
|
'uploader': 'ndrinfo',
|
|
'timestamp': 1290626100,
|
|
'upload_date': '20140729',
|
|
'duration': 884,
|
|
},
|
|
'params': {
|
|
'skip_download': True,
|
|
},
|
|
}, {
|
|
'url': 'https://www.ndr.de/Fettes-Brot-Ferris-MC-und-Thees-Uhlmann-live-on-stage,festivalsommer116.html',
|
|
'only_matching': True,
|
|
}]
|
|
|
|
def _extract_embed(self, webpage, display_id):
|
|
embed_url = self._html_search_meta(
|
|
'embedURL', webpage, 'embed URL',
|
|
default=None) or self._search_regex(
|
|
r'\bembedUrl["\']\s*:\s*(["\'])(?P<url>(?:(?!\1).)+)\1', webpage,
|
|
'embed URL', group='url')
|
|
description = self._search_regex(
|
|
r'<p[^>]+itemprop="description">([^<]+)</p>',
|
|
webpage, 'description', default=None) or self._og_search_description(webpage)
|
|
timestamp = parse_iso8601(
|
|
self._search_regex(
|
|
r'<span[^>]+itemprop="(?:datePublished|uploadDate)"[^>]+content="([^"]+)"',
|
|
webpage, 'upload date', default=None))
|
|
info = self._search_json_ld(webpage, display_id, default={})
|
|
return merge_dicts({
|
|
'_type': 'url_transparent',
|
|
'url': embed_url,
|
|
'display_id': display_id,
|
|
'description': description,
|
|
'timestamp': timestamp,
|
|
}, info)
|
|
|
|
|
|
class NJoyIE(NDRBaseIE):
|
|
IE_NAME = 'njoy'
|
|
IE_DESC = 'N-JOY'
|
|
_VALID_URL = r'https?://(?:www\.)?n-joy\.de/(?:[^/]+/)*(?:(?P<display_id>[^/?#]+),)?(?P<id>[\da-z]+)\.html'
|
|
_TESTS = [{
|
|
# httpVideo, same content id
|
|
'url': 'http://www.n-joy.de/entertainment/comedy/comedy_contest/Benaissa-beim-NDR-Comedy-Contest,comedycontest2480.html',
|
|
'md5': 'cb63be60cd6f9dd75218803146d8dc67',
|
|
'info_dict': {
|
|
'id': 'comedycontest2480',
|
|
'display_id': 'Benaissa-beim-NDR-Comedy-Contest',
|
|
'ext': 'mp4',
|
|
'title': 'Benaissa beim NDR Comedy Contest',
|
|
'description': 'md5:f057a6c4e1c728b10d33b5ffd36ddc39',
|
|
'uploader': 'ndrtv',
|
|
'upload_date': '20141129',
|
|
'duration': 654,
|
|
},
|
|
'params': {
|
|
'skip_download': True,
|
|
},
|
|
}, {
|
|
# httpVideo, different content id
|
|
'url': 'http://www.n-joy.de/musik/Das-frueheste-DJ-Set-des-Nordens-live-mit-Felix-Jaehn-,felixjaehn168.html',
|
|
'md5': '417660fffa90e6df2fda19f1b40a64d8',
|
|
'info_dict': {
|
|
'id': 'dockville882',
|
|
'display_id': 'Das-frueheste-DJ-Set-des-Nordens-live-mit-Felix-Jaehn-',
|
|
'ext': 'mp4',
|
|
'title': '"Ich hab noch nie" mit Felix Jaehn',
|
|
'description': 'md5:85dd312d53be1b99e1f998a16452a2f3',
|
|
'uploader': 'njoy',
|
|
'upload_date': '20150822',
|
|
'duration': 211,
|
|
},
|
|
'params': {
|
|
'skip_download': True,
|
|
},
|
|
}, {
|
|
'url': 'http://www.n-joy.de/radio/webradio/morningshow209.html',
|
|
'only_matching': True,
|
|
}]
|
|
|
|
def _extract_embed(self, webpage, display_id):
|
|
video_id = self._search_regex(
|
|
r'<iframe[^>]+id="pp_([\da-z]+)"', webpage, 'embed id')
|
|
description = self._search_regex(
|
|
r'<div[^>]+class="subline"[^>]*>[^<]+</div>\s*<p>([^<]+)</p>',
|
|
webpage, 'description', fatal=False)
|
|
return {
|
|
'_type': 'url_transparent',
|
|
'ie_key': 'NDREmbedBase',
|
|
'url': 'ndr:%s' % video_id,
|
|
'display_id': display_id,
|
|
'description': description,
|
|
}
|
|
|
|
|
|
class NDREmbedBaseIE(InfoExtractor):
|
|
IE_NAME = 'ndr:embed:base'
|
|
_VALID_URL = r'(?:ndr:(?P<id_s>[\da-z]+)|https?://www\.ndr\.de/(?P<id>[\da-z]+)-ppjson\.json)'
|
|
_TESTS = [{
|
|
'url': 'ndr:soundcheck3366',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'http://www.ndr.de/soundcheck3366-ppjson.json',
|
|
'only_matching': True,
|
|
}]
|
|
|
|
def _real_extract(self, url):
|
|
mobj = re.match(self._VALID_URL, url)
|
|
video_id = mobj.group('id') or mobj.group('id_s')
|
|
|
|
ppjson = self._download_json(
|
|
'http://www.ndr.de/%s-ppjson.json' % video_id, video_id)
|
|
|
|
playlist = ppjson['playlist']
|
|
|
|
formats = []
|
|
quality_key = qualities(('xs', 's', 'm', 'l', 'xl'))
|
|
|
|
for format_id, f in playlist.items():
|
|
src = f.get('src')
|
|
if not src:
|
|
continue
|
|
ext = determine_ext(src, None)
|
|
if ext == 'f4m':
|
|
formats.extend(self._extract_f4m_formats(
|
|
src + '?hdcore=3.7.0&plugin=aasp-3.7.0.39.44', video_id,
|
|
f4m_id='hds', fatal=False))
|
|
elif ext == 'm3u8':
|
|
formats.extend(self._extract_m3u8_formats(
|
|
src, video_id, 'mp4', m3u8_id='hls',
|
|
entry_protocol='m3u8_native', fatal=False))
|
|
else:
|
|
quality = f.get('quality')
|
|
ff = {
|
|
'url': src,
|
|
'format_id': quality or format_id,
|
|
'quality': quality_key(quality),
|
|
}
|
|
type_ = f.get('type')
|
|
if type_ and type_.split('/')[0] == 'audio':
|
|
ff['vcodec'] = 'none'
|
|
ff['ext'] = ext or 'mp3'
|
|
formats.append(ff)
|
|
self._sort_formats(formats)
|
|
|
|
config = playlist['config']
|
|
|
|
live = playlist.get('config', {}).get('streamType') in ['httpVideoLive', 'httpAudioLive']
|
|
title = config['title']
|
|
if live:
|
|
title = self._live_title(title)
|
|
uploader = ppjson.get('config', {}).get('branding')
|
|
upload_date = ppjson.get('config', {}).get('publicationDate')
|
|
duration = int_or_none(config.get('duration'))
|
|
|
|
thumbnails = []
|
|
poster = try_get(config, lambda x: x['poster'], dict) or {}
|
|
for thumbnail_id, thumbnail in poster.items():
|
|
thumbnail_url = urljoin(url, thumbnail.get('src'))
|
|
if not thumbnail_url:
|
|
continue
|
|
thumbnails.append({
|
|
'id': thumbnail.get('quality') or thumbnail_id,
|
|
'url': thumbnail_url,
|
|
'preference': quality_key(thumbnail.get('quality')),
|
|
})
|
|
|
|
return {
|
|
'id': video_id,
|
|
'title': title,
|
|
'is_live': live,
|
|
'uploader': uploader if uploader != '-' else None,
|
|
'upload_date': upload_date[0:8] if upload_date else None,
|
|
'duration': duration,
|
|
'thumbnails': thumbnails,
|
|
'formats': formats,
|
|
}
|
|
|
|
|
|
class NDREmbedIE(NDREmbedBaseIE):
|
|
IE_NAME = 'ndr:embed'
|
|
_VALID_URL = r'https?://(?:www\.)?ndr\.de/(?:[^/]+/)*(?P<id>[\da-z]+)-(?:player|externalPlayer)\.html'
|
|
_TESTS = [{
|
|
'url': 'http://www.ndr.de/fernsehen/sendungen/ndr_aktuell/ndraktuell28488-player.html',
|
|
'md5': '8b9306142fe65bbdefb5ce24edb6b0a9',
|
|
'info_dict': {
|
|
'id': 'ndraktuell28488',
|
|
'ext': 'mp4',
|
|
'title': 'Norddeutschland begrüßt Flüchtlinge',
|
|
'is_live': False,
|
|
'uploader': 'ndrtv',
|
|
'upload_date': '20150907',
|
|
'duration': 132,
|
|
},
|
|
}, {
|
|
'url': 'http://www.ndr.de/ndr2/events/soundcheck/soundcheck3366-player.html',
|
|
'md5': '002085c44bae38802d94ae5802a36e78',
|
|
'info_dict': {
|
|
'id': 'soundcheck3366',
|
|
'ext': 'mp4',
|
|
'title': 'Ella Henderson braucht Vergleiche nicht zu scheuen',
|
|
'is_live': False,
|
|
'uploader': 'ndr2',
|
|
'upload_date': '20150912',
|
|
'duration': 3554,
|
|
},
|
|
'params': {
|
|
'skip_download': True,
|
|
},
|
|
}, {
|
|
'url': 'http://www.ndr.de/info/audio51535-player.html',
|
|
'md5': 'bb3cd38e24fbcc866d13b50ca59307b8',
|
|
'info_dict': {
|
|
'id': 'audio51535',
|
|
'ext': 'mp3',
|
|
'title': 'La Valette entgeht der Hinrichtung',
|
|
'is_live': False,
|
|
'uploader': 'ndrinfo',
|
|
'upload_date': '20140729',
|
|
'duration': 884,
|
|
},
|
|
'params': {
|
|
'skip_download': True,
|
|
},
|
|
}, {
|
|
'url': 'http://www.ndr.de/fernsehen/sendungen/visite/visite11010-externalPlayer.html',
|
|
'md5': 'ae57f80511c1e1f2fd0d0d3d31aeae7c',
|
|
'info_dict': {
|
|
'id': 'visite11010',
|
|
'ext': 'mp4',
|
|
'title': 'Visite - die ganze Sendung',
|
|
'is_live': False,
|
|
'uploader': 'ndrtv',
|
|
'upload_date': '20150902',
|
|
'duration': 3525,
|
|
},
|
|
'params': {
|
|
'skip_download': True,
|
|
},
|
|
}, {
|
|
# httpVideoLive
|
|
'url': 'http://www.ndr.de/fernsehen/livestream/livestream217-externalPlayer.html',
|
|
'info_dict': {
|
|
'id': 'livestream217',
|
|
'ext': 'flv',
|
|
'title': r're:^NDR Fernsehen Niedersachsen \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
|
|
'is_live': True,
|
|
'upload_date': '20150910',
|
|
},
|
|
'params': {
|
|
'skip_download': True,
|
|
},
|
|
}, {
|
|
'url': 'http://www.ndr.de/ndrkultur/audio255020-player.html',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'http://www.ndr.de/fernsehen/sendungen/nordtour/nordtour7124-player.html',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'http://www.ndr.de/kultur/film/videos/videoimport10424-player.html',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'http://www.ndr.de/fernsehen/sendungen/hamburg_journal/hamj43006-player.html',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'http://www.ndr.de/fernsehen/sendungen/weltbilder/weltbilder4518-player.html',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'http://www.ndr.de/fernsehen/doku952-player.html',
|
|
'only_matching': True,
|
|
}]
|
|
|
|
|
|
class NJoyEmbedIE(NDREmbedBaseIE):
|
|
IE_NAME = 'njoy:embed'
|
|
_VALID_URL = r'https?://(?:www\.)?n-joy\.de/(?:[^/]+/)*(?P<id>[\da-z]+)-(?:player|externalPlayer)_[^/]+\.html'
|
|
_TESTS = [{
|
|
# httpVideo
|
|
'url': 'http://www.n-joy.de/events/reeperbahnfestival/doku948-player_image-bc168e87-5263-4d6d-bd27-bb643005a6de_theme-n-joy.html',
|
|
'md5': '8483cbfe2320bd4d28a349d62d88bd74',
|
|
'info_dict': {
|
|
'id': 'doku948',
|
|
'ext': 'mp4',
|
|
'title': 'Zehn Jahre Reeperbahn Festival - die Doku',
|
|
'is_live': False,
|
|
'upload_date': '20150807',
|
|
'duration': 1011,
|
|
},
|
|
}, {
|
|
# httpAudio
|
|
'url': 'http://www.n-joy.de/news_wissen/stefanrichter100-player_image-d5e938b1-f21a-4b9a-86b8-aaba8bca3a13_theme-n-joy.html',
|
|
'md5': 'd989f80f28ac954430f7b8a48197188a',
|
|
'info_dict': {
|
|
'id': 'stefanrichter100',
|
|
'ext': 'mp3',
|
|
'title': 'Interview mit einem Augenzeugen',
|
|
'is_live': False,
|
|
'uploader': 'njoy',
|
|
'upload_date': '20150909',
|
|
'duration': 140,
|
|
},
|
|
'params': {
|
|
'skip_download': True,
|
|
},
|
|
}, {
|
|
# httpAudioLive, no explicit ext
|
|
'url': 'http://www.n-joy.de/news_wissen/webradioweltweit100-player_image-3fec0484-2244-4565-8fb8-ed25fd28b173_theme-n-joy.html',
|
|
'info_dict': {
|
|
'id': 'webradioweltweit100',
|
|
'ext': 'mp3',
|
|
'title': r're:^N-JOY Weltweit \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
|
|
'is_live': True,
|
|
'uploader': 'njoy',
|
|
'upload_date': '20150810',
|
|
},
|
|
'params': {
|
|
'skip_download': True,
|
|
},
|
|
}, {
|
|
'url': 'http://www.n-joy.de/musik/dockville882-player_image-3905259e-0803-4764-ac72-8b7de077d80a_theme-n-joy.html',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'http://www.n-joy.de/radio/sendungen/morningshow/urlaubsfotos190-player_image-066a5df1-5c95-49ec-a323-941d848718db_theme-n-joy.html',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'http://www.n-joy.de/entertainment/comedy/krudetv290-player_image-ab261bfe-51bf-4bf3-87ba-c5122ee35b3d_theme-n-joy.html',
|
|
'only_matching': True,
|
|
}]
|