2017-04-01 17:42:10 -04:00
|
|
|
|
# coding: utf-8
|
2016-02-06 08:27:04 -05:00
|
|
|
|
from __future__ import unicode_literals
|
2014-08-27 19:04:43 -04:00
|
|
|
|
|
2013-06-23 13:57:38 -04:00
|
|
|
|
import base64
|
2014-09-28 02:53:52 -04:00
|
|
|
|
import datetime
|
2014-01-17 08:47:46 -05:00
|
|
|
|
import hashlib
|
2014-01-07 03:35:34 -05:00
|
|
|
|
import json
|
2014-07-11 04:57:08 -04:00
|
|
|
|
import netrc
|
2013-06-23 13:57:38 -04:00
|
|
|
|
import os
|
2017-02-04 06:49:58 -05:00
|
|
|
|
import random
|
2013-06-23 13:57:38 -04:00
|
|
|
|
import re
|
|
|
|
|
import socket
|
|
|
|
|
import sys
|
2014-07-11 04:57:08 -04:00
|
|
|
|
import time
|
2016-02-02 12:07:07 -05:00
|
|
|
|
import math
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
2014-11-02 05:23:40 -05:00
|
|
|
|
from ..compat import (
|
pull changes from remote master (#190)
* [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 commit cff99c91d150df2a4e21962a3ca8d4ae94533b8c.
* [utils] Add reference to cookie file format
* Revert "[vimeo] fix showcase password protected video extraction(closes #24224)"
This reverts commit 12ee431676bb655f04c7dd416a73c1f142ed368d.
* [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>
2020-08-25 10:53:34 -04:00
|
|
|
|
compat_cookiejar_Cookie,
|
2015-07-29 18:20:37 -04:00
|
|
|
|
compat_cookies,
|
2019-03-05 13:21:57 -05:00
|
|
|
|
compat_etree_Element,
|
2016-03-03 06:24:24 -05:00
|
|
|
|
compat_etree_fromstring,
|
2015-08-15 11:55:07 -04:00
|
|
|
|
compat_getpass,
|
2018-06-17 17:01:48 -04:00
|
|
|
|
compat_integer_types,
|
2013-06-23 13:57:38 -04:00
|
|
|
|
compat_http_client,
|
2016-03-03 06:24:24 -05:00
|
|
|
|
compat_os_name,
|
|
|
|
|
compat_str,
|
2013-06-23 13:57:38 -04:00
|
|
|
|
compat_urllib_error,
|
2016-10-07 07:20:53 -04:00
|
|
|
|
compat_urllib_parse_unquote,
|
2016-03-25 15:46:57 -04:00
|
|
|
|
compat_urllib_parse_urlencode,
|
2016-03-31 12:58:38 -04:00
|
|
|
|
compat_urllib_request,
|
2014-09-24 08:16:56 -04:00
|
|
|
|
compat_urlparse,
|
2017-08-22 13:32:41 -04:00
|
|
|
|
compat_xml_parse_error,
|
2014-11-02 05:23:40 -05:00
|
|
|
|
)
|
2017-11-04 11:10:55 -04:00
|
|
|
|
from ..downloader.f4m import (
|
|
|
|
|
get_base_url,
|
|
|
|
|
remove_encrypted_media,
|
|
|
|
|
)
|
2014-11-02 05:23:40 -05:00
|
|
|
|
from ..utils import (
|
2015-06-28 12:56:45 -04:00
|
|
|
|
NO_DEFAULT,
|
2015-01-07 01:20:20 -05:00
|
|
|
|
age_restricted,
|
2016-11-01 15:14:01 -04:00
|
|
|
|
base_url,
|
2015-04-17 08:55:24 -04:00
|
|
|
|
bug_reports_message,
|
2013-06-23 13:57:38 -04:00
|
|
|
|
clean_html,
|
|
|
|
|
compiled_regex_type,
|
2015-07-15 15:15:15 -04:00
|
|
|
|
determine_ext,
|
2017-03-08 18:13:54 -05:00
|
|
|
|
determine_protocol,
|
2019-03-16 22:09:32 -04:00
|
|
|
|
dict_get,
|
2015-12-19 20:00:39 -05:00
|
|
|
|
error_to_compat_str,
|
2013-06-23 13:57:38 -04:00
|
|
|
|
ExtractorError,
|
2017-03-08 18:13:54 -05:00
|
|
|
|
extract_attributes,
|
2015-07-15 15:14:08 -04:00
|
|
|
|
fix_xml_ampersands,
|
2014-09-28 04:34:55 -04:00
|
|
|
|
float_or_none,
|
2017-02-04 06:49:58 -05:00
|
|
|
|
GeoRestrictedError,
|
|
|
|
|
GeoUtils,
|
2014-07-28 09:25:56 -04:00
|
|
|
|
int_or_none,
|
2017-02-16 10:42:36 -05:00
|
|
|
|
js_to_json,
|
2018-07-09 12:43:05 -04:00
|
|
|
|
JSON_LD_RE,
|
2017-03-08 18:13:54 -05:00
|
|
|
|
mimetype2ext,
|
|
|
|
|
orderedSet,
|
2019-03-16 22:09:32 -04:00
|
|
|
|
parse_bitrate,
|
2017-03-08 18:13:54 -05:00
|
|
|
|
parse_codecs,
|
|
|
|
|
parse_duration,
|
2016-01-15 13:36:02 -05:00
|
|
|
|
parse_iso8601,
|
2017-03-08 18:13:54 -05:00
|
|
|
|
parse_m3u8_attributes,
|
2019-03-16 22:09:32 -04:00
|
|
|
|
parse_resolution,
|
2013-10-23 08:38:03 -04:00
|
|
|
|
RegexNotFoundError,
|
2015-11-21 11:18:17 -05:00
|
|
|
|
sanitized_Request,
|
2017-03-08 18:13:54 -05:00
|
|
|
|
sanitize_filename,
|
2019-03-16 22:09:32 -04:00
|
|
|
|
str_or_none,
|
2019-05-23 12:52:11 -04:00
|
|
|
|
strip_or_none,
|
2013-07-17 04:38:23 -04:00
|
|
|
|
unescapeHTML,
|
2015-10-01 12:18:59 -04:00
|
|
|
|
unified_strdate,
|
2016-07-08 16:27:11 -04:00
|
|
|
|
unified_timestamp,
|
2017-03-08 18:13:54 -05:00
|
|
|
|
update_Request,
|
|
|
|
|
update_url_query,
|
|
|
|
|
urljoin,
|
2015-08-01 15:13:21 -04:00
|
|
|
|
url_basename,
|
2018-10-28 13:19:08 -04:00
|
|
|
|
url_or_none,
|
2016-06-07 12:19:33 -04:00
|
|
|
|
xpath_element,
|
2015-08-09 09:07:18 -04:00
|
|
|
|
xpath_text,
|
|
|
|
|
xpath_with_ns,
|
2013-06-23 13:57:38 -04:00
|
|
|
|
)
|
2015-06-28 12:56:45 -04:00
|
|
|
|
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
|
|
|
|
class InfoExtractor(object):
|
|
|
|
|
"""Information Extractor class.
|
|
|
|
|
|
|
|
|
|
Information extractors are the classes that, given a URL, extract
|
|
|
|
|
information about the video (or videos) the URL refers to. This
|
|
|
|
|
information includes the real video URL, the video title, author and
|
|
|
|
|
others. The information is stored in a dictionary which is then
|
2014-12-21 10:58:29 -05:00
|
|
|
|
passed to the YoutubeDL. The YoutubeDL processes this
|
2013-06-23 13:57:38 -04:00
|
|
|
|
information possibly downloading the video to the file system, among
|
|
|
|
|
other possible outcomes.
|
|
|
|
|
|
2015-04-29 11:03:10 -04:00
|
|
|
|
The type field determines the type of the result.
|
2014-11-20 10:47:59 -05:00
|
|
|
|
By far the most common value (and the default if _type is missing) is
|
|
|
|
|
"video", which indicates a single video.
|
|
|
|
|
|
|
|
|
|
For a video, the dictionaries must include the following fields:
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
|
|
|
|
id: Video identifier.
|
|
|
|
|
title: Video title, unescaped.
|
2013-12-16 08:13:40 -05:00
|
|
|
|
|
2013-12-24 05:56:02 -05:00
|
|
|
|
Additionally, it must contain either a formats entry or a url one:
|
2013-12-16 08:13:40 -05:00
|
|
|
|
|
2013-12-24 05:56:02 -05:00
|
|
|
|
formats: A list of dictionaries for each format available, ordered
|
|
|
|
|
from worst to best quality.
|
|
|
|
|
|
|
|
|
|
Potential fields:
|
2019-03-04 12:39:15 -05:00
|
|
|
|
* url The mandatory URL representing the media:
|
|
|
|
|
for plain file media - HTTP URL of this file,
|
|
|
|
|
for RTMP - RTMP URL,
|
|
|
|
|
for HLS - URL of the M3U8 media playlist,
|
|
|
|
|
for HDS - URL of the F4M manifest,
|
2019-03-14 13:42:14 -04:00
|
|
|
|
for DASH
|
|
|
|
|
- HTTP URL to plain file media (in case of
|
|
|
|
|
unfragmented media)
|
|
|
|
|
- URL of the MPD manifest or base URL
|
|
|
|
|
representing the media if MPD manifest
|
2019-05-10 17:53:48 -04:00
|
|
|
|
is parsed from a string (in case of
|
2019-03-14 13:42:14 -04:00
|
|
|
|
fragmented media)
|
2019-03-04 12:39:15 -05:00
|
|
|
|
for MSS - URL of the ISM manifest.
|
2016-09-17 09:35:22 -04:00
|
|
|
|
* manifest_url
|
|
|
|
|
The URL of the manifest file in case of
|
2019-03-04 12:39:15 -05:00
|
|
|
|
fragmented media:
|
|
|
|
|
for HLS - URL of the M3U8 master playlist,
|
|
|
|
|
for HDS - URL of the F4M manifest,
|
|
|
|
|
for DASH - URL of the MPD manifest,
|
|
|
|
|
for MSS - URL of the ISM manifest.
|
2015-07-23 13:37:45 -04:00
|
|
|
|
* ext Will be calculated from URL if missing
|
2013-12-16 08:13:40 -05:00
|
|
|
|
* format A human-readable description of the format
|
|
|
|
|
("mp4 container with h264/opus").
|
|
|
|
|
Calculated from the format_id, width, height.
|
|
|
|
|
and format_note fields if missing.
|
|
|
|
|
* format_id A short description of the format
|
2013-12-26 15:19:00 -05:00
|
|
|
|
("mp4_h264_opus" or "19").
|
|
|
|
|
Technically optional, but strongly recommended.
|
2013-12-16 08:13:40 -05:00
|
|
|
|
* format_note Additional info about the format
|
|
|
|
|
("3D" or "DASH video")
|
|
|
|
|
* width Width of the video, if known
|
|
|
|
|
* height Height of the video, if known
|
2013-12-24 05:56:02 -05:00
|
|
|
|
* resolution Textual description of width and height
|
2013-12-25 09:18:40 -05:00
|
|
|
|
* tbr Average bitrate of audio and video in KBit/s
|
2013-12-16 08:13:40 -05:00
|
|
|
|
* abr Average audio bitrate in KBit/s
|
|
|
|
|
* acodec Name of the audio codec in use
|
2014-01-18 23:47:20 -05:00
|
|
|
|
* asr Audio sampling rate in Hertz
|
2013-12-16 08:13:40 -05:00
|
|
|
|
* vbr Average video bitrate in KBit/s
|
2014-10-30 04:34:13 -04:00
|
|
|
|
* fps Frame rate
|
2013-12-16 08:13:40 -05:00
|
|
|
|
* vcodec Name of the video codec in use
|
2014-01-23 17:54:06 -05:00
|
|
|
|
* container Name of the container format
|
2013-12-16 08:13:40 -05:00
|
|
|
|
* filesize The number of bytes, if known in advance
|
2014-07-21 06:02:44 -04:00
|
|
|
|
* filesize_approx An estimate for the number of bytes
|
2013-12-16 08:13:40 -05:00
|
|
|
|
* player_url SWF Player URL (used for rtmpdump).
|
2013-12-24 17:32:04 -05:00
|
|
|
|
* protocol The protocol that will be used for the actual
|
|
|
|
|
download, lower-case.
|
2015-01-30 09:53:16 -05:00
|
|
|
|
"http", "https", "rtsp", "rtmp", "rtmpe",
|
2016-03-06 04:47:07 -05:00
|
|
|
|
"m3u8", "m3u8_native" or "http_dash_segments".
|
2017-01-28 17:56:43 -05:00
|
|
|
|
* fragment_base_url
|
|
|
|
|
Base URL for fragments. Each fragment's path
|
|
|
|
|
value (if present) will be relative to
|
|
|
|
|
this URL.
|
|
|
|
|
* fragments A list of fragments of a fragmented media.
|
|
|
|
|
Each fragment entry must contain either an url
|
|
|
|
|
or a path. If an url is present it should be
|
|
|
|
|
considered by a client. Otherwise both path and
|
|
|
|
|
fragment_base_url must be present. Here is
|
|
|
|
|
the list of all potential fields:
|
|
|
|
|
* "url" - fragment's URL
|
|
|
|
|
* "path" - fragment's path relative to
|
|
|
|
|
fragment_base_url
|
2016-09-05 14:18:57 -04:00
|
|
|
|
* "duration" (optional, int or float)
|
|
|
|
|
* "filesize" (optional, int)
|
2013-12-24 05:56:02 -05:00
|
|
|
|
* preference Order number of this format. If this field is
|
2014-01-01 14:23:47 -05:00
|
|
|
|
present and not None, the formats get sorted
|
2014-03-23 12:41:43 -04:00
|
|
|
|
by this field, regardless of all other values.
|
2013-12-24 05:56:02 -05:00
|
|
|
|
-1 for default (order by other properties),
|
|
|
|
|
-2 or smaller for less than default.
|
2015-01-03 12:33:38 -05:00
|
|
|
|
< -1000 to hide the format (if there is
|
|
|
|
|
another one which is strictly better)
|
2016-01-01 07:28:45 -05:00
|
|
|
|
* language Language code, e.g. "de" or "en-US".
|
|
|
|
|
* language_preference Is this in the language mentioned in
|
|
|
|
|
the URL?
|
2014-11-20 06:06:33 -05:00
|
|
|
|
10 if it's what the URL is about,
|
|
|
|
|
-1 for default (don't know),
|
|
|
|
|
-10 otherwise, other values reserved for now.
|
2014-01-06 11:15:27 -05:00
|
|
|
|
* quality Order number of the video quality of this
|
|
|
|
|
format, irrespective of the file format.
|
|
|
|
|
-1 for default (order by other properties),
|
|
|
|
|
-2 or smaller for less than default.
|
2014-10-24 18:10:11 -04:00
|
|
|
|
* source_preference Order number for this video source
|
|
|
|
|
(quality takes higher priority)
|
|
|
|
|
-1 for default (order by other properties),
|
|
|
|
|
-2 or smaller for less than default.
|
2014-08-23 19:31:35 -04:00
|
|
|
|
* http_headers A dictionary of additional HTTP headers
|
|
|
|
|
to add to the request.
|
2015-01-09 23:45:51 -05:00
|
|
|
|
* stretched_ratio If given and not 1, indicates that the
|
2015-01-25 12:09:48 -05:00
|
|
|
|
video's pixels are not square.
|
|
|
|
|
width : height ratio as float.
|
|
|
|
|
* no_resume The server does not support resuming the
|
|
|
|
|
(HTTP or RTMP) download. Boolean.
|
2018-02-03 19:16:22 -05:00
|
|
|
|
* downloader_options A dictionary of downloader options as
|
|
|
|
|
described in FileDownloader
|
2015-01-25 12:09:48 -05:00
|
|
|
|
|
2013-12-15 22:09:30 -05:00
|
|
|
|
url: Final video URL.
|
2013-06-23 13:57:38 -04:00
|
|
|
|
ext: Video filename extension.
|
2013-12-16 08:13:40 -05:00
|
|
|
|
format: The video format, defaults to ext (used for --get-format)
|
|
|
|
|
player_url: SWF Player URL (used for rtmpdump).
|
2013-10-04 05:09:43 -04:00
|
|
|
|
|
2013-06-23 13:57:38 -04:00
|
|
|
|
The following fields are optional:
|
|
|
|
|
|
2014-12-11 21:34:28 -05:00
|
|
|
|
alt_title: A secondary title of the video.
|
2014-03-03 06:06:28 -05:00
|
|
|
|
display_id An alternative identifier for the video, not necessarily
|
|
|
|
|
unique, but available before title. Typically, id is
|
|
|
|
|
something like "4234987", title "Dancing naked mole rats",
|
|
|
|
|
and display_id "dancing-naked-mole-rats"
|
2014-06-07 09:33:45 -04:00
|
|
|
|
thumbnails: A list of dictionaries, with the following entries:
|
2015-01-24 20:38:47 -05:00
|
|
|
|
* "id" (optional, string) - Thumbnail format ID
|
2014-06-07 09:33:45 -04:00
|
|
|
|
* "url"
|
2015-01-24 20:38:47 -05:00
|
|
|
|
* "preference" (optional, int) - quality of the image
|
2014-06-07 09:33:45 -04:00
|
|
|
|
* "width" (optional, int)
|
|
|
|
|
* "height" (optional, int)
|
2019-07-17 11:47:53 -04:00
|
|
|
|
* "resolution" (optional, string "{width}x{height}",
|
2014-06-07 09:33:45 -04:00
|
|
|
|
deprecated)
|
2016-07-08 16:24:36 -04:00
|
|
|
|
* "filesize" (optional, int)
|
2013-06-23 13:57:38 -04:00
|
|
|
|
thumbnail: Full URL to a video thumbnail image.
|
2014-12-11 21:34:28 -05:00
|
|
|
|
description: Full video description.
|
2013-06-23 13:57:38 -04:00
|
|
|
|
uploader: Full name of the video uploader.
|
2016-03-02 12:06:39 -05:00
|
|
|
|
license: License name the video is licensed under.
|
2016-05-02 11:31:35 -04:00
|
|
|
|
creator: The creator of the video.
|
2015-09-26 11:07:54 -04:00
|
|
|
|
release_date: The date (YYYYMMDD) when the video was released.
|
2014-03-13 13:21:55 -04:00
|
|
|
|
timestamp: UNIX timestamp of the moment the video became available.
|
2013-06-23 13:57:38 -04:00
|
|
|
|
upload_date: Video upload date (YYYYMMDD).
|
2014-03-13 13:21:55 -04:00
|
|
|
|
If not explicitly set, calculated from timestamp.
|
2013-06-23 13:57:38 -04:00
|
|
|
|
uploader_id: Nickname or id of the video uploader.
|
2016-03-02 12:31:24 -05:00
|
|
|
|
uploader_url: Full URL to a personal webpage of the video uploader.
|
2018-09-14 14:23:36 -04:00
|
|
|
|
channel: Full name of the channel the video is uploaded on.
|
2018-09-14 14:53:01 -04:00
|
|
|
|
Note that channel fields may or may not repeat uploader
|
2018-09-14 14:23:36 -04:00
|
|
|
|
fields. This depends on a particular extractor.
|
|
|
|
|
channel_id: Id of the channel.
|
|
|
|
|
channel_url: Full URL to a channel webpage.
|
2014-08-26 19:44:47 -04:00
|
|
|
|
location: Physical location where the video was filmed.
|
2015-02-15 12:03:41 -05:00
|
|
|
|
subtitles: The available subtitles as a dictionary in the format
|
2016-12-24 12:50:50 -05:00
|
|
|
|
{tag: subformats}. "tag" is usually a language code, and
|
|
|
|
|
"subformats" is a list sorted from lower to higher
|
|
|
|
|
preference, each element is a dictionary with the "ext"
|
|
|
|
|
entry and one of:
|
2015-02-15 12:03:41 -05:00
|
|
|
|
* "data": The subtitles file contents
|
2015-07-23 13:37:45 -04:00
|
|
|
|
* "url": A URL pointing to the subtitles file
|
2015-10-04 10:33:42 -04:00
|
|
|
|
"ext" will be calculated from URL if missing
|
2015-02-16 15:44:17 -05:00
|
|
|
|
automatic_captions: Like 'subtitles', used by the YoutubeIE for
|
|
|
|
|
automatically generated captions
|
2015-12-03 09:55:02 -05:00
|
|
|
|
duration: Length of the video in seconds, as an integer or float.
|
2013-06-29 10:32:28 -04:00
|
|
|
|
view_count: How many users have watched the video on the platform.
|
2013-12-05 12:29:07 -05:00
|
|
|
|
like_count: Number of positive ratings of the video
|
|
|
|
|
dislike_count: Number of negative ratings of the video
|
2015-10-17 23:34:54 -04:00
|
|
|
|
repost_count: Number of reposts of the video
|
2015-02-11 12:39:31 -05:00
|
|
|
|
average_rating: Average rating give by users, the scale used depends on the webpage
|
2013-12-05 12:29:07 -05:00
|
|
|
|
comment_count: Number of comments on the video
|
2015-01-09 17:59:18 -05:00
|
|
|
|
comments: A list of comments, each with one or more of the following
|
|
|
|
|
properties (all but one of text or html optional):
|
|
|
|
|
* "author" - human-readable name of the comment author
|
|
|
|
|
* "author_id" - user ID of the comment author
|
|
|
|
|
* "id" - Comment ID
|
|
|
|
|
* "html" - Comment as HTML
|
|
|
|
|
* "text" - Plain text of the comment
|
|
|
|
|
* "timestamp" - UNIX timestamp of comment
|
|
|
|
|
* "parent" - ID of the comment this one is replying to.
|
|
|
|
|
Set to "root" to indicate that this is a
|
|
|
|
|
comment to the original video.
|
2013-10-06 00:06:30 -04:00
|
|
|
|
age_limit: Age restriction for the video, as an integer (years)
|
2015-07-23 13:37:45 -04:00
|
|
|
|
webpage_url: The URL to the video webpage, if given to youtube-dl it
|
2013-11-03 06:11:13 -05:00
|
|
|
|
should allow to get the same result again. (It will be set
|
|
|
|
|
by YoutubeDL if it's missing)
|
2014-05-15 06:41:42 -04:00
|
|
|
|
categories: A list of categories that the video falls in, for example
|
|
|
|
|
["Sports", "Berlin"]
|
2015-07-28 17:43:03 -04:00
|
|
|
|
tags: A list of tags assigned to the video, e.g. ["sweden", "pop music"]
|
2014-09-19 03:57:53 -04:00
|
|
|
|
is_live: True, False, or None (=unknown). Whether this video is a
|
|
|
|
|
live stream that goes on instead of a fixed-length video.
|
2015-07-20 15:10:28 -04:00
|
|
|
|
start_time: Time in seconds where the reproduction should start, as
|
2015-07-23 13:37:45 -04:00
|
|
|
|
specified in the URL.
|
2015-07-23 07:20:21 -04:00
|
|
|
|
end_time: Time in seconds where the reproduction should end, as
|
2015-07-23 13:37:45 -04:00
|
|
|
|
specified in the URL.
|
2016-05-05 16:40:19 -04:00
|
|
|
|
chapters: A list of dictionaries, with the following entries:
|
|
|
|
|
* "start_time" - The start time of the chapter in seconds
|
|
|
|
|
* "end_time" - The end time of the chapter in seconds
|
|
|
|
|
* "title" (optional, string)
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
2015-12-30 16:10:44 -05:00
|
|
|
|
The following fields should only be used when the video belongs to some logical
|
|
|
|
|
chapter or section:
|
|
|
|
|
|
|
|
|
|
chapter: Name or title of the chapter the video belongs to.
|
2016-01-01 09:26:56 -05:00
|
|
|
|
chapter_number: Number of the chapter the video belongs to, as an integer.
|
|
|
|
|
chapter_id: Id of the chapter the video belongs to, as a unicode string.
|
2015-12-30 16:10:44 -05:00
|
|
|
|
|
|
|
|
|
The following fields should only be used when the video is an episode of some
|
2016-10-16 07:37:17 -04:00
|
|
|
|
series, programme or podcast:
|
2015-12-30 16:10:44 -05:00
|
|
|
|
|
|
|
|
|
series: Title of the series or programme the video episode belongs to.
|
|
|
|
|
season: Title of the season the video episode belongs to.
|
2016-01-01 09:26:56 -05:00
|
|
|
|
season_number: Number of the season the video episode belongs to, as an integer.
|
|
|
|
|
season_id: Id of the season the video episode belongs to, as a unicode string.
|
2015-12-30 16:10:44 -05:00
|
|
|
|
episode: Title of the video episode. Unlike mandatory video title field,
|
|
|
|
|
this field should denote the exact title of the video episode
|
|
|
|
|
without any kind of decoration.
|
2016-01-01 09:26:56 -05:00
|
|
|
|
episode_number: Number of the video episode within a season, as an integer.
|
|
|
|
|
episode_id: Id of the video episode, as a unicode string.
|
2015-12-30 16:10:44 -05:00
|
|
|
|
|
2016-04-06 16:53:53 -04:00
|
|
|
|
The following fields should only be used when the media is a track or a part of
|
|
|
|
|
a music album:
|
|
|
|
|
|
|
|
|
|
track: Title of the track.
|
|
|
|
|
track_number: Number of the track within an album or a disc, as an integer.
|
|
|
|
|
track_id: Id of the track (useful in case of custom indexing, e.g. 6.iii),
|
|
|
|
|
as a unicode string.
|
|
|
|
|
artist: Artist(s) of the track.
|
|
|
|
|
genre: Genre(s) of the track.
|
|
|
|
|
album: Title of the album the track belongs to.
|
|
|
|
|
album_type: Type of the album (e.g. "Demo", "Full-length", "Split", "Compilation", etc).
|
|
|
|
|
album_artist: List of all artists appeared on the album (e.g.
|
|
|
|
|
"Ash Borer / Fell Voices" or "Various Artists", useful for splits
|
|
|
|
|
and compilations).
|
|
|
|
|
disc_number: Number of the disc or other physical medium the track belongs to,
|
|
|
|
|
as an integer.
|
|
|
|
|
release_year: Year (YYYY) when the album was released.
|
|
|
|
|
|
2013-10-04 04:40:42 -04:00
|
|
|
|
Unless mentioned otherwise, the fields should be Unicode strings.
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
2014-10-03 14:17:10 -04:00
|
|
|
|
Unless mentioned otherwise, None is equivalent to absence of information.
|
|
|
|
|
|
2014-11-20 10:47:59 -05:00
|
|
|
|
|
|
|
|
|
_type "playlist" indicates multiple videos.
|
2014-12-06 08:02:19 -05:00
|
|
|
|
There must be a key "entries", which is a list, an iterable, or a PagedList
|
|
|
|
|
object, each element of which is a valid dictionary by this specification.
|
2014-11-20 10:47:59 -05:00
|
|
|
|
|
2017-12-18 15:51:03 -05:00
|
|
|
|
Additionally, playlists can have "id", "title", "description", "uploader",
|
|
|
|
|
"uploader_id", "uploader_url" attributes with the same semantics as videos
|
|
|
|
|
(see above).
|
2014-11-20 10:47:59 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_type "multi_video" indicates that there are multiple videos that
|
|
|
|
|
form a single show, for examples multiple acts of an opera or TV episode.
|
|
|
|
|
It must have an entries key like a playlist and contain all the keys
|
|
|
|
|
required for a video at the same time.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_type "url" indicates that the video must be extracted from another
|
|
|
|
|
location, possibly by a different extractor. Its only required key is:
|
|
|
|
|
"url" - the next URL to extract.
|
2014-12-09 04:58:06 -05:00
|
|
|
|
The key "ie_key" can be set to the class name (minus the trailing "IE",
|
|
|
|
|
e.g. "Youtube") if the extractor class is known in advance.
|
|
|
|
|
Additionally, the dictionary may have any properties of the resolved entity
|
|
|
|
|
known in advance, for example "title" if the title of the referred video is
|
2014-11-20 10:47:59 -05:00
|
|
|
|
known ahead of time.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_type "url_transparent" entities have the same specification as "url", but
|
|
|
|
|
indicate that the given additional information is more precise than the one
|
|
|
|
|
associated with the resolved URL.
|
|
|
|
|
This is useful when a site employs a video service that hosts the video and
|
|
|
|
|
its technical metadata, but that video service does not embed a useful
|
|
|
|
|
title, description etc.
|
|
|
|
|
|
|
|
|
|
|
2013-06-23 13:57:38 -04:00
|
|
|
|
Subclasses of this one should re-define the _real_initialize() and
|
|
|
|
|
_real_extract() methods and define a _VALID_URL regexp.
|
|
|
|
|
Probably, they should also be added to the list of extractors.
|
|
|
|
|
|
2017-02-18 15:53:23 -05:00
|
|
|
|
_GEO_BYPASS attribute may be set to False in order to disable
|
2017-02-04 06:49:58 -05:00
|
|
|
|
geo restriction bypass mechanisms for a particular extractor.
|
|
|
|
|
Though it won't disable explicit geo restriction bypass based on
|
2018-05-19 12:53:24 -04:00
|
|
|
|
country code provided with geo_bypass_country.
|
2017-02-18 15:53:23 -05:00
|
|
|
|
|
|
|
|
|
_GEO_COUNTRIES attribute may contain a list of presumably geo unrestricted
|
|
|
|
|
countries for this extractor. One of these countries will be used by
|
|
|
|
|
geo restriction bypass mechanism right away in order to bypass
|
2018-05-19 12:53:24 -04:00
|
|
|
|
geo restriction, of course, if the mechanism is not disabled.
|
2017-02-04 06:49:58 -05:00
|
|
|
|
|
2018-05-01 20:18:01 -04:00
|
|
|
|
_GEO_IP_BLOCKS attribute may contain a list of presumably geo unrestricted
|
|
|
|
|
IP blocks in CIDR notation for this extractor. One of these IP blocks
|
|
|
|
|
will be used by geo restriction bypass mechanism similarly
|
2018-05-19 12:53:24 -04:00
|
|
|
|
to _GEO_COUNTRIES.
|
2017-02-20 11:21:15 -05:00
|
|
|
|
|
2013-06-23 13:57:38 -04:00
|
|
|
|
Finally, the _WORKING attribute should be set to False for broken IEs
|
|
|
|
|
in order to warn the users and skip the tests.
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
_ready = False
|
|
|
|
|
_downloader = None
|
2017-02-04 06:49:58 -05:00
|
|
|
|
_x_forwarded_for_ip = None
|
2017-02-18 15:53:23 -05:00
|
|
|
|
_GEO_BYPASS = True
|
|
|
|
|
_GEO_COUNTRIES = None
|
2018-05-01 20:18:01 -04:00
|
|
|
|
_GEO_IP_BLOCKS = None
|
2013-06-23 13:57:38 -04:00
|
|
|
|
_WORKING = True
|
|
|
|
|
|
|
|
|
|
def __init__(self, downloader=None):
|
|
|
|
|
"""Constructor. Receives an optional downloader."""
|
|
|
|
|
self._ready = False
|
2017-02-04 06:49:58 -05:00
|
|
|
|
self._x_forwarded_for_ip = None
|
2013-06-23 13:57:38 -04:00
|
|
|
|
self.set_downloader(downloader)
|
|
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
|
def suitable(cls, url):
|
|
|
|
|
"""Receives a URL and returns True if suitable for this IE."""
|
2013-08-20 22:06:46 -04:00
|
|
|
|
|
|
|
|
|
# This does not use has/getattr intentionally - we want to know whether
|
|
|
|
|
# we have cached the regexp for *this* class, whereas getattr would also
|
|
|
|
|
# match the superclass
|
|
|
|
|
if '_VALID_URL_RE' not in cls.__dict__:
|
|
|
|
|
cls._VALID_URL_RE = re.compile(cls._VALID_URL)
|
|
|
|
|
return cls._VALID_URL_RE.match(url) is not None
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
2014-09-28 03:31:58 -04:00
|
|
|
|
@classmethod
|
|
|
|
|
def _match_id(cls, url):
|
|
|
|
|
if '_VALID_URL_RE' not in cls.__dict__:
|
|
|
|
|
cls._VALID_URL_RE = re.compile(cls._VALID_URL)
|
|
|
|
|
m = cls._VALID_URL_RE.match(url)
|
|
|
|
|
assert m
|
2017-06-08 13:40:03 -04:00
|
|
|
|
return compat_str(m.group('id'))
|
2014-09-28 03:31:58 -04:00
|
|
|
|
|
2013-06-23 13:57:38 -04:00
|
|
|
|
@classmethod
|
|
|
|
|
def working(cls):
|
|
|
|
|
"""Getter method for _WORKING."""
|
|
|
|
|
return cls._WORKING
|
|
|
|
|
|
|
|
|
|
def initialize(self):
|
|
|
|
|
"""Initializes an instance (authentication, etc)."""
|
2018-05-01 20:18:01 -04:00
|
|
|
|
self._initialize_geo_bypass({
|
|
|
|
|
'countries': self._GEO_COUNTRIES,
|
|
|
|
|
'ip_blocks': self._GEO_IP_BLOCKS,
|
|
|
|
|
})
|
2017-02-18 15:53:23 -05:00
|
|
|
|
if not self._ready:
|
|
|
|
|
self._real_initialize()
|
|
|
|
|
self._ready = True
|
|
|
|
|
|
2018-05-01 20:18:01 -04:00
|
|
|
|
def _initialize_geo_bypass(self, geo_bypass_context):
|
2017-02-21 11:00:43 -05:00
|
|
|
|
"""
|
|
|
|
|
Initialize geo restriction bypass mechanism.
|
|
|
|
|
|
|
|
|
|
This method is used to initialize geo bypass mechanism based on faking
|
|
|
|
|
X-Forwarded-For HTTP header. A random country from provided country list
|
2017-02-21 11:05:31 -05:00
|
|
|
|
is selected and a random IP belonging to this country is generated. This
|
2017-02-21 11:00:43 -05:00
|
|
|
|
IP will be passed as X-Forwarded-For HTTP header in all subsequent
|
|
|
|
|
HTTP requests.
|
|
|
|
|
|
|
|
|
|
This method will be used for initial geo bypass mechanism initialization
|
2018-05-01 20:18:01 -04:00
|
|
|
|
during the instance initialization with _GEO_COUNTRIES and
|
|
|
|
|
_GEO_IP_BLOCKS.
|
2017-02-21 11:00:43 -05:00
|
|
|
|
|
2018-05-01 20:18:01 -04:00
|
|
|
|
You may also manually call it from extractor's code if geo bypass
|
2017-02-21 11:00:43 -05:00
|
|
|
|
information is not available beforehand (e.g. obtained during
|
2018-05-01 20:18:01 -04:00
|
|
|
|
extraction) or due to some other reason. In this case you should pass
|
|
|
|
|
this information in geo bypass context passed as first argument. It may
|
|
|
|
|
contain following fields:
|
|
|
|
|
|
|
|
|
|
countries: List of geo unrestricted countries (similar
|
|
|
|
|
to _GEO_COUNTRIES)
|
|
|
|
|
ip_blocks: List of geo unrestricted IP blocks in CIDR notation
|
|
|
|
|
(similar to _GEO_IP_BLOCKS)
|
|
|
|
|
|
2017-02-21 11:00:43 -05:00
|
|
|
|
"""
|
2017-02-04 06:49:58 -05:00
|
|
|
|
if not self._x_forwarded_for_ip:
|
2018-05-01 20:18:01 -04:00
|
|
|
|
|
|
|
|
|
# Geo bypass mechanism is explicitly disabled by user
|
|
|
|
|
if not self._downloader.params.get('geo_bypass', True):
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
if not geo_bypass_context:
|
|
|
|
|
geo_bypass_context = {}
|
|
|
|
|
|
|
|
|
|
# Backward compatibility: previously _initialize_geo_bypass
|
|
|
|
|
# expected a list of countries, some 3rd party code may still use
|
|
|
|
|
# it this way
|
|
|
|
|
if isinstance(geo_bypass_context, (list, tuple)):
|
|
|
|
|
geo_bypass_context = {
|
|
|
|
|
'countries': geo_bypass_context,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# The whole point of geo bypass mechanism is to fake IP
|
|
|
|
|
# as X-Forwarded-For HTTP header based on some IP block or
|
|
|
|
|
# country code.
|
|
|
|
|
|
|
|
|
|
# Path 1: bypassing based on IP block in CIDR notation
|
|
|
|
|
|
|
|
|
|
# Explicit IP block specified by user, use it right away
|
|
|
|
|
# regardless of whether extractor is geo bypassable or not
|
|
|
|
|
ip_block = self._downloader.params.get('geo_bypass_ip_block', None)
|
|
|
|
|
|
|
|
|
|
# Otherwise use random IP block from geo bypass context but only
|
|
|
|
|
# if extractor is known as geo bypassable
|
|
|
|
|
if not ip_block:
|
|
|
|
|
ip_blocks = geo_bypass_context.get('ip_blocks')
|
|
|
|
|
if self._GEO_BYPASS and ip_blocks:
|
|
|
|
|
ip_block = random.choice(ip_blocks)
|
|
|
|
|
|
|
|
|
|
if ip_block:
|
|
|
|
|
self._x_forwarded_for_ip = GeoUtils.random_ipv4(ip_block)
|
|
|
|
|
if self._downloader.params.get('verbose', False):
|
|
|
|
|
self._downloader.to_screen(
|
|
|
|
|
'[debug] Using fake IP %s as X-Forwarded-For.'
|
|
|
|
|
% self._x_forwarded_for_ip)
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
# Path 2: bypassing based on country code
|
|
|
|
|
|
|
|
|
|
# Explicit country code specified by user, use it right away
|
|
|
|
|
# regardless of whether extractor is geo bypassable or not
|
|
|
|
|
country = self._downloader.params.get('geo_bypass_country', None)
|
|
|
|
|
|
|
|
|
|
# Otherwise use random country code from geo bypass context but
|
|
|
|
|
# only if extractor is known as geo bypassable
|
|
|
|
|
if not country:
|
|
|
|
|
countries = geo_bypass_context.get('countries')
|
|
|
|
|
if self._GEO_BYPASS and countries:
|
|
|
|
|
country = random.choice(countries)
|
|
|
|
|
|
|
|
|
|
if country:
|
|
|
|
|
self._x_forwarded_for_ip = GeoUtils.random_ipv4(country)
|
2017-02-18 15:53:23 -05:00
|
|
|
|
if self._downloader.params.get('verbose', False):
|
2017-06-15 01:04:36 -04:00
|
|
|
|
self._downloader.to_screen(
|
2017-02-21 11:14:33 -05:00
|
|
|
|
'[debug] Using fake IP %s (%s) as X-Forwarded-For.'
|
2018-05-01 20:18:01 -04:00
|
|
|
|
% (self._x_forwarded_for_ip, country.upper()))
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
|
|
|
|
def extract(self, url):
|
|
|
|
|
"""Extracts URL information and returns it in list of dicts."""
|
2015-02-09 19:13:57 -05:00
|
|
|
|
try:
|
2017-02-04 06:49:58 -05:00
|
|
|
|
for _ in range(2):
|
|
|
|
|
try:
|
|
|
|
|
self.initialize()
|
2017-02-04 09:06:07 -05:00
|
|
|
|
ie_result = self._real_extract(url)
|
|
|
|
|
if self._x_forwarded_for_ip:
|
|
|
|
|
ie_result['__x_forwarded_for_ip'] = self._x_forwarded_for_ip
|
|
|
|
|
return ie_result
|
2017-02-04 06:49:58 -05:00
|
|
|
|
except GeoRestrictedError as e:
|
2017-02-18 15:53:23 -05:00
|
|
|
|
if self.__maybe_fake_ip_and_retry(e.countries):
|
|
|
|
|
continue
|
2017-02-04 06:49:58 -05:00
|
|
|
|
raise
|
2015-02-09 19:13:57 -05:00
|
|
|
|
except ExtractorError:
|
|
|
|
|
raise
|
|
|
|
|
except compat_http_client.IncompleteRead as e:
|
2016-01-10 10:17:47 -05:00
|
|
|
|
raise ExtractorError('A network error has occurred.', cause=e, expected=True)
|
2015-02-10 09:55:51 -05:00
|
|
|
|
except (KeyError, StopIteration) as e:
|
2016-01-10 10:17:47 -05:00
|
|
|
|
raise ExtractorError('An extractor error has occurred.', cause=e)
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
2017-02-18 15:53:23 -05:00
|
|
|
|
def __maybe_fake_ip_and_retry(self, countries):
|
2019-05-10 16:56:22 -04:00
|
|
|
|
if (not self._downloader.params.get('geo_bypass_country', None)
|
|
|
|
|
and self._GEO_BYPASS
|
|
|
|
|
and self._downloader.params.get('geo_bypass', True)
|
|
|
|
|
and not self._x_forwarded_for_ip
|
|
|
|
|
and countries):
|
2017-02-21 11:14:33 -05:00
|
|
|
|
country_code = random.choice(countries)
|
|
|
|
|
self._x_forwarded_for_ip = GeoUtils.random_ipv4(country_code)
|
2017-02-18 15:53:23 -05:00
|
|
|
|
if self._x_forwarded_for_ip:
|
|
|
|
|
self.report_warning(
|
2017-02-21 11:14:33 -05:00
|
|
|
|
'Video is geo restricted. Retrying extraction with fake IP %s (%s) as X-Forwarded-For.'
|
|
|
|
|
% (self._x_forwarded_for_ip, country_code.upper()))
|
2017-02-18 15:53:23 -05:00
|
|
|
|
return True
|
|
|
|
|
return False
|
|
|
|
|
|
2013-06-23 13:57:38 -04:00
|
|
|
|
def set_downloader(self, downloader):
|
|
|
|
|
"""Sets the downloader for this IE."""
|
|
|
|
|
self._downloader = downloader
|
|
|
|
|
|
|
|
|
|
def _real_initialize(self):
|
|
|
|
|
"""Real initialization process. Redefine in subclasses."""
|
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
def _real_extract(self, url):
|
|
|
|
|
"""Real extraction process. Redefine in subclasses."""
|
|
|
|
|
pass
|
|
|
|
|
|
2013-07-08 09:14:27 -04:00
|
|
|
|
@classmethod
|
|
|
|
|
def ie_key(cls):
|
|
|
|
|
"""A string for getting the InfoExtractor with get_info_extractor"""
|
2015-10-31 13:12:57 -04:00
|
|
|
|
return compat_str(cls.__name__[:-2])
|
2013-07-08 09:14:27 -04:00
|
|
|
|
|
2013-06-23 13:57:38 -04:00
|
|
|
|
@property
|
|
|
|
|
def IE_NAME(self):
|
2015-10-31 13:12:57 -04:00
|
|
|
|
return compat_str(type(self).__name__[:-2])
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
2018-06-17 17:01:48 -04:00
|
|
|
|
@staticmethod
|
|
|
|
|
def __can_accept_status_code(err, expected_status):
|
|
|
|
|
assert isinstance(err, compat_urllib_error.HTTPError)
|
|
|
|
|
if expected_status is None:
|
|
|
|
|
return False
|
|
|
|
|
if isinstance(expected_status, compat_integer_types):
|
|
|
|
|
return err.code == expected_status
|
|
|
|
|
elif isinstance(expected_status, (list, tuple)):
|
|
|
|
|
return err.code in expected_status
|
|
|
|
|
elif callable(expected_status):
|
|
|
|
|
return expected_status(err.code) is True
|
|
|
|
|
else:
|
|
|
|
|
assert False
|
|
|
|
|
|
|
|
|
|
def _request_webpage(self, url_or_request, video_id, note=None, errnote=None, fatal=True, data=None, headers={}, query={}, expected_status=None):
|
|
|
|
|
"""
|
|
|
|
|
Return the response handle.
|
|
|
|
|
|
|
|
|
|
See _download_webpage docstring for arguments specification.
|
|
|
|
|
"""
|
2013-06-23 13:57:38 -04:00
|
|
|
|
if note is None:
|
|
|
|
|
self.report_download_webpage(video_id)
|
|
|
|
|
elif note is not False:
|
2013-12-08 19:49:01 -05:00
|
|
|
|
if video_id is None:
|
2014-08-27 19:04:43 -04:00
|
|
|
|
self.to_screen('%s' % (note,))
|
2013-12-08 19:49:01 -05:00
|
|
|
|
else:
|
2014-08-27 19:04:43 -04:00
|
|
|
|
self.to_screen('%s: %s' % (video_id, note))
|
2017-12-23 08:57:35 -05:00
|
|
|
|
|
|
|
|
|
# Some sites check X-Forwarded-For HTTP header in order to figure out
|
|
|
|
|
# the origin of the client behind proxy. This allows bypassing geo
|
|
|
|
|
# restriction by faking this header's value to IP that belongs to some
|
|
|
|
|
# geo unrestricted country. We will do so once we encounter any
|
|
|
|
|
# geo restriction error.
|
|
|
|
|
if self._x_forwarded_for_ip:
|
|
|
|
|
if 'X-Forwarded-For' not in headers:
|
|
|
|
|
headers['X-Forwarded-For'] = self._x_forwarded_for_ip
|
|
|
|
|
|
2016-03-31 12:58:38 -04:00
|
|
|
|
if isinstance(url_or_request, compat_urllib_request.Request):
|
|
|
|
|
url_or_request = update_Request(
|
|
|
|
|
url_or_request, data=data, headers=headers, query=query)
|
|
|
|
|
else:
|
2016-03-10 13:49:13 -05:00
|
|
|
|
if query:
|
|
|
|
|
url_or_request = update_url_query(url_or_request, query)
|
2016-04-21 01:06:06 -04:00
|
|
|
|
if data is not None or headers:
|
2016-03-31 12:58:38 -04:00
|
|
|
|
url_or_request = sanitized_Request(url_or_request, data, headers)
|
2013-06-23 13:57:38 -04:00
|
|
|
|
try:
|
2013-11-22 13:57:52 -05:00
|
|
|
|
return self._downloader.urlopen(url_or_request)
|
2013-06-23 13:57:38 -04:00
|
|
|
|
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
|
2018-06-17 17:01:48 -04:00
|
|
|
|
if isinstance(err, compat_urllib_error.HTTPError):
|
|
|
|
|
if self.__can_accept_status_code(err, expected_status):
|
2018-11-02 14:18:20 -04:00
|
|
|
|
# Retain reference to error to prevent file object from
|
|
|
|
|
# being closed before it can be read. Works around the
|
|
|
|
|
# effects of <https://bugs.python.org/issue15002>
|
|
|
|
|
# introduced in Python 3.4.1.
|
|
|
|
|
err.fp._error = err
|
2018-06-17 17:01:48 -04:00
|
|
|
|
return err.fp
|
|
|
|
|
|
2013-12-20 11:05:28 -05:00
|
|
|
|
if errnote is False:
|
|
|
|
|
return False
|
2013-06-23 13:57:38 -04:00
|
|
|
|
if errnote is None:
|
2014-08-27 19:04:43 -04:00
|
|
|
|
errnote = 'Unable to download webpage'
|
2015-12-19 18:27:38 -05:00
|
|
|
|
|
2015-12-19 20:00:39 -05:00
|
|
|
|
errmsg = '%s: %s' % (errnote, error_to_compat_str(err))
|
2013-12-08 19:49:01 -05:00
|
|
|
|
if fatal:
|
|
|
|
|
raise ExtractorError(errmsg, sys.exc_info()[2], cause=err)
|
|
|
|
|
else:
|
|
|
|
|
self._downloader.report_warning(errmsg)
|
|
|
|
|
return False
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
2018-06-17 17:01:48 -04:00
|
|
|
|
def _download_webpage_handle(self, url_or_request, video_id, note=None, errnote=None, fatal=True, encoding=None, data=None, headers={}, query={}, expected_status=None):
|
|
|
|
|
"""
|
|
|
|
|
Return a tuple (page content as string, URL handle).
|
|
|
|
|
|
|
|
|
|
See _download_webpage docstring for arguments specification.
|
|
|
|
|
"""
|
2013-07-13 16:52:12 -04:00
|
|
|
|
# Strip hashes from the URL (#1038)
|
|
|
|
|
if isinstance(url_or_request, (compat_str, str)):
|
|
|
|
|
url_or_request = url_or_request.partition('#')[0]
|
|
|
|
|
|
2018-06-17 17:01:48 -04:00
|
|
|
|
urlh = self._request_webpage(url_or_request, video_id, note, errnote, fatal, data=data, headers=headers, query=query, expected_status=expected_status)
|
2013-12-08 19:49:01 -05:00
|
|
|
|
if urlh is False:
|
|
|
|
|
assert not fatal
|
|
|
|
|
return False
|
2015-03-21 00:21:27 -04:00
|
|
|
|
content = self._webpage_read_content(urlh, url_or_request, video_id, note, errnote, fatal, encoding=encoding)
|
2014-10-26 12:05:44 -04:00
|
|
|
|
return (content, urlh)
|
|
|
|
|
|
2015-03-21 00:21:27 -04:00
|
|
|
|
@staticmethod
|
|
|
|
|
def _guess_encoding_from_content(content_type, webpage_bytes):
|
2013-06-23 13:57:38 -04:00
|
|
|
|
m = re.match(r'[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+\s*;\s*charset=(.+)', content_type)
|
|
|
|
|
if m:
|
|
|
|
|
encoding = m.group(1)
|
|
|
|
|
else:
|
2013-08-29 05:35:15 -04:00
|
|
|
|
m = re.search(br'<meta[^>]+charset=[\'"]?([^\'")]+)[ /\'">]',
|
2013-08-28 07:59:08 -04:00
|
|
|
|
webpage_bytes[:1024])
|
|
|
|
|
if m:
|
|
|
|
|
encoding = m.group(1).decode('ascii')
|
2014-01-20 19:39:39 -05:00
|
|
|
|
elif webpage_bytes.startswith(b'\xff\xfe'):
|
|
|
|
|
encoding = 'utf-16'
|
2013-08-28 07:59:08 -04:00
|
|
|
|
else:
|
|
|
|
|
encoding = 'utf-8'
|
2015-03-21 00:21:27 -04:00
|
|
|
|
|
|
|
|
|
return encoding
|
|
|
|
|
|
2017-04-01 16:56:49 -04:00
|
|
|
|
def __check_blocked(self, content):
|
|
|
|
|
first_block = content[:512]
|
2019-05-10 16:56:22 -04:00
|
|
|
|
if ('<title>Access to this site is blocked</title>' in content
|
|
|
|
|
and 'Websense' in first_block):
|
2017-04-01 16:56:49 -04:00
|
|
|
|
msg = 'Access to this webpage has been blocked by Websense filtering software in your network.'
|
|
|
|
|
blocked_iframe = self._html_search_regex(
|
|
|
|
|
r'<iframe src="([^"]+)"', content,
|
|
|
|
|
'Websense information URL', default=None)
|
|
|
|
|
if blocked_iframe:
|
|
|
|
|
msg += ' Visit %s for more details' % blocked_iframe
|
|
|
|
|
raise ExtractorError(msg, expected=True)
|
|
|
|
|
if '<title>The URL you requested has been blocked</title>' in first_block:
|
|
|
|
|
msg = (
|
|
|
|
|
'Access to this webpage has been blocked by Indian censorship. '
|
|
|
|
|
'Use a VPN or proxy server (with --proxy) to route around it.')
|
|
|
|
|
block_msg = self._html_search_regex(
|
|
|
|
|
r'</h1><p>(.*?)</p>',
|
|
|
|
|
content, 'block message', default=None)
|
|
|
|
|
if block_msg:
|
|
|
|
|
msg += ' (Message: "%s")' % block_msg.replace('\n', ' ')
|
|
|
|
|
raise ExtractorError(msg, expected=True)
|
2019-05-10 16:56:22 -04:00
|
|
|
|
if ('<title>TTK :: Доступ к ресурсу ограничен</title>' in content
|
|
|
|
|
and 'blocklist.rkn.gov.ru' in content):
|
2017-04-01 16:56:49 -04:00
|
|
|
|
raise ExtractorError(
|
|
|
|
|
'Access to this webpage has been blocked by decision of the Russian government. '
|
|
|
|
|
'Visit http://blocklist.rkn.gov.ru/ for a block reason.',
|
|
|
|
|
expected=True)
|
|
|
|
|
|
2015-03-21 00:21:27 -04:00
|
|
|
|
def _webpage_read_content(self, urlh, url_or_request, video_id, note=None, errnote=None, fatal=True, prefix=None, encoding=None):
|
|
|
|
|
content_type = urlh.headers.get('Content-Type', '')
|
|
|
|
|
webpage_bytes = urlh.read()
|
|
|
|
|
if prefix is not None:
|
|
|
|
|
webpage_bytes = prefix + webpage_bytes
|
|
|
|
|
if not encoding:
|
|
|
|
|
encoding = self._guess_encoding_from_content(content_type, webpage_bytes)
|
2013-06-23 13:57:38 -04:00
|
|
|
|
if self._downloader.params.get('dump_intermediate_pages', False):
|
2017-11-18 07:02:56 -05:00
|
|
|
|
self.to_screen('Dumping request to ' + urlh.geturl())
|
2013-06-23 13:57:38 -04:00
|
|
|
|
dump = base64.b64encode(webpage_bytes).decode('ascii')
|
|
|
|
|
self._downloader.to_screen(dump)
|
2013-10-28 05:44:02 -04:00
|
|
|
|
if self._downloader.params.get('write_pages', False):
|
2017-11-18 07:02:56 -05:00
|
|
|
|
basen = '%s_%s' % (video_id, urlh.geturl())
|
2014-05-12 15:56:10 -04:00
|
|
|
|
if len(basen) > 240:
|
2014-08-27 19:04:43 -04:00
|
|
|
|
h = '___' + hashlib.md5(basen.encode('utf-8')).hexdigest()
|
2014-05-12 15:56:10 -04:00
|
|
|
|
basen = basen[:240 - len(h)] + h
|
|
|
|
|
raw_filename = basen + '.dump'
|
2013-10-28 05:44:02 -04:00
|
|
|
|
filename = sanitize_filename(raw_filename, restricted=True)
|
2014-08-27 19:04:43 -04:00
|
|
|
|
self.to_screen('Saving request to ' + filename)
|
2014-10-14 10:43:48 -04:00
|
|
|
|
# Working around MAX_PATH limitation on Windows (see
|
|
|
|
|
# http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx)
|
2016-03-03 06:24:24 -05:00
|
|
|
|
if compat_os_name == 'nt':
|
2014-10-14 10:43:48 -04:00
|
|
|
|
absfilepath = os.path.abspath(filename)
|
|
|
|
|
if len(absfilepath) > 259:
|
|
|
|
|
filename = '\\\\?\\' + absfilepath
|
2013-10-28 05:44:02 -04:00
|
|
|
|
with open(filename, 'wb') as outf:
|
|
|
|
|
outf.write(webpage_bytes)
|
|
|
|
|
|
2014-04-07 17:09:53 -04:00
|
|
|
|
try:
|
|
|
|
|
content = webpage_bytes.decode(encoding, 'replace')
|
|
|
|
|
except LookupError:
|
|
|
|
|
content = webpage_bytes.decode('utf-8', 'replace')
|
2014-04-03 00:07:35 -04:00
|
|
|
|
|
2017-04-01 16:56:49 -04:00
|
|
|
|
self.__check_blocked(content)
|
2014-04-03 00:07:35 -04:00
|
|
|
|
|
2014-10-26 12:05:44 -04:00
|
|
|
|
return content
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
2018-06-17 17:01:48 -04:00
|
|
|
|
def _download_webpage(
|
|
|
|
|
self, url_or_request, video_id, note=None, errnote=None,
|
|
|
|
|
fatal=True, tries=1, timeout=5, encoding=None, data=None,
|
|
|
|
|
headers={}, query={}, expected_status=None):
|
|
|
|
|
"""
|
|
|
|
|
Return the data of the page as a string.
|
|
|
|
|
|
|
|
|
|
Arguments:
|
|
|
|
|
url_or_request -- plain text URL as a string or
|
|
|
|
|
a compat_urllib_request.Requestobject
|
|
|
|
|
video_id -- Video/playlist/item identifier (string)
|
|
|
|
|
|
|
|
|
|
Keyword arguments:
|
|
|
|
|
note -- note printed before downloading (string)
|
|
|
|
|
errnote -- note printed in case of an error (string)
|
|
|
|
|
fatal -- flag denoting whether error should be considered fatal,
|
|
|
|
|
i.e. whether it should cause ExtractionError to be raised,
|
|
|
|
|
otherwise a warning will be reported and extraction continued
|
|
|
|
|
tries -- number of tries
|
|
|
|
|
timeout -- sleep interval between tries
|
|
|
|
|
encoding -- encoding for a page content decoding, guessed automatically
|
|
|
|
|
when not explicitly specified
|
|
|
|
|
data -- POST data (bytes)
|
|
|
|
|
headers -- HTTP headers (dict)
|
|
|
|
|
query -- URL query (dict)
|
|
|
|
|
expected_status -- allows to accept failed HTTP requests (non 2xx
|
|
|
|
|
status code) by explicitly specifying a set of accepted status
|
|
|
|
|
codes. Can be any of the following entities:
|
|
|
|
|
- an integer type specifying an exact failed status code to
|
|
|
|
|
accept
|
|
|
|
|
- a list or a tuple of integer types specifying a list of
|
|
|
|
|
failed status codes to accept
|
|
|
|
|
- a callable accepting an actual failed status code and
|
|
|
|
|
returning True if it should be accepted
|
|
|
|
|
Note that this argument does not affect success status codes (2xx)
|
|
|
|
|
which are always accepted.
|
|
|
|
|
"""
|
|
|
|
|
|
2014-12-04 08:11:27 -05:00
|
|
|
|
success = False
|
|
|
|
|
try_count = 0
|
|
|
|
|
while success is False:
|
|
|
|
|
try:
|
2018-06-17 17:01:48 -04:00
|
|
|
|
res = self._download_webpage_handle(
|
|
|
|
|
url_or_request, video_id, note, errnote, fatal,
|
|
|
|
|
encoding=encoding, data=data, headers=headers, query=query,
|
|
|
|
|
expected_status=expected_status)
|
2014-12-04 08:11:27 -05:00
|
|
|
|
success = True
|
|
|
|
|
except compat_http_client.IncompleteRead as e:
|
|
|
|
|
try_count += 1
|
|
|
|
|
if try_count >= tries:
|
|
|
|
|
raise e
|
|
|
|
|
self._sleep(timeout, video_id)
|
2013-12-08 19:49:01 -05:00
|
|
|
|
if res is False:
|
|
|
|
|
return res
|
|
|
|
|
else:
|
|
|
|
|
content, _ = res
|
|
|
|
|
return content
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
2018-03-17 15:17:34 -04:00
|
|
|
|
def _download_xml_handle(
|
|
|
|
|
self, url_or_request, video_id, note='Downloading XML',
|
|
|
|
|
errnote='Unable to download XML', transform_source=None,
|
2018-06-17 17:01:48 -04:00
|
|
|
|
fatal=True, encoding=None, data=None, headers={}, query={},
|
|
|
|
|
expected_status=None):
|
|
|
|
|
"""
|
2019-03-05 13:21:57 -05:00
|
|
|
|
Return a tuple (xml as an compat_etree_Element, URL handle).
|
2018-06-17 17:01:48 -04:00
|
|
|
|
|
|
|
|
|
See _download_webpage docstring for arguments specification.
|
|
|
|
|
"""
|
2018-03-17 15:17:34 -04:00
|
|
|
|
res = self._download_webpage_handle(
|
|
|
|
|
url_or_request, video_id, note, errnote, fatal=fatal,
|
2018-06-17 17:01:48 -04:00
|
|
|
|
encoding=encoding, data=data, headers=headers, query=query,
|
|
|
|
|
expected_status=expected_status)
|
2018-03-17 15:17:34 -04:00
|
|
|
|
if res is False:
|
|
|
|
|
return res
|
|
|
|
|
xml_string, urlh = res
|
|
|
|
|
return self._parse_xml(
|
|
|
|
|
xml_string, video_id, transform_source=transform_source,
|
|
|
|
|
fatal=fatal), urlh
|
|
|
|
|
|
2018-06-17 17:01:48 -04:00
|
|
|
|
def _download_xml(
|
|
|
|
|
self, url_or_request, video_id,
|
|
|
|
|
note='Downloading XML', errnote='Unable to download XML',
|
|
|
|
|
transform_source=None, fatal=True, encoding=None,
|
|
|
|
|
data=None, headers={}, query={}, expected_status=None):
|
|
|
|
|
"""
|
2019-03-05 13:21:57 -05:00
|
|
|
|
Return the xml as an compat_etree_Element.
|
2018-06-17 17:01:48 -04:00
|
|
|
|
|
|
|
|
|
See _download_webpage docstring for arguments specification.
|
|
|
|
|
"""
|
2018-03-17 15:17:34 -04:00
|
|
|
|
res = self._download_xml_handle(
|
|
|
|
|
url_or_request, video_id, note=note, errnote=errnote,
|
|
|
|
|
transform_source=transform_source, fatal=fatal, encoding=encoding,
|
2018-06-17 17:01:48 -04:00
|
|
|
|
data=data, headers=headers, query=query,
|
|
|
|
|
expected_status=expected_status)
|
2018-03-17 15:17:34 -04:00
|
|
|
|
return res if res is False else res[0]
|
2017-08-22 13:32:41 -04:00
|
|
|
|
|
|
|
|
|
def _parse_xml(self, xml_string, video_id, transform_source=None, fatal=True):
|
2013-12-10 06:45:22 -05:00
|
|
|
|
if transform_source:
|
|
|
|
|
xml_string = transform_source(xml_string)
|
2017-08-22 13:32:41 -04:00
|
|
|
|
try:
|
|
|
|
|
return compat_etree_fromstring(xml_string.encode('utf-8'))
|
|
|
|
|
except compat_xml_parse_error as ve:
|
|
|
|
|
errmsg = '%s: Failed to parse XML ' % video_id
|
|
|
|
|
if fatal:
|
|
|
|
|
raise ExtractorError(errmsg, cause=ve)
|
|
|
|
|
else:
|
|
|
|
|
self.report_warning(errmsg + str(ve))
|
2013-11-24 08:59:19 -05:00
|
|
|
|
|
2018-04-27 14:59:15 -04:00
|
|
|
|
def _download_json_handle(
|
|
|
|
|
self, url_or_request, video_id, note='Downloading JSON metadata',
|
|
|
|
|
errnote='Unable to download JSON metadata', transform_source=None,
|
2018-06-17 17:01:48 -04:00
|
|
|
|
fatal=True, encoding=None, data=None, headers={}, query={},
|
|
|
|
|
expected_status=None):
|
|
|
|
|
"""
|
|
|
|
|
Return a tuple (JSON object, URL handle).
|
|
|
|
|
|
|
|
|
|
See _download_webpage docstring for arguments specification.
|
|
|
|
|
"""
|
2018-04-27 14:59:15 -04:00
|
|
|
|
res = self._download_webpage_handle(
|
2015-03-21 00:21:27 -04:00
|
|
|
|
url_or_request, video_id, note, errnote, fatal=fatal,
|
2018-06-17 17:01:48 -04:00
|
|
|
|
encoding=encoding, data=data, headers=headers, query=query,
|
|
|
|
|
expected_status=expected_status)
|
2018-04-27 14:59:15 -04:00
|
|
|
|
if res is False:
|
|
|
|
|
return res
|
|
|
|
|
json_string, urlh = res
|
2014-12-05 06:07:06 -05:00
|
|
|
|
return self._parse_json(
|
2018-04-27 14:59:15 -04:00
|
|
|
|
json_string, video_id, transform_source=transform_source,
|
|
|
|
|
fatal=fatal), urlh
|
|
|
|
|
|
|
|
|
|
def _download_json(
|
|
|
|
|
self, url_or_request, video_id, note='Downloading JSON metadata',
|
|
|
|
|
errnote='Unable to download JSON metadata', transform_source=None,
|
2018-06-17 17:01:48 -04:00
|
|
|
|
fatal=True, encoding=None, data=None, headers={}, query={},
|
|
|
|
|
expected_status=None):
|
|
|
|
|
"""
|
|
|
|
|
Return the JSON object as a dict.
|
|
|
|
|
|
|
|
|
|
See _download_webpage docstring for arguments specification.
|
|
|
|
|
"""
|
2018-04-27 14:59:15 -04:00
|
|
|
|
res = self._download_json_handle(
|
|
|
|
|
url_or_request, video_id, note=note, errnote=errnote,
|
|
|
|
|
transform_source=transform_source, fatal=fatal, encoding=encoding,
|
2018-06-17 17:01:48 -04:00
|
|
|
|
data=data, headers=headers, query=query,
|
|
|
|
|
expected_status=expected_status)
|
2018-04-27 14:59:15 -04:00
|
|
|
|
return res if res is False else res[0]
|
2014-12-05 06:07:06 -05:00
|
|
|
|
|
|
|
|
|
def _parse_json(self, json_string, video_id, transform_source=None, fatal=True):
|
2014-02-09 11:56:10 -05:00
|
|
|
|
if transform_source:
|
|
|
|
|
json_string = transform_source(json_string)
|
2014-01-07 03:35:34 -05:00
|
|
|
|
try:
|
|
|
|
|
return json.loads(json_string)
|
|
|
|
|
except ValueError as ve:
|
2014-09-30 05:12:59 -04:00
|
|
|
|
errmsg = '%s: Failed to parse JSON ' % video_id
|
|
|
|
|
if fatal:
|
|
|
|
|
raise ExtractorError(errmsg, cause=ve)
|
|
|
|
|
else:
|
|
|
|
|
self.report_warning(errmsg + str(ve))
|
2014-01-07 03:35:34 -05:00
|
|
|
|
|
2013-12-23 09:57:43 -05:00
|
|
|
|
def report_warning(self, msg, video_id=None):
|
2014-08-27 19:04:43 -04:00
|
|
|
|
idstr = '' if video_id is None else '%s: ' % video_id
|
2013-12-23 09:57:43 -05:00
|
|
|
|
self._downloader.report_warning(
|
2014-08-27 19:04:43 -04:00
|
|
|
|
'[%s] %s%s' % (self.IE_NAME, idstr, msg))
|
2013-12-23 09:57:43 -05:00
|
|
|
|
|
2013-06-23 13:57:38 -04:00
|
|
|
|
def to_screen(self, msg):
|
|
|
|
|
"""Print msg to screen, prefixing it with '[ie_name]'"""
|
2014-08-27 19:04:43 -04:00
|
|
|
|
self._downloader.to_screen('[%s] %s' % (self.IE_NAME, msg))
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
|
|
|
|
def report_extraction(self, id_or_name):
|
|
|
|
|
"""Report information extraction."""
|
2014-08-27 19:04:43 -04:00
|
|
|
|
self.to_screen('%s: Extracting information' % id_or_name)
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
|
|
|
|
def report_download_webpage(self, video_id):
|
|
|
|
|
"""Report webpage download."""
|
2014-08-27 19:04:43 -04:00
|
|
|
|
self.to_screen('%s: Downloading webpage' % video_id)
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
|
|
|
|
def report_age_confirmation(self):
|
|
|
|
|
"""Report attempt to confirm age."""
|
2014-08-27 19:04:43 -04:00
|
|
|
|
self.to_screen('Confirming age')
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
2013-07-07 17:24:34 -04:00
|
|
|
|
def report_login(self):
|
|
|
|
|
"""Report attempt to log in."""
|
2014-08-27 19:04:43 -04:00
|
|
|
|
self.to_screen('Logging in')
|
2013-07-07 17:24:34 -04:00
|
|
|
|
|
2015-08-26 11:24:47 -04:00
|
|
|
|
@staticmethod
|
|
|
|
|
def raise_login_required(msg='This video is only available for registered users'):
|
|
|
|
|
raise ExtractorError(
|
|
|
|
|
'%s. Use --username and --password or --netrc to provide account credentials.' % msg,
|
|
|
|
|
expected=True)
|
|
|
|
|
|
2015-09-22 11:50:20 -04:00
|
|
|
|
@staticmethod
|
2017-02-04 06:49:58 -05:00
|
|
|
|
def raise_geo_restricted(msg='This video is not available from your location due to geo restriction', countries=None):
|
|
|
|
|
raise GeoRestrictedError(msg, countries=countries)
|
2015-09-22 11:50:20 -04:00
|
|
|
|
|
2014-11-23 14:41:03 -05:00
|
|
|
|
# Methods for following #608
|
2013-12-19 14:28:52 -05:00
|
|
|
|
@staticmethod
|
2015-04-12 13:11:47 -04:00
|
|
|
|
def url_result(url, ie=None, video_id=None, video_title=None):
|
2015-07-23 13:37:45 -04:00
|
|
|
|
"""Returns a URL that points to a page that should be processed"""
|
2014-11-23 14:41:03 -05:00
|
|
|
|
# TODO: ie should be the class used for getting the info
|
2013-06-23 13:57:38 -04:00
|
|
|
|
video_info = {'_type': 'url',
|
|
|
|
|
'url': url,
|
|
|
|
|
'ie_key': ie}
|
2013-11-22 16:46:46 -05:00
|
|
|
|
if video_id is not None:
|
|
|
|
|
video_info['id'] = video_id
|
2015-04-12 13:11:47 -04:00
|
|
|
|
if video_title is not None:
|
|
|
|
|
video_info['title'] = video_title
|
2013-06-23 13:57:38 -04:00
|
|
|
|
return video_info
|
2014-11-23 14:41:03 -05:00
|
|
|
|
|
2017-07-15 17:33:14 -04:00
|
|
|
|
def playlist_from_matches(self, matches, playlist_id=None, playlist_title=None, getter=None, ie=None):
|
|
|
|
|
urls = orderedSet(
|
2017-03-08 18:13:54 -05:00
|
|
|
|
self.url_result(self._proto_relative_url(getter(m) if getter else m), ie)
|
|
|
|
|
for m in matches)
|
|
|
|
|
return self.playlist_result(
|
2017-07-15 17:33:14 -04:00
|
|
|
|
urls, playlist_id=playlist_id, playlist_title=playlist_title)
|
2017-03-08 18:13:54 -05:00
|
|
|
|
|
2013-12-19 14:28:52 -05:00
|
|
|
|
@staticmethod
|
2014-12-06 14:46:30 -05:00
|
|
|
|
def playlist_result(entries, playlist_id=None, playlist_title=None, playlist_description=None):
|
2013-06-23 13:57:38 -04:00
|
|
|
|
"""Returns a playlist"""
|
|
|
|
|
video_info = {'_type': 'playlist',
|
|
|
|
|
'entries': entries}
|
|
|
|
|
if playlist_id:
|
|
|
|
|
video_info['id'] = playlist_id
|
|
|
|
|
if playlist_title:
|
|
|
|
|
video_info['title'] = playlist_title
|
2014-12-06 14:46:30 -05:00
|
|
|
|
if playlist_description:
|
|
|
|
|
video_info['description'] = playlist_description
|
2013-06-23 13:57:38 -04:00
|
|
|
|
return video_info
|
|
|
|
|
|
2015-06-28 12:56:45 -04:00
|
|
|
|
def _search_regex(self, pattern, string, name, default=NO_DEFAULT, fatal=True, flags=0, group=None):
|
2013-06-23 13:57:38 -04:00
|
|
|
|
"""
|
|
|
|
|
Perform a regex search on the given string, using a single or a list of
|
|
|
|
|
patterns returning the first matching group.
|
|
|
|
|
In case of failure return a default value or raise a WARNING or a
|
2013-10-23 08:38:03 -04:00
|
|
|
|
RegexNotFoundError, depending on fatal, specifying the field name.
|
2013-06-23 13:57:38 -04:00
|
|
|
|
"""
|
|
|
|
|
if isinstance(pattern, (str, compat_str, compiled_regex_type)):
|
|
|
|
|
mobj = re.search(pattern, string, flags)
|
|
|
|
|
else:
|
|
|
|
|
for p in pattern:
|
|
|
|
|
mobj = re.search(p, string, flags)
|
2014-07-25 04:43:03 -04:00
|
|
|
|
if mobj:
|
|
|
|
|
break
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
2016-03-03 06:24:24 -05:00
|
|
|
|
if not self._downloader.params.get('no_color') and compat_os_name != 'nt' and sys.stderr.isatty():
|
2014-08-27 19:04:43 -04:00
|
|
|
|
_name = '\033[0;34m%s\033[0m' % name
|
2013-06-23 13:57:38 -04:00
|
|
|
|
else:
|
|
|
|
|
_name = name
|
|
|
|
|
|
|
|
|
|
if mobj:
|
2014-11-04 17:14:16 -05:00
|
|
|
|
if group is None:
|
|
|
|
|
# return the first matching group
|
|
|
|
|
return next(g for g in mobj.groups() if g is not None)
|
|
|
|
|
else:
|
|
|
|
|
return mobj.group(group)
|
2015-06-28 12:56:45 -04:00
|
|
|
|
elif default is not NO_DEFAULT:
|
2013-06-23 13:57:38 -04:00
|
|
|
|
return default
|
|
|
|
|
elif fatal:
|
2014-08-27 19:04:43 -04:00
|
|
|
|
raise RegexNotFoundError('Unable to extract %s' % _name)
|
2013-06-23 13:57:38 -04:00
|
|
|
|
else:
|
2015-04-17 08:55:24 -04:00
|
|
|
|
self._downloader.report_warning('unable to extract %s' % _name + bug_reports_message())
|
2013-06-23 13:57:38 -04:00
|
|
|
|
return None
|
|
|
|
|
|
2015-06-28 12:56:45 -04:00
|
|
|
|
def _html_search_regex(self, pattern, string, name, default=NO_DEFAULT, fatal=True, flags=0, group=None):
|
2013-06-23 13:57:38 -04:00
|
|
|
|
"""
|
|
|
|
|
Like _search_regex, but strips HTML tags and unescapes entities.
|
|
|
|
|
"""
|
2014-11-04 17:14:16 -05:00
|
|
|
|
res = self._search_regex(pattern, string, name, default, fatal, flags, group)
|
2013-06-23 13:57:38 -04:00
|
|
|
|
if res:
|
|
|
|
|
return clean_html(res).strip()
|
|
|
|
|
else:
|
|
|
|
|
return res
|
|
|
|
|
|
2016-08-14 06:48:13 -04:00
|
|
|
|
def _get_netrc_login_info(self, netrc_machine=None):
|
|
|
|
|
username = None
|
|
|
|
|
password = None
|
|
|
|
|
netrc_machine = netrc_machine or self._NETRC_MACHINE
|
|
|
|
|
|
|
|
|
|
if self._downloader.params.get('usenetrc', False):
|
|
|
|
|
try:
|
|
|
|
|
info = netrc.netrc().authenticators(netrc_machine)
|
|
|
|
|
if info is not None:
|
|
|
|
|
username = info[0]
|
|
|
|
|
password = info[2]
|
|
|
|
|
else:
|
2016-09-15 11:35:12 -04:00
|
|
|
|
raise netrc.NetrcParseError(
|
|
|
|
|
'No authenticators for %s' % netrc_machine)
|
2016-08-14 06:48:13 -04:00
|
|
|
|
except (IOError, netrc.NetrcParseError) as err:
|
2016-09-15 11:35:12 -04:00
|
|
|
|
self._downloader.report_warning(
|
|
|
|
|
'parsing .netrc: %s' % error_to_compat_str(err))
|
2016-08-14 06:48:13 -04:00
|
|
|
|
|
2016-09-15 11:35:12 -04:00
|
|
|
|
return username, password
|
2016-08-14 06:48:13 -04:00
|
|
|
|
|
2016-09-13 17:16:01 -04:00
|
|
|
|
def _get_login_info(self, username_option='username', password_option='password', netrc_machine=None):
|
2013-07-07 17:24:34 -04:00
|
|
|
|
"""
|
2015-04-29 11:03:10 -04:00
|
|
|
|
Get the login info as (username, password)
|
2016-09-15 11:34:29 -04:00
|
|
|
|
First look for the manually specified credentials using username_option
|
|
|
|
|
and password_option as keys in params dictionary. If no such credentials
|
|
|
|
|
available look in the netrc file using the netrc_machine or _NETRC_MACHINE
|
|
|
|
|
value.
|
2013-07-07 17:24:34 -04:00
|
|
|
|
If there's no info available, return (None, None)
|
|
|
|
|
"""
|
|
|
|
|
if self._downloader is None:
|
|
|
|
|
return (None, None)
|
|
|
|
|
|
|
|
|
|
downloader_params = self._downloader.params
|
|
|
|
|
|
|
|
|
|
# Attempt to use provided username and password or .netrc data
|
2016-09-13 17:16:01 -04:00
|
|
|
|
if downloader_params.get(username_option) is not None:
|
|
|
|
|
username = downloader_params[username_option]
|
|
|
|
|
password = downloader_params[password_option]
|
2016-08-14 06:48:13 -04:00
|
|
|
|
else:
|
2016-09-13 17:16:01 -04:00
|
|
|
|
username, password = self._get_netrc_login_info(netrc_machine)
|
2014-11-23 14:41:03 -05:00
|
|
|
|
|
2016-09-15 11:26:37 -04:00
|
|
|
|
return username, password
|
2013-07-07 17:24:34 -04:00
|
|
|
|
|
2015-08-15 11:55:07 -04:00
|
|
|
|
def _get_tfa_info(self, note='two-factor verification code'):
|
2014-08-16 17:28:41 -04:00
|
|
|
|
"""
|
|
|
|
|
Get the two-factor authentication info
|
|
|
|
|
TODO - asking the user will be required for sms/phone verify
|
|
|
|
|
currently just uses the command line option
|
|
|
|
|
If there's no info available, return None
|
|
|
|
|
"""
|
|
|
|
|
if self._downloader is None:
|
|
|
|
|
return None
|
|
|
|
|
downloader_params = self._downloader.params
|
|
|
|
|
|
2016-02-14 03:25:04 -05:00
|
|
|
|
if downloader_params.get('twofactor') is not None:
|
2014-08-16 17:28:41 -04:00
|
|
|
|
return downloader_params['twofactor']
|
|
|
|
|
|
2015-08-15 11:55:07 -04:00
|
|
|
|
return compat_getpass('Type %s and press [Return]: ' % note)
|
2014-08-16 17:28:41 -04:00
|
|
|
|
|
2013-07-12 13:00:19 -04:00
|
|
|
|
# Helper functions for extracting OpenGraph info
|
|
|
|
|
@staticmethod
|
2013-11-15 06:24:54 -05:00
|
|
|
|
def _og_regexes(prop):
|
2015-10-17 23:11:02 -04:00
|
|
|
|
content_re = r'content=(?:"([^"]+?)"|\'([^\']+?)\'|\s*([^\s"\'=<>`]+?))'
|
2018-10-10 17:47:21 -04:00
|
|
|
|
property_re = (r'(?:name|property)=(?:\'og[:-]%(prop)s\'|"og[:-]%(prop)s"|\s*og[:-]%(prop)s\b)'
|
2015-10-14 10:49:39 -04:00
|
|
|
|
% {'prop': re.escape(prop)})
|
2013-11-15 06:54:13 -05:00
|
|
|
|
template = r'<meta[^>]+?%s[^>]+?%s'
|
2013-11-15 06:24:54 -05:00
|
|
|
|
return [
|
2013-11-15 06:54:13 -05:00
|
|
|
|
template % (property_re, content_re),
|
|
|
|
|
template % (content_re, property_re),
|
2013-11-15 06:24:54 -05:00
|
|
|
|
]
|
2013-07-12 13:00:19 -04:00
|
|
|
|
|
2015-07-28 17:43:03 -04:00
|
|
|
|
@staticmethod
|
|
|
|
|
def _meta_regex(prop):
|
|
|
|
|
return r'''(?isx)<meta
|
2015-08-15 05:58:30 -04:00
|
|
|
|
(?=[^>]+(?:itemprop|name|property|id|http-equiv)=(["\']?)%s\1)
|
2015-07-28 17:43:03 -04:00
|
|
|
|
[^>]+?content=(["\'])(?P<content>.*?)\2''' % re.escape(prop)
|
|
|
|
|
|
2013-07-13 14:39:47 -04:00
|
|
|
|
def _og_search_property(self, prop, html, name=None, **kargs):
|
2016-08-02 11:55:14 -04:00
|
|
|
|
if not isinstance(prop, (list, tuple)):
|
|
|
|
|
prop = [prop]
|
2013-07-12 13:00:19 -04:00
|
|
|
|
if name is None:
|
2016-08-02 11:55:14 -04:00
|
|
|
|
name = 'OpenGraph %s' % prop[0]
|
|
|
|
|
og_regexes = []
|
|
|
|
|
for p in prop:
|
|
|
|
|
og_regexes.extend(self._og_regexes(p))
|
|
|
|
|
escaped = self._search_regex(og_regexes, html, name, flags=re.DOTALL, **kargs)
|
2013-11-12 04:36:23 -05:00
|
|
|
|
if escaped is None:
|
|
|
|
|
return None
|
|
|
|
|
return unescapeHTML(escaped)
|
2013-07-12 13:00:19 -04:00
|
|
|
|
|
|
|
|
|
def _og_search_thumbnail(self, html, **kargs):
|
2015-07-23 13:37:45 -04:00
|
|
|
|
return self._og_search_property('image', html, 'thumbnail URL', fatal=False, **kargs)
|
2013-07-12 13:00:19 -04:00
|
|
|
|
|
|
|
|
|
def _og_search_description(self, html, **kargs):
|
|
|
|
|
return self._og_search_property('description', html, fatal=False, **kargs)
|
|
|
|
|
|
|
|
|
|
def _og_search_title(self, html, **kargs):
|
|
|
|
|
return self._og_search_property('title', html, **kargs)
|
|
|
|
|
|
2013-10-28 02:34:29 -04:00
|
|
|
|
def _og_search_video_url(self, html, name='video url', secure=True, **kargs):
|
2014-08-21 07:05:24 -04:00
|
|
|
|
regexes = self._og_regexes('video') + self._og_regexes('video:url')
|
|
|
|
|
if secure:
|
|
|
|
|
regexes = self._og_regexes('video:secure_url') + regexes
|
2013-10-28 02:34:29 -04:00
|
|
|
|
return self._html_search_regex(regexes, html, name, **kargs)
|
2013-07-12 13:00:19 -04:00
|
|
|
|
|
2014-06-26 10:34:36 -04:00
|
|
|
|
def _og_search_url(self, html, **kargs):
|
|
|
|
|
return self._og_search_property('url', html, **kargs)
|
|
|
|
|
|
2014-07-11 09:38:18 -04:00
|
|
|
|
def _html_search_meta(self, name, html, display_name=None, fatal=False, **kwargs):
|
2016-06-26 05:57:14 -04:00
|
|
|
|
if not isinstance(name, (list, tuple)):
|
|
|
|
|
name = [name]
|
2013-11-20 00:13:19 -05:00
|
|
|
|
if display_name is None:
|
2016-06-26 05:57:14 -04:00
|
|
|
|
display_name = name[0]
|
2013-11-20 00:13:19 -05:00
|
|
|
|
return self._html_search_regex(
|
2016-06-26 05:57:14 -04:00
|
|
|
|
[self._meta_regex(n) for n in name],
|
2014-11-04 17:14:16 -05:00
|
|
|
|
html, display_name, fatal=fatal, group='content', **kwargs)
|
2013-11-20 00:13:19 -05:00
|
|
|
|
|
|
|
|
|
def _dc_search_uploader(self, html):
|
|
|
|
|
return self._html_search_meta('dc.creator', html, 'uploader')
|
|
|
|
|
|
2013-10-06 00:06:30 -04:00
|
|
|
|
def _rta_search(self, html):
|
|
|
|
|
# See http://www.rtalabel.org/index.php?content=howtofaq#single
|
|
|
|
|
if re.search(r'(?ix)<meta\s+name="rating"\s+'
|
|
|
|
|
r' content="RTA-5042-1996-1400-1577-RTA"',
|
|
|
|
|
html):
|
|
|
|
|
return 18
|
|
|
|
|
return 0
|
|
|
|
|
|
2013-11-20 00:13:19 -05:00
|
|
|
|
def _media_rating_search(self, html):
|
|
|
|
|
# See http://www.tjg-designs.com/WP/metadata-code-examples-adding-metadata-to-your-web-pages/
|
|
|
|
|
rating = self._html_search_meta('rating', html)
|
|
|
|
|
|
|
|
|
|
if not rating:
|
|
|
|
|
return None
|
|
|
|
|
|
|
|
|
|
RATING_TABLE = {
|
|
|
|
|
'safe for kids': 0,
|
|
|
|
|
'general': 8,
|
|
|
|
|
'14 years': 14,
|
|
|
|
|
'mature': 17,
|
|
|
|
|
'restricted': 19,
|
|
|
|
|
}
|
2016-02-14 03:25:04 -05:00
|
|
|
|
return RATING_TABLE.get(rating.lower())
|
2013-11-20 00:13:19 -05:00
|
|
|
|
|
2015-02-08 10:39:00 -05:00
|
|
|
|
def _family_friendly_search(self, html):
|
2015-02-14 16:20:24 -05:00
|
|
|
|
# See http://schema.org/VideoObject
|
2017-08-12 06:11:35 -04:00
|
|
|
|
family_friendly = self._html_search_meta(
|
|
|
|
|
'isFamilyFriendly', html, default=None)
|
2015-02-08 10:39:00 -05:00
|
|
|
|
|
|
|
|
|
if not family_friendly:
|
|
|
|
|
return None
|
|
|
|
|
|
|
|
|
|
RATING_TABLE = {
|
|
|
|
|
'1': 0,
|
|
|
|
|
'true': 0,
|
|
|
|
|
'0': 18,
|
|
|
|
|
'false': 18,
|
|
|
|
|
}
|
2016-02-14 03:25:04 -05:00
|
|
|
|
return RATING_TABLE.get(family_friendly.lower())
|
2015-02-08 10:39:00 -05:00
|
|
|
|
|
2014-01-29 12:03:32 -05:00
|
|
|
|
def _twitter_search_player(self, html):
|
|
|
|
|
return self._html_search_meta('twitter:player', html,
|
2014-11-23 15:39:15 -05:00
|
|
|
|
'twitter card player')
|
2014-01-29 12:03:32 -05:00
|
|
|
|
|
2016-07-08 16:28:04 -04:00
|
|
|
|
def _search_json_ld(self, html, video_id, expected_type=None, **kwargs):
|
pull changes from remote master (#190)
* [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 commit cff99c91d150df2a4e21962a3ca8d4ae94533b8c.
* [utils] Add reference to cookie file format
* Revert "[vimeo] fix showcase password protected video extraction(closes #24224)"
This reverts commit 12ee431676bb655f04c7dd416a73c1f142ed368d.
* [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>
2020-08-25 10:53:34 -04:00
|
|
|
|
json_ld_list = list(re.finditer(JSON_LD_RE, html))
|
2016-08-08 11:36:18 -04:00
|
|
|
|
default = kwargs.get('default', NO_DEFAULT)
|
|
|
|
|
# JSON-LD may be malformed and thus `fatal` should be respected.
|
|
|
|
|
# At the same time `default` may be passed that assumes `fatal=False`
|
|
|
|
|
# for _search_regex. Let's simulate the same behavior here as well.
|
|
|
|
|
fatal = kwargs.get('fatal', True) if default == NO_DEFAULT else False
|
pull changes from remote master (#190)
* [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 commit cff99c91d150df2a4e21962a3ca8d4ae94533b8c.
* [utils] Add reference to cookie file format
* Revert "[vimeo] fix showcase password protected video extraction(closes #24224)"
This reverts commit 12ee431676bb655f04c7dd416a73c1f142ed368d.
* [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>
2020-08-25 10:53:34 -04:00
|
|
|
|
json_ld = []
|
|
|
|
|
for mobj in json_ld_list:
|
|
|
|
|
json_ld_item = self._parse_json(
|
|
|
|
|
mobj.group('json_ld'), video_id, fatal=fatal)
|
|
|
|
|
if not json_ld_item:
|
|
|
|
|
continue
|
|
|
|
|
if isinstance(json_ld_item, dict):
|
|
|
|
|
json_ld.append(json_ld_item)
|
|
|
|
|
elif isinstance(json_ld_item, (list, tuple)):
|
|
|
|
|
json_ld.extend(json_ld_item)
|
|
|
|
|
if json_ld:
|
|
|
|
|
json_ld = self._json_ld(json_ld, video_id, fatal=fatal, expected_type=expected_type)
|
|
|
|
|
if json_ld:
|
|
|
|
|
return json_ld
|
|
|
|
|
if default is not NO_DEFAULT:
|
|
|
|
|
return default
|
|
|
|
|
elif fatal:
|
|
|
|
|
raise RegexNotFoundError('Unable to extract JSON-LD')
|
|
|
|
|
else:
|
|
|
|
|
self._downloader.report_warning('unable to extract JSON-LD %s' % bug_reports_message())
|
|
|
|
|
return {}
|
2016-01-15 13:36:02 -05:00
|
|
|
|
|
2016-07-08 16:28:04 -04:00
|
|
|
|
def _json_ld(self, json_ld, video_id, fatal=True, expected_type=None):
|
2016-01-15 13:36:02 -05:00
|
|
|
|
if isinstance(json_ld, compat_str):
|
|
|
|
|
json_ld = self._parse_json(json_ld, video_id, fatal=fatal)
|
|
|
|
|
if not json_ld:
|
|
|
|
|
return {}
|
|
|
|
|
info = {}
|
2016-08-05 12:14:32 -04:00
|
|
|
|
if not isinstance(json_ld, (list, tuple, dict)):
|
|
|
|
|
return info
|
|
|
|
|
if isinstance(json_ld, dict):
|
|
|
|
|
json_ld = [json_ld]
|
2017-04-18 11:21:38 -04:00
|
|
|
|
|
2018-04-27 15:48:03 -04:00
|
|
|
|
INTERACTION_TYPE_MAP = {
|
|
|
|
|
'CommentAction': 'comment',
|
|
|
|
|
'AgreeAction': 'like',
|
|
|
|
|
'DisagreeAction': 'dislike',
|
|
|
|
|
'LikeAction': 'like',
|
|
|
|
|
'DislikeAction': 'dislike',
|
|
|
|
|
'ListenAction': 'view',
|
|
|
|
|
'WatchAction': 'view',
|
|
|
|
|
'ViewAction': 'view',
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
def extract_interaction_statistic(e):
|
|
|
|
|
interaction_statistic = e.get('interactionStatistic')
|
|
|
|
|
if not isinstance(interaction_statistic, list):
|
|
|
|
|
return
|
|
|
|
|
for is_e in interaction_statistic:
|
|
|
|
|
if not isinstance(is_e, dict):
|
|
|
|
|
continue
|
|
|
|
|
if is_e.get('@type') != 'InteractionCounter':
|
|
|
|
|
continue
|
|
|
|
|
interaction_type = is_e.get('interactionType')
|
|
|
|
|
if not isinstance(interaction_type, compat_str):
|
|
|
|
|
continue
|
|
|
|
|
interaction_count = int_or_none(is_e.get('userInteractionCount'))
|
|
|
|
|
if interaction_count is None:
|
|
|
|
|
continue
|
|
|
|
|
count_kind = INTERACTION_TYPE_MAP.get(interaction_type.split('/')[-1])
|
|
|
|
|
if not count_kind:
|
|
|
|
|
continue
|
|
|
|
|
count_key = '%s_count' % count_kind
|
|
|
|
|
if info.get(count_key) is not None:
|
|
|
|
|
continue
|
|
|
|
|
info[count_key] = interaction_count
|
|
|
|
|
|
2017-04-18 11:21:38 -04:00
|
|
|
|
def extract_video_object(e):
|
|
|
|
|
assert e['@type'] == 'VideoObject'
|
|
|
|
|
info.update({
|
2018-10-28 13:19:08 -04:00
|
|
|
|
'url': url_or_none(e.get('contentUrl')),
|
2017-04-18 11:21:38 -04:00
|
|
|
|
'title': unescapeHTML(e.get('name')),
|
|
|
|
|
'description': unescapeHTML(e.get('description')),
|
2018-10-28 13:19:08 -04:00
|
|
|
|
'thumbnail': url_or_none(e.get('thumbnailUrl') or e.get('thumbnailURL')),
|
2017-04-18 11:21:38 -04:00
|
|
|
|
'duration': parse_duration(e.get('duration')),
|
|
|
|
|
'timestamp': unified_timestamp(e.get('uploadDate')),
|
|
|
|
|
'filesize': float_or_none(e.get('contentSize')),
|
|
|
|
|
'tbr': int_or_none(e.get('bitrate')),
|
|
|
|
|
'width': int_or_none(e.get('width')),
|
|
|
|
|
'height': int_or_none(e.get('height')),
|
2017-04-30 10:11:55 -04:00
|
|
|
|
'view_count': int_or_none(e.get('interactionCount')),
|
2017-04-18 11:21:38 -04:00
|
|
|
|
})
|
2018-04-27 15:48:03 -04:00
|
|
|
|
extract_interaction_statistic(e)
|
2017-04-18 11:21:38 -04:00
|
|
|
|
|
2016-08-05 12:14:32 -04:00
|
|
|
|
for e in json_ld:
|
pull changes from remote master (#190)
* [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 commit cff99c91d150df2a4e21962a3ca8d4ae94533b8c.
* [utils] Add reference to cookie file format
* Revert "[vimeo] fix showcase password protected video extraction(closes #24224)"
This reverts commit 12ee431676bb655f04c7dd416a73c1f142ed368d.
* [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>
2020-08-25 10:53:34 -04:00
|
|
|
|
if '@context' in e:
|
2016-08-05 12:14:32 -04:00
|
|
|
|
item_type = e.get('@type')
|
|
|
|
|
if expected_type is not None and expected_type != item_type:
|
pull changes from remote master (#190)
* [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 commit cff99c91d150df2a4e21962a3ca8d4ae94533b8c.
* [utils] Add reference to cookie file format
* Revert "[vimeo] fix showcase password protected video extraction(closes #24224)"
This reverts commit 12ee431676bb655f04c7dd416a73c1f142ed368d.
* [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>
2020-08-25 10:53:34 -04:00
|
|
|
|
continue
|
2017-06-30 11:19:06 -04:00
|
|
|
|
if item_type in ('TVEpisode', 'Episode'):
|
2019-01-07 22:02:49 -05:00
|
|
|
|
episode_name = unescapeHTML(e.get('name'))
|
2016-08-05 12:14:32 -04:00
|
|
|
|
info.update({
|
2019-01-07 22:02:49 -05:00
|
|
|
|
'episode': episode_name,
|
2016-08-05 12:14:32 -04:00
|
|
|
|
'episode_number': int_or_none(e.get('episodeNumber')),
|
|
|
|
|
'description': unescapeHTML(e.get('description')),
|
|
|
|
|
})
|
2019-01-07 22:02:49 -05:00
|
|
|
|
if not info.get('title') and episode_name:
|
|
|
|
|
info['title'] = episode_name
|
2016-08-05 12:14:32 -04:00
|
|
|
|
part_of_season = e.get('partOfSeason')
|
2017-06-30 11:19:06 -04:00
|
|
|
|
if isinstance(part_of_season, dict) and part_of_season.get('@type') in ('TVSeason', 'Season', 'CreativeWorkSeason'):
|
2019-01-26 16:36:58 -05:00
|
|
|
|
info.update({
|
|
|
|
|
'season': unescapeHTML(part_of_season.get('name')),
|
|
|
|
|
'season_number': int_or_none(part_of_season.get('seasonNumber')),
|
|
|
|
|
})
|
2016-08-06 13:58:38 -04:00
|
|
|
|
part_of_series = e.get('partOfSeries') or e.get('partOfTVSeries')
|
2017-06-30 11:19:06 -04:00
|
|
|
|
if isinstance(part_of_series, dict) and part_of_series.get('@type') in ('TVSeries', 'Series', 'CreativeWorkSeries'):
|
2016-08-05 12:14:32 -04:00
|
|
|
|
info['series'] = unescapeHTML(part_of_series.get('name'))
|
2019-01-07 22:02:00 -05:00
|
|
|
|
elif item_type == 'Movie':
|
|
|
|
|
info.update({
|
|
|
|
|
'title': unescapeHTML(e.get('name')),
|
|
|
|
|
'description': unescapeHTML(e.get('description')),
|
|
|
|
|
'duration': parse_duration(e.get('duration')),
|
|
|
|
|
'timestamp': unified_timestamp(e.get('dateCreated')),
|
|
|
|
|
})
|
2018-01-27 11:23:36 -05:00
|
|
|
|
elif item_type in ('Article', 'NewsArticle'):
|
2016-08-05 12:14:32 -04:00
|
|
|
|
info.update({
|
|
|
|
|
'timestamp': parse_iso8601(e.get('datePublished')),
|
|
|
|
|
'title': unescapeHTML(e.get('headline')),
|
|
|
|
|
'description': unescapeHTML(e.get('articleBody')),
|
|
|
|
|
})
|
|
|
|
|
elif item_type == 'VideoObject':
|
2017-04-18 11:21:38 -04:00
|
|
|
|
extract_video_object(e)
|
pull changes from remote master (#190)
* [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 commit cff99c91d150df2a4e21962a3ca8d4ae94533b8c.
* [utils] Add reference to cookie file format
* Revert "[vimeo] fix showcase password protected video extraction(closes #24224)"
This reverts commit 12ee431676bb655f04c7dd416a73c1f142ed368d.
* [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>
2020-08-25 10:53:34 -04:00
|
|
|
|
if expected_type is None:
|
|
|
|
|
continue
|
|
|
|
|
else:
|
|
|
|
|
break
|
2017-06-30 11:19:06 -04:00
|
|
|
|
video = e.get('video')
|
|
|
|
|
if isinstance(video, dict) and video.get('@type') == 'VideoObject':
|
|
|
|
|
extract_video_object(video)
|
pull changes from remote master (#190)
* [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 commit cff99c91d150df2a4e21962a3ca8d4ae94533b8c.
* [utils] Add reference to cookie file format
* Revert "[vimeo] fix showcase password protected video extraction(closes #24224)"
This reverts commit 12ee431676bb655f04c7dd416a73c1f142ed368d.
* [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>
2020-08-25 10:53:34 -04:00
|
|
|
|
if expected_type is None:
|
|
|
|
|
continue
|
|
|
|
|
else:
|
|
|
|
|
break
|
2016-01-15 13:36:02 -05:00
|
|
|
|
return dict((k, v) for k, v in info.items() if v is not None)
|
|
|
|
|
|
2015-07-10 11:49:09 -04:00
|
|
|
|
@staticmethod
|
2015-07-14 12:36:30 -04:00
|
|
|
|
def _hidden_inputs(html):
|
2015-09-11 11:07:32 -04:00
|
|
|
|
html = re.sub(r'<!--(?:(?!<!--).)*-->', '', html)
|
2015-08-15 11:52:22 -04:00
|
|
|
|
hidden_inputs = {}
|
2016-09-15 10:54:48 -04:00
|
|
|
|
for input in re.findall(r'(?i)(<input[^>]+>)', html):
|
|
|
|
|
attrs = extract_attributes(input)
|
|
|
|
|
if not input:
|
2015-08-15 11:52:22 -04:00
|
|
|
|
continue
|
2016-09-15 10:54:48 -04:00
|
|
|
|
if attrs.get('type') not in ('hidden', 'submit'):
|
2015-08-15 11:52:22 -04:00
|
|
|
|
continue
|
2016-09-15 10:54:48 -04:00
|
|
|
|
name = attrs.get('name') or attrs.get('id')
|
|
|
|
|
value = attrs.get('value')
|
|
|
|
|
if name and value is not None:
|
|
|
|
|
hidden_inputs[name] = value
|
2015-08-15 11:52:22 -04:00
|
|
|
|
return hidden_inputs
|
2015-07-10 11:49:09 -04:00
|
|
|
|
|
2015-07-14 12:38:10 -04:00
|
|
|
|
def _form_hidden_inputs(self, form_id, html):
|
|
|
|
|
form = self._search_regex(
|
2015-09-11 10:43:05 -04:00
|
|
|
|
r'(?is)<form[^>]+?id=(["\'])%s\1[^>]*>(?P<form>.+?)</form>' % form_id,
|
2015-07-14 12:38:10 -04:00
|
|
|
|
html, '%s form' % form_id, group='form')
|
|
|
|
|
return self._hidden_inputs(form)
|
|
|
|
|
|
2015-04-20 11:13:31 -04:00
|
|
|
|
def _sort_formats(self, formats, field_preference=None):
|
2014-01-27 01:31:54 -05:00
|
|
|
|
if not formats:
|
2014-08-27 19:04:43 -04:00
|
|
|
|
raise ExtractorError('No video formats found')
|
2014-01-27 01:31:54 -05:00
|
|
|
|
|
2016-01-27 10:11:17 -05:00
|
|
|
|
for f in formats:
|
|
|
|
|
# Automatically determine tbr when missing based on abr and vbr (improves
|
|
|
|
|
# formats sorting in some cases)
|
2016-01-29 14:47:46 -05:00
|
|
|
|
if 'tbr' not in f and f.get('abr') is not None and f.get('vbr') is not None:
|
2016-01-27 10:11:17 -05:00
|
|
|
|
f['tbr'] = f['abr'] + f['vbr']
|
|
|
|
|
|
2013-12-24 06:25:22 -05:00
|
|
|
|
def _formats_key(f):
|
2013-12-24 06:40:23 -05:00
|
|
|
|
# TODO remove the following workaround
|
|
|
|
|
from ..utils import determine_ext
|
|
|
|
|
if not f.get('ext') and 'url' in f:
|
|
|
|
|
f['ext'] = determine_ext(f['url'])
|
|
|
|
|
|
2015-04-20 11:13:31 -04:00
|
|
|
|
if isinstance(field_preference, (list, tuple)):
|
2016-06-26 10:09:07 -04:00
|
|
|
|
return tuple(
|
|
|
|
|
f.get(field)
|
|
|
|
|
if f.get(field) is not None
|
|
|
|
|
else ('' if field == 'format_id' else -1)
|
|
|
|
|
for field in field_preference)
|
2015-04-20 11:13:31 -04:00
|
|
|
|
|
2013-12-24 06:25:22 -05:00
|
|
|
|
preference = f.get('preference')
|
|
|
|
|
if preference is None:
|
2015-12-05 15:14:43 -05:00
|
|
|
|
preference = 0
|
2013-12-24 06:25:22 -05:00
|
|
|
|
if f.get('ext') in ['f4f', 'f4m']: # Not yet supported
|
|
|
|
|
preference -= 0.5
|
|
|
|
|
|
2016-08-04 04:24:20 -04:00
|
|
|
|
protocol = f.get('protocol') or determine_protocol(f)
|
|
|
|
|
proto_preference = 0 if protocol in ['http', 'https'] else (-0.5 if protocol == 'rtsp' else -0.1)
|
2015-12-05 15:14:43 -05:00
|
|
|
|
|
2013-12-24 06:25:22 -05:00
|
|
|
|
if f.get('vcodec') == 'none': # audio only
|
2016-02-11 04:55:50 -05:00
|
|
|
|
preference -= 50
|
2013-12-24 06:25:22 -05:00
|
|
|
|
if self._downloader.params.get('prefer_free_formats'):
|
2014-08-27 19:04:43 -04:00
|
|
|
|
ORDER = ['aac', 'mp3', 'm4a', 'webm', 'ogg', 'opus']
|
2013-12-24 06:25:22 -05:00
|
|
|
|
else:
|
2014-08-27 19:04:43 -04:00
|
|
|
|
ORDER = ['webm', 'opus', 'ogg', 'mp3', 'aac', 'm4a']
|
2013-12-24 06:25:22 -05:00
|
|
|
|
ext_preference = 0
|
|
|
|
|
try:
|
|
|
|
|
audio_ext_preference = ORDER.index(f['ext'])
|
|
|
|
|
except ValueError:
|
|
|
|
|
audio_ext_preference = -1
|
|
|
|
|
else:
|
2016-02-11 04:55:50 -05:00
|
|
|
|
if f.get('acodec') == 'none': # video only
|
|
|
|
|
preference -= 40
|
2013-12-24 06:25:22 -05:00
|
|
|
|
if self._downloader.params.get('prefer_free_formats'):
|
2014-08-27 19:04:43 -04:00
|
|
|
|
ORDER = ['flv', 'mp4', 'webm']
|
2013-12-24 06:25:22 -05:00
|
|
|
|
else:
|
2014-08-27 19:04:43 -04:00
|
|
|
|
ORDER = ['webm', 'flv', 'mp4']
|
2013-12-24 06:25:22 -05:00
|
|
|
|
try:
|
|
|
|
|
ext_preference = ORDER.index(f['ext'])
|
|
|
|
|
except ValueError:
|
|
|
|
|
ext_preference = -1
|
|
|
|
|
audio_ext_preference = 0
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
|
preference,
|
2014-11-20 06:06:33 -05:00
|
|
|
|
f.get('language_preference') if f.get('language_preference') is not None else -1,
|
2014-01-06 11:15:27 -05:00
|
|
|
|
f.get('quality') if f.get('quality') is not None else -1,
|
2014-01-07 04:25:34 -05:00
|
|
|
|
f.get('tbr') if f.get('tbr') is not None else -1,
|
2015-02-15 22:37:55 -05:00
|
|
|
|
f.get('filesize') if f.get('filesize') is not None else -1,
|
2013-12-24 06:25:22 -05:00
|
|
|
|
f.get('vbr') if f.get('vbr') is not None else -1,
|
2015-02-03 04:53:05 -05:00
|
|
|
|
f.get('height') if f.get('height') is not None else -1,
|
|
|
|
|
f.get('width') if f.get('width') is not None else -1,
|
2015-12-05 15:14:43 -05:00
|
|
|
|
proto_preference,
|
2015-02-06 09:16:43 -05:00
|
|
|
|
ext_preference,
|
2013-12-24 06:25:22 -05:00
|
|
|
|
f.get('abr') if f.get('abr') is not None else -1,
|
|
|
|
|
audio_ext_preference,
|
2014-10-30 04:40:52 -04:00
|
|
|
|
f.get('fps') if f.get('fps') is not None else -1,
|
2014-07-21 06:02:44 -04:00
|
|
|
|
f.get('filesize_approx') if f.get('filesize_approx') is not None else -1,
|
2014-10-24 18:10:11 -04:00
|
|
|
|
f.get('source_preference') if f.get('source_preference') is not None else -1,
|
2015-05-06 11:24:24 -04:00
|
|
|
|
f.get('format_id') if f.get('format_id') is not None else '',
|
2013-12-24 06:25:22 -05:00
|
|
|
|
)
|
|
|
|
|
formats.sort(key=_formats_key)
|
2013-11-20 00:13:19 -05:00
|
|
|
|
|
2015-01-25 13:32:31 -05:00
|
|
|
|
def _check_formats(self, formats, video_id):
|
|
|
|
|
if formats:
|
|
|
|
|
formats[:] = filter(
|
|
|
|
|
lambda f: self._is_valid_url(
|
|
|
|
|
f['url'], video_id,
|
|
|
|
|
item='%s video format' % f.get('format_id') if f.get('format_id') else 'video'),
|
|
|
|
|
formats)
|
|
|
|
|
|
2016-02-21 14:19:39 -05:00
|
|
|
|
@staticmethod
|
|
|
|
|
def _remove_duplicate_formats(formats):
|
|
|
|
|
format_urls = set()
|
|
|
|
|
unique_formats = []
|
|
|
|
|
for f in formats:
|
|
|
|
|
if f['url'] not in format_urls:
|
|
|
|
|
format_urls.add(f['url'])
|
|
|
|
|
unique_formats.append(f)
|
|
|
|
|
formats[:] = unique_formats
|
|
|
|
|
|
2017-02-02 23:10:13 -05:00
|
|
|
|
def _is_valid_url(self, url, video_id, item='video', headers={}):
|
2015-03-02 11:38:44 -05:00
|
|
|
|
url = self._proto_relative_url(url, scheme='http:')
|
|
|
|
|
# For now assume non HTTP(S) URLs always valid
|
|
|
|
|
if not (url.startswith('http://') or url.startswith('https://')):
|
|
|
|
|
return True
|
2015-01-25 13:32:31 -05:00
|
|
|
|
try:
|
2017-02-02 23:10:13 -05:00
|
|
|
|
self._request_webpage(url, video_id, 'Checking %s URL' % item, headers=headers)
|
2015-01-25 13:32:31 -05:00
|
|
|
|
return True
|
2019-10-02 13:53:07 -04:00
|
|
|
|
except ExtractorError:
|
|
|
|
|
self.to_screen(
|
|
|
|
|
'%s: %s URL is invalid, skipping' % (video_id, item))
|
|
|
|
|
return False
|
2015-01-25 13:32:31 -05:00
|
|
|
|
|
2014-05-04 21:12:41 -04:00
|
|
|
|
def http_scheme(self):
|
2014-10-24 09:34:19 -04:00
|
|
|
|
""" Either "http:" or "https:", depending on the user's preferences """
|
2014-05-04 21:12:41 -04:00
|
|
|
|
return (
|
|
|
|
|
'http:'
|
|
|
|
|
if self._downloader.params.get('prefer_insecure', False)
|
|
|
|
|
else 'https:')
|
|
|
|
|
|
2014-05-13 03:42:38 -04:00
|
|
|
|
def _proto_relative_url(self, url, scheme=None):
|
|
|
|
|
if url is None:
|
|
|
|
|
return url
|
|
|
|
|
if url.startswith('//'):
|
|
|
|
|
if scheme is None:
|
|
|
|
|
scheme = self.http_scheme()
|
|
|
|
|
return scheme + url
|
|
|
|
|
else:
|
|
|
|
|
return url
|
|
|
|
|
|
2014-07-11 04:57:08 -04:00
|
|
|
|
def _sleep(self, timeout, video_id, msg_template=None):
|
|
|
|
|
if msg_template is None:
|
2014-08-27 19:04:43 -04:00
|
|
|
|
msg_template = '%(video_id)s: Waiting for %(timeout)s seconds'
|
2014-07-11 04:57:08 -04:00
|
|
|
|
msg = msg_template % {'video_id': video_id, 'timeout': timeout}
|
|
|
|
|
self.to_screen(msg)
|
|
|
|
|
time.sleep(timeout)
|
|
|
|
|
|
2015-07-17 00:02:49 -04:00
|
|
|
|
def _extract_f4m_formats(self, manifest_url, video_id, preference=None, f4m_id=None,
|
2015-10-01 13:03:31 -04:00
|
|
|
|
transform_source=lambda s: fix_xml_ampersands(s).strip(),
|
2019-11-15 17:44:14 -05:00
|
|
|
|
fatal=True, m3u8_id=None, data=None, headers={}, query={}):
|
2014-07-28 09:42:19 -04:00
|
|
|
|
manifest = self._download_xml(
|
|
|
|
|
manifest_url, video_id, 'Downloading f4m manifest',
|
2015-07-15 15:14:08 -04:00
|
|
|
|
'Unable to download f4m manifest',
|
|
|
|
|
# Some manifests may be malformed, e.g. prosiebensat1 generated manifests
|
2019-03-09 07:14:41 -05:00
|
|
|
|
# (see https://github.com/ytdl-org/youtube-dl/issues/6215#issuecomment-121704244)
|
2015-10-01 13:03:31 -04:00
|
|
|
|
transform_source=transform_source,
|
2019-11-15 17:44:14 -05:00
|
|
|
|
fatal=fatal, data=data, headers=headers, query=query)
|
2015-10-01 13:03:31 -04:00
|
|
|
|
|
|
|
|
|
if manifest is False:
|
2015-12-27 09:33:39 -05:00
|
|
|
|
return []
|
2014-07-28 09:25:56 -04:00
|
|
|
|
|
2016-03-12 16:16:08 -05:00
|
|
|
|
return self._parse_f4m_formats(
|
|
|
|
|
manifest, manifest_url, video_id, preference=preference, f4m_id=f4m_id,
|
2016-05-26 12:03:03 -04:00
|
|
|
|
transform_source=transform_source, fatal=fatal, m3u8_id=m3u8_id)
|
2016-03-12 16:16:08 -05:00
|
|
|
|
|
|
|
|
|
def _parse_f4m_formats(self, manifest, manifest_url, video_id, preference=None, f4m_id=None,
|
|
|
|
|
transform_source=lambda s: fix_xml_ampersands(s).strip(),
|
2016-05-26 12:03:03 -04:00
|
|
|
|
fatal=True, m3u8_id=None):
|
2019-03-05 13:21:57 -05:00
|
|
|
|
if not isinstance(manifest, compat_etree_Element) and not fatal:
|
2019-03-05 11:45:40 -05:00
|
|
|
|
return []
|
|
|
|
|
|
2015-07-30 12:34:38 -04:00
|
|
|
|
# currently youtube-dl cannot decode the playerVerificationChallenge as Akamai uses Adobe Alchemy
|
|
|
|
|
akamai_pv = manifest.find('{http://ns.adobe.com/f4m/1.0}pv-2.0')
|
|
|
|
|
if akamai_pv is not None and ';' in akamai_pv.text:
|
|
|
|
|
playerVerificationChallenge = akamai_pv.text.split(';')[0]
|
|
|
|
|
if playerVerificationChallenge.strip() != '':
|
|
|
|
|
return []
|
|
|
|
|
|
2014-07-28 09:25:56 -04:00
|
|
|
|
formats = []
|
2014-10-24 00:17:39 -04:00
|
|
|
|
manifest_version = '1.0'
|
2014-08-25 07:03:08 -04:00
|
|
|
|
media_nodes = manifest.findall('{http://ns.adobe.com/f4m/1.0}media')
|
2014-10-23 17:11:10 -04:00
|
|
|
|
if not media_nodes:
|
2014-10-24 00:17:39 -04:00
|
|
|
|
manifest_version = '2.0'
|
2014-10-23 17:11:10 -04:00
|
|
|
|
media_nodes = manifest.findall('{http://ns.adobe.com/f4m/2.0}media')
|
2016-03-26 21:42:38 -04:00
|
|
|
|
# Remove unsupported DRM protected media from final formats
|
2019-03-09 07:14:41 -05:00
|
|
|
|
# rendition (see https://github.com/ytdl-org/youtube-dl/issues/8573).
|
2016-03-26 21:42:38 -04:00
|
|
|
|
media_nodes = remove_encrypted_media(media_nodes)
|
|
|
|
|
if not media_nodes:
|
|
|
|
|
return formats
|
2017-11-04 11:10:55 -04:00
|
|
|
|
|
|
|
|
|
manifest_base_url = get_base_url(manifest)
|
2016-05-26 09:41:47 -04:00
|
|
|
|
|
2016-06-07 12:19:33 -04:00
|
|
|
|
bootstrap_info = xpath_element(
|
2016-05-26 09:41:47 -04:00
|
|
|
|
manifest, ['{http://ns.adobe.com/f4m/1.0}bootstrapInfo', '{http://ns.adobe.com/f4m/2.0}bootstrapInfo'],
|
|
|
|
|
'bootstrap info', default=None)
|
|
|
|
|
|
2016-10-19 09:42:48 -04:00
|
|
|
|
vcodec = None
|
|
|
|
|
mime_type = xpath_text(
|
|
|
|
|
manifest, ['{http://ns.adobe.com/f4m/1.0}mimeType', '{http://ns.adobe.com/f4m/2.0}mimeType'],
|
|
|
|
|
'base URL', default=None)
|
|
|
|
|
if mime_type and mime_type.startswith('audio/'):
|
|
|
|
|
vcodec = 'none'
|
|
|
|
|
|
2014-08-25 07:03:08 -04:00
|
|
|
|
for i, media_el in enumerate(media_nodes):
|
2016-05-26 15:47:44 -04:00
|
|
|
|
tbr = int_or_none(media_el.attrib.get('bitrate'))
|
|
|
|
|
width = int_or_none(media_el.attrib.get('width'))
|
|
|
|
|
height = int_or_none(media_el.attrib.get('height'))
|
|
|
|
|
format_id = '-'.join(filter(None, [f4m_id, compat_str(i if tbr is None else tbr)]))
|
2016-05-26 12:03:03 -04:00
|
|
|
|
# If <bootstrapInfo> is present, the specified f4m is a
|
|
|
|
|
# stream-level manifest, and only set-level manifests may refer to
|
|
|
|
|
# external resources. See section 11.4 and section 4 of F4M spec
|
|
|
|
|
if bootstrap_info is None:
|
|
|
|
|
media_url = None
|
|
|
|
|
# @href is introduced in 2.0, see section 11.6 of F4M spec
|
|
|
|
|
if manifest_version == '2.0':
|
|
|
|
|
media_url = media_el.attrib.get('href')
|
|
|
|
|
if media_url is None:
|
|
|
|
|
media_url = media_el.attrib.get('url')
|
2015-07-15 15:25:33 -04:00
|
|
|
|
if not media_url:
|
|
|
|
|
continue
|
2015-07-15 15:14:52 -04:00
|
|
|
|
manifest_url = (
|
|
|
|
|
media_url if media_url.startswith('http://') or media_url.startswith('https://')
|
2017-11-04 11:10:55 -04:00
|
|
|
|
else ((manifest_base_url or '/'.join(manifest_url.split('/')[:-1])) + '/' + media_url))
|
2015-07-15 15:15:15 -04:00
|
|
|
|
# If media_url is itself a f4m manifest do the recursive extraction
|
|
|
|
|
# since bitrates in parent manifest (this one) and media_url manifest
|
|
|
|
|
# may differ leading to inability to resolve the format by requested
|
|
|
|
|
# bitrate in f4m downloader
|
2016-05-26 09:55:43 -04:00
|
|
|
|
ext = determine_ext(manifest_url)
|
|
|
|
|
if ext == 'f4m':
|
2016-05-26 15:47:44 -04:00
|
|
|
|
f4m_formats = self._extract_f4m_formats(
|
2016-03-12 16:16:08 -05:00
|
|
|
|
manifest_url, video_id, preference=preference, f4m_id=f4m_id,
|
2016-05-26 15:47:44 -04:00
|
|
|
|
transform_source=transform_source, fatal=fatal)
|
|
|
|
|
# Sometimes stream-level manifest contains single media entry that
|
|
|
|
|
# does not contain any quality metadata (e.g. http://matchtv.ru/#live-player).
|
|
|
|
|
# At the same time parent's media entry in set-level manifest may
|
|
|
|
|
# contain it. We will copy it from parent in such cases.
|
|
|
|
|
if len(f4m_formats) == 1:
|
|
|
|
|
f = f4m_formats[0]
|
|
|
|
|
f.update({
|
|
|
|
|
'tbr': f.get('tbr') or tbr,
|
|
|
|
|
'width': f.get('width') or width,
|
|
|
|
|
'height': f.get('height') or height,
|
|
|
|
|
'format_id': f.get('format_id') if not tbr else format_id,
|
2016-10-19 09:42:48 -04:00
|
|
|
|
'vcodec': vcodec,
|
2016-05-26 15:47:44 -04:00
|
|
|
|
})
|
|
|
|
|
formats.extend(f4m_formats)
|
2015-07-15 15:15:15 -04:00
|
|
|
|
continue
|
2016-05-26 09:55:43 -04:00
|
|
|
|
elif ext == 'm3u8':
|
|
|
|
|
formats.extend(self._extract_m3u8_formats(
|
|
|
|
|
manifest_url, video_id, 'mp4', preference=preference,
|
2016-05-26 13:41:27 -04:00
|
|
|
|
m3u8_id=m3u8_id, fatal=fatal))
|
2016-05-26 09:55:43 -04:00
|
|
|
|
continue
|
2014-07-28 09:25:56 -04:00
|
|
|
|
formats.append({
|
2016-05-26 15:47:44 -04:00
|
|
|
|
'format_id': format_id,
|
2014-07-28 09:25:56 -04:00
|
|
|
|
'url': manifest_url,
|
2016-09-17 10:33:38 -04:00
|
|
|
|
'manifest_url': manifest_url,
|
2016-06-07 12:19:33 -04:00
|
|
|
|
'ext': 'flv' if bootstrap_info is not None else None,
|
2017-11-04 11:11:39 -04:00
|
|
|
|
'protocol': 'f4m',
|
2014-08-25 07:03:08 -04:00
|
|
|
|
'tbr': tbr,
|
2016-05-26 15:47:44 -04:00
|
|
|
|
'width': width,
|
|
|
|
|
'height': height,
|
2016-10-19 09:42:48 -04:00
|
|
|
|
'vcodec': vcodec,
|
2015-02-05 11:16:27 -05:00
|
|
|
|
'preference': preference,
|
2014-07-28 09:25:56 -04:00
|
|
|
|
})
|
|
|
|
|
return formats
|
|
|
|
|
|
2016-05-21 01:15:28 -04:00
|
|
|
|
def _m3u8_meta_format(self, m3u8_url, ext=None, preference=None, m3u8_id=None):
|
|
|
|
|
return {
|
2015-03-06 11:53:53 -05:00
|
|
|
|
'format_id': '-'.join(filter(None, [m3u8_id, 'meta'])),
|
2014-08-26 06:51:13 -04:00
|
|
|
|
'url': m3u8_url,
|
|
|
|
|
'ext': ext,
|
|
|
|
|
'protocol': 'm3u8',
|
2016-08-07 05:58:11 -04:00
|
|
|
|
'preference': preference - 100 if preference else -100,
|
2014-08-26 06:51:13 -04:00
|
|
|
|
'resolution': 'multiple',
|
|
|
|
|
'format_note': 'Quality selection URL',
|
2016-05-21 01:15:28 -04:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
def _extract_m3u8_formats(self, m3u8_url, video_id, ext=None,
|
|
|
|
|
entry_protocol='m3u8', preference=None,
|
|
|
|
|
m3u8_id=None, note=None, errnote=None,
|
2019-11-15 17:44:14 -05:00
|
|
|
|
fatal=True, live=False, data=None, headers={},
|
|
|
|
|
query={}):
|
2015-10-31 14:01:34 -04:00
|
|
|
|
res = self._download_webpage_handle(
|
2014-10-26 21:28:37 -04:00
|
|
|
|
m3u8_url, video_id,
|
2015-06-07 04:33:22 -04:00
|
|
|
|
note=note or 'Downloading m3u8 information',
|
2015-07-05 20:39:38 -04:00
|
|
|
|
errnote=errnote or 'Failed to download m3u8 information',
|
2019-11-15 17:44:14 -05:00
|
|
|
|
fatal=fatal, data=data, headers=headers, query=query)
|
2017-04-21 20:01:00 -04:00
|
|
|
|
|
2015-10-31 14:01:34 -04:00
|
|
|
|
if res is False:
|
2015-12-27 09:33:39 -05:00
|
|
|
|
return []
|
2017-04-21 20:01:00 -04:00
|
|
|
|
|
2015-10-31 14:01:34 -04:00
|
|
|
|
m3u8_doc, urlh = res
|
2015-09-08 14:35:41 -04:00
|
|
|
|
m3u8_url = urlh.geturl()
|
2016-02-26 20:01:11 -05:00
|
|
|
|
|
2017-04-21 20:01:00 -04:00
|
|
|
|
return self._parse_m3u8_formats(
|
|
|
|
|
m3u8_doc, m3u8_url, ext=ext, entry_protocol=entry_protocol,
|
|
|
|
|
preference=preference, m3u8_id=m3u8_id, live=live)
|
|
|
|
|
|
|
|
|
|
def _parse_m3u8_formats(self, m3u8_doc, m3u8_url, ext=None,
|
|
|
|
|
entry_protocol='m3u8', preference=None,
|
|
|
|
|
m3u8_id=None, live=False):
|
2017-02-10 10:51:41 -05:00
|
|
|
|
if '#EXT-X-FAXS-CM:' in m3u8_doc: # Adobe Flash Access
|
|
|
|
|
return []
|
|
|
|
|
|
2017-11-14 11:41:30 -05:00
|
|
|
|
if re.search(r'#EXT-X-SESSION-KEY:.*?URI="skd://', m3u8_doc): # Apple FairPlay
|
|
|
|
|
return []
|
|
|
|
|
|
2017-04-25 11:07:10 -04:00
|
|
|
|
formats = []
|
2016-09-04 06:42:15 -04:00
|
|
|
|
|
|
|
|
|
format_url = lambda u: (
|
|
|
|
|
u
|
|
|
|
|
if re.match(r'^https?://', u)
|
|
|
|
|
else compat_urlparse.urljoin(m3u8_url, u))
|
|
|
|
|
|
2017-04-21 20:01:00 -04:00
|
|
|
|
# References:
|
|
|
|
|
# 1. https://tools.ietf.org/html/draft-pantos-http-live-streaming-21
|
2019-03-09 07:14:41 -05:00
|
|
|
|
# 2. https://github.com/ytdl-org/youtube-dl/issues/12211
|
|
|
|
|
# 3. https://github.com/ytdl-org/youtube-dl/issues/18923
|
2017-04-21 20:01:00 -04:00
|
|
|
|
|
|
|
|
|
# We should try extracting formats only from master playlists [1, 4.3.4],
|
|
|
|
|
# i.e. playlists that describe available qualities. On the other hand
|
|
|
|
|
# media playlists [1, 4.3.3] should be returned as is since they contain
|
|
|
|
|
# just the media without qualities renditions.
|
2016-02-26 20:01:11 -05:00
|
|
|
|
# Fortunately, master playlist can be easily distinguished from media
|
2017-04-21 20:01:00 -04:00
|
|
|
|
# playlist based on particular tags availability. As of [1, 4.3.3, 4.3.4]
|
|
|
|
|
# master playlist tags MUST NOT appear in a media playist and vice versa.
|
|
|
|
|
# As of [1, 4.3.3.1] #EXT-X-TARGETDURATION tag is REQUIRED for every
|
|
|
|
|
# media playlist and MUST NOT appear in master playlist thus we can
|
|
|
|
|
# clearly detect media playlist with this criterion.
|
|
|
|
|
|
2016-02-26 20:01:11 -05:00
|
|
|
|
if '#EXT-X-TARGETDURATION' in m3u8_doc: # media playlist, return as is
|
2016-01-26 11:44:44 -05:00
|
|
|
|
return [{
|
|
|
|
|
'url': m3u8_url,
|
|
|
|
|
'format_id': m3u8_id,
|
|
|
|
|
'ext': ext,
|
|
|
|
|
'protocol': entry_protocol,
|
|
|
|
|
'preference': preference,
|
|
|
|
|
}]
|
2017-04-21 20:01:00 -04:00
|
|
|
|
|
|
|
|
|
groups = {}
|
|
|
|
|
last_stream_inf = {}
|
|
|
|
|
|
|
|
|
|
def extract_media(x_media_line):
|
|
|
|
|
media = parse_m3u8_attributes(x_media_line)
|
|
|
|
|
# As per [1, 4.3.4.1] TYPE, GROUP-ID and NAME are REQUIRED
|
|
|
|
|
media_type, group_id, name = media.get('TYPE'), media.get('GROUP-ID'), media.get('NAME')
|
|
|
|
|
if not (media_type and group_id and name):
|
|
|
|
|
return
|
|
|
|
|
groups.setdefault(group_id, []).append(media)
|
|
|
|
|
if media_type not in ('VIDEO', 'AUDIO'):
|
|
|
|
|
return
|
|
|
|
|
media_url = media.get('URI')
|
|
|
|
|
if media_url:
|
|
|
|
|
format_id = []
|
2017-10-28 20:05:55 -04:00
|
|
|
|
for v in (m3u8_id, group_id, name):
|
2017-04-21 20:01:00 -04:00
|
|
|
|
if v:
|
|
|
|
|
format_id.append(v)
|
|
|
|
|
f = {
|
|
|
|
|
'format_id': '-'.join(format_id),
|
|
|
|
|
'url': format_url(media_url),
|
2017-04-27 16:00:14 -04:00
|
|
|
|
'manifest_url': m3u8_url,
|
2017-04-21 20:01:00 -04:00
|
|
|
|
'language': media.get('LANGUAGE'),
|
|
|
|
|
'ext': ext,
|
|
|
|
|
'protocol': entry_protocol,
|
|
|
|
|
'preference': preference,
|
|
|
|
|
}
|
|
|
|
|
if media_type == 'AUDIO':
|
|
|
|
|
f['vcodec'] = 'none'
|
|
|
|
|
formats.append(f)
|
|
|
|
|
|
|
|
|
|
def build_stream_name():
|
|
|
|
|
# Despite specification does not mention NAME attribute for
|
2017-04-23 00:51:53 -04:00
|
|
|
|
# EXT-X-STREAM-INF tag it still sometimes may be present (see [1]
|
|
|
|
|
# or vidio test in TestInfoExtractor.test_parse_m3u8_formats)
|
2017-04-23 00:49:57 -04:00
|
|
|
|
# 1. http://www.vidio.com/watch/165683-dj_ambred-booyah-live-2015
|
2017-04-21 20:01:00 -04:00
|
|
|
|
stream_name = last_stream_inf.get('NAME')
|
|
|
|
|
if stream_name:
|
|
|
|
|
return stream_name
|
|
|
|
|
# If there is no NAME in EXT-X-STREAM-INF it will be obtained
|
|
|
|
|
# from corresponding rendition group
|
|
|
|
|
stream_group_id = last_stream_inf.get('VIDEO')
|
|
|
|
|
if not stream_group_id:
|
|
|
|
|
return
|
|
|
|
|
stream_group = groups.get(stream_group_id)
|
|
|
|
|
if not stream_group:
|
|
|
|
|
return stream_group_id
|
|
|
|
|
rendition = stream_group[0]
|
|
|
|
|
return rendition.get('NAME') or stream_group_id
|
|
|
|
|
|
2019-01-19 15:35:02 -05:00
|
|
|
|
# parse EXT-X-MEDIA tags before EXT-X-STREAM-INF in order to have the
|
2019-01-19 15:25:15 -05:00
|
|
|
|
# chance to detect video only formats when EXT-X-STREAM-INF tags
|
|
|
|
|
# precede EXT-X-MEDIA tags in HLS manifest such as [3].
|
|
|
|
|
for line in m3u8_doc.splitlines():
|
|
|
|
|
if line.startswith('#EXT-X-MEDIA:'):
|
|
|
|
|
extract_media(line)
|
|
|
|
|
|
2014-08-26 06:51:13 -04:00
|
|
|
|
for line in m3u8_doc.splitlines():
|
|
|
|
|
if line.startswith('#EXT-X-STREAM-INF:'):
|
2017-04-21 20:01:00 -04:00
|
|
|
|
last_stream_inf = parse_m3u8_attributes(line)
|
2014-08-26 06:51:13 -04:00
|
|
|
|
elif line.startswith('#') or not line.strip():
|
|
|
|
|
continue
|
|
|
|
|
else:
|
2017-04-23 00:33:19 -04:00
|
|
|
|
tbr = float_or_none(
|
2019-05-10 16:56:22 -04:00
|
|
|
|
last_stream_inf.get('AVERAGE-BANDWIDTH')
|
|
|
|
|
or last_stream_inf.get('BANDWIDTH'), scale=1000)
|
2015-03-06 11:52:50 -05:00
|
|
|
|
format_id = []
|
|
|
|
|
if m3u8_id:
|
|
|
|
|
format_id.append(m3u8_id)
|
2017-04-21 20:01:00 -04:00
|
|
|
|
stream_name = build_stream_name()
|
2016-04-26 10:30:24 -04:00
|
|
|
|
# Bandwidth of live streams may differ over time thus making
|
|
|
|
|
# format_id unpredictable. So it's better to keep provided
|
|
|
|
|
# format_id intact.
|
2016-04-29 10:49:04 -04:00
|
|
|
|
if not live:
|
2016-05-14 17:34:35 -04:00
|
|
|
|
format_id.append(stream_name if stream_name else '%d' % (tbr if tbr else len(formats)))
|
2016-09-17 10:33:38 -04:00
|
|
|
|
manifest_url = format_url(line.strip())
|
2014-08-26 06:51:13 -04:00
|
|
|
|
f = {
|
2015-03-06 11:52:50 -05:00
|
|
|
|
'format_id': '-'.join(format_id),
|
2016-09-17 10:33:38 -04:00
|
|
|
|
'url': manifest_url,
|
2017-04-25 11:07:10 -04:00
|
|
|
|
'manifest_url': m3u8_url,
|
2014-08-26 06:51:13 -04:00
|
|
|
|
'tbr': tbr,
|
|
|
|
|
'ext': ext,
|
2017-04-21 20:01:00 -04:00
|
|
|
|
'fps': float_or_none(last_stream_inf.get('FRAME-RATE')),
|
2014-09-24 08:16:56 -04:00
|
|
|
|
'protocol': entry_protocol,
|
|
|
|
|
'preference': preference,
|
2014-08-26 06:51:13 -04:00
|
|
|
|
}
|
2017-04-21 20:01:00 -04:00
|
|
|
|
resolution = last_stream_inf.get('RESOLUTION')
|
2014-08-26 06:51:13 -04:00
|
|
|
|
if resolution:
|
2016-11-03 18:02:31 -04:00
|
|
|
|
mobj = re.search(r'(?P<width>\d+)[xX](?P<height>\d+)', resolution)
|
|
|
|
|
if mobj:
|
|
|
|
|
f['width'] = int(mobj.group('width'))
|
|
|
|
|
f['height'] = int(mobj.group('height'))
|
2016-07-13 10:54:43 -04:00
|
|
|
|
# Unified Streaming Platform
|
|
|
|
|
mobj = re.search(
|
|
|
|
|
r'audio.*?(?:%3D|=)(\d+)(?:-video.*?(?:%3D|=)(\d+))?', f['url'])
|
|
|
|
|
if mobj:
|
|
|
|
|
abr, vbr = mobj.groups()
|
|
|
|
|
abr, vbr = float_or_none(abr, 1000), float_or_none(vbr, 1000)
|
2016-02-26 19:48:13 -05:00
|
|
|
|
f.update({
|
2016-07-13 10:54:43 -04:00
|
|
|
|
'vbr': vbr,
|
|
|
|
|
'abr': abr,
|
2016-02-26 19:48:13 -05:00
|
|
|
|
})
|
2017-04-21 20:01:00 -04:00
|
|
|
|
codecs = parse_codecs(last_stream_inf.get('CODECS'))
|
|
|
|
|
f.update(codecs)
|
|
|
|
|
audio_group_id = last_stream_inf.get('AUDIO')
|
|
|
|
|
# As per [1, 4.3.4.1.1] any EXT-X-STREAM-INF tag which
|
|
|
|
|
# references a rendition group MUST have a CODECS attribute.
|
|
|
|
|
# However, this is not always respected, for example, [2]
|
|
|
|
|
# contains EXT-X-STREAM-INF tag which references AUDIO
|
|
|
|
|
# rendition group but does not have CODECS and despite
|
2018-09-14 14:53:01 -04:00
|
|
|
|
# referencing an audio group it represents a complete
|
|
|
|
|
# (with audio and video) format. So, for such cases we will
|
|
|
|
|
# ignore references to rendition groups and treat them
|
2017-04-21 20:01:00 -04:00
|
|
|
|
# as complete formats.
|
|
|
|
|
if audio_group_id and codecs and f.get('vcodec') != 'none':
|
|
|
|
|
audio_group = groups.get(audio_group_id)
|
|
|
|
|
if audio_group and audio_group[0].get('URI'):
|
|
|
|
|
# TODO: update acodec for audio only formats with
|
|
|
|
|
# the same GROUP-ID
|
|
|
|
|
f['acodec'] = 'none'
|
2014-08-26 06:51:13 -04:00
|
|
|
|
formats.append(f)
|
2019-11-26 16:01:34 -05:00
|
|
|
|
|
|
|
|
|
# for DailyMotion
|
|
|
|
|
progressive_uri = last_stream_inf.get('PROGRESSIVE-URI')
|
|
|
|
|
if progressive_uri:
|
|
|
|
|
http_f = f.copy()
|
|
|
|
|
del http_f['manifest_url']
|
|
|
|
|
http_f.update({
|
|
|
|
|
'format_id': f['format_id'].replace('hls-', 'http-'),
|
|
|
|
|
'protocol': 'http',
|
|
|
|
|
'url': progressive_uri,
|
|
|
|
|
})
|
|
|
|
|
formats.append(http_f)
|
|
|
|
|
|
2017-04-21 20:01:00 -04:00
|
|
|
|
last_stream_inf = {}
|
2014-08-26 06:51:13 -04:00
|
|
|
|
return formats
|
|
|
|
|
|
2015-08-01 15:13:21 -04:00
|
|
|
|
@staticmethod
|
|
|
|
|
def _xpath_ns(path, namespace=None):
|
|
|
|
|
if not namespace:
|
|
|
|
|
return path
|
|
|
|
|
out = []
|
|
|
|
|
for c in path.split('/'):
|
|
|
|
|
if not c or c == '.':
|
|
|
|
|
out.append(c)
|
|
|
|
|
else:
|
|
|
|
|
out.append('{%s}%s' % (namespace, c))
|
|
|
|
|
return '/'.join(out)
|
|
|
|
|
|
2016-03-11 16:37:07 -05:00
|
|
|
|
def _extract_smil_formats(self, smil_url, video_id, fatal=True, f4m_params=None, transform_source=None):
|
|
|
|
|
smil = self._download_smil(smil_url, video_id, fatal=fatal, transform_source=transform_source)
|
2015-08-01 15:13:21 -04:00
|
|
|
|
|
2015-02-02 17:38:35 -05:00
|
|
|
|
if smil is False:
|
|
|
|
|
assert not fatal
|
|
|
|
|
return []
|
2014-12-09 11:28:28 -05:00
|
|
|
|
|
2015-08-01 15:31:17 -04:00
|
|
|
|
namespace = self._parse_smil_namespace(smil)
|
2015-08-01 15:13:21 -04:00
|
|
|
|
|
|
|
|
|
return self._parse_smil_formats(
|
|
|
|
|
smil, smil_url, video_id, namespace=namespace, f4m_params=f4m_params)
|
|
|
|
|
|
|
|
|
|
def _extract_smil_info(self, smil_url, video_id, fatal=True, f4m_params=None):
|
|
|
|
|
smil = self._download_smil(smil_url, video_id, fatal=fatal)
|
|
|
|
|
if smil is False:
|
|
|
|
|
return {}
|
|
|
|
|
return self._parse_smil(smil, smil_url, video_id, f4m_params=f4m_params)
|
|
|
|
|
|
2016-03-11 16:37:07 -05:00
|
|
|
|
def _download_smil(self, smil_url, video_id, fatal=True, transform_source=None):
|
2015-08-01 15:13:21 -04:00
|
|
|
|
return self._download_xml(
|
|
|
|
|
smil_url, video_id, 'Downloading SMIL file',
|
2016-03-11 16:37:07 -05:00
|
|
|
|
'Unable to download SMIL file', fatal=fatal, transform_source=transform_source)
|
2015-08-01 15:13:21 -04:00
|
|
|
|
|
|
|
|
|
def _parse_smil(self, smil, smil_url, video_id, f4m_params=None):
|
2015-08-01 15:31:17 -04:00
|
|
|
|
namespace = self._parse_smil_namespace(smil)
|
2015-08-01 15:13:21 -04:00
|
|
|
|
|
|
|
|
|
formats = self._parse_smil_formats(
|
|
|
|
|
smil, smil_url, video_id, namespace=namespace, f4m_params=f4m_params)
|
|
|
|
|
subtitles = self._parse_smil_subtitles(smil, namespace=namespace)
|
|
|
|
|
|
|
|
|
|
video_id = os.path.splitext(url_basename(smil_url))[0]
|
|
|
|
|
title = None
|
|
|
|
|
description = None
|
2015-10-01 12:18:59 -04:00
|
|
|
|
upload_date = None
|
2015-08-01 15:13:21 -04:00
|
|
|
|
for meta in smil.findall(self._xpath_ns('./head/meta', namespace)):
|
|
|
|
|
name = meta.attrib.get('name')
|
|
|
|
|
content = meta.attrib.get('content')
|
|
|
|
|
if not name or not content:
|
|
|
|
|
continue
|
|
|
|
|
if not title and name == 'title':
|
|
|
|
|
title = content
|
|
|
|
|
elif not description and name in ('description', 'abstract'):
|
|
|
|
|
description = content
|
2015-10-01 12:18:59 -04:00
|
|
|
|
elif not upload_date and name == 'date':
|
|
|
|
|
upload_date = unified_strdate(content)
|
2015-08-01 15:13:21 -04:00
|
|
|
|
|
2015-10-01 12:08:16 -04:00
|
|
|
|
thumbnails = [{
|
|
|
|
|
'id': image.get('type'),
|
|
|
|
|
'url': image.get('src'),
|
|
|
|
|
'width': int_or_none(image.get('width')),
|
|
|
|
|
'height': int_or_none(image.get('height')),
|
|
|
|
|
} for image in smil.findall(self._xpath_ns('.//image', namespace)) if image.get('src')]
|
|
|
|
|
|
2015-08-01 15:13:21 -04:00
|
|
|
|
return {
|
|
|
|
|
'id': video_id,
|
|
|
|
|
'title': title or video_id,
|
|
|
|
|
'description': description,
|
2015-10-01 12:18:59 -04:00
|
|
|
|
'upload_date': upload_date,
|
2015-10-01 12:08:16 -04:00
|
|
|
|
'thumbnails': thumbnails,
|
2015-08-01 15:13:21 -04:00
|
|
|
|
'formats': formats,
|
|
|
|
|
'subtitles': subtitles,
|
|
|
|
|
}
|
|
|
|
|
|
2015-08-01 15:31:17 -04:00
|
|
|
|
def _parse_smil_namespace(self, smil):
|
|
|
|
|
return self._search_regex(
|
|
|
|
|
r'(?i)^{([^}]+)?}smil$', smil.tag, 'namespace', default=None)
|
|
|
|
|
|
2015-08-19 11:11:25 -04:00
|
|
|
|
def _parse_smil_formats(self, smil, smil_url, video_id, namespace=None, f4m_params=None, transform_rtmp_url=None):
|
2015-08-01 15:13:21 -04:00
|
|
|
|
base = smil_url
|
|
|
|
|
for meta in smil.findall(self._xpath_ns('./head/meta', namespace)):
|
|
|
|
|
b = meta.get('base') or meta.get('httpBase')
|
|
|
|
|
if b:
|
|
|
|
|
base = b
|
|
|
|
|
break
|
2014-12-09 11:28:28 -05:00
|
|
|
|
|
|
|
|
|
formats = []
|
|
|
|
|
rtmp_count = 0
|
2015-08-01 15:13:21 -04:00
|
|
|
|
http_count = 0
|
2016-01-26 11:44:44 -05:00
|
|
|
|
m3u8_count = 0
|
2015-08-01 15:13:21 -04:00
|
|
|
|
|
2016-02-11 11:58:48 -05:00
|
|
|
|
srcs = []
|
2016-05-20 07:02:53 -04:00
|
|
|
|
media = smil.findall(self._xpath_ns('.//video', namespace)) + smil.findall(self._xpath_ns('.//audio', namespace))
|
|
|
|
|
for medium in media:
|
|
|
|
|
src = medium.get('src')
|
2016-02-11 11:58:48 -05:00
|
|
|
|
if not src or src in srcs:
|
2015-08-01 15:13:21 -04:00
|
|
|
|
continue
|
2016-02-11 11:58:48 -05:00
|
|
|
|
srcs.append(src)
|
2015-08-01 15:13:21 -04:00
|
|
|
|
|
2016-05-20 07:02:53 -04:00
|
|
|
|
bitrate = float_or_none(medium.get('system-bitrate') or medium.get('systemBitrate'), 1000)
|
|
|
|
|
filesize = int_or_none(medium.get('size') or medium.get('fileSize'))
|
|
|
|
|
width = int_or_none(medium.get('width'))
|
|
|
|
|
height = int_or_none(medium.get('height'))
|
|
|
|
|
proto = medium.get('proto')
|
|
|
|
|
ext = medium.get('ext')
|
2015-08-01 15:13:21 -04:00
|
|
|
|
src_ext = determine_ext(src)
|
2016-05-20 07:02:53 -04:00
|
|
|
|
streamer = medium.get('streamer') or base
|
2015-08-01 15:13:21 -04:00
|
|
|
|
|
|
|
|
|
if proto == 'rtmp' or streamer.startswith('rtmp'):
|
|
|
|
|
rtmp_count += 1
|
|
|
|
|
formats.append({
|
|
|
|
|
'url': streamer,
|
|
|
|
|
'play_path': src,
|
|
|
|
|
'ext': 'flv',
|
|
|
|
|
'format_id': 'rtmp-%d' % (rtmp_count if bitrate is None else bitrate),
|
|
|
|
|
'tbr': bitrate,
|
|
|
|
|
'filesize': filesize,
|
|
|
|
|
'width': width,
|
|
|
|
|
'height': height,
|
|
|
|
|
})
|
2015-08-19 11:11:25 -04:00
|
|
|
|
if transform_rtmp_url:
|
|
|
|
|
streamer, src = transform_rtmp_url(streamer, src)
|
|
|
|
|
formats[-1].update({
|
|
|
|
|
'url': streamer,
|
|
|
|
|
'play_path': src,
|
|
|
|
|
})
|
2015-08-01 15:13:21 -04:00
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
src_url = src if src.startswith('http') else compat_urlparse.urljoin(base, src)
|
2016-02-12 11:38:48 -05:00
|
|
|
|
src_url = src_url.strip()
|
2015-08-01 15:13:21 -04:00
|
|
|
|
|
|
|
|
|
if proto == 'm3u8' or src_ext == 'm3u8':
|
2016-01-26 11:44:44 -05:00
|
|
|
|
m3u8_formats = self._extract_m3u8_formats(
|
|
|
|
|
src_url, video_id, ext or 'mp4', m3u8_id='hls', fatal=False)
|
|
|
|
|
if len(m3u8_formats) == 1:
|
|
|
|
|
m3u8_count += 1
|
|
|
|
|
m3u8_formats[0].update({
|
|
|
|
|
'format_id': 'hls-%d' % (m3u8_count if bitrate is None else bitrate),
|
|
|
|
|
'tbr': bitrate,
|
|
|
|
|
'width': width,
|
|
|
|
|
'height': height,
|
|
|
|
|
})
|
|
|
|
|
formats.extend(m3u8_formats)
|
2018-07-18 13:29:18 -04:00
|
|
|
|
elif src_ext == 'f4m':
|
2015-08-01 15:13:21 -04:00
|
|
|
|
f4m_url = src_url
|
|
|
|
|
if not f4m_params:
|
|
|
|
|
f4m_params = {
|
|
|
|
|
'hdcore': '3.2.0',
|
|
|
|
|
'plugin': 'flowplayer-3.2.0.1',
|
|
|
|
|
}
|
|
|
|
|
f4m_url += '&' if '?' in f4m_url else '?'
|
2016-03-25 15:46:57 -04:00
|
|
|
|
f4m_url += compat_urllib_parse_urlencode(f4m_params)
|
2015-12-28 13:58:24 -05:00
|
|
|
|
formats.extend(self._extract_f4m_formats(f4m_url, video_id, f4m_id='hds', fatal=False))
|
2018-07-18 13:29:18 -04:00
|
|
|
|
elif src_ext == 'mpd':
|
|
|
|
|
formats.extend(self._extract_mpd_formats(
|
|
|
|
|
src_url, video_id, mpd_id='dash', fatal=False))
|
|
|
|
|
elif re.search(r'\.ism/[Mm]anifest', src_url):
|
|
|
|
|
formats.extend(self._extract_ism_formats(
|
|
|
|
|
src_url, video_id, ism_id='mss', fatal=False))
|
|
|
|
|
elif src_url.startswith('http') and self._is_valid_url(src, video_id):
|
2015-08-01 15:13:21 -04:00
|
|
|
|
http_count += 1
|
|
|
|
|
formats.append({
|
|
|
|
|
'url': src_url,
|
|
|
|
|
'ext': ext or src_ext or 'flv',
|
|
|
|
|
'format_id': 'http-%d' % (bitrate or http_count),
|
|
|
|
|
'tbr': bitrate,
|
|
|
|
|
'filesize': filesize,
|
|
|
|
|
'width': width,
|
|
|
|
|
'height': height,
|
|
|
|
|
})
|
2015-02-22 03:16:51 -05:00
|
|
|
|
|
2014-12-09 11:28:28 -05:00
|
|
|
|
return formats
|
|
|
|
|
|
2015-08-19 14:56:17 -04:00
|
|
|
|
def _parse_smil_subtitles(self, smil, namespace=None, subtitles_lang='en'):
|
2016-02-09 11:15:41 -05:00
|
|
|
|
urls = []
|
2015-08-01 15:13:21 -04:00
|
|
|
|
subtitles = {}
|
|
|
|
|
for num, textstream in enumerate(smil.findall(self._xpath_ns('.//textstream', namespace))):
|
|
|
|
|
src = textstream.get('src')
|
2016-02-09 11:15:41 -05:00
|
|
|
|
if not src or src in urls:
|
2015-08-01 15:13:21 -04:00
|
|
|
|
continue
|
2016-02-09 11:15:41 -05:00
|
|
|
|
urls.append(src)
|
2016-04-01 14:39:02 -04:00
|
|
|
|
ext = textstream.get('ext') or mimetype2ext(textstream.get('type')) or determine_ext(src)
|
2015-08-20 11:18:58 -04:00
|
|
|
|
lang = textstream.get('systemLanguage') or textstream.get('systemLanguageName') or textstream.get('lang') or subtitles_lang
|
2015-08-01 15:13:21 -04:00
|
|
|
|
subtitles.setdefault(lang, []).append({
|
|
|
|
|
'url': src,
|
|
|
|
|
'ext': ext,
|
|
|
|
|
})
|
|
|
|
|
return subtitles
|
2015-02-22 03:16:51 -05:00
|
|
|
|
|
2018-03-17 15:46:50 -04:00
|
|
|
|
def _extract_xspf_playlist(self, xspf_url, playlist_id, fatal=True):
|
2015-08-09 09:41:55 -04:00
|
|
|
|
xspf = self._download_xml(
|
2018-03-17 15:46:50 -04:00
|
|
|
|
xspf_url, playlist_id, 'Downloading xpsf playlist',
|
2015-08-09 09:41:55 -04:00
|
|
|
|
'Unable to download xspf manifest', fatal=fatal)
|
|
|
|
|
if xspf is False:
|
|
|
|
|
return []
|
2018-03-17 15:46:50 -04:00
|
|
|
|
return self._parse_xspf(
|
|
|
|
|
xspf, playlist_id, xspf_url=xspf_url,
|
|
|
|
|
xspf_base_url=base_url(xspf_url))
|
2015-08-09 09:07:18 -04:00
|
|
|
|
|
2018-03-17 15:46:50 -04:00
|
|
|
|
def _parse_xspf(self, xspf_doc, playlist_id, xspf_url=None, xspf_base_url=None):
|
2015-08-09 09:07:18 -04:00
|
|
|
|
NS_MAP = {
|
|
|
|
|
'xspf': 'http://xspf.org/ns/0/',
|
|
|
|
|
's1': 'http://static.streamone.nl/player/ns/0',
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
entries = []
|
2018-03-17 15:46:50 -04:00
|
|
|
|
for track in xspf_doc.findall(xpath_with_ns('./xspf:trackList/xspf:track', NS_MAP)):
|
2015-08-09 09:07:18 -04:00
|
|
|
|
title = xpath_text(
|
2015-08-09 09:18:50 -04:00
|
|
|
|
track, xpath_with_ns('./xspf:title', NS_MAP), 'title', default=playlist_id)
|
2015-08-09 09:07:18 -04:00
|
|
|
|
description = xpath_text(
|
|
|
|
|
track, xpath_with_ns('./xspf:annotation', NS_MAP), 'description')
|
|
|
|
|
thumbnail = xpath_text(
|
|
|
|
|
track, xpath_with_ns('./xspf:image', NS_MAP), 'thumbnail')
|
|
|
|
|
duration = float_or_none(
|
|
|
|
|
xpath_text(track, xpath_with_ns('./xspf:duration', NS_MAP), 'duration'), 1000)
|
|
|
|
|
|
2018-03-17 15:46:50 -04:00
|
|
|
|
formats = []
|
|
|
|
|
for location in track.findall(xpath_with_ns('./xspf:location', NS_MAP)):
|
|
|
|
|
format_url = urljoin(xspf_base_url, location.text)
|
|
|
|
|
if not format_url:
|
|
|
|
|
continue
|
|
|
|
|
formats.append({
|
|
|
|
|
'url': format_url,
|
|
|
|
|
'manifest_url': xspf_url,
|
|
|
|
|
'format_id': location.get(xpath_with_ns('s1:label', NS_MAP)),
|
|
|
|
|
'width': int_or_none(location.get(xpath_with_ns('s1:width', NS_MAP))),
|
|
|
|
|
'height': int_or_none(location.get(xpath_with_ns('s1:height', NS_MAP))),
|
|
|
|
|
})
|
2015-08-09 09:07:18 -04:00
|
|
|
|
self._sort_formats(formats)
|
|
|
|
|
|
|
|
|
|
entries.append({
|
|
|
|
|
'id': playlist_id,
|
|
|
|
|
'title': title,
|
|
|
|
|
'description': description,
|
|
|
|
|
'thumbnail': thumbnail,
|
|
|
|
|
'duration': duration,
|
|
|
|
|
'formats': formats,
|
|
|
|
|
})
|
|
|
|
|
return entries
|
|
|
|
|
|
2019-11-15 17:44:14 -05:00
|
|
|
|
def _extract_mpd_formats(self, mpd_url, video_id, mpd_id=None, note=None, errnote=None, fatal=True, formats_dict={}, data=None, headers={}, query={}):
|
2018-03-17 15:46:50 -04:00
|
|
|
|
res = self._download_xml_handle(
|
2016-02-02 12:07:07 -05:00
|
|
|
|
mpd_url, video_id,
|
|
|
|
|
note=note or 'Downloading MPD manifest',
|
|
|
|
|
errnote=errnote or 'Failed to download MPD manifest',
|
2019-11-15 17:44:14 -05:00
|
|
|
|
fatal=fatal, data=data, headers=headers, query=query)
|
2016-02-02 12:07:07 -05:00
|
|
|
|
if res is False:
|
2016-01-30 09:52:23 -05:00
|
|
|
|
return []
|
2018-03-17 15:46:50 -04:00
|
|
|
|
mpd_doc, urlh = res
|
2019-04-21 12:20:28 -04:00
|
|
|
|
if mpd_doc is None:
|
|
|
|
|
return []
|
2016-11-01 15:14:01 -04:00
|
|
|
|
mpd_base_url = base_url(urlh.geturl())
|
2016-02-02 12:07:07 -05:00
|
|
|
|
|
2016-02-06 08:03:48 -05:00
|
|
|
|
return self._parse_mpd_formats(
|
2018-03-17 15:46:50 -04:00
|
|
|
|
mpd_doc, mpd_id=mpd_id, mpd_base_url=mpd_base_url,
|
2016-09-17 09:35:22 -04:00
|
|
|
|
formats_dict=formats_dict, mpd_url=mpd_url)
|
2016-01-30 09:52:23 -05:00
|
|
|
|
|
2016-09-17 09:35:22 -04:00
|
|
|
|
def _parse_mpd_formats(self, mpd_doc, mpd_id=None, mpd_base_url='', formats_dict={}, mpd_url=None):
|
2016-07-23 23:27:16 -04:00
|
|
|
|
"""
|
|
|
|
|
Parse formats from MPD manifest.
|
|
|
|
|
References:
|
|
|
|
|
1. MPEG-DASH Standard, ISO/IEC 23009-1:2014(E),
|
|
|
|
|
http://standards.iso.org/ittf/PubliclyAvailableStandards/c065274_ISO_IEC_23009-1_2014.zip
|
|
|
|
|
2. https://en.wikipedia.org/wiki/Dynamic_Adaptive_Streaming_over_HTTP
|
|
|
|
|
"""
|
2016-02-02 12:07:07 -05:00
|
|
|
|
if mpd_doc.get('type') == 'dynamic':
|
|
|
|
|
return []
|
2016-01-30 09:52:23 -05:00
|
|
|
|
|
2016-02-06 08:03:48 -05:00
|
|
|
|
namespace = self._search_regex(r'(?i)^{([^}]+)?}MPD$', mpd_doc.tag, 'namespace', default=None)
|
2016-02-02 16:02:08 -05:00
|
|
|
|
|
|
|
|
|
def _add_ns(path):
|
|
|
|
|
return self._xpath_ns(path, namespace)
|
|
|
|
|
|
2016-02-03 12:44:43 -05:00
|
|
|
|
def is_drm_protected(element):
|
|
|
|
|
return element.find(_add_ns('ContentProtection')) is not None
|
|
|
|
|
|
2016-02-02 12:07:07 -05:00
|
|
|
|
def extract_multisegment_info(element, ms_parent_info):
|
|
|
|
|
ms_info = ms_parent_info.copy()
|
2016-09-05 14:21:57 -04:00
|
|
|
|
|
|
|
|
|
# As per [1, 5.3.9.2.2] SegmentList and SegmentTemplate share some
|
|
|
|
|
# common attributes and elements. We will only extract relevant
|
|
|
|
|
# for us.
|
|
|
|
|
def extract_common(source):
|
|
|
|
|
segment_timeline = source.find(_add_ns('SegmentTimeline'))
|
|
|
|
|
if segment_timeline is not None:
|
|
|
|
|
s_e = segment_timeline.findall(_add_ns('S'))
|
|
|
|
|
if s_e:
|
|
|
|
|
ms_info['total_number'] = 0
|
|
|
|
|
ms_info['s'] = []
|
|
|
|
|
for s in s_e:
|
|
|
|
|
r = int(s.get('r', 0))
|
|
|
|
|
ms_info['total_number'] += 1 + r
|
|
|
|
|
ms_info['s'].append({
|
|
|
|
|
't': int(s.get('t', 0)),
|
|
|
|
|
# @d is mandatory (see [1, 5.3.9.6.2, Table 17, page 60])
|
|
|
|
|
'd': int(s.attrib['d']),
|
|
|
|
|
'r': r,
|
|
|
|
|
})
|
|
|
|
|
start_number = source.get('startNumber')
|
|
|
|
|
if start_number:
|
|
|
|
|
ms_info['start_number'] = int(start_number)
|
|
|
|
|
timescale = source.get('timescale')
|
|
|
|
|
if timescale:
|
|
|
|
|
ms_info['timescale'] = int(timescale)
|
|
|
|
|
segment_duration = source.get('duration')
|
|
|
|
|
if segment_duration:
|
2017-08-15 12:58:00 -04:00
|
|
|
|
ms_info['segment_duration'] = float(segment_duration)
|
2016-09-05 14:21:57 -04:00
|
|
|
|
|
|
|
|
|
def extract_Initialization(source):
|
|
|
|
|
initialization = source.find(_add_ns('Initialization'))
|
|
|
|
|
if initialization is not None:
|
|
|
|
|
ms_info['initialization_url'] = initialization.attrib['sourceURL']
|
|
|
|
|
|
2016-02-02 16:02:08 -05:00
|
|
|
|
segment_list = element.find(_add_ns('SegmentList'))
|
2016-02-02 12:07:07 -05:00
|
|
|
|
if segment_list is not None:
|
2016-09-05 14:21:57 -04:00
|
|
|
|
extract_common(segment_list)
|
|
|
|
|
extract_Initialization(segment_list)
|
2016-02-02 16:02:08 -05:00
|
|
|
|
segment_urls_e = segment_list.findall(_add_ns('SegmentURL'))
|
2016-02-02 12:07:07 -05:00
|
|
|
|
if segment_urls_e:
|
|
|
|
|
ms_info['segment_urls'] = [segment.attrib['media'] for segment in segment_urls_e]
|
|
|
|
|
else:
|
2016-02-02 16:02:08 -05:00
|
|
|
|
segment_template = element.find(_add_ns('SegmentTemplate'))
|
2016-02-02 12:07:07 -05:00
|
|
|
|
if segment_template is not None:
|
2016-09-05 14:21:57 -04:00
|
|
|
|
extract_common(segment_template)
|
2017-01-28 18:57:39 -05:00
|
|
|
|
media = segment_template.get('media')
|
|
|
|
|
if media:
|
|
|
|
|
ms_info['media'] = media
|
2016-02-02 12:07:07 -05:00
|
|
|
|
initialization = segment_template.get('initialization')
|
|
|
|
|
if initialization:
|
2017-01-28 18:57:39 -05:00
|
|
|
|
ms_info['initialization'] = initialization
|
2016-02-02 12:07:07 -05:00
|
|
|
|
else:
|
2016-09-05 14:21:57 -04:00
|
|
|
|
extract_Initialization(segment_template)
|
2016-02-02 12:07:07 -05:00
|
|
|
|
return ms_info
|
2016-01-30 08:27:43 -05:00
|
|
|
|
|
2016-02-02 12:07:07 -05:00
|
|
|
|
mpd_duration = parse_duration(mpd_doc.get('mediaPresentationDuration'))
|
2016-01-30 08:05:55 -05:00
|
|
|
|
formats = []
|
2016-02-02 16:02:08 -05:00
|
|
|
|
for period in mpd_doc.findall(_add_ns('Period')):
|
2016-02-02 12:07:07 -05:00
|
|
|
|
period_duration = parse_duration(period.get('duration')) or mpd_duration
|
|
|
|
|
period_ms_info = extract_multisegment_info(period, {
|
|
|
|
|
'start_number': 1,
|
|
|
|
|
'timescale': 1,
|
|
|
|
|
})
|
2016-02-02 16:02:08 -05:00
|
|
|
|
for adaptation_set in period.findall(_add_ns('AdaptationSet')):
|
2016-02-03 12:44:43 -05:00
|
|
|
|
if is_drm_protected(adaptation_set):
|
|
|
|
|
continue
|
2016-02-02 12:07:07 -05:00
|
|
|
|
adaption_set_ms_info = extract_multisegment_info(adaptation_set, period_ms_info)
|
2016-02-02 16:02:08 -05:00
|
|
|
|
for representation in adaptation_set.findall(_add_ns('Representation')):
|
2016-02-03 12:44:43 -05:00
|
|
|
|
if is_drm_protected(representation):
|
|
|
|
|
continue
|
2016-02-02 12:07:07 -05:00
|
|
|
|
representation_attrib = adaptation_set.attrib.copy()
|
|
|
|
|
representation_attrib.update(representation.attrib)
|
2016-07-23 23:27:16 -04:00
|
|
|
|
# According to [1, 5.3.7.2, Table 9, page 41], @mimeType is mandatory
|
2016-03-11 10:49:55 -05:00
|
|
|
|
mime_type = representation_attrib['mimeType']
|
|
|
|
|
content_type = mime_type.split('/')[0]
|
2016-02-02 12:07:07 -05:00
|
|
|
|
if content_type == 'text':
|
|
|
|
|
# TODO implement WebVTT downloading
|
|
|
|
|
pass
|
2017-04-12 15:38:43 -04:00
|
|
|
|
elif content_type in ('video', 'audio'):
|
2016-02-02 12:07:07 -05:00
|
|
|
|
base_url = ''
|
|
|
|
|
for element in (representation, adaptation_set, period, mpd_doc):
|
2016-02-02 16:02:08 -05:00
|
|
|
|
base_url_e = element.find(_add_ns('BaseURL'))
|
2016-02-02 12:07:07 -05:00
|
|
|
|
if base_url_e is not None:
|
|
|
|
|
base_url = base_url_e.text + base_url
|
|
|
|
|
if re.match(r'^https?://', base_url):
|
|
|
|
|
break
|
2016-02-12 13:13:56 -05:00
|
|
|
|
if mpd_base_url and not re.match(r'^https?://', base_url):
|
|
|
|
|
if not mpd_base_url.endswith('/') and not base_url.startswith('/'):
|
|
|
|
|
mpd_base_url += '/'
|
2016-02-02 12:07:07 -05:00
|
|
|
|
base_url = mpd_base_url + base_url
|
|
|
|
|
representation_id = representation_attrib.get('id')
|
2016-02-03 07:24:07 -05:00
|
|
|
|
lang = representation_attrib.get('lang')
|
2016-02-09 14:05:39 -05:00
|
|
|
|
url_el = representation.find(_add_ns('BaseURL'))
|
|
|
|
|
filesize = int_or_none(url_el.attrib.get('{http://youtube.com/yt/2012/10/10}contentLength') if url_el is not None else None)
|
2017-01-28 18:57:39 -05:00
|
|
|
|
bandwidth = int_or_none(representation_attrib.get('bandwidth'))
|
2016-02-02 12:07:07 -05:00
|
|
|
|
f = {
|
2016-02-11 04:33:26 -05:00
|
|
|
|
'format_id': '%s-%s' % (mpd_id, representation_id) if mpd_id else representation_id,
|
2016-09-17 09:35:22 -04:00
|
|
|
|
'manifest_url': mpd_url,
|
2016-03-11 10:49:55 -05:00
|
|
|
|
'ext': mimetype2ext(mime_type),
|
2016-02-02 12:07:07 -05:00
|
|
|
|
'width': int_or_none(representation_attrib.get('width')),
|
|
|
|
|
'height': int_or_none(representation_attrib.get('height')),
|
2017-04-23 00:33:19 -04:00
|
|
|
|
'tbr': float_or_none(bandwidth, 1000),
|
2016-02-02 12:07:07 -05:00
|
|
|
|
'asr': int_or_none(representation_attrib.get('audioSamplingRate')),
|
|
|
|
|
'fps': int_or_none(representation_attrib.get('frameRate')),
|
2016-02-03 07:24:07 -05:00
|
|
|
|
'language': lang if lang not in ('mul', 'und', 'zxx', 'mis') else None,
|
2016-02-02 12:07:07 -05:00
|
|
|
|
'format_note': 'DASH %s' % content_type,
|
2016-02-09 14:05:39 -05:00
|
|
|
|
'filesize': filesize,
|
2017-12-30 16:02:46 -05:00
|
|
|
|
'container': mimetype2ext(mime_type) + '_dash',
|
2016-02-02 12:07:07 -05:00
|
|
|
|
}
|
2016-12-20 06:23:16 -05:00
|
|
|
|
f.update(parse_codecs(representation_attrib.get('codecs')))
|
2016-02-02 12:07:07 -05:00
|
|
|
|
representation_ms_info = extract_multisegment_info(representation, adaption_set_ms_info)
|
2016-09-05 14:21:57 -04:00
|
|
|
|
|
2017-01-28 18:57:39 -05:00
|
|
|
|
def prepare_template(template_name, identifiers):
|
2018-06-30 15:00:16 -04:00
|
|
|
|
tmpl = representation_ms_info[template_name]
|
|
|
|
|
# First of, % characters outside $...$ templates
|
|
|
|
|
# must be escaped by doubling for proper processing
|
|
|
|
|
# by % operator string formatting used further (see
|
2019-03-09 07:14:41 -05:00
|
|
|
|
# https://github.com/ytdl-org/youtube-dl/issues/16867).
|
2018-06-30 15:00:16 -04:00
|
|
|
|
t = ''
|
|
|
|
|
in_template = False
|
|
|
|
|
for c in tmpl:
|
|
|
|
|
t += c
|
|
|
|
|
if c == '$':
|
|
|
|
|
in_template = not in_template
|
|
|
|
|
elif c == '%' and not in_template:
|
|
|
|
|
t += c
|
|
|
|
|
# Next, $...$ templates are translated to their
|
|
|
|
|
# %(...) counterparts to be used with % operator
|
2017-01-28 18:57:39 -05:00
|
|
|
|
t = t.replace('$RepresentationID$', representation_id)
|
|
|
|
|
t = re.sub(r'\$(%s)\$' % '|'.join(identifiers), r'%(\1)d', t)
|
|
|
|
|
t = re.sub(r'\$(%s)%%([^$]+)\$' % '|'.join(identifiers), r'%(\1)\2', t)
|
|
|
|
|
t.replace('$$', '$')
|
|
|
|
|
return t
|
|
|
|
|
|
|
|
|
|
# @initialization is a regular template like @media one
|
|
|
|
|
# so it should be handled just the same way (see
|
2019-03-09 07:14:41 -05:00
|
|
|
|
# https://github.com/ytdl-org/youtube-dl/issues/11605)
|
2017-01-28 18:57:39 -05:00
|
|
|
|
if 'initialization' in representation_ms_info:
|
|
|
|
|
initialization_template = prepare_template(
|
|
|
|
|
'initialization',
|
|
|
|
|
# As per [1, 5.3.9.4.2, Table 15, page 54] $Number$ and
|
|
|
|
|
# $Time$ shall not be included for @initialization thus
|
|
|
|
|
# only $Bandwidth$ remains
|
|
|
|
|
('Bandwidth', ))
|
|
|
|
|
representation_ms_info['initialization_url'] = initialization_template % {
|
|
|
|
|
'Bandwidth': bandwidth,
|
|
|
|
|
}
|
|
|
|
|
|
2017-08-04 19:57:19 -04:00
|
|
|
|
def location_key(location):
|
|
|
|
|
return 'url' if re.match(r'^https?://', location) else 'path'
|
|
|
|
|
|
2017-01-28 18:57:39 -05:00
|
|
|
|
if 'segment_urls' not in representation_ms_info and 'media' in representation_ms_info:
|
|
|
|
|
|
|
|
|
|
media_template = prepare_template('media', ('Number', 'Bandwidth', 'Time'))
|
2017-08-04 19:57:19 -04:00
|
|
|
|
media_location_key = location_key(media_template)
|
2016-07-23 23:27:16 -04:00
|
|
|
|
|
|
|
|
|
# As per [1, 5.3.9.4.4, Table 16, page 55] $Number$ and $Time$
|
|
|
|
|
# can't be used at the same time
|
2016-09-05 14:21:57 -04:00
|
|
|
|
if '%(Number' in media_template and 's' not in representation_ms_info:
|
|
|
|
|
segment_duration = None
|
2017-10-03 16:50:27 -04:00
|
|
|
|
if 'total_number' not in representation_ms_info and 'segment_duration' in representation_ms_info:
|
2016-09-05 14:21:57 -04:00
|
|
|
|
segment_duration = float_or_none(representation_ms_info['segment_duration'], representation_ms_info['timescale'])
|
|
|
|
|
representation_ms_info['total_number'] = int(math.ceil(float(period_duration) / segment_duration))
|
|
|
|
|
representation_ms_info['fragments'] = [{
|
2017-08-04 19:57:19 -04:00
|
|
|
|
media_location_key: media_template % {
|
2016-09-05 14:21:57 -04:00
|
|
|
|
'Number': segment_number,
|
2017-01-28 18:57:39 -05:00
|
|
|
|
'Bandwidth': bandwidth,
|
2016-09-05 14:21:57 -04:00
|
|
|
|
},
|
|
|
|
|
'duration': segment_duration,
|
|
|
|
|
} for segment_number in range(
|
|
|
|
|
representation_ms_info['start_number'],
|
|
|
|
|
representation_ms_info['total_number'] + representation_ms_info['start_number'])]
|
2016-07-23 23:27:16 -04:00
|
|
|
|
else:
|
2016-09-05 14:21:57 -04:00
|
|
|
|
# $Number*$ or $Time$ in media template with S list available
|
|
|
|
|
# Example $Number*$: http://www.svtplay.se/klipp/9023742/stopptid-om-bjorn-borg
|
|
|
|
|
# Example $Time$: https://play.arkena.com/embed/avp/v2/player/media/b41dda37-d8e7-4d3f-b1b5-9a9db578bdfe/1/129411
|
|
|
|
|
representation_ms_info['fragments'] = []
|
2016-07-23 23:27:16 -04:00
|
|
|
|
segment_time = 0
|
2016-09-05 14:21:57 -04:00
|
|
|
|
segment_d = None
|
|
|
|
|
segment_number = representation_ms_info['start_number']
|
2016-07-23 23:27:16 -04:00
|
|
|
|
|
|
|
|
|
def add_segment_url():
|
2016-09-05 14:21:57 -04:00
|
|
|
|
segment_url = media_template % {
|
|
|
|
|
'Time': segment_time,
|
2017-01-28 18:57:39 -05:00
|
|
|
|
'Bandwidth': bandwidth,
|
2016-09-05 14:21:57 -04:00
|
|
|
|
'Number': segment_number,
|
|
|
|
|
}
|
|
|
|
|
representation_ms_info['fragments'].append({
|
2017-08-04 19:57:19 -04:00
|
|
|
|
media_location_key: segment_url,
|
2016-09-05 14:21:57 -04:00
|
|
|
|
'duration': float_or_none(segment_d, representation_ms_info['timescale']),
|
|
|
|
|
})
|
2016-07-23 23:27:16 -04:00
|
|
|
|
|
|
|
|
|
for num, s in enumerate(representation_ms_info['s']):
|
|
|
|
|
segment_time = s.get('t') or segment_time
|
2016-09-05 14:21:57 -04:00
|
|
|
|
segment_d = s['d']
|
2016-07-23 23:27:16 -04:00
|
|
|
|
add_segment_url()
|
2016-09-05 14:21:57 -04:00
|
|
|
|
segment_number += 1
|
2016-07-23 23:27:16 -04:00
|
|
|
|
for r in range(s.get('r', 0)):
|
2016-09-05 14:21:57 -04:00
|
|
|
|
segment_time += segment_d
|
2016-07-23 23:27:16 -04:00
|
|
|
|
add_segment_url()
|
2016-09-05 14:21:57 -04:00
|
|
|
|
segment_number += 1
|
|
|
|
|
segment_time += segment_d
|
|
|
|
|
elif 'segment_urls' in representation_ms_info and 's' in representation_ms_info:
|
|
|
|
|
# No media template
|
|
|
|
|
# Example: https://www.youtube.com/watch?v=iXZV5uAYMJI
|
|
|
|
|
# or any YouTube dashsegments video
|
|
|
|
|
fragments = []
|
2017-01-28 17:36:53 -05:00
|
|
|
|
segment_index = 0
|
|
|
|
|
timescale = representation_ms_info['timescale']
|
|
|
|
|
for s in representation_ms_info['s']:
|
|
|
|
|
duration = float_or_none(s['d'], timescale)
|
2016-09-05 14:21:57 -04:00
|
|
|
|
for r in range(s.get('r', 0) + 1):
|
2017-08-04 19:57:19 -04:00
|
|
|
|
segment_uri = representation_ms_info['segment_urls'][segment_index]
|
2016-09-05 14:21:57 -04:00
|
|
|
|
fragments.append({
|
2017-08-04 19:57:19 -04:00
|
|
|
|
location_key(segment_uri): segment_uri,
|
2017-01-28 17:36:53 -05:00
|
|
|
|
'duration': duration,
|
2016-09-05 14:21:57 -04:00
|
|
|
|
})
|
2017-01-28 17:36:53 -05:00
|
|
|
|
segment_index += 1
|
2016-09-05 14:21:57 -04:00
|
|
|
|
representation_ms_info['fragments'] = fragments
|
2017-11-24 20:13:23 -05:00
|
|
|
|
elif 'segment_urls' in representation_ms_info:
|
|
|
|
|
# Segment URLs with no SegmentTimeline
|
|
|
|
|
# Example: https://www.seznam.cz/zpravy/clanek/cesko-zasahne-vitr-o-sile-vichrice-muze-byt-i-zivotu-nebezpecny-39091
|
2019-03-09 07:14:41 -05:00
|
|
|
|
# https://github.com/ytdl-org/youtube-dl/pull/14844
|
2017-11-24 20:13:23 -05:00
|
|
|
|
fragments = []
|
2017-12-02 09:10:35 -05:00
|
|
|
|
segment_duration = float_or_none(
|
|
|
|
|
representation_ms_info['segment_duration'],
|
|
|
|
|
representation_ms_info['timescale']) if 'segment_duration' in representation_ms_info else None
|
2017-11-24 20:13:23 -05:00
|
|
|
|
for segment_url in representation_ms_info['segment_urls']:
|
2017-12-02 09:10:35 -05:00
|
|
|
|
fragment = {
|
2017-11-24 20:13:23 -05:00
|
|
|
|
location_key(segment_url): segment_url,
|
2017-12-02 09:10:35 -05:00
|
|
|
|
}
|
|
|
|
|
if segment_duration:
|
|
|
|
|
fragment['duration'] = segment_duration
|
|
|
|
|
fragments.append(fragment)
|
2017-11-24 20:13:23 -05:00
|
|
|
|
representation_ms_info['fragments'] = fragments
|
2019-03-14 13:42:14 -04:00
|
|
|
|
# If there is a fragments key available then we correctly recognized fragmented media.
|
|
|
|
|
# Otherwise we will assume unfragmented media with direct access. Technically, such
|
|
|
|
|
# assumption is not necessarily correct since we may simply have no support for
|
|
|
|
|
# some forms of fragmented media renditions yet, but for now we'll use this fallback.
|
2016-09-17 09:35:22 -04:00
|
|
|
|
if 'fragments' in representation_ms_info:
|
2016-02-02 12:07:07 -05:00
|
|
|
|
f.update({
|
2019-03-14 13:42:14 -04:00
|
|
|
|
# NB: mpd_url may be empty when MPD manifest is parsed from a string
|
|
|
|
|
'url': mpd_url or base_url,
|
2017-08-04 19:57:19 -04:00
|
|
|
|
'fragment_base_url': base_url,
|
2016-09-05 14:21:57 -04:00
|
|
|
|
'fragments': [],
|
2016-02-02 12:07:07 -05:00
|
|
|
|
'protocol': 'http_dash_segments',
|
2016-01-30 08:42:27 -05:00
|
|
|
|
})
|
2016-02-02 12:07:07 -05:00
|
|
|
|
if 'initialization_url' in representation_ms_info:
|
2017-01-28 18:57:39 -05:00
|
|
|
|
initialization_url = representation_ms_info['initialization_url']
|
2016-02-02 12:07:07 -05:00
|
|
|
|
if not f.get('url'):
|
|
|
|
|
f['url'] = initialization_url
|
2017-08-04 19:57:19 -04:00
|
|
|
|
f['fragments'].append({location_key(initialization_url): initialization_url})
|
2016-09-05 14:21:57 -04:00
|
|
|
|
f['fragments'].extend(representation_ms_info['fragments'])
|
2019-03-14 13:42:14 -04:00
|
|
|
|
else:
|
|
|
|
|
# Assuming direct URL to unfragmented media.
|
|
|
|
|
f['url'] = base_url
|
|
|
|
|
|
2017-12-29 11:14:15 -05:00
|
|
|
|
# According to [1, 5.3.5.2, Table 7, page 35] @id of Representation
|
|
|
|
|
# is not necessarily unique within a Period thus formats with
|
|
|
|
|
# the same `format_id` are quite possible. There are numerous examples
|
2019-03-09 07:14:41 -05:00
|
|
|
|
# of such manifests (see https://github.com/ytdl-org/youtube-dl/issues/15111,
|
|
|
|
|
# https://github.com/ytdl-org/youtube-dl/issues/13919)
|
2017-12-29 11:14:15 -05:00
|
|
|
|
full_info = formats_dict.get(representation_id, {}).copy()
|
|
|
|
|
full_info.update(f)
|
|
|
|
|
formats.append(full_info)
|
2016-01-30 08:05:55 -05:00
|
|
|
|
else:
|
2016-02-02 12:07:07 -05:00
|
|
|
|
self.report_warning('Unknown MIME type %s in DASH manifest' % mime_type)
|
2016-01-30 08:05:55 -05:00
|
|
|
|
return formats
|
|
|
|
|
|
2019-11-15 17:44:14 -05:00
|
|
|
|
def _extract_ism_formats(self, ism_url, video_id, ism_id=None, note=None, errnote=None, fatal=True, data=None, headers={}, query={}):
|
2018-03-17 15:46:50 -04:00
|
|
|
|
res = self._download_xml_handle(
|
2016-10-19 11:22:40 -04:00
|
|
|
|
ism_url, video_id,
|
|
|
|
|
note=note or 'Downloading ISM manifest',
|
|
|
|
|
errnote=errnote or 'Failed to download ISM manifest',
|
2019-11-15 17:44:14 -05:00
|
|
|
|
fatal=fatal, data=data, headers=headers, query=query)
|
2016-10-19 11:22:40 -04:00
|
|
|
|
if res is False:
|
|
|
|
|
return []
|
2018-03-17 15:46:50 -04:00
|
|
|
|
ism_doc, urlh = res
|
pull changes from remote master (#190)
* [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 commit cff99c91d150df2a4e21962a3ca8d4ae94533b8c.
* [utils] Add reference to cookie file format
* Revert "[vimeo] fix showcase password protected video extraction(closes #24224)"
This reverts commit 12ee431676bb655f04c7dd416a73c1f142ed368d.
* [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>
2020-08-25 10:53:34 -04:00
|
|
|
|
if ism_doc is None:
|
|
|
|
|
return []
|
2016-10-19 11:22:40 -04:00
|
|
|
|
|
2018-03-17 15:46:50 -04:00
|
|
|
|
return self._parse_ism_formats(ism_doc, urlh.geturl(), ism_id)
|
2016-10-19 11:22:40 -04:00
|
|
|
|
|
|
|
|
|
def _parse_ism_formats(self, ism_doc, ism_url, ism_id=None):
|
2017-05-13 19:11:45 -04:00
|
|
|
|
"""
|
|
|
|
|
Parse formats from ISM manifest.
|
|
|
|
|
References:
|
|
|
|
|
1. [MS-SSTR]: Smooth Streaming Protocol,
|
|
|
|
|
https://msdn.microsoft.com/en-us/library/ff469518.aspx
|
|
|
|
|
"""
|
2016-10-19 11:22:40 -04:00
|
|
|
|
if ism_doc.get('IsLive') == 'TRUE' or ism_doc.find('Protection') is not None:
|
|
|
|
|
return []
|
|
|
|
|
|
|
|
|
|
duration = int(ism_doc.attrib['Duration'])
|
|
|
|
|
timescale = int_or_none(ism_doc.get('TimeScale')) or 10000000
|
|
|
|
|
|
|
|
|
|
formats = []
|
|
|
|
|
for stream in ism_doc.findall('StreamIndex'):
|
|
|
|
|
stream_type = stream.get('Type')
|
|
|
|
|
if stream_type not in ('video', 'audio'):
|
|
|
|
|
continue
|
|
|
|
|
url_pattern = stream.attrib['Url']
|
|
|
|
|
stream_timescale = int_or_none(stream.get('TimeScale')) or timescale
|
|
|
|
|
stream_name = stream.get('Name')
|
|
|
|
|
for track in stream.findall('QualityLevel'):
|
2016-11-12 16:15:51 -05:00
|
|
|
|
fourcc = track.get('FourCC', 'AACL' if track.get('AudioTag') == '255' else None)
|
2016-10-19 11:22:40 -04:00
|
|
|
|
# TODO: add support for WVC1 and WMAP
|
|
|
|
|
if fourcc not in ('H264', 'AVC1', 'AACL'):
|
|
|
|
|
self.report_warning('%s is not a supported codec' % fourcc)
|
|
|
|
|
continue
|
|
|
|
|
tbr = int(track.attrib['Bitrate']) // 1000
|
2017-05-13 19:11:45 -04:00
|
|
|
|
# [1] does not mention Width and Height attributes. However,
|
|
|
|
|
# they're often present while MaxWidth and MaxHeight are
|
|
|
|
|
# missing, so should be used as fallbacks
|
|
|
|
|
width = int_or_none(track.get('MaxWidth') or track.get('Width'))
|
|
|
|
|
height = int_or_none(track.get('MaxHeight') or track.get('Height'))
|
2016-10-19 11:22:40 -04:00
|
|
|
|
sampling_rate = int_or_none(track.get('SamplingRate'))
|
|
|
|
|
|
|
|
|
|
track_url_pattern = re.sub(r'{[Bb]itrate}', track.attrib['Bitrate'], url_pattern)
|
|
|
|
|
track_url_pattern = compat_urlparse.urljoin(ism_url, track_url_pattern)
|
|
|
|
|
|
|
|
|
|
fragments = []
|
|
|
|
|
fragment_ctx = {
|
|
|
|
|
'time': 0,
|
|
|
|
|
}
|
|
|
|
|
stream_fragments = stream.findall('c')
|
|
|
|
|
for stream_fragment_index, stream_fragment in enumerate(stream_fragments):
|
|
|
|
|
fragment_ctx['time'] = int_or_none(stream_fragment.get('t')) or fragment_ctx['time']
|
|
|
|
|
fragment_repeat = int_or_none(stream_fragment.get('r')) or 1
|
|
|
|
|
fragment_ctx['duration'] = int_or_none(stream_fragment.get('d'))
|
|
|
|
|
if not fragment_ctx['duration']:
|
|
|
|
|
try:
|
|
|
|
|
next_fragment_time = int(stream_fragment[stream_fragment_index + 1].attrib['t'])
|
|
|
|
|
except IndexError:
|
|
|
|
|
next_fragment_time = duration
|
2016-11-01 15:21:43 -04:00
|
|
|
|
fragment_ctx['duration'] = (next_fragment_time - fragment_ctx['time']) / fragment_repeat
|
2016-10-19 11:22:40 -04:00
|
|
|
|
for _ in range(fragment_repeat):
|
|
|
|
|
fragments.append({
|
2016-11-01 15:21:43 -04:00
|
|
|
|
'url': re.sub(r'{start[ _]time}', compat_str(fragment_ctx['time']), track_url_pattern),
|
2016-10-19 11:22:40 -04:00
|
|
|
|
'duration': fragment_ctx['duration'] / stream_timescale,
|
|
|
|
|
})
|
|
|
|
|
fragment_ctx['time'] += fragment_ctx['duration']
|
|
|
|
|
|
|
|
|
|
format_id = []
|
|
|
|
|
if ism_id:
|
|
|
|
|
format_id.append(ism_id)
|
|
|
|
|
if stream_name:
|
|
|
|
|
format_id.append(stream_name)
|
|
|
|
|
format_id.append(compat_str(tbr))
|
|
|
|
|
|
|
|
|
|
formats.append({
|
|
|
|
|
'format_id': '-'.join(format_id),
|
|
|
|
|
'url': ism_url,
|
|
|
|
|
'manifest_url': ism_url,
|
|
|
|
|
'ext': 'ismv' if stream_type == 'video' else 'isma',
|
|
|
|
|
'width': width,
|
|
|
|
|
'height': height,
|
|
|
|
|
'tbr': tbr,
|
|
|
|
|
'asr': sampling_rate,
|
|
|
|
|
'vcodec': 'none' if stream_type == 'audio' else fourcc,
|
|
|
|
|
'acodec': 'none' if stream_type == 'video' else fourcc,
|
|
|
|
|
'protocol': 'ism',
|
|
|
|
|
'fragments': fragments,
|
|
|
|
|
'_download_params': {
|
|
|
|
|
'duration': duration,
|
|
|
|
|
'timescale': stream_timescale,
|
|
|
|
|
'width': width or 0,
|
|
|
|
|
'height': height or 0,
|
|
|
|
|
'fourcc': fourcc,
|
|
|
|
|
'codec_private_data': track.get('CodecPrivateData'),
|
|
|
|
|
'sampling_rate': sampling_rate,
|
|
|
|
|
'channels': int_or_none(track.get('Channels', 2)),
|
|
|
|
|
'bits_per_sample': int_or_none(track.get('BitsPerSample', 16)),
|
|
|
|
|
'nal_unit_length_field': int_or_none(track.get('NALUnitLengthField', 4)),
|
|
|
|
|
},
|
|
|
|
|
})
|
|
|
|
|
return formats
|
|
|
|
|
|
2017-02-25 05:40:05 -05:00
|
|
|
|
def _parse_html5_media_entries(self, base_url, webpage, video_id, m3u8_id=None, m3u8_entry_protocol='m3u8', mpd_id=None, preference=None):
|
2018-03-19 12:43:53 -04:00
|
|
|
|
def absolute_url(item_url):
|
|
|
|
|
return urljoin(base_url, item_url)
|
2016-03-16 13:50:45 -04:00
|
|
|
|
|
|
|
|
|
def parse_content_type(content_type):
|
|
|
|
|
if not content_type:
|
|
|
|
|
return {}
|
|
|
|
|
ctr = re.search(r'(?P<mimetype>[^/]+/[^;]+)(?:;\s*codecs="?(?P<codecs>[^"]+))?', content_type)
|
|
|
|
|
if ctr:
|
|
|
|
|
mimetype, codecs = ctr.groups()
|
|
|
|
|
f = parse_codecs(codecs)
|
|
|
|
|
f['ext'] = mimetype2ext(mimetype)
|
|
|
|
|
return f
|
|
|
|
|
return {}
|
|
|
|
|
|
2017-08-12 08:24:26 -04:00
|
|
|
|
def _media_formats(src, cur_media_type, type_info={}):
|
2016-08-19 11:53:47 -04:00
|
|
|
|
full_url = absolute_url(src)
|
2017-08-12 05:48:11 -04:00
|
|
|
|
ext = type_info.get('ext') or determine_ext(full_url)
|
2016-12-17 11:03:13 -05:00
|
|
|
|
if ext == 'm3u8':
|
2016-08-19 11:53:47 -04:00
|
|
|
|
is_plain_url = False
|
|
|
|
|
formats = self._extract_m3u8_formats(
|
2016-08-21 14:18:46 -04:00
|
|
|
|
full_url, video_id, ext='mp4',
|
2017-02-25 05:40:05 -05:00
|
|
|
|
entry_protocol=m3u8_entry_protocol, m3u8_id=m3u8_id,
|
2017-08-20 03:16:58 -04:00
|
|
|
|
preference=preference, fatal=False)
|
2016-12-17 11:03:13 -05:00
|
|
|
|
elif ext == 'mpd':
|
|
|
|
|
is_plain_url = False
|
|
|
|
|
formats = self._extract_mpd_formats(
|
2017-08-20 03:16:58 -04:00
|
|
|
|
full_url, video_id, mpd_id=mpd_id, fatal=False)
|
2016-08-19 11:53:47 -04:00
|
|
|
|
else:
|
|
|
|
|
is_plain_url = True
|
|
|
|
|
formats = [{
|
|
|
|
|
'url': full_url,
|
|
|
|
|
'vcodec': 'none' if cur_media_type == 'audio' else None,
|
|
|
|
|
}]
|
|
|
|
|
return is_plain_url, formats
|
|
|
|
|
|
2016-03-16 13:50:45 -04:00
|
|
|
|
entries = []
|
2017-07-09 05:29:52 -04:00
|
|
|
|
# amp-video and amp-audio are very similar to their HTML5 counterparts
|
|
|
|
|
# so we wll include them right here (see
|
|
|
|
|
# https://www.ampproject.org/docs/reference/components/amp-video)
|
2016-10-11 13:40:28 -04:00
|
|
|
|
media_tags = [(media_tag, media_type, '')
|
|
|
|
|
for media_tag, media_type
|
2017-07-09 05:29:52 -04:00
|
|
|
|
in re.findall(r'(?s)(<(?:amp-)?(video|audio)[^>]*/>)', webpage)]
|
2017-02-05 12:20:30 -05:00
|
|
|
|
media_tags.extend(re.findall(
|
|
|
|
|
# We only allow video|audio followed by a whitespace or '>'.
|
|
|
|
|
# Allowing more characters may end up in significant slow down (see
|
2019-03-09 07:14:41 -05:00
|
|
|
|
# https://github.com/ytdl-org/youtube-dl/issues/11979, example URL:
|
2017-02-05 12:20:30 -05:00
|
|
|
|
# http://www.porntrex.com/maps/videositemap.xml).
|
2017-07-09 05:29:52 -04:00
|
|
|
|
r'(?s)(<(?P<tag>(?:amp-)?(?:video|audio))(?:\s+[^>]*)?>)(.*?)</(?P=tag)>', webpage))
|
2016-10-11 13:40:28 -04:00
|
|
|
|
for media_tag, media_type, media_content in media_tags:
|
2016-03-16 13:50:45 -04:00
|
|
|
|
media_info = {
|
|
|
|
|
'formats': [],
|
|
|
|
|
'subtitles': {},
|
|
|
|
|
}
|
|
|
|
|
media_attributes = extract_attributes(media_tag)
|
2019-05-23 12:52:11 -04:00
|
|
|
|
src = strip_or_none(media_attributes.get('src'))
|
2016-03-16 13:50:45 -04:00
|
|
|
|
if src:
|
2016-09-02 19:50:26 -04:00
|
|
|
|
_, formats = _media_formats(src, media_type)
|
2016-08-19 11:53:47 -04:00
|
|
|
|
media_info['formats'].extend(formats)
|
2018-03-19 12:43:53 -04:00
|
|
|
|
media_info['thumbnail'] = absolute_url(media_attributes.get('poster'))
|
2016-03-16 13:50:45 -04:00
|
|
|
|
if media_content:
|
|
|
|
|
for source_tag in re.findall(r'<source[^>]+>', media_content):
|
2019-03-16 22:09:32 -04:00
|
|
|
|
s_attr = extract_attributes(source_tag)
|
|
|
|
|
# data-video-src and data-src are non standard but seen
|
|
|
|
|
# several times in the wild
|
2019-05-23 12:52:11 -04:00
|
|
|
|
src = strip_or_none(dict_get(s_attr, ('src', 'data-video-src', 'data-src')))
|
2016-03-16 13:50:45 -04:00
|
|
|
|
if not src:
|
|
|
|
|
continue
|
2019-03-16 22:09:32 -04:00
|
|
|
|
f = parse_content_type(s_attr.get('type'))
|
2017-08-12 08:24:26 -04:00
|
|
|
|
is_plain_url, formats = _media_formats(src, media_type, f)
|
2016-08-19 11:53:47 -04:00
|
|
|
|
if is_plain_url:
|
2019-03-16 22:09:32 -04:00
|
|
|
|
# width, height, res, label and title attributes are
|
|
|
|
|
# all not standard but seen several times in the wild
|
|
|
|
|
labels = [
|
|
|
|
|
s_attr.get(lbl)
|
|
|
|
|
for lbl in ('label', 'title')
|
|
|
|
|
if str_or_none(s_attr.get(lbl))
|
|
|
|
|
]
|
|
|
|
|
width = int_or_none(s_attr.get('width'))
|
2019-05-10 16:56:22 -04:00
|
|
|
|
height = (int_or_none(s_attr.get('height'))
|
|
|
|
|
or int_or_none(s_attr.get('res')))
|
2019-03-16 22:09:32 -04:00
|
|
|
|
if not width or not height:
|
|
|
|
|
for lbl in labels:
|
|
|
|
|
resolution = parse_resolution(lbl)
|
|
|
|
|
if not resolution:
|
|
|
|
|
continue
|
|
|
|
|
width = width or resolution.get('width')
|
|
|
|
|
height = height or resolution.get('height')
|
|
|
|
|
for lbl in labels:
|
|
|
|
|
tbr = parse_bitrate(lbl)
|
|
|
|
|
if tbr:
|
|
|
|
|
break
|
|
|
|
|
else:
|
|
|
|
|
tbr = None
|
2017-08-26 16:27:05 -04:00
|
|
|
|
f.update({
|
2019-03-16 22:09:32 -04:00
|
|
|
|
'width': width,
|
|
|
|
|
'height': height,
|
|
|
|
|
'tbr': tbr,
|
|
|
|
|
'format_id': s_attr.get('label') or s_attr.get('title'),
|
2017-08-26 16:27:05 -04:00
|
|
|
|
})
|
2016-08-19 11:53:47 -04:00
|
|
|
|
f.update(formats[0])
|
|
|
|
|
media_info['formats'].append(f)
|
|
|
|
|
else:
|
|
|
|
|
media_info['formats'].extend(formats)
|
2016-03-16 13:50:45 -04:00
|
|
|
|
for track_tag in re.findall(r'<track[^>]+>', media_content):
|
|
|
|
|
track_attributes = extract_attributes(track_tag)
|
|
|
|
|
kind = track_attributes.get('kind')
|
2016-09-24 02:20:42 -04:00
|
|
|
|
if not kind or kind in ('subtitles', 'captions'):
|
2019-05-23 12:52:11 -04:00
|
|
|
|
src = strip_or_none(track_attributes.get('src'))
|
2016-03-16 13:50:45 -04:00
|
|
|
|
if not src:
|
|
|
|
|
continue
|
|
|
|
|
lang = track_attributes.get('srclang') or track_attributes.get('lang') or track_attributes.get('label')
|
|
|
|
|
media_info['subtitles'].setdefault(lang, []).append({
|
|
|
|
|
'url': absolute_url(src),
|
|
|
|
|
})
|
2018-06-28 14:25:05 -04:00
|
|
|
|
for f in media_info['formats']:
|
|
|
|
|
f.setdefault('http_headers', {})['Referer'] = base_url
|
2016-09-24 02:20:42 -04:00
|
|
|
|
if media_info['formats'] or media_info['subtitles']:
|
2016-03-16 13:50:45 -04:00
|
|
|
|
entries.append(media_info)
|
|
|
|
|
return entries
|
|
|
|
|
|
2017-01-13 04:08:51 -05:00
|
|
|
|
def _extract_akamai_formats(self, manifest_url, video_id, hosts={}):
|
2016-08-22 02:47:25 -04:00
|
|
|
|
formats = []
|
2016-09-24 16:55:53 -04:00
|
|
|
|
hdcore_sign = 'hdcore=3.7.0'
|
2017-05-04 11:04:25 -04:00
|
|
|
|
f4m_url = re.sub(r'(https?://[^/]+)/i/', r'\1/z/', manifest_url).replace('/master.m3u8', '/manifest.f4m')
|
2017-01-13 04:08:51 -05:00
|
|
|
|
hds_host = hosts.get('hds')
|
|
|
|
|
if hds_host:
|
|
|
|
|
f4m_url = re.sub(r'(https?://)[^/]+', r'\1' + hds_host, f4m_url)
|
2016-09-24 16:55:53 -04:00
|
|
|
|
if 'hdcore=' not in f4m_url:
|
|
|
|
|
f4m_url += ('&' if '?' in f4m_url else '?') + hdcore_sign
|
|
|
|
|
f4m_formats = self._extract_f4m_formats(
|
|
|
|
|
f4m_url, video_id, f4m_id='hds', fatal=False)
|
|
|
|
|
for entry in f4m_formats:
|
|
|
|
|
entry.update({'extra_param_to_segment_url': hdcore_sign})
|
|
|
|
|
formats.extend(f4m_formats)
|
2017-01-13 04:08:51 -05:00
|
|
|
|
m3u8_url = re.sub(r'(https?://[^/]+)/z/', r'\1/i/', manifest_url).replace('/manifest.f4m', '/master.m3u8')
|
|
|
|
|
hls_host = hosts.get('hls')
|
|
|
|
|
if hls_host:
|
|
|
|
|
m3u8_url = re.sub(r'(https?://)[^/]+', r'\1' + hls_host, m3u8_url)
|
2016-08-22 02:47:25 -04:00
|
|
|
|
formats.extend(self._extract_m3u8_formats(
|
|
|
|
|
m3u8_url, video_id, 'mp4', 'm3u8_native',
|
|
|
|
|
m3u8_id='hls', fatal=False))
|
|
|
|
|
return formats
|
|
|
|
|
|
2016-09-16 14:30:38 -04:00
|
|
|
|
def _extract_wowza_formats(self, url, video_id, m3u8_entry_protocol='m3u8_native', skip_protocols=[]):
|
2017-11-01 12:39:26 -04:00
|
|
|
|
query = compat_urlparse.urlparse(url).query
|
2016-09-16 14:30:38 -04:00
|
|
|
|
url = re.sub(r'/(?:manifest|playlist|jwplayer)\.(?:m3u8|f4m|mpd|smil)', '', url)
|
2018-02-05 11:41:55 -05:00
|
|
|
|
mobj = re.search(
|
|
|
|
|
r'(?:(?:http|rtmp|rtsp)(?P<s>s)?:)?(?P<url>//[^?]+)', url)
|
|
|
|
|
url_base = mobj.group('url')
|
|
|
|
|
http_base_url = '%s%s:%s' % ('http', mobj.group('s') or '', url_base)
|
2016-09-16 14:30:38 -04:00
|
|
|
|
formats = []
|
2017-11-01 12:39:26 -04:00
|
|
|
|
|
|
|
|
|
def manifest_url(manifest):
|
|
|
|
|
m_url = '%s/%s' % (http_base_url, manifest)
|
|
|
|
|
if query:
|
|
|
|
|
m_url += '?%s' % query
|
|
|
|
|
return m_url
|
|
|
|
|
|
2016-09-16 14:30:38 -04:00
|
|
|
|
if 'm3u8' not in skip_protocols:
|
|
|
|
|
formats.extend(self._extract_m3u8_formats(
|
2017-11-01 12:39:26 -04:00
|
|
|
|
manifest_url('playlist.m3u8'), video_id, 'mp4',
|
2016-09-16 14:30:38 -04:00
|
|
|
|
m3u8_entry_protocol, m3u8_id='hls', fatal=False))
|
|
|
|
|
if 'f4m' not in skip_protocols:
|
|
|
|
|
formats.extend(self._extract_f4m_formats(
|
2017-11-01 12:39:26 -04:00
|
|
|
|
manifest_url('manifest.f4m'),
|
2016-09-16 14:30:38 -04:00
|
|
|
|
video_id, f4m_id='hds', fatal=False))
|
2016-10-19 09:57:12 -04:00
|
|
|
|
if 'dash' not in skip_protocols:
|
|
|
|
|
formats.extend(self._extract_mpd_formats(
|
2017-11-01 12:39:26 -04:00
|
|
|
|
manifest_url('manifest.mpd'),
|
2016-10-19 09:57:12 -04:00
|
|
|
|
video_id, mpd_id='dash', fatal=False))
|
2016-09-16 14:30:38 -04:00
|
|
|
|
if re.search(r'(?:/smil:|\.smil)', url_base):
|
|
|
|
|
if 'smil' not in skip_protocols:
|
|
|
|
|
rtmp_formats = self._extract_smil_formats(
|
2017-11-01 12:39:26 -04:00
|
|
|
|
manifest_url('jwplayer.smil'),
|
2016-09-16 14:30:38 -04:00
|
|
|
|
video_id, fatal=False)
|
|
|
|
|
for rtmp_format in rtmp_formats:
|
|
|
|
|
rtsp_format = rtmp_format.copy()
|
|
|
|
|
rtsp_format['url'] = '%s/%s' % (rtmp_format['url'], rtmp_format['play_path'])
|
|
|
|
|
del rtsp_format['play_path']
|
|
|
|
|
del rtsp_format['ext']
|
|
|
|
|
rtsp_format.update({
|
|
|
|
|
'url': rtsp_format['url'].replace('rtmp://', 'rtsp://'),
|
|
|
|
|
'format_id': rtmp_format['format_id'].replace('rtmp', 'rtsp'),
|
|
|
|
|
'protocol': 'rtsp',
|
|
|
|
|
})
|
|
|
|
|
formats.extend([rtmp_format, rtsp_format])
|
|
|
|
|
else:
|
|
|
|
|
for protocol in ('rtmp', 'rtsp'):
|
|
|
|
|
if protocol not in skip_protocols:
|
|
|
|
|
formats.append({
|
2017-05-17 11:19:33 -04:00
|
|
|
|
'url': '%s:%s' % (protocol, url_base),
|
2016-09-16 14:30:38 -04:00
|
|
|
|
'format_id': protocol,
|
|
|
|
|
'protocol': protocol,
|
|
|
|
|
})
|
|
|
|
|
return formats
|
|
|
|
|
|
2017-03-25 14:38:30 -04:00
|
|
|
|
def _find_jwplayer_data(self, webpage, video_id=None, transform_source=js_to_json):
|
2017-02-16 10:42:36 -05:00
|
|
|
|
mobj = re.search(
|
2017-04-25 12:46:05 -04:00
|
|
|
|
r'(?s)jwplayer\((?P<quote>[\'"])[^\'" ]+(?P=quote)\)(?!</script>).*?\.setup\s*\((?P<options>[^)]+)\)',
|
2017-02-16 10:42:36 -05:00
|
|
|
|
webpage)
|
|
|
|
|
if mobj:
|
2017-03-25 14:38:30 -04:00
|
|
|
|
try:
|
|
|
|
|
jwplayer_data = self._parse_json(mobj.group('options'),
|
|
|
|
|
video_id=video_id,
|
|
|
|
|
transform_source=transform_source)
|
|
|
|
|
except ExtractorError:
|
|
|
|
|
pass
|
|
|
|
|
else:
|
|
|
|
|
if isinstance(jwplayer_data, dict):
|
|
|
|
|
return jwplayer_data
|
2017-02-16 10:42:36 -05:00
|
|
|
|
|
|
|
|
|
def _extract_jwplayer_data(self, webpage, video_id, *args, **kwargs):
|
2017-03-25 14:38:30 -04:00
|
|
|
|
jwplayer_data = self._find_jwplayer_data(
|
|
|
|
|
webpage, video_id, transform_source=js_to_json)
|
2017-02-16 10:42:36 -05:00
|
|
|
|
return self._parse_jwplayer_data(
|
|
|
|
|
jwplayer_data, video_id, *args, **kwargs)
|
|
|
|
|
|
|
|
|
|
def _parse_jwplayer_data(self, jwplayer_data, video_id=None, require_title=True,
|
|
|
|
|
m3u8_id=None, mpd_id=None, rtmp_params=None, base_url=None):
|
|
|
|
|
# JWPlayer backward compatibility: flattened playlists
|
|
|
|
|
# https://github.com/jwplayer/jwplayer/blob/v7.4.3/src/js/api/config.js#L81-L96
|
|
|
|
|
if 'playlist' not in jwplayer_data:
|
|
|
|
|
jwplayer_data = {'playlist': [jwplayer_data]}
|
|
|
|
|
|
|
|
|
|
entries = []
|
|
|
|
|
|
|
|
|
|
# JWPlayer backward compatibility: single playlist item
|
|
|
|
|
# https://github.com/jwplayer/jwplayer/blob/v7.7.0/src/js/playlist/playlist.js#L10
|
|
|
|
|
if not isinstance(jwplayer_data['playlist'], list):
|
|
|
|
|
jwplayer_data['playlist'] = [jwplayer_data['playlist']]
|
|
|
|
|
|
|
|
|
|
for video_data in jwplayer_data['playlist']:
|
|
|
|
|
# JWPlayer backward compatibility: flattened sources
|
|
|
|
|
# https://github.com/jwplayer/jwplayer/blob/v7.4.3/src/js/playlist/item.js#L29-L35
|
|
|
|
|
if 'sources' not in video_data:
|
|
|
|
|
video_data['sources'] = [video_data]
|
|
|
|
|
|
|
|
|
|
this_video_id = video_id or video_data['mediaid']
|
|
|
|
|
|
2017-03-05 11:28:32 -05:00
|
|
|
|
formats = self._parse_jwplayer_formats(
|
|
|
|
|
video_data['sources'], video_id=this_video_id, m3u8_id=m3u8_id,
|
|
|
|
|
mpd_id=mpd_id, rtmp_params=rtmp_params, base_url=base_url)
|
2017-02-16 10:42:36 -05:00
|
|
|
|
|
|
|
|
|
subtitles = {}
|
|
|
|
|
tracks = video_data.get('tracks')
|
|
|
|
|
if tracks and isinstance(tracks, list):
|
|
|
|
|
for track in tracks:
|
2017-06-15 12:40:39 -04:00
|
|
|
|
if not isinstance(track, dict):
|
|
|
|
|
continue
|
2018-02-24 12:59:29 -05:00
|
|
|
|
track_kind = track.get('kind')
|
|
|
|
|
if not track_kind or not isinstance(track_kind, compat_str):
|
|
|
|
|
continue
|
|
|
|
|
if track_kind.lower() not in ('captions', 'subtitles'):
|
2017-02-16 10:42:36 -05:00
|
|
|
|
continue
|
|
|
|
|
track_url = urljoin(base_url, track.get('file'))
|
|
|
|
|
if not track_url:
|
|
|
|
|
continue
|
|
|
|
|
subtitles.setdefault(track.get('label') or 'en', []).append({
|
|
|
|
|
'url': self._proto_relative_url(track_url)
|
|
|
|
|
})
|
|
|
|
|
|
2017-10-12 12:12:47 -04:00
|
|
|
|
entry = {
|
2017-02-16 10:42:36 -05:00
|
|
|
|
'id': this_video_id,
|
2017-10-12 12:12:47 -04:00
|
|
|
|
'title': unescapeHTML(video_data['title'] if require_title else video_data.get('title')),
|
2019-11-09 07:11:59 -05:00
|
|
|
|
'description': clean_html(video_data.get('description')),
|
2019-01-20 07:31:41 -05:00
|
|
|
|
'thumbnail': urljoin(base_url, self._proto_relative_url(video_data.get('image'))),
|
2017-02-16 10:42:36 -05:00
|
|
|
|
'timestamp': int_or_none(video_data.get('pubdate')),
|
|
|
|
|
'duration': float_or_none(jwplayer_data.get('duration') or video_data.get('duration')),
|
|
|
|
|
'subtitles': subtitles,
|
2017-10-12 12:12:47 -04:00
|
|
|
|
}
|
|
|
|
|
# https://github.com/jwplayer/jwplayer/blob/master/src/js/utils/validator.js#L32
|
|
|
|
|
if len(formats) == 1 and re.search(r'^(?:http|//).*(?:youtube\.com|youtu\.be)/.+', formats[0]['url']):
|
|
|
|
|
entry.update({
|
|
|
|
|
'_type': 'url_transparent',
|
|
|
|
|
'url': formats[0]['url'],
|
|
|
|
|
})
|
|
|
|
|
else:
|
|
|
|
|
self._sort_formats(formats)
|
|
|
|
|
entry['formats'] = formats
|
|
|
|
|
entries.append(entry)
|
2017-02-16 10:42:36 -05:00
|
|
|
|
if len(entries) == 1:
|
|
|
|
|
return entries[0]
|
|
|
|
|
else:
|
|
|
|
|
return self.playlist_result(entries)
|
|
|
|
|
|
2017-03-05 11:22:27 -05:00
|
|
|
|
def _parse_jwplayer_formats(self, jwplayer_sources_data, video_id=None,
|
|
|
|
|
m3u8_id=None, mpd_id=None, rtmp_params=None, base_url=None):
|
2017-04-17 03:48:24 -04:00
|
|
|
|
urls = []
|
2017-03-05 11:22:27 -05:00
|
|
|
|
formats = []
|
2017-03-05 11:28:32 -05:00
|
|
|
|
for source in jwplayer_sources_data:
|
2017-06-14 11:02:15 -04:00
|
|
|
|
if not isinstance(source, dict):
|
|
|
|
|
continue
|
2019-01-20 07:31:41 -05:00
|
|
|
|
source_url = urljoin(
|
|
|
|
|
base_url, self._proto_relative_url(source.get('file')))
|
|
|
|
|
if not source_url or source_url in urls:
|
2017-04-17 03:48:24 -04:00
|
|
|
|
continue
|
|
|
|
|
urls.append(source_url)
|
2017-03-05 11:22:27 -05:00
|
|
|
|
source_type = source.get('type') or ''
|
|
|
|
|
ext = mimetype2ext(source_type) or determine_ext(source_url)
|
|
|
|
|
if source_type == 'hls' or ext == 'm3u8':
|
|
|
|
|
formats.extend(self._extract_m3u8_formats(
|
2017-03-05 11:25:03 -05:00
|
|
|
|
source_url, video_id, 'mp4', entry_protocol='m3u8_native',
|
|
|
|
|
m3u8_id=m3u8_id, fatal=False))
|
2018-01-21 05:42:48 -05:00
|
|
|
|
elif source_type == 'dash' or ext == 'mpd':
|
2017-03-05 11:22:27 -05:00
|
|
|
|
formats.extend(self._extract_mpd_formats(
|
|
|
|
|
source_url, video_id, mpd_id=mpd_id, fatal=False))
|
2017-03-15 16:30:53 -04:00
|
|
|
|
elif ext == 'smil':
|
|
|
|
|
formats.extend(self._extract_smil_formats(
|
|
|
|
|
source_url, video_id, fatal=False))
|
2017-03-05 11:22:27 -05:00
|
|
|
|
# https://github.com/jwplayer/jwplayer/blob/master/src/js/providers/default.js#L67
|
2017-03-05 11:25:03 -05:00
|
|
|
|
elif source_type.startswith('audio') or ext in (
|
|
|
|
|
'oga', 'aac', 'mp3', 'mpeg', 'vorbis'):
|
2017-03-05 11:22:27 -05:00
|
|
|
|
formats.append({
|
|
|
|
|
'url': source_url,
|
|
|
|
|
'vcodec': 'none',
|
|
|
|
|
'ext': ext,
|
|
|
|
|
})
|
|
|
|
|
else:
|
|
|
|
|
height = int_or_none(source.get('height'))
|
|
|
|
|
if height is None:
|
|
|
|
|
# Often no height is provided but there is a label in
|
2017-03-05 11:25:03 -05:00
|
|
|
|
# format like "1080p", "720p SD", or 1080.
|
2017-03-05 11:22:27 -05:00
|
|
|
|
height = int_or_none(self._search_regex(
|
2017-03-05 11:25:03 -05:00
|
|
|
|
r'^(\d{3,4})[pP]?(?:\b|$)', compat_str(source.get('label') or ''),
|
2017-03-05 11:22:27 -05:00
|
|
|
|
'height', default=None))
|
|
|
|
|
a_format = {
|
|
|
|
|
'url': source_url,
|
|
|
|
|
'width': int_or_none(source.get('width')),
|
|
|
|
|
'height': height,
|
2017-03-05 11:25:03 -05:00
|
|
|
|
'tbr': int_or_none(source.get('bitrate')),
|
2017-03-05 11:22:27 -05:00
|
|
|
|
'ext': ext,
|
|
|
|
|
}
|
|
|
|
|
if source_url.startswith('rtmp'):
|
|
|
|
|
a_format['ext'] = 'flv'
|
|
|
|
|
# See com/longtailvideo/jwplayer/media/RTMPMediaProvider.as
|
|
|
|
|
# of jwplayer.flash.swf
|
|
|
|
|
rtmp_url_parts = re.split(
|
|
|
|
|
r'((?:mp4|mp3|flv):)', source_url, 1)
|
|
|
|
|
if len(rtmp_url_parts) == 3:
|
|
|
|
|
rtmp_url, prefix, play_path = rtmp_url_parts
|
|
|
|
|
a_format.update({
|
|
|
|
|
'url': rtmp_url,
|
|
|
|
|
'play_path': prefix + play_path,
|
|
|
|
|
})
|
|
|
|
|
if rtmp_params:
|
|
|
|
|
a_format.update(rtmp_params)
|
|
|
|
|
formats.append(a_format)
|
|
|
|
|
return formats
|
|
|
|
|
|
2014-09-28 02:53:52 -04:00
|
|
|
|
def _live_title(self, name):
|
|
|
|
|
""" Generate the title for a live video """
|
|
|
|
|
now = datetime.datetime.now()
|
2016-02-14 04:37:17 -05:00
|
|
|
|
now_str = now.strftime('%Y-%m-%d %H:%M')
|
2014-09-28 02:53:52 -04:00
|
|
|
|
return name + ' ' + now_str
|
|
|
|
|
|
2014-09-28 04:34:55 -04:00
|
|
|
|
def _int(self, v, name, fatal=False, **kwargs):
|
|
|
|
|
res = int_or_none(v, **kwargs)
|
|
|
|
|
if 'get_attr' in kwargs:
|
|
|
|
|
print(getattr(v, kwargs['get_attr']))
|
|
|
|
|
if res is None:
|
|
|
|
|
msg = 'Failed to extract %s: Could not parse value %r' % (name, v)
|
|
|
|
|
if fatal:
|
|
|
|
|
raise ExtractorError(msg)
|
|
|
|
|
else:
|
|
|
|
|
self._downloader.report_warning(msg)
|
|
|
|
|
return res
|
|
|
|
|
|
|
|
|
|
def _float(self, v, name, fatal=False, **kwargs):
|
|
|
|
|
res = float_or_none(v, **kwargs)
|
|
|
|
|
if res is None:
|
|
|
|
|
msg = 'Failed to extract %s: Could not parse value %r' % (name, v)
|
|
|
|
|
if fatal:
|
|
|
|
|
raise ExtractorError(msg)
|
|
|
|
|
else:
|
|
|
|
|
self._downloader.report_warning(msg)
|
|
|
|
|
return res
|
|
|
|
|
|
2017-04-25 09:12:54 -04:00
|
|
|
|
def _set_cookie(self, domain, name, value, expire_time=None, port=None,
|
|
|
|
|
path='/', secure=False, discard=False, rest={}, **kwargs):
|
pull changes from remote master (#190)
* [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 commit cff99c91d150df2a4e21962a3ca8d4ae94533b8c.
* [utils] Add reference to cookie file format
* Revert "[vimeo] fix showcase password protected video extraction(closes #24224)"
This reverts commit 12ee431676bb655f04c7dd416a73c1f142ed368d.
* [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>
2020-08-25 10:53:34 -04:00
|
|
|
|
cookie = compat_cookiejar_Cookie(
|
2017-09-17 01:53:04 -04:00
|
|
|
|
0, name, value, port, port is not None, domain, True,
|
2017-04-25 09:12:54 -04:00
|
|
|
|
domain.startswith('.'), path, True, secure, expire_time,
|
|
|
|
|
discard, None, None, rest)
|
2014-11-29 18:03:59 -05:00
|
|
|
|
self._downloader.cookiejar.set_cookie(cookie)
|
|
|
|
|
|
2015-07-29 18:20:37 -04:00
|
|
|
|
def _get_cookies(self, url):
|
|
|
|
|
""" Return a compat_cookies.SimpleCookie with the cookies for the url """
|
2015-11-21 11:18:17 -05:00
|
|
|
|
req = sanitized_Request(url)
|
2015-07-29 18:20:37 -04:00
|
|
|
|
self._downloader.cookiejar.add_cookie_header(req)
|
|
|
|
|
return compat_cookies.SimpleCookie(req.get_header('Cookie'))
|
|
|
|
|
|
2019-05-17 16:17:15 -04:00
|
|
|
|
def _apply_first_set_cookie_header(self, url_handle, cookie):
|
2019-05-20 12:23:18 -04:00
|
|
|
|
"""
|
|
|
|
|
Apply first Set-Cookie header instead of the last. Experimental.
|
|
|
|
|
|
|
|
|
|
Some sites (e.g. [1-3]) may serve two cookies under the same name
|
|
|
|
|
in Set-Cookie header and expect the first (old) one to be set rather
|
|
|
|
|
than second (new). However, as of RFC6265 the newer one cookie
|
|
|
|
|
should be set into cookie store what actually happens.
|
|
|
|
|
We will workaround this issue by resetting the cookie to
|
|
|
|
|
the first one manually.
|
|
|
|
|
1. https://new.vk.com/
|
|
|
|
|
2. https://github.com/ytdl-org/youtube-dl/issues/9841#issuecomment-227871201
|
|
|
|
|
3. https://learning.oreilly.com/
|
|
|
|
|
"""
|
2019-05-17 16:17:15 -04:00
|
|
|
|
for header, cookies in url_handle.headers.items():
|
|
|
|
|
if header.lower() != 'set-cookie':
|
|
|
|
|
continue
|
|
|
|
|
if sys.version_info[0] >= 3:
|
|
|
|
|
cookies = cookies.encode('iso-8859-1')
|
|
|
|
|
cookies = cookies.decode('utf-8')
|
|
|
|
|
cookie_value = re.search(
|
|
|
|
|
r'%s=(.+?);.*?\b[Dd]omain=(.+?)(?:[,;]|$)' % cookie, cookies)
|
|
|
|
|
if cookie_value:
|
|
|
|
|
value, domain = cookie_value.groups()
|
|
|
|
|
self._set_cookie(domain, cookie, value)
|
|
|
|
|
break
|
|
|
|
|
|
2015-01-07 01:20:20 -05:00
|
|
|
|
def get_testcases(self, include_onlymatching=False):
|
|
|
|
|
t = getattr(self, '_TEST', None)
|
|
|
|
|
if t:
|
|
|
|
|
assert not hasattr(self, '_TESTS'), \
|
|
|
|
|
'%s has _TEST and _TESTS' % type(self).__name__
|
|
|
|
|
tests = [t]
|
|
|
|
|
else:
|
|
|
|
|
tests = getattr(self, '_TESTS', [])
|
|
|
|
|
for t in tests:
|
|
|
|
|
if not include_onlymatching and t.get('only_matching', False):
|
|
|
|
|
continue
|
|
|
|
|
t['name'] = type(self).__name__[:-len('IE')]
|
|
|
|
|
yield t
|
|
|
|
|
|
|
|
|
|
def is_suitable(self, age_limit):
|
|
|
|
|
""" Test whether the extractor is generally suitable for the given
|
|
|
|
|
age limit (i.e. pornographic sites are not, all others usually are) """
|
|
|
|
|
|
|
|
|
|
any_restricted = False
|
|
|
|
|
for tc in self.get_testcases(include_onlymatching=False):
|
2016-07-26 12:54:06 -04:00
|
|
|
|
if tc.get('playlist', []):
|
2015-01-07 01:20:20 -05:00
|
|
|
|
tc = tc['playlist'][0]
|
|
|
|
|
is_restricted = age_restricted(
|
|
|
|
|
tc.get('info_dict', {}).get('age_limit'), age_limit)
|
|
|
|
|
if not is_restricted:
|
|
|
|
|
return True
|
|
|
|
|
any_restricted = any_restricted or is_restricted
|
|
|
|
|
return not any_restricted
|
|
|
|
|
|
2015-02-15 12:03:41 -05:00
|
|
|
|
def extract_subtitles(self, *args, **kwargs):
|
2019-05-10 16:56:22 -04:00
|
|
|
|
if (self._downloader.params.get('writesubtitles', False)
|
|
|
|
|
or self._downloader.params.get('listsubtitles')):
|
2015-02-17 16:16:29 -05:00
|
|
|
|
return self._get_subtitles(*args, **kwargs)
|
|
|
|
|
return {}
|
2015-02-15 12:03:41 -05:00
|
|
|
|
|
|
|
|
|
def _get_subtitles(self, *args, **kwargs):
|
2016-02-14 04:37:17 -05:00
|
|
|
|
raise NotImplementedError('This method must be implemented by subclasses')
|
2015-02-15 12:03:41 -05:00
|
|
|
|
|
2015-08-20 13:37:07 -04:00
|
|
|
|
@staticmethod
|
|
|
|
|
def _merge_subtitle_items(subtitle_list1, subtitle_list2):
|
|
|
|
|
""" Merge subtitle items for one language. Items with duplicated URLs
|
|
|
|
|
will be dropped. """
|
|
|
|
|
list1_urls = set([item['url'] for item in subtitle_list1])
|
|
|
|
|
ret = list(subtitle_list1)
|
|
|
|
|
ret.extend([item for item in subtitle_list2 if item['url'] not in list1_urls])
|
|
|
|
|
return ret
|
|
|
|
|
|
|
|
|
|
@classmethod
|
2015-08-21 05:35:51 -04:00
|
|
|
|
def _merge_subtitles(cls, subtitle_dict1, subtitle_dict2):
|
2015-08-20 13:37:07 -04:00
|
|
|
|
""" Merge two subtitle dictionaries, language by language. """
|
|
|
|
|
ret = dict(subtitle_dict1)
|
|
|
|
|
for lang in subtitle_dict2:
|
2015-08-21 05:35:51 -04:00
|
|
|
|
ret[lang] = cls._merge_subtitle_items(subtitle_dict1.get(lang, []), subtitle_dict2[lang])
|
2015-08-20 13:37:07 -04:00
|
|
|
|
return ret
|
|
|
|
|
|
2015-02-16 15:44:17 -05:00
|
|
|
|
def extract_automatic_captions(self, *args, **kwargs):
|
2019-05-10 16:56:22 -04:00
|
|
|
|
if (self._downloader.params.get('writeautomaticsub', False)
|
|
|
|
|
or self._downloader.params.get('listsubtitles')):
|
2015-02-17 16:16:29 -05:00
|
|
|
|
return self._get_automatic_captions(*args, **kwargs)
|
|
|
|
|
return {}
|
2015-02-16 15:44:17 -05:00
|
|
|
|
|
|
|
|
|
def _get_automatic_captions(self, *args, **kwargs):
|
2016-02-14 04:37:17 -05:00
|
|
|
|
raise NotImplementedError('This method must be implemented by subclasses')
|
2015-02-16 15:44:17 -05:00
|
|
|
|
|
2016-02-29 14:01:33 -05:00
|
|
|
|
def mark_watched(self, *args, **kwargs):
|
2019-05-10 16:56:22 -04:00
|
|
|
|
if (self._downloader.params.get('mark_watched', False)
|
|
|
|
|
and (self._get_login_info()[0] is not None
|
|
|
|
|
or self._downloader.params.get('cookiefile') is not None)):
|
2016-02-29 14:01:33 -05:00
|
|
|
|
self._mark_watched(*args, **kwargs)
|
|
|
|
|
|
|
|
|
|
def _mark_watched(self, *args, **kwargs):
|
|
|
|
|
raise NotImplementedError('This method must be implemented by subclasses')
|
|
|
|
|
|
2016-07-03 11:23:48 -04:00
|
|
|
|
def geo_verification_headers(self):
|
|
|
|
|
headers = {}
|
|
|
|
|
geo_verification_proxy = self._downloader.params.get('geo_verification_proxy')
|
|
|
|
|
if geo_verification_proxy:
|
|
|
|
|
headers['Ytdl-request-proxy'] = geo_verification_proxy
|
|
|
|
|
return headers
|
|
|
|
|
|
2016-10-07 07:20:53 -04:00
|
|
|
|
def _generic_id(self, url):
|
|
|
|
|
return compat_urllib_parse_unquote(os.path.splitext(url.rstrip('/').split('/')[-1])[0])
|
|
|
|
|
|
|
|
|
|
def _generic_title(self, url):
|
|
|
|
|
return compat_urllib_parse_unquote(os.path.splitext(url_basename(url))[0])
|
|
|
|
|
|
2013-10-06 00:06:30 -04:00
|
|
|
|
|
2013-06-23 13:57:38 -04:00
|
|
|
|
class SearchInfoExtractor(InfoExtractor):
|
|
|
|
|
"""
|
|
|
|
|
Base class for paged search queries extractors.
|
2015-07-23 13:37:45 -04:00
|
|
|
|
They accept URLs in the format _SEARCH_KEY(|all|[0-9]):{query}
|
2013-06-23 13:57:38 -04:00
|
|
|
|
Instances should define _SEARCH_KEY and _MAX_RESULTS.
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
|
def _make_valid_url(cls):
|
|
|
|
|
return r'%s(?P<prefix>|[1-9][0-9]*|all):(?P<query>[\s\S]+)' % cls._SEARCH_KEY
|
|
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
|
def suitable(cls, url):
|
|
|
|
|
return re.match(cls._make_valid_url(), url) is not None
|
|
|
|
|
|
|
|
|
|
def _real_extract(self, query):
|
|
|
|
|
mobj = re.match(self._make_valid_url(), query)
|
|
|
|
|
if mobj is None:
|
2014-08-27 19:04:43 -04:00
|
|
|
|
raise ExtractorError('Invalid search query "%s"' % query)
|
2013-06-23 13:57:38 -04:00
|
|
|
|
|
|
|
|
|
prefix = mobj.group('prefix')
|
|
|
|
|
query = mobj.group('query')
|
|
|
|
|
if prefix == '':
|
|
|
|
|
return self._get_n_results(query, 1)
|
|
|
|
|
elif prefix == 'all':
|
|
|
|
|
return self._get_n_results(query, self._MAX_RESULTS)
|
|
|
|
|
else:
|
|
|
|
|
n = int(prefix)
|
|
|
|
|
if n <= 0:
|
2014-08-27 19:04:43 -04:00
|
|
|
|
raise ExtractorError('invalid download number %s for query "%s"' % (n, query))
|
2013-06-23 13:57:38 -04:00
|
|
|
|
elif n > self._MAX_RESULTS:
|
2014-08-27 19:04:43 -04:00
|
|
|
|
self._downloader.report_warning('%s returns max %i results (you requested %i)' % (self._SEARCH_KEY, self._MAX_RESULTS, n))
|
2013-06-23 13:57:38 -04:00
|
|
|
|
n = self._MAX_RESULTS
|
|
|
|
|
return self._get_n_results(query, n)
|
|
|
|
|
|
|
|
|
|
def _get_n_results(self, query, n):
|
|
|
|
|
"""Get a specified number of results for a query"""
|
2016-02-14 04:37:17 -05:00
|
|
|
|
raise NotImplementedError('This method must be implemented by subclasses')
|
2013-07-01 12:52:19 -04:00
|
|
|
|
|
|
|
|
|
@property
|
|
|
|
|
def SEARCH_KEY(self):
|
|
|
|
|
return self._SEARCH_KEY
|