mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-24 21:56:53 +01: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>
394 lines
15 KiB
Python
394 lines
15 KiB
Python
# coding: utf-8
|
||
from __future__ import unicode_literals
|
||
|
||
import functools
|
||
import json
|
||
import re
|
||
|
||
from .common import InfoExtractor
|
||
from ..compat import compat_HTTPError
|
||
from ..utils import (
|
||
age_restricted,
|
||
clean_html,
|
||
ExtractorError,
|
||
int_or_none,
|
||
OnDemandPagedList,
|
||
try_get,
|
||
unescapeHTML,
|
||
urlencode_postdata,
|
||
)
|
||
|
||
|
||
class DailymotionBaseInfoExtractor(InfoExtractor):
|
||
_FAMILY_FILTER = None
|
||
_HEADERS = {
|
||
'Content-Type': 'application/json',
|
||
'Origin': 'https://www.dailymotion.com',
|
||
}
|
||
_NETRC_MACHINE = 'dailymotion'
|
||
|
||
def _get_dailymotion_cookies(self):
|
||
return self._get_cookies('https://www.dailymotion.com/')
|
||
|
||
@staticmethod
|
||
def _get_cookie_value(cookies, name):
|
||
cookie = cookies.get(name)
|
||
if cookie:
|
||
return cookie.value
|
||
|
||
def _set_dailymotion_cookie(self, name, value):
|
||
self._set_cookie('www.dailymotion.com', name, value)
|
||
|
||
def _real_initialize(self):
|
||
cookies = self._get_dailymotion_cookies()
|
||
ff = self._get_cookie_value(cookies, 'ff')
|
||
self._FAMILY_FILTER = ff == 'on' if ff else age_restricted(18, self._downloader.params.get('age_limit'))
|
||
self._set_dailymotion_cookie('ff', 'on' if self._FAMILY_FILTER else 'off')
|
||
|
||
def _call_api(self, object_type, xid, object_fields, note, filter_extra=None):
|
||
if not self._HEADERS.get('Authorization'):
|
||
cookies = self._get_dailymotion_cookies()
|
||
token = self._get_cookie_value(cookies, 'access_token') or self._get_cookie_value(cookies, 'client_token')
|
||
if not token:
|
||
data = {
|
||
'client_id': 'f1a362d288c1b98099c7',
|
||
'client_secret': 'eea605b96e01c796ff369935357eca920c5da4c5',
|
||
}
|
||
username, password = self._get_login_info()
|
||
if username:
|
||
data.update({
|
||
'grant_type': 'password',
|
||
'password': password,
|
||
'username': username,
|
||
})
|
||
else:
|
||
data['grant_type'] = 'client_credentials'
|
||
try:
|
||
token = self._download_json(
|
||
'https://graphql.api.dailymotion.com/oauth/token',
|
||
None, 'Downloading Access Token',
|
||
data=urlencode_postdata(data))['access_token']
|
||
except ExtractorError as e:
|
||
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 400:
|
||
raise ExtractorError(self._parse_json(
|
||
e.cause.read().decode(), xid)['error_description'], expected=True)
|
||
raise
|
||
self._set_dailymotion_cookie('access_token' if username else 'client_token', token)
|
||
self._HEADERS['Authorization'] = 'Bearer ' + token
|
||
|
||
resp = self._download_json(
|
||
'https://graphql.api.dailymotion.com/', xid, note, data=json.dumps({
|
||
'query': '''{
|
||
%s(xid: "%s"%s) {
|
||
%s
|
||
}
|
||
}''' % (object_type, xid, ', ' + filter_extra if filter_extra else '', object_fields),
|
||
}).encode(), headers=self._HEADERS)
|
||
obj = resp['data'][object_type]
|
||
if not obj:
|
||
raise ExtractorError(resp['errors'][0]['message'], expected=True)
|
||
return obj
|
||
|
||
|
||
class DailymotionIE(DailymotionBaseInfoExtractor):
|
||
_VALID_URL = r'''(?ix)
|
||
https?://
|
||
(?:
|
||
(?:(?:www|touch)\.)?dailymotion\.[a-z]{2,3}/(?:(?:(?:embed|swf|\#)/)?video|swf)|
|
||
(?:www\.)?lequipe\.fr/video
|
||
)
|
||
/(?P<id>[^/?_]+)(?:.+?\bplaylist=(?P<playlist_id>x[0-9a-z]+))?
|
||
'''
|
||
IE_NAME = 'dailymotion'
|
||
_TESTS = [{
|
||
'url': 'http://www.dailymotion.com/video/x5kesuj_office-christmas-party-review-jason-bateman-olivia-munn-t-j-miller_news',
|
||
'md5': '074b95bdee76b9e3654137aee9c79dfe',
|
||
'info_dict': {
|
||
'id': 'x5kesuj',
|
||
'ext': 'mp4',
|
||
'title': 'Office Christmas Party Review – Jason Bateman, Olivia Munn, T.J. Miller',
|
||
'description': 'Office Christmas Party Review - Jason Bateman, Olivia Munn, T.J. Miller',
|
||
'duration': 187,
|
||
'timestamp': 1493651285,
|
||
'upload_date': '20170501',
|
||
'uploader': 'Deadline',
|
||
'uploader_id': 'x1xm8ri',
|
||
'age_limit': 0,
|
||
},
|
||
}, {
|
||
'url': 'https://www.dailymotion.com/video/x2iuewm_steam-machine-models-pricing-listed-on-steam-store-ign-news_videogames',
|
||
'md5': '2137c41a8e78554bb09225b8eb322406',
|
||
'info_dict': {
|
||
'id': 'x2iuewm',
|
||
'ext': 'mp4',
|
||
'title': 'Steam Machine Models, Pricing Listed on Steam Store - IGN News',
|
||
'description': 'Several come bundled with the Steam Controller.',
|
||
'thumbnail': r're:^https?:.*\.(?:jpg|png)$',
|
||
'duration': 74,
|
||
'timestamp': 1425657362,
|
||
'upload_date': '20150306',
|
||
'uploader': 'IGN',
|
||
'uploader_id': 'xijv66',
|
||
'age_limit': 0,
|
||
'view_count': int,
|
||
},
|
||
'skip': 'video gone',
|
||
}, {
|
||
# Vevo video
|
||
'url': 'http://www.dailymotion.com/video/x149uew_katy-perry-roar-official_musi',
|
||
'info_dict': {
|
||
'title': 'Roar (Official)',
|
||
'id': 'USUV71301934',
|
||
'ext': 'mp4',
|
||
'uploader': 'Katy Perry',
|
||
'upload_date': '20130905',
|
||
},
|
||
'params': {
|
||
'skip_download': True,
|
||
},
|
||
'skip': 'VEVO is only available in some countries',
|
||
}, {
|
||
# age-restricted video
|
||
'url': 'http://www.dailymotion.com/video/xyh2zz_leanna-decker-cyber-girl-of-the-year-desires-nude-playboy-plus_redband',
|
||
'md5': '0d667a7b9cebecc3c89ee93099c4159d',
|
||
'info_dict': {
|
||
'id': 'xyh2zz',
|
||
'ext': 'mp4',
|
||
'title': 'Leanna Decker - Cyber Girl Of The Year Desires Nude [Playboy Plus]',
|
||
'uploader': 'HotWaves1012',
|
||
'age_limit': 18,
|
||
},
|
||
'skip': 'video gone',
|
||
}, {
|
||
# geo-restricted, player v5
|
||
'url': 'http://www.dailymotion.com/video/xhza0o',
|
||
'only_matching': True,
|
||
}, {
|
||
# with subtitles
|
||
'url': 'http://www.dailymotion.com/video/x20su5f_the-power-of-nightmares-1-the-rise-of-the-politics-of-fear-bbc-2004_news',
|
||
'only_matching': True,
|
||
}, {
|
||
'url': 'http://www.dailymotion.com/swf/video/x3n92nf',
|
||
'only_matching': True,
|
||
}, {
|
||
'url': 'http://www.dailymotion.com/swf/x3ss1m_funny-magic-trick-barry-and-stuart_fun',
|
||
'only_matching': True,
|
||
}, {
|
||
'url': 'https://www.lequipe.fr/video/x791mem',
|
||
'only_matching': True,
|
||
}, {
|
||
'url': 'https://www.lequipe.fr/video/k7MtHciueyTcrFtFKA2',
|
||
'only_matching': True,
|
||
}, {
|
||
'url': 'https://www.dailymotion.com/video/x3z49k?playlist=xv4bw',
|
||
'only_matching': True,
|
||
}]
|
||
_GEO_BYPASS = False
|
||
_COMMON_MEDIA_FIELDS = '''description
|
||
geoblockedCountries {
|
||
allowed
|
||
}
|
||
xid'''
|
||
|
||
@staticmethod
|
||
def _extract_urls(webpage):
|
||
urls = []
|
||
# Look for embedded Dailymotion player
|
||
# https://developer.dailymotion.com/player#player-parameters
|
||
for mobj in re.finditer(
|
||
r'<(?:(?:embed|iframe)[^>]+?src=|input[^>]+id=[\'"]dmcloudUrlEmissionSelect[\'"][^>]+value=)(["\'])(?P<url>(?:https?:)?//(?:www\.)?dailymotion\.com/(?:embed|swf)/video/.+?)\1', webpage):
|
||
urls.append(unescapeHTML(mobj.group('url')))
|
||
for mobj in re.finditer(
|
||
r'(?s)DM\.player\([^,]+,\s*{.*?video[\'"]?\s*:\s*["\']?(?P<id>[0-9a-zA-Z]+).+?}\s*\);', webpage):
|
||
urls.append('https://www.dailymotion.com/embed/video/' + mobj.group('id'))
|
||
return urls
|
||
|
||
def _real_extract(self, url):
|
||
video_id, playlist_id = re.match(self._VALID_URL, url).groups()
|
||
|
||
if playlist_id:
|
||
if not self._downloader.params.get('noplaylist'):
|
||
self.to_screen('Downloading playlist %s - add --no-playlist to just download video' % playlist_id)
|
||
return self.url_result(
|
||
'http://www.dailymotion.com/playlist/' + playlist_id,
|
||
'DailymotionPlaylist', playlist_id)
|
||
self.to_screen('Downloading just video %s because of --no-playlist' % video_id)
|
||
|
||
password = self._downloader.params.get('videopassword')
|
||
media = self._call_api(
|
||
'media', video_id, '''... on Video {
|
||
%s
|
||
stats {
|
||
likes {
|
||
total
|
||
}
|
||
views {
|
||
total
|
||
}
|
||
}
|
||
}
|
||
... on Live {
|
||
%s
|
||
audienceCount
|
||
isOnAir
|
||
}''' % (self._COMMON_MEDIA_FIELDS, self._COMMON_MEDIA_FIELDS), 'Downloading media JSON metadata',
|
||
'password: "%s"' % self._downloader.params.get('videopassword') if password else None)
|
||
xid = media['xid']
|
||
|
||
metadata = self._download_json(
|
||
'https://www.dailymotion.com/player/metadata/video/' + xid,
|
||
xid, 'Downloading metadata JSON',
|
||
query={'app': 'com.dailymotion.neon'})
|
||
|
||
error = metadata.get('error')
|
||
if error:
|
||
title = error.get('title') or error['raw_message']
|
||
# See https://developer.dailymotion.com/api#access-error
|
||
if error.get('code') == 'DM007':
|
||
allowed_countries = try_get(media, lambda x: x['geoblockedCountries']['allowed'], list)
|
||
self.raise_geo_restricted(msg=title, countries=allowed_countries)
|
||
raise ExtractorError(
|
||
'%s said: %s' % (self.IE_NAME, title), expected=True)
|
||
|
||
title = metadata['title']
|
||
is_live = media.get('isOnAir')
|
||
formats = []
|
||
for quality, media_list in metadata['qualities'].items():
|
||
for m in media_list:
|
||
media_url = m.get('url')
|
||
media_type = m.get('type')
|
||
if not media_url or media_type == 'application/vnd.lumberjack.manifest':
|
||
continue
|
||
if media_type == 'application/x-mpegURL':
|
||
formats.extend(self._extract_m3u8_formats(
|
||
media_url, video_id, 'mp4',
|
||
'm3u8' if is_live else 'm3u8_native',
|
||
m3u8_id='hls', fatal=False))
|
||
else:
|
||
f = {
|
||
'url': media_url,
|
||
'format_id': 'http-' + quality,
|
||
}
|
||
m = re.search(r'/H264-(\d+)x(\d+)(?:-(60)/)?', media_url)
|
||
if m:
|
||
width, height, fps = map(int_or_none, m.groups())
|
||
f.update({
|
||
'fps': fps,
|
||
'height': height,
|
||
'width': width,
|
||
})
|
||
formats.append(f)
|
||
for f in formats:
|
||
f['url'] = f['url'].split('#')[0]
|
||
if not f.get('fps') and f['format_id'].endswith('@60'):
|
||
f['fps'] = 60
|
||
self._sort_formats(formats)
|
||
|
||
subtitles = {}
|
||
subtitles_data = try_get(metadata, lambda x: x['subtitles']['data'], dict) or {}
|
||
for subtitle_lang, subtitle in subtitles_data.items():
|
||
subtitles[subtitle_lang] = [{
|
||
'url': subtitle_url,
|
||
} for subtitle_url in subtitle.get('urls', [])]
|
||
|
||
thumbnails = []
|
||
for height, poster_url in metadata.get('posters', {}).items():
|
||
thumbnails.append({
|
||
'height': int_or_none(height),
|
||
'id': height,
|
||
'url': poster_url,
|
||
})
|
||
|
||
owner = metadata.get('owner') or {}
|
||
stats = media.get('stats') or {}
|
||
get_count = lambda x: int_or_none(try_get(stats, lambda y: y[x + 's']['total']))
|
||
|
||
return {
|
||
'id': video_id,
|
||
'title': self._live_title(title) if is_live else title,
|
||
'description': clean_html(media.get('description')),
|
||
'thumbnails': thumbnails,
|
||
'duration': int_or_none(metadata.get('duration')) or None,
|
||
'timestamp': int_or_none(metadata.get('created_time')),
|
||
'uploader': owner.get('screenname'),
|
||
'uploader_id': owner.get('id') or metadata.get('screenname'),
|
||
'age_limit': 18 if metadata.get('explicit') else 0,
|
||
'tags': metadata.get('tags'),
|
||
'view_count': get_count('view') or int_or_none(media.get('audienceCount')),
|
||
'like_count': get_count('like'),
|
||
'formats': formats,
|
||
'subtitles': subtitles,
|
||
'is_live': is_live,
|
||
}
|
||
|
||
|
||
class DailymotionPlaylistBaseIE(DailymotionBaseInfoExtractor):
|
||
_PAGE_SIZE = 100
|
||
|
||
def _fetch_page(self, playlist_id, page):
|
||
page += 1
|
||
videos = self._call_api(
|
||
self._OBJECT_TYPE, playlist_id,
|
||
'''videos(allowExplicit: %s, first: %d, page: %d) {
|
||
edges {
|
||
node {
|
||
xid
|
||
url
|
||
}
|
||
}
|
||
}''' % ('false' if self._FAMILY_FILTER else 'true', self._PAGE_SIZE, page),
|
||
'Downloading page %d' % page)['videos']
|
||
for edge in videos['edges']:
|
||
node = edge['node']
|
||
yield self.url_result(
|
||
node['url'], DailymotionIE.ie_key(), node['xid'])
|
||
|
||
def _real_extract(self, url):
|
||
playlist_id = self._match_id(url)
|
||
entries = OnDemandPagedList(functools.partial(
|
||
self._fetch_page, playlist_id), self._PAGE_SIZE)
|
||
return self.playlist_result(
|
||
entries, playlist_id)
|
||
|
||
|
||
class DailymotionPlaylistIE(DailymotionPlaylistBaseIE):
|
||
IE_NAME = 'dailymotion:playlist'
|
||
_VALID_URL = r'(?:https?://)?(?:www\.)?dailymotion\.[a-z]{2,3}/playlist/(?P<id>x[0-9a-z]+)'
|
||
_TESTS = [{
|
||
'url': 'http://www.dailymotion.com/playlist/xv4bw_nqtv_sport/1#video=xl8v3q',
|
||
'info_dict': {
|
||
'id': 'xv4bw',
|
||
},
|
||
'playlist_mincount': 20,
|
||
}]
|
||
_OBJECT_TYPE = 'collection'
|
||
|
||
|
||
class DailymotionUserIE(DailymotionPlaylistBaseIE):
|
||
IE_NAME = 'dailymotion:user'
|
||
_VALID_URL = r'https?://(?:www\.)?dailymotion\.[a-z]{2,3}/(?!(?:embed|swf|#|video|playlist)/)(?:(?:old/)?user/)?(?P<id>[^/]+)'
|
||
_TESTS = [{
|
||
'url': 'https://www.dailymotion.com/user/nqtv',
|
||
'info_dict': {
|
||
'id': 'nqtv',
|
||
},
|
||
'playlist_mincount': 152,
|
||
}, {
|
||
'url': 'http://www.dailymotion.com/user/UnderProject',
|
||
'info_dict': {
|
||
'id': 'UnderProject',
|
||
},
|
||
'playlist_mincount': 1000,
|
||
'skip': 'Takes too long time',
|
||
}, {
|
||
'url': 'https://www.dailymotion.com/user/nqtv',
|
||
'info_dict': {
|
||
'id': 'nqtv',
|
||
},
|
||
'playlist_mincount': 148,
|
||
'params': {
|
||
'age_limit': 0,
|
||
},
|
||
}]
|
||
_OBJECT_TYPE = 'channel'
|