mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-05 23:45:06 +00:00
b827ee921f
* [scrippsnetworks] Add new extractor(closes #19857)(closes #22981) * [teachable] Improve locked lessons detection (#23528) * [teachable] Fail with error message if no video URL found * [extractors] add missing import for ScrippsNetworksIE * [brightcove] cache brightcove player policy keys * [prosiebensat1] improve geo restriction handling(closes #23571) * [soundcloud] automatically update client id on failing requests * [spankbang] Fix extraction (closes #23307, closes #23423, closes #23444) * [spankbang] Improve removed video detection (#23423) * [brightcove] update policy key on failing requests * [pornhub] Fix extraction and add support for m3u8 formats (closes #22749, closes #23082) * [pornhub] Improve locked videos detection (closes #22449, closes #22780) * [brightcove] invalidate policy key cache on failing requests * [soundcloud] fix client id extraction for non fatal requests * [ChangeLog] Actualize [ci skip] * [devscripts/create-github-release] Switch to using PAT for authentication Basic authentication will be deprecated soon * release 2020.01.01 * [redtube] Detect private videos (#23518) * [vice] improve extraction(closes #23631) * [devscripts/create-github-release] Remove unused import * [wistia] improve format extraction and extract subtitles(closes #22590) * [nrktv:seriebase] Fix extraction (closes #23625) (#23537) * [discovery] fix anonymous token extraction(closes #23650) * [scrippsnetworks] add support for www.discovery.com videos * [scrippsnetworks] correct test case URL * [dctp] fix format extraction(closes #23656) * [pandatv] Remove extractor (#23630) * [naver] improve extraction - improve geo-restriction handling - extract automatic captions - extract uploader metadata - extract VLive HLS formats * [naver] improve metadata extraction * [cloudflarestream] improve extraction - add support for bytehighway.net domain - add support for signed URLs - extract thumbnail * [cloudflarestream] import embed URL extraction * [lego] fix extraction and extract subtitle(closes #23687) * [safari] Fix kaltura session extraction (closes #23679) (#23670) * [orf:fm4] Fix extraction (#23599) * [orf:radio] Clean description and improve extraction * [twitter] add support for promo_video_website cards(closes #23711) * [vodplatform] add support for embed.kwikmotion.com domain * [ndr:base:embed] Improve thumbnails extraction (closes #23731) * [canvas] Add support for new API endpoint and update tests (closes #17680, closes #18629) * [travis] Add flake8 job (#23720) * [yourporn] Fix extraction (closes #21645, closes #22255, closes #23459) * [ChangeLog] Actualize [ci skip] * release 2020.01.15 * [soundcloud] Restore previews extraction (closes #23739) * [orf:tvthek] Improve geo restricted videos detection (closes #23741) * [zype] improve extraction - extract subtitles(closes #21258) - support URLs with alternative keys/tokens(#21258) - extract more metadata * [americastestkitchen] fix extraction * [nbc] add support for nbc multi network URLs(closes #23049) * [ard] improve extraction(closes #23761) - simplify extraction - extract age limit and series - bypass geo-restriction * [ivi:compilation] Fix entries extraction (closes #23770) * [24video] Add support for 24video.vip (closes #23753) * [businessinsider] Fix jwplatform id extraction (closes #22929) (#22954) * [ard] add a missing condition * [azmedien] fix extraction(closes #23783) * [voicerepublic] fix extraction * [stretchinternet] fix extraction(closes #4319) * [youtube] Fix sigfunc name extraction (closes #23819) * [ChangeLog] Actualize [ci skip] * release 2020.01.24 * [soundcloud] imporve private playlist/set tracks extraction https://github.com/ytdl-org/youtube-dl/issues/3707#issuecomment-577873539 * [svt] fix article extraction(closes #22897)(closes #22919) * [svt] fix series extraction(closes #22297) * [viewlift] improve extraction - fix extraction(closes #23851) - add add support for authentication - add support for more domains * [vimeo] fix album extraction(closes #23864) * [tva] Relax _VALID_URL (closes #23903) * [tv5mondeplus] Fix extraction (closes #23907, closes #23911) * [twitch:stream] Lowercase channel id for stream request (closes #23917) * [sportdeutschland] Update to new sportdeutschland API They switched to SSL, but under a different host AND path... Remove the old test cases because these videos have become unavailable. * [popcorntimes] Add extractor (closes #23949) * [thisoldhouse] fix extraction(closes #23951) * [toggle] Add support for mewatch.sg (closes #23895) (#23930) * [compat] Introduce compat_realpath (refs #23991) * [update] Fix updating via symlinks (closes #23991) * [nytimes] improve format sorting(closes #24010) * [abc:iview] Support 720p (#22907) (#22921) * [nova:embed] Fix extraction (closes #23672) * [nova:embed] Improve (closes #23690) * [nova] Improve extraction (refs #23690) * [jpopsuki] Remove extractor (closes #23858) * [YoutubeDL] Fix playlist entry indexing with --playlist-items (closes #10591, closes #10622) * [test_YoutubeDL] Fix get_ids * [test_YoutubeDL] Add tests for #10591 (closes #23873) * [24video] Add support for porn.24video.net (closes #23779, closes #23784) * [npr] Add support for streams (closes #24042) * [ChangeLog] Actualize [ci skip] * release 2020.02.16 * [tv2dk:bornholm:play] Fix extraction (#24076) * [imdb] Fix extraction (closes #23443) * [wistia] Add support for multiple generic embeds (closes #8347, closes #11385) * [teachable] Add support for multiple videos per lecture (closes #24101) * [pornhd] Fix extraction (closes #24128) * [options] Remove duplicate short option -v for --version (#24162) * [extractor/common] Convert ISM manifest to unicode before processing on python 2 (#24152) * [YoutubeDL] Force redirect URL to unicode on python 2 * Remove no longer needed compat_str around geturl * [youjizz] Fix extraction (closes #24181) * [test_subtitles] Remove obsolete test * [zdf:channel] Fix tests * [zapiks] Fix test * [xtube] Fix metadata extraction (closes #21073, closes #22455) * [xtube:user] Fix test * [telecinco] Fix extraction (refs #24195) * [telecinco] Add support for article opening videos * [franceculture] Fix extraction (closes #24204) * [xhamster] Fix extraction (closes #24205) * [ChangeLog] Actualize [ci skip] * release 2020.03.01 * [vimeo] Fix subtitles URLs (#24209) * [servus] Add support for new URL schema (closes #23475, closes #23583, closes #24142) * [youtube:playlist] Fix tests (closes #23872) (#23885) * [peertube] Improve extraction * [peertube] Fix issues and improve extraction (closes #23657) * [pornhub] Improve title extraction (closes #24184) * [vimeo] fix showcase password protected video extraction(closes #24224) * [youtube] Fix age-gated videos support without login (closes #24248) * [youtube] Fix tests * [ChangeLog] Actualize [ci skip] * release 2020.03.06 * [nhk] update API version(closes #24270) * [youtube] Improve extraction in 429 error conditions (closes #24283) * [youtube] Improve age-gated videos extraction in 429 error conditions (refs #24283) * [youtube] Remove outdated code Additional get_video_info requests don't seem to provide any extra itags any longer * [README.md] Clarify 429 error * [pornhub] Add support for pornhubpremium.com (#24288) * [utils] Add support for cookies with spaces used instead of tabs * [ChangeLog] Actualize [ci skip] * release 2020.03.08 * Revert "[utils] Add support for cookies with spaces used instead of tabs" According to [1] TABs must be used as separators between fields. Files produces by some tools with spaces as separators are considered malformed. 1. https://curl.haxx.se/docs/http-cookies.html This reverts commitcff99c91d1
. * [utils] Add reference to cookie file format * Revert "[vimeo] fix showcase password protected video extraction(closes #24224)" This reverts commit12ee431676
. * [nhk] Relax _VALID_URL (#24329) * [nhk] Remove obsolete rtmp formats (closes #24329) * [nhk] Update m3u8 URL and use native hls (#24329) * [ndr] Fix extraction (closes #24326) * [xtube] Fix formats extraction (closes #24348) * [xtube] Fix typo * [hellporno] Fix extraction (closes #24399) * [cbc:watch] Add support for authentication * [cbc:watch] Fix authenticated device token caching (closes #19160) * [soundcloud] fix download url extraction(closes #24394) * [limelight] remove disabled API requests(closes #24255) * [bilibili] Add support for new URL schema with BV ids (closes #24439, closes #24442) * [bilibili] Add support for player.bilibili.com (closes #24402) * [teachable] Extract chapter metadata (closes #24421) * [generic] Look for teachable embeds before wistia * [teachable] Update upskillcourses domain New version does not use teachable platform any longer * [teachable] Update gns3 domain * [teachable] Update test * [ChangeLog] Actualize [ci skip] * [ChangeLog] Actualize [ci skip] * release 2020.03.24 * [spankwire] Fix extraction (closes #18924, closes #20648) * [spankwire] Add support for generic embeds (refs #24633) * [youporn] Add support form generic embeds * [mofosex] Add support for generic embeds (closes #24633) * [tele5] Fix extraction (closes #24553) * [extractor/common] Skip malformed ISM manifest XMLs while extracting ISM formats (#24667) * [tv4] Fix ISM formats extraction (closes #24667) * [twitch:clips] Extend _VALID_URL (closes #24290) (#24642) * [motherless] Fix extraction (closes #24699) * [nova:embed] Fix extraction (closes #24700) * [youtube] Skip broken multifeed videos (closes #24711) * [soundcloud] Extract AAC format * [soundcloud] Improve AAC format extraction (closes #19173, closes #24708) * [thisoldhouse] Fix video id extraction (closes #24548) Added support for: with of without "www." and either ".chorus.build" or ".com" It now validated correctly on older URL's ``` <iframe src="https://thisoldhouse.chorus.build/videos/zype/5e33baec27d2e50001d5f52f ``` and newer ones ``` <iframe src="https://www.thisoldhouse.com/videos/zype/5e2b70e95216cc0001615120 ``` * [thisoldhouse] Improve video id extraction (closes #24549) * [youtube] Fix DRM videos detection (refs #24736) * [options] Clarify doc on --exec command (closes #19087) (#24883) * [prosiebensat1] Improve extraction and remove 7tv.de support (#24948) * [prosiebensat1] Extract series metadata * [tenplay] Relax _VALID_URL (closes #25001) * [tvplay] fix Viafree extraction(closes #15189)(closes #24473)(closes #24789) * [yahoo] fix GYAO Player extraction and relax title URL regex(closes #24178)(closes #24778) * [youtube] Use redirected video id if any (closes #25063) * [youtube] Improve player id extraction and add tests * [extractor/common] Extract multiple JSON-LD entries * [crunchyroll] Fix and improve extraction (closes #25096, closes #25060) * [ChangeLog] Actualize [ci skip] * release 2020.05.03 * [puhutv] Remove no longer available HTTP formats (closes #25124) * [utils] Improve cookie files support + Add support for UTF-8 in cookie files * Skip malformed cookie file entries instead of crashing (invalid entry len, invalid expires at) * [dailymotion] Fix typo * [compat] Introduce compat_cookiejar_Cookie * [extractor/common] Use compat_cookiejar_Cookie for _set_cookie (closes #23256, closes #24776) To always ensure cookie name and value are bytestrings on python 2. * [orf] Add support for more radio stations (closes #24938) (#24968) * [uol] fix extraction(closes #22007) * [downloader/http] Finish downloading once received data length matches expected Always do this if possible, i.e. if Content-Length or expected length is known, not only in test. This will save unnecessary last extra loop trying to read 0 bytes. * [downloader/http] Request last data block of exact remaining size Always request last data block of exact size remaining to download if possible not the current block size. * [iprima] Improve extraction (closes #25138) * [youtube] Improve signature cipher extraction (closes #25188) * [ChangeLog] Actualize [ci skip] * release 2020.05.08 * [spike] fix Bellator mgid extraction(closes #25195) * [bbccouk] PEP8 * [mailru] Fix extraction (closes #24530) (#25239) * [README.md] flake8 HTTPS URL (#25230) * [youtube] Add support for yewtu.be (#25226) * [soundcloud] reduce API playlist page limit(closes #25274) * [vimeo] improve format extraction and sorting(closes #25285) * [redtube] Improve title extraction (#25208) * [indavideo] Switch to HTTPS for API request (#25191) * [utils] Fix file permissions in write_json_file (closes #12471) (#25122) * [redtube] Improve formats extraction and extract m3u8 formats (closes #25311, closes #25321) * [ard] Improve _VALID_URL (closes #25134) (#25198) * [giantbomb] Extend _VALID_URL (#25222) * [postprocessor/ffmpeg] Embed series metadata with --add-metadata * [youtube] Add support for more invidious instances (#25417) * [ard:beta] Extend _VALID_URL (closes #25405) * [ChangeLog] Actualize [ci skip] * release 2020.05.29 * [jwplatform] Improve embeds extraction (closes #25467) * [periscope] Fix untitled broadcasts (#25482) * [twitter:broadcast] Add untitled periscope broadcast test * [malltv] Add support for sk.mall.tv (#25445) * [brightcove] Fix subtitles extraction (closes #25540) * [brightcove] Sort imports * [twitch] Pass v5 accept header and fix thumbnails extraction (closes #25531) * [twitch:stream] Fix extraction (closes #25528) * [twitch:stream] Expect 400 and 410 HTTP errors from API * [tele5] Prefer jwplatform over nexx (closes #25533) * [jwplatform] Add support for bypass geo restriction * [tele5] Bypass geo restriction * [ChangeLog] Actualize [ci skip] * release 2020.06.06 * [kaltura] Add support for multiple embeds on a webpage (closes #25523) * [youtube] Extract chapters from JSON (closes #24819) * [facebook] Support single-video ID links I stumbled upon this at https://www.facebook.com/bwfbadminton/posts/10157127020046316 . No idea how prevalent it is yet. * [youtube] Fix playlist and feed extraction (closes #25675) * [youtube] Fix thumbnails extraction and remove uploader id extraction warning (closes #25676) * [youtube] Fix upload date extraction * [youtube] Improve view count extraction * [youtube] Fix uploader id and uploader URL extraction * [ChangeLog] Actualize [ci skip] * release 2020.06.16 * [youtube] Fix categories and improve tags extraction * [youtube] Force old layout (closes #25682, closes #25683, closes #25680, closes #25686) * [ChangeLog] Actualize [ci skip] * release 2020.06.16.1 * [brightcove] Improve embed detection (closes #25674) * [bellmedia] add support for cp24.com clip URLs(closes #25764) * [youtube:playlists] Extend _VALID_URL (closes #25810) * [youtube] Prevent excess HTTP 301 (#25786) * [wistia] Restrict embed regex (closes #25969) * [youtube] Improve description extraction (closes #25937) (#25980) * [youtube] Fix sigfunc name extraction (closes #26134, closes #26135, closes #26136, closes #26137) * [ChangeLog] Actualize [ci skip] * release 2020.07.28 * [xhamster] Extend _VALID_URL (closes #25789) (#25804) * [xhamster] Fix extraction (closes #26157) (#26254) * [xhamster] Extend _VALID_URL (closes #25927) Co-authored-by: Remita Amine <remitamine@gmail.com> Co-authored-by: Sergey M․ <dstftw@gmail.com> Co-authored-by: nmeum <soeren+github@soeren-tempel.net> Co-authored-by: Roxedus <me@roxedus.dev> Co-authored-by: Singwai Chan <c.singwai@gmail.com> Co-authored-by: cdarlint <cdarlint@users.noreply.github.com> Co-authored-by: Johannes N <31795504+jonolt@users.noreply.github.com> Co-authored-by: jnozsc <jnozsc@gmail.com> Co-authored-by: Moritz Patelscheck <moritz.patelscheck@campus.tu-berlin.de> Co-authored-by: PB <3854688+uno20001@users.noreply.github.com> Co-authored-by: Philipp Hagemeister <phihag@phihag.de> Co-authored-by: Xaver Hellauer <software@hellauer.bayern> Co-authored-by: d2au <d2au.dev@gmail.com> Co-authored-by: Jan 'Yenda' Trmal <jtrmal@gmail.com> Co-authored-by: jxu <7989982+jxu@users.noreply.github.com> Co-authored-by: Martin Ström <name@my-domain.se> Co-authored-by: The Hatsune Daishi <nao20010128@gmail.com> Co-authored-by: tsia <github@tsia.de> Co-authored-by: 3risian <59593325+3risian@users.noreply.github.com> Co-authored-by: Tristan Waddington <tristan.waddington@gmail.com> Co-authored-by: Devon Meunier <devon.meunier@gmail.com> Co-authored-by: Felix Stupp <felix.stupp@outlook.com> Co-authored-by: tom <tomster954@gmail.com> Co-authored-by: AndrewMBL <62922222+AndrewMBL@users.noreply.github.com> Co-authored-by: willbeaufoy <will@willbeaufoy.net> Co-authored-by: Philipp Stehle <anderschwiedu@googlemail.com> Co-authored-by: hh0rva1h <61889859+hh0rva1h@users.noreply.github.com> Co-authored-by: comsomisha <shmelev1996@mail.ru> Co-authored-by: TotalCaesar659 <14265316+TotalCaesar659@users.noreply.github.com> Co-authored-by: Juan Francisco Cantero Hurtado <iam@juanfra.info> Co-authored-by: Dave Loyall <dave@the-good-guys.net> Co-authored-by: tlsssl <63866177+tlsssl@users.noreply.github.com> Co-authored-by: Rob <ankenyr@gmail.com> Co-authored-by: Michael Klein <github@a98shuttle.de> Co-authored-by: JordanWeatherby <47519158+JordanWeatherby@users.noreply.github.com> Co-authored-by: striker.sh <19488257+strikersh@users.noreply.github.com> Co-authored-by: Matej Dujava <mdujava@gmail.com> Co-authored-by: Glenn Slayden <5589855+glenn-slayden@users.noreply.github.com> Co-authored-by: MRWITEK <mrvvitek@gmail.com> Co-authored-by: JChris246 <43832407+JChris246@users.noreply.github.com> Co-authored-by: TheRealDude2 <the.real.dude@gmx.de>
610 lines
25 KiB
Python
610 lines
25 KiB
Python
# coding: utf-8
|
|
from __future__ import unicode_literals
|
|
|
|
import re
|
|
|
|
from .common import InfoExtractor
|
|
from ..compat import (
|
|
compat_HTTPError,
|
|
compat_parse_qs,
|
|
compat_urllib_parse_unquote,
|
|
compat_urllib_parse_urlparse,
|
|
)
|
|
from ..utils import (
|
|
dict_get,
|
|
ExtractorError,
|
|
float_or_none,
|
|
int_or_none,
|
|
try_get,
|
|
strip_or_none,
|
|
unified_timestamp,
|
|
update_url_query,
|
|
xpath_text,
|
|
)
|
|
|
|
from .periscope import (
|
|
PeriscopeBaseIE,
|
|
PeriscopeIE,
|
|
)
|
|
|
|
|
|
class TwitterBaseIE(InfoExtractor):
|
|
_API_BASE = 'https://api.twitter.com/1.1/'
|
|
_BASE_REGEX = r'https?://(?:(?:www|m(?:obile)?)\.)?twitter\.com/'
|
|
_GUEST_TOKEN = None
|
|
|
|
def _extract_variant_formats(self, variant, video_id):
|
|
variant_url = variant.get('url')
|
|
if not variant_url:
|
|
return []
|
|
elif '.m3u8' in variant_url:
|
|
return self._extract_m3u8_formats(
|
|
variant_url, video_id, 'mp4', 'm3u8_native',
|
|
m3u8_id='hls', fatal=False)
|
|
else:
|
|
tbr = int_or_none(dict_get(variant, ('bitrate', 'bit_rate')), 1000) or None
|
|
f = {
|
|
'url': variant_url,
|
|
'format_id': 'http' + ('-%d' % tbr if tbr else ''),
|
|
'tbr': tbr,
|
|
}
|
|
self._search_dimensions_in_video_url(f, variant_url)
|
|
return [f]
|
|
|
|
def _extract_formats_from_vmap_url(self, vmap_url, video_id):
|
|
vmap_data = self._download_xml(vmap_url, video_id)
|
|
formats = []
|
|
urls = []
|
|
for video_variant in vmap_data.findall('.//{http://twitter.com/schema/videoVMapV2.xsd}videoVariant'):
|
|
video_variant.attrib['url'] = compat_urllib_parse_unquote(
|
|
video_variant.attrib['url'])
|
|
urls.append(video_variant.attrib['url'])
|
|
formats.extend(self._extract_variant_formats(
|
|
video_variant.attrib, video_id))
|
|
video_url = strip_or_none(xpath_text(vmap_data, './/MediaFile'))
|
|
if video_url not in urls:
|
|
formats.extend(self._extract_variant_formats({'url': video_url}, video_id))
|
|
return formats
|
|
|
|
@staticmethod
|
|
def _search_dimensions_in_video_url(a_format, video_url):
|
|
m = re.search(r'/(?P<width>\d+)x(?P<height>\d+)/', video_url)
|
|
if m:
|
|
a_format.update({
|
|
'width': int(m.group('width')),
|
|
'height': int(m.group('height')),
|
|
})
|
|
|
|
def _call_api(self, path, video_id, query={}):
|
|
headers = {
|
|
'Authorization': 'Bearer AAAAAAAAAAAAAAAAAAAAAPYXBAAAAAAACLXUNDekMxqa8h%2F40K4moUkGsoc%3DTYfbDKbT3jJPCEVnMYqilB28NHfOPqkca3qaAxGfsyKCs0wRbw',
|
|
}
|
|
if not self._GUEST_TOKEN:
|
|
self._GUEST_TOKEN = self._download_json(
|
|
self._API_BASE + 'guest/activate.json', video_id,
|
|
'Downloading guest token', data=b'',
|
|
headers=headers)['guest_token']
|
|
headers['x-guest-token'] = self._GUEST_TOKEN
|
|
try:
|
|
return self._download_json(
|
|
self._API_BASE + path, video_id, headers=headers, query=query)
|
|
except ExtractorError as e:
|
|
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 403:
|
|
raise ExtractorError(self._parse_json(
|
|
e.cause.read().decode(),
|
|
video_id)['errors'][0]['message'], expected=True)
|
|
raise
|
|
|
|
|
|
class TwitterCardIE(InfoExtractor):
|
|
IE_NAME = 'twitter:card'
|
|
_VALID_URL = TwitterBaseIE._BASE_REGEX + r'i/(?:cards/tfw/v1|videos(?:/tweet)?)/(?P<id>\d+)'
|
|
_TESTS = [
|
|
{
|
|
'url': 'https://twitter.com/i/cards/tfw/v1/560070183650213889',
|
|
# MD5 checksums are different in different places
|
|
'info_dict': {
|
|
'id': '560070183650213889',
|
|
'ext': 'mp4',
|
|
'title': "Twitter - You can now shoot, edit and share video on Twitter. Capture life's most moving moments from your perspective.",
|
|
'description': 'md5:18d3e24bb4f6e5007487dd546e53bd96',
|
|
'uploader': 'Twitter',
|
|
'uploader_id': 'Twitter',
|
|
'thumbnail': r're:^https?://.*\.jpg',
|
|
'duration': 30.033,
|
|
'timestamp': 1422366112,
|
|
'upload_date': '20150127',
|
|
},
|
|
},
|
|
{
|
|
'url': 'https://twitter.com/i/cards/tfw/v1/623160978427936768',
|
|
'md5': '7137eca597f72b9abbe61e5ae0161399',
|
|
'info_dict': {
|
|
'id': '623160978427936768',
|
|
'ext': 'mp4',
|
|
'title': "NASA - Fly over Pluto's icy Norgay Mountains and Sputnik Plain in this @NASANewHorizons #PlutoFlyby video.",
|
|
'description': "Fly over Pluto's icy Norgay Mountains and Sputnik Plain in this @NASANewHorizons #PlutoFlyby video. https://t.co/BJYgOjSeGA",
|
|
'uploader': 'NASA',
|
|
'uploader_id': 'NASA',
|
|
'timestamp': 1437408129,
|
|
'upload_date': '20150720',
|
|
},
|
|
},
|
|
{
|
|
'url': 'https://twitter.com/i/cards/tfw/v1/654001591733886977',
|
|
'md5': 'b6d9683dd3f48e340ded81c0e917ad46',
|
|
'info_dict': {
|
|
'id': 'dq4Oj5quskI',
|
|
'ext': 'mp4',
|
|
'title': 'Ubuntu 11.10 Overview',
|
|
'description': 'md5:a831e97fa384863d6e26ce48d1c43376',
|
|
'upload_date': '20111013',
|
|
'uploader': 'OMG! UBUNTU!',
|
|
'uploader_id': 'omgubuntu',
|
|
},
|
|
'add_ie': ['Youtube'],
|
|
},
|
|
{
|
|
'url': 'https://twitter.com/i/cards/tfw/v1/665289828897005568',
|
|
'md5': '6dabeaca9e68cbb71c99c322a4b42a11',
|
|
'info_dict': {
|
|
'id': 'iBb2x00UVlv',
|
|
'ext': 'mp4',
|
|
'upload_date': '20151113',
|
|
'uploader_id': '1189339351084113920',
|
|
'uploader': 'ArsenalTerje',
|
|
'title': 'Vine by ArsenalTerje',
|
|
'timestamp': 1447451307,
|
|
},
|
|
'add_ie': ['Vine'],
|
|
}, {
|
|
'url': 'https://twitter.com/i/videos/tweet/705235433198714880',
|
|
'md5': '884812a2adc8aaf6fe52b15ccbfa3b88',
|
|
'info_dict': {
|
|
'id': '705235433198714880',
|
|
'ext': 'mp4',
|
|
'title': "Brent Yarina - Khalil Iverson's missed highlight dunk. And made highlight dunk. In one highlight.",
|
|
'description': "Khalil Iverson's missed highlight dunk. And made highlight dunk. In one highlight. https://t.co/OrxcJ28Bns",
|
|
'uploader': 'Brent Yarina',
|
|
'uploader_id': 'BTNBrentYarina',
|
|
'timestamp': 1456976204,
|
|
'upload_date': '20160303',
|
|
},
|
|
'skip': 'This content is no longer available.',
|
|
}, {
|
|
'url': 'https://twitter.com/i/videos/752274308186120192',
|
|
'only_matching': True,
|
|
},
|
|
]
|
|
|
|
def _real_extract(self, url):
|
|
status_id = self._match_id(url)
|
|
return self.url_result(
|
|
'https://twitter.com/statuses/' + status_id,
|
|
TwitterIE.ie_key(), status_id)
|
|
|
|
|
|
class TwitterIE(TwitterBaseIE):
|
|
IE_NAME = 'twitter'
|
|
_VALID_URL = TwitterBaseIE._BASE_REGEX + r'(?:(?:i/web|[^/]+)/status|statuses)/(?P<id>\d+)'
|
|
|
|
_TESTS = [{
|
|
'url': 'https://twitter.com/freethenipple/status/643211948184596480',
|
|
'info_dict': {
|
|
'id': '643211948184596480',
|
|
'ext': 'mp4',
|
|
'title': 'FREE THE NIPPLE - FTN supporters on Hollywood Blvd today!',
|
|
'thumbnail': r're:^https?://.*\.jpg',
|
|
'description': 'FTN supporters on Hollywood Blvd today! http://t.co/c7jHH749xJ',
|
|
'uploader': 'FREE THE NIPPLE',
|
|
'uploader_id': 'freethenipple',
|
|
'duration': 12.922,
|
|
'timestamp': 1442188653,
|
|
'upload_date': '20150913',
|
|
'age_limit': 18,
|
|
},
|
|
}, {
|
|
'url': 'https://twitter.com/giphz/status/657991469417025536/photo/1',
|
|
'md5': 'f36dcd5fb92bf7057f155e7d927eeb42',
|
|
'info_dict': {
|
|
'id': '657991469417025536',
|
|
'ext': 'mp4',
|
|
'title': 'Gifs - tu vai cai tu vai cai tu nao eh capaz disso tu vai cai',
|
|
'description': 'Gifs on Twitter: "tu vai cai tu vai cai tu nao eh capaz disso tu vai cai https://t.co/tM46VHFlO5"',
|
|
'thumbnail': r're:^https?://.*\.png',
|
|
'uploader': 'Gifs',
|
|
'uploader_id': 'giphz',
|
|
},
|
|
'expected_warnings': ['height', 'width'],
|
|
'skip': 'Account suspended',
|
|
}, {
|
|
'url': 'https://twitter.com/starwars/status/665052190608723968',
|
|
'info_dict': {
|
|
'id': '665052190608723968',
|
|
'ext': 'mp4',
|
|
'title': 'Star Wars - A new beginning is coming December 18. Watch the official 60 second #TV spot for #StarWars: #TheForceAwakens.',
|
|
'description': 'A new beginning is coming December 18. Watch the official 60 second #TV spot for #StarWars: #TheForceAwakens. https://t.co/OkSqT2fjWJ',
|
|
'uploader_id': 'starwars',
|
|
'uploader': 'Star Wars',
|
|
'timestamp': 1447395772,
|
|
'upload_date': '20151113',
|
|
},
|
|
}, {
|
|
'url': 'https://twitter.com/BTNBrentYarina/status/705235433198714880',
|
|
'info_dict': {
|
|
'id': '705235433198714880',
|
|
'ext': 'mp4',
|
|
'title': "Brent Yarina - Khalil Iverson's missed highlight dunk. And made highlight dunk. In one highlight.",
|
|
'description': "Khalil Iverson's missed highlight dunk. And made highlight dunk. In one highlight. https://t.co/OrxcJ28Bns",
|
|
'uploader_id': 'BTNBrentYarina',
|
|
'uploader': 'Brent Yarina',
|
|
'timestamp': 1456976204,
|
|
'upload_date': '20160303',
|
|
},
|
|
'params': {
|
|
# The same video as https://twitter.com/i/videos/tweet/705235433198714880
|
|
# Test case of TwitterCardIE
|
|
'skip_download': True,
|
|
},
|
|
}, {
|
|
'url': 'https://twitter.com/jaydingeer/status/700207533655363584',
|
|
'info_dict': {
|
|
'id': '700207533655363584',
|
|
'ext': 'mp4',
|
|
'title': 'simon vetugo - BEAT PROD: @suhmeduh #Damndaniel',
|
|
'description': 'BEAT PROD: @suhmeduh https://t.co/HBrQ4AfpvZ #Damndaniel https://t.co/byBooq2ejZ',
|
|
'thumbnail': r're:^https?://.*\.jpg',
|
|
'uploader': 'simon vetugo',
|
|
'uploader_id': 'simonvertugo',
|
|
'duration': 30.0,
|
|
'timestamp': 1455777459,
|
|
'upload_date': '20160218',
|
|
},
|
|
}, {
|
|
'url': 'https://twitter.com/Filmdrunk/status/713801302971588609',
|
|
'md5': '89a15ed345d13b86e9a5a5e051fa308a',
|
|
'info_dict': {
|
|
'id': 'MIOxnrUteUd',
|
|
'ext': 'mp4',
|
|
'title': 'Dr.Pepperの飲み方 #japanese #バカ #ドクペ #電動ガン',
|
|
'uploader': 'TAKUMA',
|
|
'uploader_id': '1004126642786242560',
|
|
'timestamp': 1402826626,
|
|
'upload_date': '20140615',
|
|
},
|
|
'add_ie': ['Vine'],
|
|
}, {
|
|
'url': 'https://twitter.com/captainamerica/status/719944021058060289',
|
|
'info_dict': {
|
|
'id': '719944021058060289',
|
|
'ext': 'mp4',
|
|
'title': 'Captain America - @King0fNerd Are you sure you made the right choice? Find out in theaters.',
|
|
'description': '@King0fNerd Are you sure you made the right choice? Find out in theaters. https://t.co/GpgYi9xMJI',
|
|
'uploader_id': 'CaptainAmerica',
|
|
'uploader': 'Captain America',
|
|
'duration': 3.17,
|
|
'timestamp': 1460483005,
|
|
'upload_date': '20160412',
|
|
},
|
|
}, {
|
|
'url': 'https://twitter.com/OPP_HSD/status/779210622571536384',
|
|
'info_dict': {
|
|
'id': '1zqKVVlkqLaKB',
|
|
'ext': 'mp4',
|
|
'title': 'Sgt Kerry Schmidt - Ontario Provincial Police - Road rage, mischief, assault, rollover and fire in one occurrence',
|
|
'upload_date': '20160923',
|
|
'uploader_id': '1PmKqpJdOJQoY',
|
|
'uploader': 'Sgt Kerry Schmidt - Ontario Provincial Police',
|
|
'timestamp': 1474613214,
|
|
},
|
|
'add_ie': ['Periscope'],
|
|
}, {
|
|
# has mp4 formats via mobile API
|
|
'url': 'https://twitter.com/news_al3alm/status/852138619213144067',
|
|
'info_dict': {
|
|
'id': '852138619213144067',
|
|
'ext': 'mp4',
|
|
'title': 'عالم الأخبار - كلمة تاريخية بجلسة الجناسي التاريخية.. النائب خالد مؤنس العتيبي للمعارضين : اتقوا الله .. الظلم ظلمات يوم القيامة',
|
|
'description': 'كلمة تاريخية بجلسة الجناسي التاريخية.. النائب خالد مؤنس العتيبي للمعارضين : اتقوا الله .. الظلم ظلمات يوم القيامة https://t.co/xg6OhpyKfN',
|
|
'uploader': 'عالم الأخبار',
|
|
'uploader_id': 'news_al3alm',
|
|
'duration': 277.4,
|
|
'timestamp': 1492000653,
|
|
'upload_date': '20170412',
|
|
},
|
|
}, {
|
|
'url': 'https://twitter.com/i/web/status/910031516746514432',
|
|
'info_dict': {
|
|
'id': '910031516746514432',
|
|
'ext': 'mp4',
|
|
'title': 'Préfet de Guadeloupe - [Direct] #Maria Le centre se trouve actuellement au sud de Basse-Terre. Restez confinés. Réfugiez-vous dans la pièce la + sûre.',
|
|
'thumbnail': r're:^https?://.*\.jpg',
|
|
'description': '[Direct] #Maria Le centre se trouve actuellement au sud de Basse-Terre. Restez confinés. Réfugiez-vous dans la pièce la + sûre. https://t.co/mwx01Rs4lo',
|
|
'uploader': 'Préfet de Guadeloupe',
|
|
'uploader_id': 'Prefet971',
|
|
'duration': 47.48,
|
|
'timestamp': 1505803395,
|
|
'upload_date': '20170919',
|
|
},
|
|
'params': {
|
|
'skip_download': True, # requires ffmpeg
|
|
},
|
|
}, {
|
|
# card via api.twitter.com/1.1/videos/tweet/config
|
|
'url': 'https://twitter.com/LisPower1/status/1001551623938805763',
|
|
'info_dict': {
|
|
'id': '1001551623938805763',
|
|
'ext': 'mp4',
|
|
'title': 're:.*?Shep is on a roll today.*?',
|
|
'thumbnail': r're:^https?://.*\.jpg',
|
|
'description': 'md5:37b9f2ff31720cef23b2bd42ee8a0f09',
|
|
'uploader': 'Lis Power',
|
|
'uploader_id': 'LisPower1',
|
|
'duration': 111.278,
|
|
'timestamp': 1527623489,
|
|
'upload_date': '20180529',
|
|
},
|
|
'params': {
|
|
'skip_download': True, # requires ffmpeg
|
|
},
|
|
}, {
|
|
'url': 'https://twitter.com/foobar/status/1087791357756956680',
|
|
'info_dict': {
|
|
'id': '1087791357756956680',
|
|
'ext': 'mp4',
|
|
'title': 'Twitter - A new is coming. Some of you got an opt-in to try it now. Check out the emoji button, quick keyboard shortcuts, upgraded trends, advanced search, and more. Let us know your thoughts!',
|
|
'thumbnail': r're:^https?://.*\.jpg',
|
|
'description': 'md5:6dfd341a3310fb97d80d2bf7145df976',
|
|
'uploader': 'Twitter',
|
|
'uploader_id': 'Twitter',
|
|
'duration': 61.567,
|
|
'timestamp': 1548184644,
|
|
'upload_date': '20190122',
|
|
},
|
|
}, {
|
|
# not available in Periscope
|
|
'url': 'https://twitter.com/ViviEducation/status/1136534865145286656',
|
|
'info_dict': {
|
|
'id': '1vOGwqejwoWxB',
|
|
'ext': 'mp4',
|
|
'title': 'Vivi - Vivi founder @lior_rauchy announcing our new student feedback tool live at @EduTECH_AU #EduTECH2019',
|
|
'uploader': 'Vivi',
|
|
'uploader_id': '1eVjYOLGkGrQL',
|
|
},
|
|
'add_ie': ['TwitterBroadcast'],
|
|
}, {
|
|
# Twitch Clip Embed
|
|
'url': 'https://twitter.com/GunB1g/status/1163218564784017422',
|
|
'only_matching': True,
|
|
}, {
|
|
# promo_video_website card
|
|
'url': 'https://twitter.com/GunB1g/status/1163218564784017422',
|
|
'only_matching': True,
|
|
}]
|
|
|
|
def _real_extract(self, url):
|
|
twid = self._match_id(url)
|
|
status = self._call_api(
|
|
'statuses/show/%s.json' % twid, twid, {
|
|
'cards_platform': 'Web-12',
|
|
'include_cards': 1,
|
|
'include_reply_count': 1,
|
|
'include_user_entities': 0,
|
|
'tweet_mode': 'extended',
|
|
})
|
|
|
|
title = description = status['full_text'].replace('\n', ' ')
|
|
# strip 'https -_t.co_BJYgOjSeGA' junk from filenames
|
|
title = re.sub(r'\s+(https?://[^ ]+)', '', title)
|
|
user = status.get('user') or {}
|
|
uploader = user.get('name')
|
|
if uploader:
|
|
title = '%s - %s' % (uploader, title)
|
|
uploader_id = user.get('screen_name')
|
|
|
|
tags = []
|
|
for hashtag in (try_get(status, lambda x: x['entities']['hashtags'], list) or []):
|
|
hashtag_text = hashtag.get('text')
|
|
if not hashtag_text:
|
|
continue
|
|
tags.append(hashtag_text)
|
|
|
|
info = {
|
|
'id': twid,
|
|
'title': title,
|
|
'description': description,
|
|
'uploader': uploader,
|
|
'timestamp': unified_timestamp(status.get('created_at')),
|
|
'uploader_id': uploader_id,
|
|
'uploader_url': 'https://twitter.com/' + uploader_id if uploader_id else None,
|
|
'like_count': int_or_none(status.get('favorite_count')),
|
|
'repost_count': int_or_none(status.get('retweet_count')),
|
|
'comment_count': int_or_none(status.get('reply_count')),
|
|
'age_limit': 18 if status.get('possibly_sensitive') else 0,
|
|
'tags': tags,
|
|
}
|
|
|
|
media = try_get(status, lambda x: x['extended_entities']['media'][0])
|
|
if media and media.get('type') != 'photo':
|
|
video_info = media.get('video_info') or {}
|
|
|
|
formats = []
|
|
for variant in video_info.get('variants', []):
|
|
formats.extend(self._extract_variant_formats(variant, twid))
|
|
self._sort_formats(formats)
|
|
|
|
thumbnails = []
|
|
media_url = media.get('media_url_https') or media.get('media_url')
|
|
if media_url:
|
|
def add_thumbnail(name, size):
|
|
thumbnails.append({
|
|
'id': name,
|
|
'url': update_url_query(media_url, {'name': name}),
|
|
'width': int_or_none(size.get('w') or size.get('width')),
|
|
'height': int_or_none(size.get('h') or size.get('height')),
|
|
})
|
|
for name, size in media.get('sizes', {}).items():
|
|
add_thumbnail(name, size)
|
|
add_thumbnail('orig', media.get('original_info') or {})
|
|
|
|
info.update({
|
|
'formats': formats,
|
|
'thumbnails': thumbnails,
|
|
'duration': float_or_none(video_info.get('duration_millis'), 1000),
|
|
})
|
|
else:
|
|
card = status.get('card')
|
|
if card:
|
|
binding_values = card['binding_values']
|
|
|
|
def get_binding_value(k):
|
|
o = binding_values.get(k) or {}
|
|
return try_get(o, lambda x: x[x['type'].lower() + '_value'])
|
|
|
|
card_name = card['name'].split(':')[-1]
|
|
if card_name in ('amplify', 'promo_video_website'):
|
|
is_amplify = card_name == 'amplify'
|
|
vmap_url = get_binding_value('amplify_url_vmap') if is_amplify else get_binding_value('player_stream_url')
|
|
content_id = get_binding_value('%s_content_id' % (card_name if is_amplify else 'player'))
|
|
formats = self._extract_formats_from_vmap_url(vmap_url, content_id or twid)
|
|
self._sort_formats(formats)
|
|
|
|
thumbnails = []
|
|
for suffix in ('_small', '', '_large', '_x_large', '_original'):
|
|
image = get_binding_value('player_image' + suffix) or {}
|
|
image_url = image.get('url')
|
|
if not image_url or '/player-placeholder' in image_url:
|
|
continue
|
|
thumbnails.append({
|
|
'id': suffix[1:] if suffix else 'medium',
|
|
'url': image_url,
|
|
'width': int_or_none(image.get('width')),
|
|
'height': int_or_none(image.get('height')),
|
|
})
|
|
|
|
info.update({
|
|
'formats': formats,
|
|
'thumbnails': thumbnails,
|
|
'duration': int_or_none(get_binding_value(
|
|
'content_duration_seconds')),
|
|
})
|
|
elif card_name == 'player':
|
|
info.update({
|
|
'_type': 'url',
|
|
'url': get_binding_value('player_url'),
|
|
})
|
|
elif card_name == 'periscope_broadcast':
|
|
info.update({
|
|
'_type': 'url',
|
|
'url': get_binding_value('url') or get_binding_value('player_url'),
|
|
'ie_key': PeriscopeIE.ie_key(),
|
|
})
|
|
elif card_name == 'broadcast':
|
|
info.update({
|
|
'_type': 'url',
|
|
'url': get_binding_value('broadcast_url'),
|
|
'ie_key': TwitterBroadcastIE.ie_key(),
|
|
})
|
|
else:
|
|
raise ExtractorError('Unsupported Twitter Card.')
|
|
else:
|
|
expanded_url = try_get(status, lambda x: x['entities']['urls'][0]['expanded_url'])
|
|
if not expanded_url:
|
|
raise ExtractorError("There's no video in this tweet.")
|
|
info.update({
|
|
'_type': 'url',
|
|
'url': expanded_url,
|
|
})
|
|
return info
|
|
|
|
|
|
class TwitterAmplifyIE(TwitterBaseIE):
|
|
IE_NAME = 'twitter:amplify'
|
|
_VALID_URL = r'https?://amp\.twimg\.com/v/(?P<id>[0-9a-f\-]{36})'
|
|
|
|
_TEST = {
|
|
'url': 'https://amp.twimg.com/v/0ba0c3c7-0af3-4c0a-bed5-7efd1ffa2951',
|
|
'md5': '7df102d0b9fd7066b86f3159f8e81bf6',
|
|
'info_dict': {
|
|
'id': '0ba0c3c7-0af3-4c0a-bed5-7efd1ffa2951',
|
|
'ext': 'mp4',
|
|
'title': 'Twitter Video',
|
|
'thumbnail': 're:^https?://.*',
|
|
},
|
|
}
|
|
|
|
def _real_extract(self, url):
|
|
video_id = self._match_id(url)
|
|
webpage = self._download_webpage(url, video_id)
|
|
|
|
vmap_url = self._html_search_meta(
|
|
'twitter:amplify:vmap', webpage, 'vmap url')
|
|
formats = self._extract_formats_from_vmap_url(vmap_url, video_id)
|
|
|
|
thumbnails = []
|
|
thumbnail = self._html_search_meta(
|
|
'twitter:image:src', webpage, 'thumbnail', fatal=False)
|
|
|
|
def _find_dimension(target):
|
|
w = int_or_none(self._html_search_meta(
|
|
'twitter:%s:width' % target, webpage, fatal=False))
|
|
h = int_or_none(self._html_search_meta(
|
|
'twitter:%s:height' % target, webpage, fatal=False))
|
|
return w, h
|
|
|
|
if thumbnail:
|
|
thumbnail_w, thumbnail_h = _find_dimension('image')
|
|
thumbnails.append({
|
|
'url': thumbnail,
|
|
'width': thumbnail_w,
|
|
'height': thumbnail_h,
|
|
})
|
|
|
|
video_w, video_h = _find_dimension('player')
|
|
formats[0].update({
|
|
'width': video_w,
|
|
'height': video_h,
|
|
})
|
|
|
|
return {
|
|
'id': video_id,
|
|
'title': 'Twitter Video',
|
|
'formats': formats,
|
|
'thumbnails': thumbnails,
|
|
}
|
|
|
|
|
|
class TwitterBroadcastIE(TwitterBaseIE, PeriscopeBaseIE):
|
|
IE_NAME = 'twitter:broadcast'
|
|
_VALID_URL = TwitterBaseIE._BASE_REGEX + r'i/broadcasts/(?P<id>[0-9a-zA-Z]{13})'
|
|
|
|
_TEST = {
|
|
# untitled Periscope video
|
|
'url': 'https://twitter.com/i/broadcasts/1yNGaQLWpejGj',
|
|
'info_dict': {
|
|
'id': '1yNGaQLWpejGj',
|
|
'ext': 'mp4',
|
|
'title': 'Andrea May Sahouri - Periscope Broadcast',
|
|
'uploader': 'Andrea May Sahouri',
|
|
'uploader_id': '1PXEdBZWpGwKe',
|
|
},
|
|
}
|
|
|
|
def _real_extract(self, url):
|
|
broadcast_id = self._match_id(url)
|
|
broadcast = self._call_api(
|
|
'broadcasts/show.json', broadcast_id,
|
|
{'ids': broadcast_id})['broadcasts'][broadcast_id]
|
|
info = self._parse_broadcast_data(broadcast, broadcast_id)
|
|
media_key = broadcast['media_key']
|
|
source = self._call_api(
|
|
'live_video_stream/status/' + media_key, media_key)['source']
|
|
m3u8_url = source.get('noRedirectPlaybackUrl') or source['location']
|
|
if '/live_video_stream/geoblocked/' in m3u8_url:
|
|
self.raise_geo_restricted()
|
|
m3u8_id = compat_parse_qs(compat_urllib_parse_urlparse(
|
|
m3u8_url).query).get('type', [None])[0]
|
|
state, width, height = self._extract_common_format_info(broadcast)
|
|
info['formats'] = self._extract_pscp_m3u8_formats(
|
|
m3u8_url, broadcast_id, m3u8_id, state, width, height)
|
|
return info
|