diff options
| author | Aakash Gajjar <skyqutip@gmail.com> | 2020-08-25 20:23:34 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-25 20:23:34 +0530 |
| commit | b827ee921fe510a8730a9fab070148ed2b8279b5 (patch) | |
| tree | 4db8b0a8d954cea6fd86188a633850d7139f79c7 /youtube_dl/extractor/vice.py | |
| parent | 89cee32ce9b504bd2b892f6fd2bcda46ae33a10c (diff) | |
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>
Diffstat (limited to 'youtube_dl/extractor/vice.py')
| -rw-r--r-- | youtube_dl/extractor/vice.py | 212 |
1 files changed, 106 insertions, 106 deletions
diff --git a/youtube_dl/extractor/vice.py b/youtube_dl/extractor/vice.py index 8fdfd743d..e37499512 100644 --- a/youtube_dl/extractor/vice.py +++ b/youtube_dl/extractor/vice.py @@ -1,35 +1,50 @@ # coding: utf-8 from __future__ import unicode_literals -import re -import time +import functools import hashlib import json import random +import re +import time from .adobepass import AdobePassIE -from .youtube import YoutubeIE from .common import InfoExtractor +from .youtube import YoutubeIE from ..compat import ( compat_HTTPError, compat_str, ) from ..utils import ( + clean_html, ExtractorError, int_or_none, + OnDemandPagedList, parse_age_limit, str_or_none, try_get, ) -class ViceIE(AdobePassIE): +class ViceBaseIE(InfoExtractor): + def _call_api(self, resource, resource_key, resource_id, locale, fields, args=''): + return self._download_json( + 'https://video.vice.com/api/v1/graphql', resource_id, query={ + 'query': '''{ + %s(locale: "%s", %s: "%s"%s) { + %s + } +}''' % (resource, locale, resource_key, resource_id, args, fields), + })['data'][resource] + + +class ViceIE(ViceBaseIE, AdobePassIE): IE_NAME = 'vice' - _VALID_URL = r'https?://(?:(?:video|vms)\.vice|(?:www\.)?viceland)\.com/(?P<locale>[^/]+)/(?:video/[^/]+|embed)/(?P<id>[\da-f]+)' + _VALID_URL = r'https?://(?:(?:video|vms)\.vice|(?:www\.)?vice(?:land|tv))\.com/(?P<locale>[^/]+)/(?:video/[^/]+|embed)/(?P<id>[\da-f]{24})' _TESTS = [{ 'url': 'https://video.vice.com/en_us/video/pet-cremator/58c69e38a55424f1227dc3f7', 'info_dict': { - 'id': '5e647f0125e145c9aef2069412c0cbde', + 'id': '58c69e38a55424f1227dc3f7', 'ext': 'mp4', 'title': '10 Questions You Always Wanted To Ask: Pet Cremator', 'description': 'md5:fe856caacf61fe0e74fab15ce2b07ca5', @@ -43,17 +58,16 @@ class ViceIE(AdobePassIE): # m3u8 download 'skip_download': True, }, - 'add_ie': ['UplynkPreplay'], }, { # geo restricted to US 'url': 'https://video.vice.com/en_us/video/the-signal-from-tolva/5816510690b70e6c5fd39a56', 'info_dict': { - 'id': '930c0ad1f47141cc955087eecaddb0e2', + 'id': '5816510690b70e6c5fd39a56', 'ext': 'mp4', - 'uploader': 'waypoint', + 'uploader': 'vice', 'title': 'The Signal From Tölva', 'description': 'md5:3927e3c79f9e8094606a2b3c5b5e55d5', - 'uploader_id': '57f7d621e05ca860fa9ccaf9', + 'uploader_id': '57a204088cb727dec794c67b', 'timestamp': 1477941983, 'upload_date': '20161031', }, @@ -61,15 +75,14 @@ class ViceIE(AdobePassIE): # m3u8 download 'skip_download': True, }, - 'add_ie': ['UplynkPreplay'], }, { 'url': 'https://video.vice.com/alps/video/ulfs-wien-beruchtigste-grafitti-crew-part-1/581b12b60a0e1f4c0fb6ea2f', 'info_dict': { 'id': '581b12b60a0e1f4c0fb6ea2f', 'ext': 'mp4', 'title': 'ULFs - Wien berüchtigste Grafitti Crew - Part 1', - 'description': '<p>Zwischen Hinterzimmer-Tattoos und U-Bahnschächten erzählen uns die Ulfs, wie es ist, "süchtig nach Sachbeschädigung" zu sein.</p>', - 'uploader': 'VICE', + 'description': 'Zwischen Hinterzimmer-Tattoos und U-Bahnschächten erzählen uns die Ulfs, wie es ist, "süchtig nach Sachbeschädigung" zu sein.', + 'uploader': 'vice', 'uploader_id': '57a204088cb727dec794c67b', 'timestamp': 1485368119, 'upload_date': '20170125', @@ -78,9 +91,7 @@ class ViceIE(AdobePassIE): 'params': { # AES-encrypted m3u8 'skip_download': True, - 'proxy': '127.0.0.1:8118', }, - 'add_ie': ['UplynkPreplay'], }, { 'url': 'https://video.vice.com/en_us/video/pizza-show-trailer/56d8c9a54d286ed92f7f30e4', 'only_matching': True, @@ -98,7 +109,7 @@ class ViceIE(AdobePassIE): @staticmethod def _extract_urls(webpage): return re.findall( - r'<iframe\b[^>]+\bsrc=["\']((?:https?:)?//video\.vice\.com/[^/]+/embed/[\da-f]+)', + r'<iframe\b[^>]+\bsrc=["\']((?:https?:)?//video\.vice\.com/[^/]+/embed/[\da-f]{24})', webpage) @staticmethod @@ -109,31 +120,16 @@ class ViceIE(AdobePassIE): def _real_extract(self, url): locale, video_id = re.match(self._VALID_URL, url).groups() - webpage = self._download_webpage( - 'https://video.vice.com/%s/embed/%s' % (locale, video_id), - video_id) - - video = self._parse_json( - self._search_regex( - r'PREFETCH_DATA\s*=\s*({.+?})\s*;\s*\n', webpage, - 'app state'), video_id)['video'] - video_id = video.get('vms_id') or video.get('id') or video_id - title = video['title'] - is_locked = video.get('locked') + video = self._call_api('videos', 'id', video_id, locale, '''body + locked + rating + thumbnail_url + title''')[0] + title = video['title'].strip() rating = video.get('rating') - thumbnail = video.get('thumbnail_url') - duration = int_or_none(video.get('duration')) - series = try_get( - video, lambda x: x['episode']['season']['show']['title'], - compat_str) - episode_number = try_get( - video, lambda x: x['episode']['episode_number']) - season_number = try_get( - video, lambda x: x['episode']['season']['season_number']) - uploader = None query = {} - if is_locked: + if video.get('locked'): resource = self._get_mvpd_resource( 'VICELAND', title, video_id, rating) query['tvetoken'] = self._extract_mvpd_auth( @@ -148,12 +144,9 @@ class ViceIE(AdobePassIE): query.update({ 'exp': exp, 'sign': hashlib.sha512(('%s:GET:%d' % (video_id, exp)).encode()).hexdigest(), - '_ad_blocked': None, - '_ad_unit': '', - '_debug': '', + 'skipadstitching': 1, 'platform': 'desktop', 'rn': random.randint(10000, 100000), - 'fbprebidtoken': '', }) try: @@ -169,85 +162,94 @@ class ViceIE(AdobePassIE): raise video_data = preplay['video'] - base = video_data['base'] - uplynk_preplay_url = preplay['preplayURL'] - episode = video_data.get('episode', {}) - channel = video_data.get('channel', {}) + formats = self._extract_m3u8_formats( + preplay['playURL'], video_id, 'mp4', 'm3u8_native') + self._sort_formats(formats) + episode = video_data.get('episode') or {} + channel = video_data.get('channel') or {} + season = video_data.get('season') or {} subtitles = {} - cc_url = preplay.get('ccURL') - if cc_url: - subtitles['en'] = [{ + for subtitle in preplay.get('subtitleURLs', []): + cc_url = subtitle.get('url') + if not cc_url: + continue + language_code = try_get(subtitle, lambda x: x['languages'][0]['language_code'], compat_str) or 'en' + subtitles.setdefault(language_code, []).append({ 'url': cc_url, - }] + }) return { - '_type': 'url_transparent', - 'url': uplynk_preplay_url, + 'formats': formats, 'id': video_id, 'title': title, - 'description': base.get('body') or base.get('display_body'), - 'thumbnail': thumbnail, - 'duration': int_or_none(video_data.get('video_duration')) or duration, + 'description': clean_html(video.get('body')), + 'thumbnail': video.get('thumbnail_url'), + 'duration': int_or_none(video_data.get('video_duration')), 'timestamp': int_or_none(video_data.get('created_at'), 1000), - 'age_limit': parse_age_limit(video_data.get('video_rating')), - 'series': video_data.get('show_title') or series, - 'episode_number': int_or_none(episode.get('episode_number') or episode_number), + 'age_limit': parse_age_limit(video_data.get('video_rating') or rating), + 'series': try_get(video_data, lambda x: x['show']['base']['display_title'], compat_str), + 'episode_number': int_or_none(episode.get('episode_number')), 'episode_id': str_or_none(episode.get('id') or video_data.get('episode_id')), - 'season_number': int_or_none(season_number), - 'season_id': str_or_none(episode.get('season_id')), - 'uploader': channel.get('base', {}).get('title') or channel.get('name') or uploader, + 'season_number': int_or_none(season.get('season_number')), + 'season_id': str_or_none(season.get('id') or video_data.get('season_id')), + 'uploader': channel.get('name'), 'uploader_id': str_or_none(channel.get('id')), 'subtitles': subtitles, - 'ie_key': 'UplynkPreplay', } -class ViceShowIE(InfoExtractor): +class ViceShowIE(ViceBaseIE): IE_NAME = 'vice:show' - _VALID_URL = r'https?://(?:.+?\.)?vice\.com/(?:[^/]+/)?show/(?P<id>[^/?#&]+)' - - _TEST = { - 'url': 'https://munchies.vice.com/en/show/fuck-thats-delicious-2', + _VALID_URL = r'https?://(?:video\.vice|(?:www\.)?vice(?:land|tv))\.com/(?P<locale>[^/]+)/show/(?P<id>[^/?#&]+)' + _PAGE_SIZE = 25 + _TESTS = [{ + 'url': 'https://video.vice.com/en_us/show/fck-thats-delicious', 'info_dict': { - 'id': 'fuck-thats-delicious-2', - 'title': "Fuck, That's Delicious", - 'description': 'Follow the culinary adventures of rapper Action Bronson during his ongoing world tour.', + 'id': '57a2040c8cb727dec794c901', + 'title': 'F*ck, That’s Delicious', + 'description': 'The life and eating habits of rap’s greatest bon vivant, Action Bronson.', }, - 'playlist_count': 17, - } + 'playlist_mincount': 64, + }, { + 'url': 'https://www.vicetv.com/en_us/show/fck-thats-delicious', + 'only_matching': True, + }] - def _real_extract(self, url): - show_id = self._match_id(url) - webpage = self._download_webpage(url, show_id) + def _fetch_page(self, locale, show_id, page): + videos = self._call_api('videos', 'show_id', show_id, locale, '''body + id + url''', ', page: %d, per_page: %d' % (page + 1, self._PAGE_SIZE)) + for video in videos: + yield self.url_result( + video['url'], ViceIE.ie_key(), video.get('id')) - entries = [ - self.url_result(video_url, ViceIE.ie_key()) - for video_url, _ in re.findall( - r'<h2[^>]+class="article-title"[^>]+data-id="\d+"[^>]*>\s*<a[^>]+href="(%s.*?)"' - % ViceIE._VALID_URL, webpage)] + def _real_extract(self, url): + locale, display_id = re.match(self._VALID_URL, url).groups() + show = self._call_api('shows', 'slug', display_id, locale, '''dek + id + title''')[0] + show_id = show['id'] - title = self._search_regex( - r'<title>(.+?)</title>', webpage, 'title', default=None) - if title: - title = re.sub(r'(.+)\s*\|\s*.+$', r'\1', title).strip() - description = self._html_search_meta( - 'description', webpage, 'description') + entries = OnDemandPagedList( + functools.partial(self._fetch_page, locale, show_id), + self._PAGE_SIZE) - return self.playlist_result(entries, show_id, title, description) + return self.playlist_result( + entries, show_id, show.get('title'), show.get('dek')) -class ViceArticleIE(InfoExtractor): +class ViceArticleIE(ViceBaseIE): IE_NAME = 'vice:article' - _VALID_URL = r'https://www\.vice\.com/[^/]+/article/(?P<id>[^?#]+)' + _VALID_URL = r'https://(?:www\.)?vice\.com/(?P<locale>[^/]+)/article/(?:[0-9a-z]{6}/)?(?P<id>[^?#]+)' _TESTS = [{ 'url': 'https://www.vice.com/en_us/article/on-set-with-the-woman-making-mormon-porn-in-utah', 'info_dict': { - 'id': '41eae2a47b174a1398357cec55f1f6fc', + 'id': '58dc0a3dee202d2a0ccfcbd8', 'ext': 'mp4', - 'title': 'Mormon War on Porn ', - 'description': 'md5:6394a8398506581d0346b9ab89093fef', + 'title': 'Mormon War on Porn', + 'description': 'md5:1c5d91fe25fa8aa304f9def118b92dbf', 'uploader': 'vice', 'uploader_id': '57a204088cb727dec794c67b', 'timestamp': 1491883129, @@ -258,10 +260,10 @@ class ViceArticleIE(InfoExtractor): # AES-encrypted m3u8 'skip_download': True, }, - 'add_ie': ['UplynkPreplay'], + 'add_ie': [ViceIE.ie_key()], }, { 'url': 'https://www.vice.com/en_us/article/how-to-hack-a-car', - 'md5': '7fe8ebc4fa3323efafc127b82bd821d9', + 'md5': '13010ee0bc694ea87ec40724397c2349', 'info_dict': { 'id': '3jstaBeXgAs', 'ext': 'mp4', @@ -271,15 +273,15 @@ class ViceArticleIE(InfoExtractor): 'uploader_id': 'MotherboardTV', 'upload_date': '20140529', }, - 'add_ie': ['Youtube'], + 'add_ie': [YoutubeIE.ie_key()], }, { 'url': 'https://www.vice.com/en_us/article/znm9dx/karley-sciortino-slutever-reloaded', 'md5': 'a7ecf64ee4fa19b916c16f4b56184ae2', 'info_dict': { - 'id': 'e2ed435eb67e43efb66e6ef9a6930a88', + 'id': '57f41d3556a0a80f54726060', 'ext': 'mp4', 'title': "Making The World's First Male Sex Doll", - 'description': 'md5:916078ef0e032d76343116208b6cc2c4', + 'description': 'md5:19b00b215b99961cf869c40fbe9df755', 'uploader': 'vice', 'uploader_id': '57a204088cb727dec794c67b', 'timestamp': 1476919911, @@ -288,6 +290,7 @@ class ViceArticleIE(InfoExtractor): }, 'params': { 'skip_download': True, + 'format': 'bestvideo', }, 'add_ie': [ViceIE.ie_key()], }, { @@ -299,14 +302,11 @@ class ViceArticleIE(InfoExtractor): }] def _real_extract(self, url): - display_id = self._match_id(url) - - webpage = self._download_webpage(url, display_id) + locale, display_id = re.match(self._VALID_URL, url).groups() - prefetch_data = self._parse_json(self._search_regex( - r'__APP_STATE\s*=\s*({.+?})(?:\s*\|\|\s*{}\s*)?;\s*\n', - webpage, 'app state'), display_id)['pageData'] - body = prefetch_data['body'] + article = self._call_api('articles', 'slug', display_id, locale, '''body + embed_code''')[0] + body = article['body'] def _url_res(video_url, ie_key): return { @@ -316,7 +316,7 @@ class ViceArticleIE(InfoExtractor): 'ie_key': ie_key, } - vice_url = ViceIE._extract_url(webpage) + vice_url = ViceIE._extract_url(body) if vice_url: return _url_res(vice_url, ViceIE.ie_key()) @@ -332,6 +332,6 @@ class ViceArticleIE(InfoExtractor): video_url = self._html_search_regex( r'data-video-url="([^"]+)"', - prefetch_data['embed_code'], 'video URL') + article['embed_code'], 'video URL') return _url_res(video_url, ViceIE.ie_key()) |