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>
497 lines
20 KiB
Python
497 lines
20 KiB
Python
# coding: utf-8
|
||
from __future__ import unicode_literals
|
||
|
||
import hashlib
|
||
import json
|
||
import re
|
||
from xml.sax.saxutils import escape
|
||
|
||
from .common import InfoExtractor
|
||
from ..compat import (
|
||
compat_str,
|
||
compat_HTTPError,
|
||
)
|
||
from ..utils import (
|
||
js_to_json,
|
||
smuggle_url,
|
||
try_get,
|
||
xpath_text,
|
||
xpath_element,
|
||
xpath_with_ns,
|
||
find_xpath_attr,
|
||
orderedSet,
|
||
parse_duration,
|
||
parse_iso8601,
|
||
parse_age_limit,
|
||
strip_or_none,
|
||
int_or_none,
|
||
ExtractorError,
|
||
)
|
||
|
||
|
||
class CBCIE(InfoExtractor):
|
||
IE_NAME = 'cbc.ca'
|
||
_VALID_URL = r'https?://(?:www\.)?cbc\.ca/(?!player/)(?:[^/]+/)+(?P<id>[^/?#]+)'
|
||
_TESTS = [{
|
||
# with mediaId
|
||
'url': 'http://www.cbc.ca/22minutes/videos/clips-season-23/don-cherry-play-offs',
|
||
'md5': '97e24d09672fc4cf56256d6faa6c25bc',
|
||
'info_dict': {
|
||
'id': '2682904050',
|
||
'ext': 'mp4',
|
||
'title': 'Don Cherry – All-Stars',
|
||
'description': 'Don Cherry has a bee in his bonnet about AHL player John Scott because that guy’s got heart.',
|
||
'timestamp': 1454463000,
|
||
'upload_date': '20160203',
|
||
'uploader': 'CBCC-NEW',
|
||
},
|
||
'skip': 'Geo-restricted to Canada',
|
||
}, {
|
||
# with clipId, feed available via tpfeed.cbc.ca and feed.theplatform.com
|
||
'url': 'http://www.cbc.ca/22minutes/videos/22-minutes-update/22-minutes-update-episode-4',
|
||
'md5': '162adfa070274b144f4fdc3c3b8207db',
|
||
'info_dict': {
|
||
'id': '2414435309',
|
||
'ext': 'mp4',
|
||
'title': '22 Minutes Update: What Not To Wear Quebec',
|
||
'description': "This week's latest Canadian top political story is What Not To Wear Quebec.",
|
||
'upload_date': '20131025',
|
||
'uploader': 'CBCC-NEW',
|
||
'timestamp': 1382717907,
|
||
},
|
||
}, {
|
||
# with clipId, feed only available via tpfeed.cbc.ca
|
||
'url': 'http://www.cbc.ca/archives/entry/1978-robin-williams-freestyles-on-90-minutes-live',
|
||
'md5': '0274a90b51a9b4971fe005c63f592f12',
|
||
'info_dict': {
|
||
'id': '2487345465',
|
||
'ext': 'mp4',
|
||
'title': 'Robin Williams freestyles on 90 Minutes Live',
|
||
'description': 'Wacky American comedian Robin Williams shows off his infamous "freestyle" comedic talents while being interviewed on CBC\'s 90 Minutes Live.',
|
||
'upload_date': '19780210',
|
||
'uploader': 'CBCC-NEW',
|
||
'timestamp': 255977160,
|
||
},
|
||
}, {
|
||
# multiple iframes
|
||
'url': 'http://www.cbc.ca/natureofthings/blog/birds-eye-view-from-vancouvers-burrard-street-bridge-how-we-got-the-shot',
|
||
'playlist': [{
|
||
'md5': '377572d0b49c4ce0c9ad77470e0b96b4',
|
||
'info_dict': {
|
||
'id': '2680832926',
|
||
'ext': 'mp4',
|
||
'title': 'An Eagle\'s-Eye View Off Burrard Bridge',
|
||
'description': 'Hercules the eagle flies from Vancouver\'s Burrard Bridge down to a nearby park with a mini-camera strapped to his back.',
|
||
'upload_date': '20160201',
|
||
'timestamp': 1454342820,
|
||
'uploader': 'CBCC-NEW',
|
||
},
|
||
}, {
|
||
'md5': '415a0e3f586113894174dfb31aa5bb1a',
|
||
'info_dict': {
|
||
'id': '2658915080',
|
||
'ext': 'mp4',
|
||
'title': 'Fly like an eagle!',
|
||
'description': 'Eagle equipped with a mini camera flies from the world\'s tallest tower',
|
||
'upload_date': '20150315',
|
||
'timestamp': 1426443984,
|
||
'uploader': 'CBCC-NEW',
|
||
},
|
||
}],
|
||
'skip': 'Geo-restricted to Canada',
|
||
}, {
|
||
# multiple CBC.APP.Caffeine.initInstance(...)
|
||
'url': 'http://www.cbc.ca/news/canada/calgary/dog-indoor-exercise-winter-1.3928238',
|
||
'info_dict': {
|
||
'title': 'Keep Rover active during the deep freeze with doggie pushups and other fun indoor tasks',
|
||
'id': 'dog-indoor-exercise-winter-1.3928238',
|
||
'description': 'md5:c18552e41726ee95bd75210d1ca9194c',
|
||
},
|
||
'playlist_mincount': 6,
|
||
}]
|
||
|
||
@classmethod
|
||
def suitable(cls, url):
|
||
return False if CBCPlayerIE.suitable(url) else super(CBCIE, cls).suitable(url)
|
||
|
||
def _extract_player_init(self, player_init, display_id):
|
||
player_info = self._parse_json(player_init, display_id, js_to_json)
|
||
media_id = player_info.get('mediaId')
|
||
if not media_id:
|
||
clip_id = player_info['clipId']
|
||
feed = self._download_json(
|
||
'http://tpfeed.cbc.ca/f/ExhSPC/vms_5akSXx4Ng_Zn?byCustomValue={:mpsReleases}{%s}' % clip_id,
|
||
clip_id, fatal=False)
|
||
if feed:
|
||
media_id = try_get(feed, lambda x: x['entries'][0]['guid'], compat_str)
|
||
if not media_id:
|
||
media_id = self._download_json(
|
||
'http://feed.theplatform.com/f/h9dtGB/punlNGjMlc1F?fields=id&byContent=byReleases%3DbyId%253D' + clip_id,
|
||
clip_id)['entries'][0]['id'].split('/')[-1]
|
||
return self.url_result('cbcplayer:%s' % media_id, 'CBCPlayer', media_id)
|
||
|
||
def _real_extract(self, url):
|
||
display_id = self._match_id(url)
|
||
webpage = self._download_webpage(url, display_id)
|
||
title = self._og_search_title(webpage, default=None) or self._html_search_meta(
|
||
'twitter:title', webpage, 'title', default=None) or self._html_search_regex(
|
||
r'<title>([^<]+)</title>', webpage, 'title', fatal=False)
|
||
entries = [
|
||
self._extract_player_init(player_init, display_id)
|
||
for player_init in re.findall(r'CBC\.APP\.Caffeine\.initInstance\(({.+?})\);', webpage)]
|
||
media_ids = []
|
||
for media_id_re in (
|
||
r'<iframe[^>]+src="[^"]+?mediaId=(\d+)"',
|
||
r'<div[^>]+\bid=["\']player-(\d+)',
|
||
r'guid["\']\s*:\s*["\'](\d+)'):
|
||
media_ids.extend(re.findall(media_id_re, webpage))
|
||
entries.extend([
|
||
self.url_result('cbcplayer:%s' % media_id, 'CBCPlayer', media_id)
|
||
for media_id in orderedSet(media_ids)])
|
||
return self.playlist_result(
|
||
entries, display_id, strip_or_none(title),
|
||
self._og_search_description(webpage))
|
||
|
||
|
||
class CBCPlayerIE(InfoExtractor):
|
||
IE_NAME = 'cbc.ca:player'
|
||
_VALID_URL = r'(?:cbcplayer:|https?://(?:www\.)?cbc\.ca/(?:player/play/|i/caffeine/syndicate/\?mediaId=))(?P<id>\d+)'
|
||
_TESTS = [{
|
||
'url': 'http://www.cbc.ca/player/play/2683190193',
|
||
'md5': '64d25f841ddf4ddb28a235338af32e2c',
|
||
'info_dict': {
|
||
'id': '2683190193',
|
||
'ext': 'mp4',
|
||
'title': 'Gerry Runs a Sweat Shop',
|
||
'description': 'md5:b457e1c01e8ff408d9d801c1c2cd29b0',
|
||
'timestamp': 1455071400,
|
||
'upload_date': '20160210',
|
||
'uploader': 'CBCC-NEW',
|
||
},
|
||
'skip': 'Geo-restricted to Canada',
|
||
}, {
|
||
# Redirected from http://www.cbc.ca/player/AudioMobile/All%20in%20a%20Weekend%20Montreal/ID/2657632011/
|
||
'url': 'http://www.cbc.ca/player/play/2657631896',
|
||
'md5': 'e5e708c34ae6fca156aafe17c43e8b75',
|
||
'info_dict': {
|
||
'id': '2657631896',
|
||
'ext': 'mp3',
|
||
'title': 'CBC Montreal is organizing its first ever community hackathon!',
|
||
'description': 'The modern technology we tend to depend on so heavily, is never without it\'s share of hiccups and headaches. Next weekend - CBC Montreal will be getting members of the public for its first Hackathon.',
|
||
'timestamp': 1425704400,
|
||
'upload_date': '20150307',
|
||
'uploader': 'CBCC-NEW',
|
||
},
|
||
}, {
|
||
'url': 'http://www.cbc.ca/player/play/2164402062',
|
||
'md5': '33fcd8f6719b9dd60a5e73adcb83b9f6',
|
||
'info_dict': {
|
||
'id': '2164402062',
|
||
'ext': 'mp4',
|
||
'title': 'Cancer survivor four times over',
|
||
'description': 'Tim Mayer has beaten three different forms of cancer four times in five years.',
|
||
'timestamp': 1320410746,
|
||
'upload_date': '20111104',
|
||
'uploader': 'CBCC-NEW',
|
||
},
|
||
}]
|
||
|
||
def _real_extract(self, url):
|
||
video_id = self._match_id(url)
|
||
return {
|
||
'_type': 'url_transparent',
|
||
'ie_key': 'ThePlatform',
|
||
'url': smuggle_url(
|
||
'http://link.theplatform.com/s/ExhSPC/media/guid/2655402169/%s?mbr=true&formats=MPEG4,FLV,MP3' % video_id, {
|
||
'force_smil_url': True
|
||
}),
|
||
'id': video_id,
|
||
}
|
||
|
||
|
||
class CBCWatchBaseIE(InfoExtractor):
|
||
_device_id = None
|
||
_device_token = None
|
||
_API_BASE_URL = 'https://api-cbc.cloud.clearleap.com/cloffice/client/'
|
||
_NS_MAP = {
|
||
'media': 'http://search.yahoo.com/mrss/',
|
||
'clearleap': 'http://www.clearleap.com/namespace/clearleap/1.0/',
|
||
}
|
||
_GEO_COUNTRIES = ['CA']
|
||
_LOGIN_URL = 'https://api.loginradius.com/identity/v2/auth/login'
|
||
_TOKEN_URL = 'https://cloud-api.loginradius.com/sso/jwt/api/token'
|
||
_API_KEY = '3f4beddd-2061-49b0-ae80-6f1f2ed65b37'
|
||
_NETRC_MACHINE = 'cbcwatch'
|
||
|
||
def _signature(self, email, password):
|
||
data = json.dumps({
|
||
'email': email,
|
||
'password': password,
|
||
}).encode()
|
||
headers = {'content-type': 'application/json'}
|
||
query = {'apikey': self._API_KEY}
|
||
resp = self._download_json(self._LOGIN_URL, None, data=data, headers=headers, query=query)
|
||
access_token = resp['access_token']
|
||
|
||
# token
|
||
query = {
|
||
'access_token': access_token,
|
||
'apikey': self._API_KEY,
|
||
'jwtapp': 'jwt',
|
||
}
|
||
resp = self._download_json(self._TOKEN_URL, None, headers=headers, query=query)
|
||
return resp['signature']
|
||
|
||
def _call_api(self, path, video_id):
|
||
url = path if path.startswith('http') else self._API_BASE_URL + path
|
||
for _ in range(2):
|
||
try:
|
||
result = self._download_xml(url, video_id, headers={
|
||
'X-Clearleap-DeviceId': self._device_id,
|
||
'X-Clearleap-DeviceToken': self._device_token,
|
||
})
|
||
except ExtractorError as e:
|
||
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 401:
|
||
# Device token has expired, re-acquiring device token
|
||
self._register_device()
|
||
continue
|
||
raise
|
||
error_message = xpath_text(result, 'userMessage') or xpath_text(result, 'systemMessage')
|
||
if error_message:
|
||
raise ExtractorError('%s said: %s' % (self.IE_NAME, error_message))
|
||
return result
|
||
|
||
def _real_initialize(self):
|
||
if self._valid_device_token():
|
||
return
|
||
device = self._downloader.cache.load(
|
||
'cbcwatch', self._cache_device_key()) or {}
|
||
self._device_id, self._device_token = device.get('id'), device.get('token')
|
||
if self._valid_device_token():
|
||
return
|
||
self._register_device()
|
||
|
||
def _valid_device_token(self):
|
||
return self._device_id and self._device_token
|
||
|
||
def _cache_device_key(self):
|
||
email, _ = self._get_login_info()
|
||
return '%s_device' % hashlib.sha256(email.encode()).hexdigest() if email else 'device'
|
||
|
||
def _register_device(self):
|
||
result = self._download_xml(
|
||
self._API_BASE_URL + 'device/register',
|
||
None, 'Acquiring device token',
|
||
data=b'<device><type>web</type></device>')
|
||
self._device_id = xpath_text(result, 'deviceId', fatal=True)
|
||
email, password = self._get_login_info()
|
||
if email and password:
|
||
signature = self._signature(email, password)
|
||
data = '<login><token>{0}</token><device><deviceId>{1}</deviceId><type>web</type></device></login>'.format(
|
||
escape(signature), escape(self._device_id)).encode()
|
||
url = self._API_BASE_URL + 'device/login'
|
||
result = self._download_xml(
|
||
url, None, data=data,
|
||
headers={'content-type': 'application/xml'})
|
||
self._device_token = xpath_text(result, 'token', fatal=True)
|
||
else:
|
||
self._device_token = xpath_text(result, 'deviceToken', fatal=True)
|
||
self._downloader.cache.store(
|
||
'cbcwatch', self._cache_device_key(), {
|
||
'id': self._device_id,
|
||
'token': self._device_token,
|
||
})
|
||
|
||
def _parse_rss_feed(self, rss):
|
||
channel = xpath_element(rss, 'channel', fatal=True)
|
||
|
||
def _add_ns(path):
|
||
return xpath_with_ns(path, self._NS_MAP)
|
||
|
||
entries = []
|
||
for item in channel.findall('item'):
|
||
guid = xpath_text(item, 'guid', fatal=True)
|
||
title = xpath_text(item, 'title', fatal=True)
|
||
|
||
media_group = xpath_element(item, _add_ns('media:group'), fatal=True)
|
||
content = xpath_element(media_group, _add_ns('media:content'), fatal=True)
|
||
content_url = content.attrib['url']
|
||
|
||
thumbnails = []
|
||
for thumbnail in media_group.findall(_add_ns('media:thumbnail')):
|
||
thumbnail_url = thumbnail.get('url')
|
||
if not thumbnail_url:
|
||
continue
|
||
thumbnails.append({
|
||
'id': thumbnail.get('profile'),
|
||
'url': thumbnail_url,
|
||
'width': int_or_none(thumbnail.get('width')),
|
||
'height': int_or_none(thumbnail.get('height')),
|
||
})
|
||
|
||
timestamp = None
|
||
release_date = find_xpath_attr(
|
||
item, _add_ns('media:credit'), 'role', 'releaseDate')
|
||
if release_date is not None:
|
||
timestamp = parse_iso8601(release_date.text)
|
||
|
||
entries.append({
|
||
'_type': 'url_transparent',
|
||
'url': content_url,
|
||
'id': guid,
|
||
'title': title,
|
||
'description': xpath_text(item, 'description'),
|
||
'timestamp': timestamp,
|
||
'duration': int_or_none(content.get('duration')),
|
||
'age_limit': parse_age_limit(xpath_text(item, _add_ns('media:rating'))),
|
||
'episode': xpath_text(item, _add_ns('clearleap:episode')),
|
||
'episode_number': int_or_none(xpath_text(item, _add_ns('clearleap:episodeInSeason'))),
|
||
'series': xpath_text(item, _add_ns('clearleap:series')),
|
||
'season_number': int_or_none(xpath_text(item, _add_ns('clearleap:season'))),
|
||
'thumbnails': thumbnails,
|
||
'ie_key': 'CBCWatchVideo',
|
||
})
|
||
|
||
return self.playlist_result(
|
||
entries, xpath_text(channel, 'guid'),
|
||
xpath_text(channel, 'title'),
|
||
xpath_text(channel, 'description'))
|
||
|
||
|
||
class CBCWatchVideoIE(CBCWatchBaseIE):
|
||
IE_NAME = 'cbc.ca:watch:video'
|
||
_VALID_URL = r'https?://api-cbc\.cloud\.clearleap\.com/cloffice/client/web/play/?\?.*?\bcontentId=(?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})'
|
||
_TEST = {
|
||
# geo-restricted to Canada, bypassable
|
||
'url': 'https://api-cbc.cloud.clearleap.com/cloffice/client/web/play/?contentId=3c84472a-1eea-4dee-9267-2655d5055dcf&categoryId=ebc258f5-ee40-4cca-b66b-ba6bd55b7235',
|
||
'only_matching': True,
|
||
}
|
||
|
||
def _real_extract(self, url):
|
||
video_id = self._match_id(url)
|
||
result = self._call_api(url, video_id)
|
||
|
||
m3u8_url = xpath_text(result, 'url', fatal=True)
|
||
formats = self._extract_m3u8_formats(re.sub(r'/([^/]+)/[^/?]+\.m3u8', r'/\1/\1.m3u8', m3u8_url), video_id, 'mp4', fatal=False)
|
||
if len(formats) < 2:
|
||
formats = self._extract_m3u8_formats(m3u8_url, video_id, 'mp4')
|
||
for f in formats:
|
||
format_id = f.get('format_id')
|
||
if format_id.startswith('AAC'):
|
||
f['acodec'] = 'aac'
|
||
elif format_id.startswith('AC3'):
|
||
f['acodec'] = 'ac-3'
|
||
self._sort_formats(formats)
|
||
|
||
info = {
|
||
'id': video_id,
|
||
'title': video_id,
|
||
'formats': formats,
|
||
}
|
||
|
||
rss = xpath_element(result, 'rss')
|
||
if rss:
|
||
info.update(self._parse_rss_feed(rss)['entries'][0])
|
||
del info['url']
|
||
del info['_type']
|
||
del info['ie_key']
|
||
return info
|
||
|
||
|
||
class CBCWatchIE(CBCWatchBaseIE):
|
||
IE_NAME = 'cbc.ca:watch'
|
||
_VALID_URL = r'https?://(?:gem|watch)\.cbc\.ca/(?:[^/]+/)+(?P<id>[0-9a-f-]+)'
|
||
_TESTS = [{
|
||
# geo-restricted to Canada, bypassable
|
||
'url': 'http://watch.cbc.ca/doc-zone/season-6/customer-disservice/38e815a-009e3ab12e4',
|
||
'info_dict': {
|
||
'id': '9673749a-5e77-484c-8b62-a1092a6b5168',
|
||
'ext': 'mp4',
|
||
'title': 'Customer (Dis)Service',
|
||
'description': 'md5:8bdd6913a0fe03d4b2a17ebe169c7c87',
|
||
'upload_date': '20160219',
|
||
'timestamp': 1455840000,
|
||
},
|
||
'params': {
|
||
# m3u8 download
|
||
'skip_download': True,
|
||
'format': 'bestvideo',
|
||
},
|
||
}, {
|
||
# geo-restricted to Canada, bypassable
|
||
'url': 'http://watch.cbc.ca/arthur/all/1ed4b385-cd84-49cf-95f0-80f004680057',
|
||
'info_dict': {
|
||
'id': '1ed4b385-cd84-49cf-95f0-80f004680057',
|
||
'title': 'Arthur',
|
||
'description': 'Arthur, the sweetest 8-year-old aardvark, and his pals solve all kinds of problems with humour, kindness and teamwork.',
|
||
},
|
||
'playlist_mincount': 30,
|
||
}, {
|
||
'url': 'https://gem.cbc.ca/media/this-hour-has-22-minutes/season-26/episode-20/38e815a-0108c6c6a42',
|
||
'only_matching': True,
|
||
}]
|
||
|
||
def _real_extract(self, url):
|
||
video_id = self._match_id(url)
|
||
rss = self._call_api('web/browse/' + video_id, video_id)
|
||
return self._parse_rss_feed(rss)
|
||
|
||
|
||
class CBCOlympicsIE(InfoExtractor):
|
||
IE_NAME = 'cbc.ca:olympics'
|
||
_VALID_URL = r'https?://olympics\.cbc\.ca/video/[^/]+/(?P<id>[^/?#]+)'
|
||
_TESTS = [{
|
||
'url': 'https://olympics.cbc.ca/video/whats-on-tv/olympic-morning-featuring-the-opening-ceremony/',
|
||
'only_matching': True,
|
||
}]
|
||
|
||
def _real_extract(self, url):
|
||
display_id = self._match_id(url)
|
||
webpage = self._download_webpage(url, display_id)
|
||
video_id = self._hidden_inputs(webpage)['videoId']
|
||
video_doc = self._download_xml(
|
||
'https://olympics.cbc.ca/videodata/%s.xml' % video_id, video_id)
|
||
title = xpath_text(video_doc, 'title', fatal=True)
|
||
is_live = xpath_text(video_doc, 'kind') == 'Live'
|
||
if is_live:
|
||
title = self._live_title(title)
|
||
|
||
formats = []
|
||
for video_source in video_doc.findall('videoSources/videoSource'):
|
||
uri = xpath_text(video_source, 'uri')
|
||
if not uri:
|
||
continue
|
||
tokenize = self._download_json(
|
||
'https://olympics.cbc.ca/api/api-akamai/tokenize',
|
||
video_id, data=json.dumps({
|
||
'VideoSource': uri,
|
||
}).encode(), headers={
|
||
'Content-Type': 'application/json',
|
||
'Referer': url,
|
||
# d3.VideoPlayer._init in https://olympics.cbc.ca/components/script/base.js
|
||
'Cookie': '_dvp=TK:C0ObxjerU', # AKAMAI CDN cookie
|
||
}, fatal=False)
|
||
if not tokenize:
|
||
continue
|
||
content_url = tokenize['ContentUrl']
|
||
video_source_format = video_source.get('format')
|
||
if video_source_format == 'IIS':
|
||
formats.extend(self._extract_ism_formats(
|
||
content_url, video_id, ism_id=video_source_format, fatal=False))
|
||
else:
|
||
formats.extend(self._extract_m3u8_formats(
|
||
content_url, video_id, 'mp4',
|
||
'm3u8' if is_live else 'm3u8_native',
|
||
m3u8_id=video_source_format, fatal=False))
|
||
self._sort_formats(formats)
|
||
|
||
return {
|
||
'id': video_id,
|
||
'display_id': display_id,
|
||
'title': title,
|
||
'description': xpath_text(video_doc, 'description'),
|
||
'thumbnail': xpath_text(video_doc, 'thumbnailUrl'),
|
||
'duration': parse_duration(xpath_text(video_doc, 'duration')),
|
||
'formats': formats,
|
||
'is_live': is_live,
|
||
}
|