mirror of
https://codeberg.org/polarisfm/youtube-dl
synced 2024-11-27 10:54:34 +01:00
tsia
GitHub
commit
e80b66de97
6
.github/ISSUE_TEMPLATE/1_broken_site.md
vendored
6
.github/ISSUE_TEMPLATE/1_broken_site.md
vendored
@ -18,7 +18,7 @@ title: ''
|
|||||||
|
|
||||||
<!--
|
<!--
|
||||||
Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
|
Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
|
||||||
- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2019.11.28. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
|
- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.01.01. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
|
||||||
- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
|
- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
|
||||||
- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape.
|
- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape.
|
||||||
- Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
|
- Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
|
||||||
@ -26,7 +26,7 @@ Carefully read and work through this check list in order to prevent the most com
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
- [ ] I'm reporting a broken site support
|
- [ ] I'm reporting a broken site support
|
||||||
- [ ] I've verified that I'm running youtube-dl version **2019.11.28**
|
- [ ] I've verified that I'm running youtube-dl version **2020.01.01**
|
||||||
- [ ] I've checked that all provided URLs are alive and playable in a browser
|
- [ ] I've checked that all provided URLs are alive and playable in a browser
|
||||||
- [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
|
- [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
|
||||||
- [ ] I've searched the bugtracker for similar issues including closed ones
|
- [ ] I've searched the bugtracker for similar issues including closed ones
|
||||||
@ -41,7 +41,7 @@ Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v <
|
|||||||
[debug] User config: []
|
[debug] User config: []
|
||||||
[debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
|
[debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
|
||||||
[debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
|
[debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
|
||||||
[debug] youtube-dl version 2019.11.28
|
[debug] youtube-dl version 2020.01.01
|
||||||
[debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
|
[debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
|
||||||
[debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
|
[debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
|
||||||
[debug] Proxy map: {}
|
[debug] Proxy map: {}
|
||||||
|
|||||||
@ -19,7 +19,7 @@ labels: 'site-support-request'
|
|||||||
|
|
||||||
<!--
|
<!--
|
||||||
Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
|
Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
|
||||||
- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2019.11.28. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
|
- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.01.01. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
|
||||||
- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
|
- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
|
||||||
- Make sure that site you are requesting is not dedicated to copyright infringement, see https://yt-dl.org/copyright-infringement. youtube-dl does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
|
- Make sure that site you are requesting is not dedicated to copyright infringement, see https://yt-dl.org/copyright-infringement. youtube-dl does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
|
||||||
- Search the bugtracker for similar site support requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
|
- Search the bugtracker for similar site support requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
|
||||||
@ -27,7 +27,7 @@ Carefully read and work through this check list in order to prevent the most com
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
- [ ] I'm reporting a new site support request
|
- [ ] I'm reporting a new site support request
|
||||||
- [ ] I've verified that I'm running youtube-dl version **2019.11.28**
|
- [ ] I've verified that I'm running youtube-dl version **2020.01.01**
|
||||||
- [ ] I've checked that all provided URLs are alive and playable in a browser
|
- [ ] I've checked that all provided URLs are alive and playable in a browser
|
||||||
- [ ] I've checked that none of provided URLs violate any copyrights
|
- [ ] I've checked that none of provided URLs violate any copyrights
|
||||||
- [ ] I've searched the bugtracker for similar site support requests including closed ones
|
- [ ] I've searched the bugtracker for similar site support requests including closed ones
|
||||||
|
|||||||
@ -18,13 +18,13 @@ title: ''
|
|||||||
|
|
||||||
<!--
|
<!--
|
||||||
Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
|
Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
|
||||||
- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2019.11.28. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
|
- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.01.01. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
|
||||||
- Search the bugtracker for similar site feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
|
- Search the bugtracker for similar site feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
|
||||||
- Finally, put x into all relevant boxes (like this [x])
|
- Finally, put x into all relevant boxes (like this [x])
|
||||||
-->
|
-->
|
||||||
|
|
||||||
- [ ] I'm reporting a site feature request
|
- [ ] I'm reporting a site feature request
|
||||||
- [ ] I've verified that I'm running youtube-dl version **2019.11.28**
|
- [ ] I've verified that I'm running youtube-dl version **2020.01.01**
|
||||||
- [ ] I've searched the bugtracker for similar site feature requests including closed ones
|
- [ ] I've searched the bugtracker for similar site feature requests including closed ones
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
6
.github/ISSUE_TEMPLATE/4_bug_report.md
vendored
6
.github/ISSUE_TEMPLATE/4_bug_report.md
vendored
@ -18,7 +18,7 @@ title: ''
|
|||||||
|
|
||||||
<!--
|
<!--
|
||||||
Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
|
Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
|
||||||
- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2019.11.28. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
|
- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.01.01. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
|
||||||
- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
|
- Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
|
||||||
- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape.
|
- Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape.
|
||||||
- Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
|
- Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
|
||||||
@ -27,7 +27,7 @@ Carefully read and work through this check list in order to prevent the most com
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
- [ ] I'm reporting a broken site support issue
|
- [ ] I'm reporting a broken site support issue
|
||||||
- [ ] I've verified that I'm running youtube-dl version **2019.11.28**
|
- [ ] I've verified that I'm running youtube-dl version **2020.01.01**
|
||||||
- [ ] I've checked that all provided URLs are alive and playable in a browser
|
- [ ] I've checked that all provided URLs are alive and playable in a browser
|
||||||
- [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
|
- [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
|
||||||
- [ ] I've searched the bugtracker for similar bug reports including closed ones
|
- [ ] I've searched the bugtracker for similar bug reports including closed ones
|
||||||
@ -43,7 +43,7 @@ Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v <
|
|||||||
[debug] User config: []
|
[debug] User config: []
|
||||||
[debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
|
[debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
|
||||||
[debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
|
[debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
|
||||||
[debug] youtube-dl version 2019.11.28
|
[debug] youtube-dl version 2020.01.01
|
||||||
[debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
|
[debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
|
||||||
[debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
|
[debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
|
||||||
[debug] Proxy map: {}
|
[debug] Proxy map: {}
|
||||||
|
|||||||
4
.github/ISSUE_TEMPLATE/5_feature_request.md
vendored
4
.github/ISSUE_TEMPLATE/5_feature_request.md
vendored
@ -19,13 +19,13 @@ labels: 'request'
|
|||||||
|
|
||||||
<!--
|
<!--
|
||||||
Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
|
Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
|
||||||
- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2019.11.28. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
|
- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.01.01. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
|
||||||
- Search the bugtracker for similar feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
|
- Search the bugtracker for similar feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
|
||||||
- Finally, put x into all relevant boxes (like this [x])
|
- Finally, put x into all relevant boxes (like this [x])
|
||||||
-->
|
-->
|
||||||
|
|
||||||
- [ ] I'm reporting a feature request
|
- [ ] I'm reporting a feature request
|
||||||
- [ ] I've verified that I'm running youtube-dl version **2019.11.28**
|
- [ ] I've verified that I'm running youtube-dl version **2020.01.01**
|
||||||
- [ ] I've searched the bugtracker for similar feature requests including closed ones
|
- [ ] I've searched the bugtracker for similar feature requests including closed ones
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
24
ChangeLog
24
ChangeLog
@ -1,10 +1,32 @@
|
|||||||
version <unreleased>
|
version 2020.01.01
|
||||||
|
|
||||||
|
Extractors
|
||||||
|
* [brightcove] Invalidate policy key cache on failing requests
|
||||||
|
* [pornhub] Improve locked videos detection (#22449, #22780)
|
||||||
|
+ [pornhub] Add support for m3u8 formats
|
||||||
|
* [pornhub] Fix extraction (#22749, #23082)
|
||||||
|
* [brightcove] Update policy key on failing requests
|
||||||
|
* [spankbang] Improve removed video detection (#23423)
|
||||||
|
* [spankbang] Fix extraction (#23307, #23423, #23444)
|
||||||
|
* [soundcloud] Automatically update client id on failing requests
|
||||||
|
* [prosiebensat1] Improve geo restriction handling (#23571)
|
||||||
|
* [brightcove] Cache brightcove player policy keys
|
||||||
|
* [teachable] Fail with error message if no video URL found
|
||||||
|
* [teachable] Improve locked lessons detection (#23528)
|
||||||
|
+ [scrippsnetworks] Add support for Scripps Networks sites (#19857, #22981)
|
||||||
|
* [mitele] Fix extraction (#21354, #23456)
|
||||||
|
* [soundcloud] Update client id (#23516)
|
||||||
|
* [mailru] Relax URL regular expressions (#23509)
|
||||||
|
|
||||||
|
|
||||||
|
version 2019.12.25
|
||||||
|
|
||||||
Core
|
Core
|
||||||
* [utils] Improve str_to_int
|
* [utils] Improve str_to_int
|
||||||
+ [downloader/hls] Add ability to override AES decryption key URL (#17521)
|
+ [downloader/hls] Add ability to override AES decryption key URL (#17521)
|
||||||
|
|
||||||
Extractors
|
Extractors
|
||||||
|
* [mediaset] Fix parse formats (#23508)
|
||||||
+ [tv2dk:bornholm:play] Add support for play.tv2bornholm.dk (#23291)
|
+ [tv2dk:bornholm:play] Add support for play.tv2bornholm.dk (#23291)
|
||||||
+ [slideslive] Add support for url and vimeo service names (#23414)
|
+ [slideslive] Add support for url and vimeo service names (#23414)
|
||||||
* [slideslive] Fix extraction (#23413)
|
* [slideslive] Fix extraction (#23413)
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import base64
|
|
||||||
import io
|
import io
|
||||||
import json
|
import json
|
||||||
import mimetypes
|
import mimetypes
|
||||||
@ -15,7 +14,6 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
|||||||
|
|
||||||
from youtube_dl.compat import (
|
from youtube_dl.compat import (
|
||||||
compat_basestring,
|
compat_basestring,
|
||||||
compat_input,
|
|
||||||
compat_getpass,
|
compat_getpass,
|
||||||
compat_print,
|
compat_print,
|
||||||
compat_urllib_request,
|
compat_urllib_request,
|
||||||
@ -40,28 +38,20 @@ class GitHubReleaser(object):
|
|||||||
try:
|
try:
|
||||||
info = netrc.netrc().authenticators(self._NETRC_MACHINE)
|
info = netrc.netrc().authenticators(self._NETRC_MACHINE)
|
||||||
if info is not None:
|
if info is not None:
|
||||||
self._username = info[0]
|
self._token = info[2]
|
||||||
self._password = info[2]
|
|
||||||
compat_print('Using GitHub credentials found in .netrc...')
|
compat_print('Using GitHub credentials found in .netrc...')
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
compat_print('No GitHub credentials found in .netrc')
|
compat_print('No GitHub credentials found in .netrc')
|
||||||
except (IOError, netrc.NetrcParseError):
|
except (IOError, netrc.NetrcParseError):
|
||||||
compat_print('Unable to parse .netrc')
|
compat_print('Unable to parse .netrc')
|
||||||
self._username = compat_input(
|
self._token = compat_getpass(
|
||||||
'Type your GitHub username or email address and press [Return]: ')
|
'Type your GitHub PAT (personal access token) and press [Return]: ')
|
||||||
self._password = compat_getpass(
|
|
||||||
'Type your GitHub password and press [Return]: ')
|
|
||||||
|
|
||||||
def _call(self, req):
|
def _call(self, req):
|
||||||
if isinstance(req, compat_basestring):
|
if isinstance(req, compat_basestring):
|
||||||
req = sanitized_Request(req)
|
req = sanitized_Request(req)
|
||||||
# Authorizing manually since GitHub does not response with 401 with
|
req.add_header('Authorization', 'token %s' % self._token)
|
||||||
# WWW-Authenticate header set (see
|
|
||||||
# https://developer.github.com/v3/#basic-authentication)
|
|
||||||
b64 = base64.b64encode(
|
|
||||||
('%s:%s' % (self._username, self._password)).encode('utf-8')).decode('ascii')
|
|
||||||
req.add_header('Authorization', 'Basic %s' % b64)
|
|
||||||
response = self._opener.open(req).read().decode('utf-8')
|
response = self._opener.open(req).read().decode('utf-8')
|
||||||
return json.loads(response)
|
return json.loads(response)
|
||||||
|
|
||||||
|
|||||||
@ -28,10 +28,11 @@
|
|||||||
- **acast:channel**
|
- **acast:channel**
|
||||||
- **ADN**: Anime Digital Network
|
- **ADN**: Anime Digital Network
|
||||||
- **AdobeConnect**
|
- **AdobeConnect**
|
||||||
- **AdobeTV**
|
- **adobetv**
|
||||||
- **AdobeTVChannel**
|
- **adobetv:channel**
|
||||||
- **AdobeTVShow**
|
- **adobetv:embed**
|
||||||
- **AdobeTVVideo**
|
- **adobetv:show**
|
||||||
|
- **adobetv:video**
|
||||||
- **AdultSwim**
|
- **AdultSwim**
|
||||||
- **aenetworks**: A+E Networks: A&E, Lifetime, History.com, FYI Network and History Vault
|
- **aenetworks**: A+E Networks: A&E, Lifetime, History.com, FYI Network and History Vault
|
||||||
- **afreecatv**: afreecatv.com
|
- **afreecatv**: afreecatv.com
|
||||||
@ -396,6 +397,7 @@
|
|||||||
- **Kankan**
|
- **Kankan**
|
||||||
- **Karaoketv**
|
- **Karaoketv**
|
||||||
- **KarriereVideos**
|
- **KarriereVideos**
|
||||||
|
- **Katsomo**
|
||||||
- **KeezMovies**
|
- **KeezMovies**
|
||||||
- **Ketnet**
|
- **Ketnet**
|
||||||
- **KhanAcademy**
|
- **KhanAcademy**
|
||||||
@ -403,7 +405,6 @@
|
|||||||
- **KinjaEmbed**
|
- **KinjaEmbed**
|
||||||
- **KinoPoisk**
|
- **KinoPoisk**
|
||||||
- **KonserthusetPlay**
|
- **KonserthusetPlay**
|
||||||
- **kontrtube**: KontrTube.ru - Труба зовёт
|
|
||||||
- **KrasView**: Красвью
|
- **KrasView**: Красвью
|
||||||
- **Ku6**
|
- **Ku6**
|
||||||
- **KUSI**
|
- **KUSI**
|
||||||
@ -513,7 +514,6 @@
|
|||||||
- **mtvjapan**
|
- **mtvjapan**
|
||||||
- **mtvservices:embedded**
|
- **mtvservices:embedded**
|
||||||
- **MuenchenTV**: münchen.tv
|
- **MuenchenTV**: münchen.tv
|
||||||
- **MusicPlayOn**
|
|
||||||
- **mva**: Microsoft Virtual Academy videos
|
- **mva**: Microsoft Virtual Academy videos
|
||||||
- **mva:course**: Microsoft Virtual Academy courses
|
- **mva:course**: Microsoft Virtual Academy courses
|
||||||
- **Mwave**
|
- **Mwave**
|
||||||
@ -761,6 +761,7 @@
|
|||||||
- **screen.yahoo:search**: Yahoo screen search
|
- **screen.yahoo:search**: Yahoo screen search
|
||||||
- **Screencast**
|
- **Screencast**
|
||||||
- **ScreencastOMatic**
|
- **ScreencastOMatic**
|
||||||
|
- **ScrippsNetworks**
|
||||||
- **scrippsnetworks:watch**
|
- **scrippsnetworks:watch**
|
||||||
- **SCTE**
|
- **SCTE**
|
||||||
- **SCTECourse**
|
- **SCTECourse**
|
||||||
@ -913,6 +914,7 @@
|
|||||||
- **tv2.hu**
|
- **tv2.hu**
|
||||||
- **TV2Article**
|
- **TV2Article**
|
||||||
- **TV2DK**
|
- **TV2DK**
|
||||||
|
- **TV2DKBornholmPlay**
|
||||||
- **TV4**: tv4.se and tv4play.se
|
- **TV4**: tv4.se and tv4play.se
|
||||||
- **TV5MondePlus**: TV5MONDE+
|
- **TV5MondePlus**: TV5MONDE+
|
||||||
- **TVA**
|
- **TVA**
|
||||||
@ -954,6 +956,7 @@
|
|||||||
- **udemy**
|
- **udemy**
|
||||||
- **udemy:course**
|
- **udemy:course**
|
||||||
- **UDNEmbed**: 聯合影音
|
- **UDNEmbed**: 聯合影音
|
||||||
|
- **UFCArabia**
|
||||||
- **UFCTV**
|
- **UFCTV**
|
||||||
- **UKTVPlay**
|
- **UKTVPlay**
|
||||||
- **umg:de**: Universal Music Deutschland
|
- **umg:de**: Universal Music Deutschland
|
||||||
@ -993,7 +996,6 @@
|
|||||||
- **videomore**
|
- **videomore**
|
||||||
- **videomore:season**
|
- **videomore:season**
|
||||||
- **videomore:video**
|
- **videomore:video**
|
||||||
- **VideoPremium**
|
|
||||||
- **VideoPress**
|
- **VideoPress**
|
||||||
- **Vidio**
|
- **Vidio**
|
||||||
- **VidLii**
|
- **VidLii**
|
||||||
|
|||||||
@ -586,6 +586,12 @@ class BrightcoveNewIE(AdobePassIE):
|
|||||||
|
|
||||||
account_id, player_id, embed, content_type, video_id = re.match(self._VALID_URL, url).groups()
|
account_id, player_id, embed, content_type, video_id = re.match(self._VALID_URL, url).groups()
|
||||||
|
|
||||||
|
policy_key_id = '%s_%s' % (account_id, player_id)
|
||||||
|
policy_key = self._downloader.cache.load('brightcove', policy_key_id)
|
||||||
|
policy_key_extracted = False
|
||||||
|
store_pk = lambda x: self._downloader.cache.store('brightcove', policy_key_id, x)
|
||||||
|
|
||||||
|
def extract_policy_key():
|
||||||
webpage = self._download_webpage(
|
webpage = self._download_webpage(
|
||||||
'http://players.brightcove.net/%s/%s_%s/index.min.js'
|
'http://players.brightcove.net/%s/%s_%s/index.min.js'
|
||||||
% (account_id, player_id, embed), video_id)
|
% (account_id, player_id, embed), video_id)
|
||||||
@ -605,24 +611,36 @@ class BrightcoveNewIE(AdobePassIE):
|
|||||||
r'policyKey\s*:\s*(["\'])(?P<pk>.+?)\1',
|
r'policyKey\s*:\s*(["\'])(?P<pk>.+?)\1',
|
||||||
webpage, 'policy key', group='pk')
|
webpage, 'policy key', group='pk')
|
||||||
|
|
||||||
|
store_pk(policy_key)
|
||||||
|
return policy_key
|
||||||
|
|
||||||
api_url = 'https://edge.api.brightcove.com/playback/v1/accounts/%s/%ss/%s' % (account_id, content_type, video_id)
|
api_url = 'https://edge.api.brightcove.com/playback/v1/accounts/%s/%ss/%s' % (account_id, content_type, video_id)
|
||||||
headers = {
|
headers = {}
|
||||||
'Accept': 'application/json;pk=%s' % policy_key,
|
|
||||||
}
|
|
||||||
referrer = smuggled_data.get('referrer')
|
referrer = smuggled_data.get('referrer')
|
||||||
if referrer:
|
if referrer:
|
||||||
headers.update({
|
headers.update({
|
||||||
'Referer': referrer,
|
'Referer': referrer,
|
||||||
'Origin': re.search(r'https?://[^/]+', referrer).group(0),
|
'Origin': re.search(r'https?://[^/]+', referrer).group(0),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
for _ in range(2):
|
||||||
|
if not policy_key:
|
||||||
|
policy_key = extract_policy_key()
|
||||||
|
policy_key_extracted = True
|
||||||
|
headers['Accept'] = 'application/json;pk=%s' % policy_key
|
||||||
try:
|
try:
|
||||||
json_data = self._download_json(api_url, video_id, headers=headers)
|
json_data = self._download_json(api_url, video_id, headers=headers)
|
||||||
|
break
|
||||||
except ExtractorError as e:
|
except ExtractorError as e:
|
||||||
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 403:
|
if isinstance(e.cause, compat_HTTPError) and e.cause.code in (401, 403):
|
||||||
json_data = self._parse_json(e.cause.read().decode(), video_id)[0]
|
json_data = self._parse_json(e.cause.read().decode(), video_id)[0]
|
||||||
message = json_data.get('message') or json_data['error_code']
|
message = json_data.get('message') or json_data['error_code']
|
||||||
if json_data.get('error_subcode') == 'CLIENT_GEO':
|
if json_data.get('error_subcode') == 'CLIENT_GEO':
|
||||||
self.raise_geo_restricted(msg=message)
|
self.raise_geo_restricted(msg=message)
|
||||||
|
elif json_data.get('error_code') == 'INVALID_POLICY_KEY' and not policy_key_extracted:
|
||||||
|
policy_key = None
|
||||||
|
store_pk(None)
|
||||||
|
continue
|
||||||
raise ExtractorError(message, expected=True)
|
raise ExtractorError(message, expected=True)
|
||||||
raise
|
raise
|
||||||
|
|
||||||
|
|||||||
@ -1,20 +1,24 @@
|
|||||||
# coding: utf-8
|
# coding: utf-8
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
import base64
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
|
|
||||||
|
|
||||||
class CloudflareStreamIE(InfoExtractor):
|
class CloudflareStreamIE(InfoExtractor):
|
||||||
|
_DOMAIN_RE = r'(?:cloudflarestream\.com|(?:videodelivery|bytehighway)\.net)'
|
||||||
|
_EMBED_RE = r'embed\.%s/embed/[^/]+\.js\?.*?\bvideo=' % _DOMAIN_RE
|
||||||
|
_ID_RE = r'[\da-f]{32}|[\w-]+\.[\w-]+\.[\w-]+'
|
||||||
_VALID_URL = r'''(?x)
|
_VALID_URL = r'''(?x)
|
||||||
https?://
|
https?://
|
||||||
(?:
|
(?:
|
||||||
(?:watch\.)?(?:cloudflarestream\.com|videodelivery\.net)/|
|
(?:watch\.)?%s/|
|
||||||
embed\.(?:cloudflarestream\.com|videodelivery\.net)/embed/[^/]+\.js\?.*?\bvideo=
|
%s
|
||||||
)
|
)
|
||||||
(?P<id>[\da-f]+)
|
(?P<id>%s)
|
||||||
'''
|
''' % (_DOMAIN_RE, _EMBED_RE, _ID_RE)
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'https://embed.cloudflarestream.com/embed/we4g.fla9.latest.js?video=31c9291ab41fac05471db4e73aa11717',
|
'url': 'https://embed.cloudflarestream.com/embed/we4g.fla9.latest.js?video=31c9291ab41fac05471db4e73aa11717',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
@ -41,23 +45,28 @@ class CloudflareStreamIE(InfoExtractor):
|
|||||||
return [
|
return [
|
||||||
mobj.group('url')
|
mobj.group('url')
|
||||||
for mobj in re.finditer(
|
for mobj in re.finditer(
|
||||||
r'<script[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//embed\.(?:cloudflarestream\.com|videodelivery\.net)/embed/[^/]+\.js\?.*?\bvideo=[\da-f]+?.*?)\1',
|
r'<script[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//%s(?:%s).*?)\1' % (CloudflareStreamIE._EMBED_RE, CloudflareStreamIE._ID_RE),
|
||||||
webpage)]
|
webpage)]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
video_id = self._match_id(url)
|
video_id = self._match_id(url)
|
||||||
|
domain = 'bytehighway.net' if 'bytehighway.net/' in url else 'videodelivery.net'
|
||||||
|
base_url = 'https://%s/%s/' % (domain, video_id)
|
||||||
|
if '.' in video_id:
|
||||||
|
video_id = self._parse_json(base64.urlsafe_b64decode(
|
||||||
|
video_id.split('.')[1]), video_id)['sub']
|
||||||
|
manifest_base_url = base_url + 'manifest/video.'
|
||||||
|
|
||||||
formats = self._extract_m3u8_formats(
|
formats = self._extract_m3u8_formats(
|
||||||
'https://cloudflarestream.com/%s/manifest/video.m3u8' % video_id,
|
manifest_base_url + 'm3u8', video_id, 'mp4',
|
||||||
video_id, 'mp4', entry_protocol='m3u8_native', m3u8_id='hls',
|
'm3u8_native', m3u8_id='hls', fatal=False)
|
||||||
fatal=False)
|
|
||||||
formats.extend(self._extract_mpd_formats(
|
formats.extend(self._extract_mpd_formats(
|
||||||
'https://cloudflarestream.com/%s/manifest/video.mpd' % video_id,
|
manifest_base_url + 'mpd', video_id, mpd_id='dash', fatal=False))
|
||||||
video_id, mpd_id='dash', fatal=False))
|
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'title': video_id,
|
'title': video_id,
|
||||||
|
'thumbnail': base_url + 'thumbnails/thumbnail.jpg',
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,10 +16,11 @@ class DctpTvIE(InfoExtractor):
|
|||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
# 4x3
|
# 4x3
|
||||||
'url': 'http://www.dctp.tv/filme/videoinstallation-fuer-eine-kaufhausfassade/',
|
'url': 'http://www.dctp.tv/filme/videoinstallation-fuer-eine-kaufhausfassade/',
|
||||||
|
'md5': '3ffbd1556c3fe210724d7088fad723e3',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '95eaa4f33dad413aa17b4ee613cccc6c',
|
'id': '95eaa4f33dad413aa17b4ee613cccc6c',
|
||||||
'display_id': 'videoinstallation-fuer-eine-kaufhausfassade',
|
'display_id': 'videoinstallation-fuer-eine-kaufhausfassade',
|
||||||
'ext': 'flv',
|
'ext': 'm4v',
|
||||||
'title': 'Videoinstallation für eine Kaufhausfassade',
|
'title': 'Videoinstallation für eine Kaufhausfassade',
|
||||||
'description': 'Kurzfilm',
|
'description': 'Kurzfilm',
|
||||||
'thumbnail': r're:^https?://.*\.jpg$',
|
'thumbnail': r're:^https?://.*\.jpg$',
|
||||||
@ -27,10 +28,6 @@ class DctpTvIE(InfoExtractor):
|
|||||||
'timestamp': 1302172322,
|
'timestamp': 1302172322,
|
||||||
'upload_date': '20110407',
|
'upload_date': '20110407',
|
||||||
},
|
},
|
||||||
'params': {
|
|
||||||
# rtmp download
|
|
||||||
'skip_download': True,
|
|
||||||
},
|
|
||||||
}, {
|
}, {
|
||||||
# 16x9
|
# 16x9
|
||||||
'url': 'http://www.dctp.tv/filme/sind-youtuber-die-besseren-lehrer/',
|
'url': 'http://www.dctp.tv/filme/sind-youtuber-die-besseren-lehrer/',
|
||||||
@ -59,33 +56,26 @@ class DctpTvIE(InfoExtractor):
|
|||||||
|
|
||||||
uuid = media['uuid']
|
uuid = media['uuid']
|
||||||
title = media['title']
|
title = media['title']
|
||||||
ratio = '16x9' if media.get('is_wide') else '4x3'
|
is_wide = media.get('is_wide')
|
||||||
play_path = 'mp4:%s_dctp_0500_%s.m4v' % (uuid, ratio)
|
formats = []
|
||||||
|
|
||||||
servers = self._download_json(
|
def add_formats(suffix):
|
||||||
'http://www.dctp.tv/streaming_servers/', display_id,
|
templ = 'https://%%s/%s_dctp_%s.m4v' % (uuid, suffix)
|
||||||
note='Downloading server list JSON', fatal=False)
|
formats.extend([{
|
||||||
|
'format_id': 'hls-' + suffix,
|
||||||
|
'url': templ % 'cdn-segments.dctp.tv' + '/playlist.m3u8',
|
||||||
|
'protocol': 'm3u8_native',
|
||||||
|
}, {
|
||||||
|
'format_id': 's3-' + suffix,
|
||||||
|
'url': templ % 'completed-media.s3.amazonaws.com',
|
||||||
|
}, {
|
||||||
|
'format_id': 'http-' + suffix,
|
||||||
|
'url': templ % 'cdn-media.dctp.tv',
|
||||||
|
}])
|
||||||
|
|
||||||
if servers:
|
add_formats('0500_' + ('16x9' if is_wide else '4x3'))
|
||||||
endpoint = next(
|
if is_wide:
|
||||||
server['endpoint']
|
add_formats('720p')
|
||||||
for server in servers
|
|
||||||
if url_or_none(server.get('endpoint'))
|
|
||||||
and 'cloudfront' in server['endpoint'])
|
|
||||||
else:
|
|
||||||
endpoint = 'rtmpe://s2pqqn4u96e4j8.cloudfront.net/cfx/st/'
|
|
||||||
|
|
||||||
app = self._search_regex(
|
|
||||||
r'^rtmpe?://[^/]+/(?P<app>.*)$', endpoint, 'app')
|
|
||||||
|
|
||||||
formats = [{
|
|
||||||
'url': endpoint,
|
|
||||||
'app': app,
|
|
||||||
'play_path': play_path,
|
|
||||||
'page_url': url,
|
|
||||||
'player_url': 'http://svm-prod-dctptv-static.s3.amazonaws.com/dctptv-relaunch2012-110.swf',
|
|
||||||
'ext': 'flv',
|
|
||||||
}]
|
|
||||||
|
|
||||||
thumbnails = []
|
thumbnails = []
|
||||||
images = media.get('images')
|
images = media.get('images')
|
||||||
|
|||||||
@ -13,8 +13,8 @@ from ..compat import compat_HTTPError
|
|||||||
class DiscoveryIE(DiscoveryGoBaseIE):
|
class DiscoveryIE(DiscoveryGoBaseIE):
|
||||||
_VALID_URL = r'''(?x)https?://
|
_VALID_URL = r'''(?x)https?://
|
||||||
(?P<site>
|
(?P<site>
|
||||||
(?:(?:www|go)\.)?discovery|
|
go\.discovery|
|
||||||
(?:www\.)?
|
www\.
|
||||||
(?:
|
(?:
|
||||||
investigationdiscovery|
|
investigationdiscovery|
|
||||||
discoverylife|
|
discoverylife|
|
||||||
@ -22,8 +22,7 @@ class DiscoveryIE(DiscoveryGoBaseIE):
|
|||||||
ahctv|
|
ahctv|
|
||||||
destinationamerica|
|
destinationamerica|
|
||||||
sciencechannel|
|
sciencechannel|
|
||||||
tlc|
|
tlc
|
||||||
velocity
|
|
||||||
)|
|
)|
|
||||||
watch\.
|
watch\.
|
||||||
(?:
|
(?:
|
||||||
@ -83,7 +82,7 @@ class DiscoveryIE(DiscoveryGoBaseIE):
|
|||||||
'authRel': 'authorization',
|
'authRel': 'authorization',
|
||||||
'client_id': '3020a40c2356a645b4b4',
|
'client_id': '3020a40c2356a645b4b4',
|
||||||
'nonce': ''.join([random.choice(string.ascii_letters) for _ in range(32)]),
|
'nonce': ''.join([random.choice(string.ascii_letters) for _ in range(32)]),
|
||||||
'redirectUri': 'https://fusion.ddmcdn.com/app/mercury-sdk/180/redirectHandler.html?https://www.%s.com' % site,
|
'redirectUri': 'https://www.discovery.com/',
|
||||||
})['access_token']
|
})['access_token']
|
||||||
|
|
||||||
headers = self.geo_verification_headers()
|
headers = self.geo_verification_headers()
|
||||||
|
|||||||
@ -812,7 +812,6 @@ from .packtpub import (
|
|||||||
PacktPubIE,
|
PacktPubIE,
|
||||||
PacktPubCourseIE,
|
PacktPubCourseIE,
|
||||||
)
|
)
|
||||||
from .pandatv import PandaTVIE
|
|
||||||
from .pandoratv import PandoraTVIE
|
from .pandoratv import PandoraTVIE
|
||||||
from .parliamentliveuk import ParliamentLiveUKIE
|
from .parliamentliveuk import ParliamentLiveUKIE
|
||||||
from .patreon import PatreonIE
|
from .patreon import PatreonIE
|
||||||
@ -967,7 +966,10 @@ from .savefrom import SaveFromIE
|
|||||||
from .sbs import SBSIE
|
from .sbs import SBSIE
|
||||||
from .screencast import ScreencastIE
|
from .screencast import ScreencastIE
|
||||||
from .screencastomatic import ScreencastOMaticIE
|
from .screencastomatic import ScreencastOMaticIE
|
||||||
from .scrippsnetworks import ScrippsNetworksWatchIE
|
from .scrippsnetworks import (
|
||||||
|
ScrippsNetworksWatchIE,
|
||||||
|
ScrippsNetworksIE,
|
||||||
|
)
|
||||||
from .scte import (
|
from .scte import (
|
||||||
SCTEIE,
|
SCTEIE,
|
||||||
SCTECourseIE,
|
SCTECourseIE,
|
||||||
|
|||||||
@ -2960,7 +2960,7 @@ class GenericIE(InfoExtractor):
|
|||||||
|
|
||||||
# Look for VODPlatform embeds
|
# Look for VODPlatform embeds
|
||||||
mobj = re.search(
|
mobj = re.search(
|
||||||
r'<iframe[^>]+src=(["\'])(?P<url>(?:https?:)?//(?:www\.)?vod-platform\.net/[eE]mbed/.+?)\1',
|
r'<iframe[^>]+src=(["\'])(?P<url>(?:https?:)?//(?:(?:www\.)?vod-platform\.net|embed\.kwikmotion\.com)/[eE]mbed/.+?)\1',
|
||||||
webpage)
|
webpage)
|
||||||
if mobj is not None:
|
if mobj is not None:
|
||||||
return self.url_result(
|
return self.url_result(
|
||||||
|
|||||||
@ -2,23 +2,24 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
import uuid
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..compat import compat_str
|
from ..compat import compat_HTTPError
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
unescapeHTML,
|
ExtractorError,
|
||||||
parse_duration,
|
int_or_none,
|
||||||
get_element_by_class,
|
qualities,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class LEGOIE(InfoExtractor):
|
class LEGOIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://(?:www\.)?lego\.com/(?P<locale>[^/]+)/(?:[^/]+/)*videos/(?:[^/]+/)*[^/?#]+-(?P<id>[0-9a-f]+)'
|
_VALID_URL = r'https?://(?:www\.)?lego\.com/(?P<locale>[a-z]{2}-[a-z]{2})/(?:[^/]+/)*videos/(?:[^/]+/)*[^/?#]+-(?P<id>[0-9a-f]{32})'
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'http://www.lego.com/en-us/videos/themes/club/blocumentary-kawaguchi-55492d823b1b4d5e985787fa8c2973b1',
|
'url': 'http://www.lego.com/en-us/videos/themes/club/blocumentary-kawaguchi-55492d823b1b4d5e985787fa8c2973b1',
|
||||||
'md5': 'f34468f176cfd76488767fc162c405fa',
|
'md5': 'f34468f176cfd76488767fc162c405fa',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '55492d823b1b4d5e985787fa8c2973b1',
|
'id': '55492d82-3b1b-4d5e-9857-87fa8c2973b1_en-US',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Blocumentary Great Creations: Akiyuki Kawaguchi',
|
'title': 'Blocumentary Great Creations: Akiyuki Kawaguchi',
|
||||||
'description': 'Blocumentary Great Creations: Akiyuki Kawaguchi',
|
'description': 'Blocumentary Great Creations: Akiyuki Kawaguchi',
|
||||||
@ -26,103 +27,123 @@ class LEGOIE(InfoExtractor):
|
|||||||
}, {
|
}, {
|
||||||
# geo-restricted but the contentUrl contain a valid url
|
# geo-restricted but the contentUrl contain a valid url
|
||||||
'url': 'http://www.lego.com/nl-nl/videos/themes/nexoknights/episode-20-kingdom-of-heroes-13bdc2299ab24d9685701a915b3d71e7##sp=399',
|
'url': 'http://www.lego.com/nl-nl/videos/themes/nexoknights/episode-20-kingdom-of-heroes-13bdc2299ab24d9685701a915b3d71e7##sp=399',
|
||||||
'md5': '4c3fec48a12e40c6e5995abc3d36cc2e',
|
'md5': 'c7420221f7ffd03ff056f9db7f8d807c',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '13bdc2299ab24d9685701a915b3d71e7',
|
'id': '13bdc229-9ab2-4d96-8570-1a915b3d71e7_nl-NL',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Aflevering 20 - Helden van het koninkrijk',
|
'title': 'Aflevering 20: Helden van het koninkrijk',
|
||||||
'description': 'md5:8ee499aac26d7fa8bcb0cedb7f9c3941',
|
'description': 'md5:8ee499aac26d7fa8bcb0cedb7f9c3941',
|
||||||
|
'age_limit': 5,
|
||||||
},
|
},
|
||||||
}, {
|
}, {
|
||||||
# special characters in title
|
# with subtitle
|
||||||
'url': 'http://www.lego.com/en-us/starwars/videos/lego-star-wars-force-surprise-9685ee9d12e84ff38e84b4e3d0db533d',
|
'url': 'https://www.lego.com/nl-nl/kids/videos/classic/creative-storytelling-the-little-puppy-aa24f27c7d5242bc86102ebdc0f24cba',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '9685ee9d12e84ff38e84b4e3d0db533d',
|
'id': 'aa24f27c-7d52-42bc-8610-2ebdc0f24cba_nl-NL',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Force Surprise – LEGO® Star Wars™ Microfighters',
|
'title': 'De kleine puppy',
|
||||||
'description': 'md5:9c673c96ce6f6271b88563fe9dc56de3',
|
'description': 'md5:5b725471f849348ac73f2e12cfb4be06',
|
||||||
|
'age_limit': 1,
|
||||||
|
'subtitles': {
|
||||||
|
'nl': [{
|
||||||
|
'ext': 'srt',
|
||||||
|
'url': r're:^https://.+\.srt$',
|
||||||
|
}],
|
||||||
|
},
|
||||||
},
|
},
|
||||||
'params': {
|
'params': {
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
}]
|
}]
|
||||||
_BITRATES = [256, 512, 1024, 1536, 2560]
|
_QUALITIES = {
|
||||||
|
'Lowest': (64, 180, 320),
|
||||||
|
'Low': (64, 270, 480),
|
||||||
|
'Medium': (96, 360, 640),
|
||||||
|
'High': (128, 540, 960),
|
||||||
|
'Highest': (128, 720, 1280),
|
||||||
|
}
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
locale, video_id = re.match(self._VALID_URL, url).groups()
|
locale, video_id = re.match(self._VALID_URL, url).groups()
|
||||||
webpage = self._download_webpage(url, video_id)
|
countries = [locale.split('-')[1].upper()]
|
||||||
title = get_element_by_class('video-header', webpage).strip()
|
self._initialize_geo_bypass({
|
||||||
progressive_base = 'https://lc-mediaplayerns-live-s.legocdn.com/'
|
'countries': countries,
|
||||||
streaming_base = 'http://legoprod-f.akamaihd.net/'
|
|
||||||
content_url = self._html_search_meta('contentUrl', webpage)
|
|
||||||
path = self._search_regex(
|
|
||||||
r'(?:https?:)?//[^/]+/(?:[iz]/s/)?public/(.+)_[0-9,]+\.(?:mp4|webm)',
|
|
||||||
content_url, 'video path', default=None)
|
|
||||||
if not path:
|
|
||||||
player_url = self._proto_relative_url(self._search_regex(
|
|
||||||
r'<iframe[^>]+src="((?:https?)?//(?:www\.)?lego\.com/[^/]+/mediaplayer/video/[^"]+)',
|
|
||||||
webpage, 'player url', default=None))
|
|
||||||
if not player_url:
|
|
||||||
base_url = self._proto_relative_url(self._search_regex(
|
|
||||||
r'data-baseurl="([^"]+)"', webpage, 'base url',
|
|
||||||
default='http://www.lego.com/%s/mediaplayer/video/' % locale))
|
|
||||||
player_url = base_url + video_id
|
|
||||||
player_webpage = self._download_webpage(player_url, video_id)
|
|
||||||
video_data = self._parse_json(unescapeHTML(self._search_regex(
|
|
||||||
r"video='([^']+)'", player_webpage, 'video data')), video_id)
|
|
||||||
progressive_base = self._search_regex(
|
|
||||||
r'data-video-progressive-url="([^"]+)"',
|
|
||||||
player_webpage, 'progressive base', default='https://lc-mediaplayerns-live-s.legocdn.com/')
|
|
||||||
streaming_base = self._search_regex(
|
|
||||||
r'data-video-streaming-url="([^"]+)"',
|
|
||||||
player_webpage, 'streaming base', default='http://legoprod-f.akamaihd.net/')
|
|
||||||
item_id = video_data['ItemId']
|
|
||||||
|
|
||||||
net_storage_path = video_data.get('NetStoragePath') or '/'.join([item_id[:2], item_id[2:4]])
|
|
||||||
base_path = '_'.join([item_id, video_data['VideoId'], video_data['Locale'], compat_str(video_data['VideoVersion'])])
|
|
||||||
path = '/'.join([net_storage_path, base_path])
|
|
||||||
streaming_path = ','.join(map(lambda bitrate: compat_str(bitrate), self._BITRATES))
|
|
||||||
|
|
||||||
formats = self._extract_akamai_formats(
|
|
||||||
'%si/s/public/%s_,%s,.mp4.csmil/master.m3u8' % (streaming_base, path, streaming_path), video_id)
|
|
||||||
m3u8_formats = list(filter(
|
|
||||||
lambda f: f.get('protocol') == 'm3u8_native' and f.get('vcodec') != 'none',
|
|
||||||
formats))
|
|
||||||
if len(m3u8_formats) == len(self._BITRATES):
|
|
||||||
self._sort_formats(m3u8_formats)
|
|
||||||
for bitrate, m3u8_format in zip(self._BITRATES, m3u8_formats):
|
|
||||||
progressive_base_url = '%spublic/%s_%d.' % (progressive_base, path, bitrate)
|
|
||||||
mp4_f = m3u8_format.copy()
|
|
||||||
mp4_f.update({
|
|
||||||
'url': progressive_base_url + 'mp4',
|
|
||||||
'format_id': m3u8_format['format_id'].replace('hls', 'mp4'),
|
|
||||||
'protocol': 'http',
|
|
||||||
})
|
})
|
||||||
web_f = {
|
|
||||||
'url': progressive_base_url + 'webm',
|
try:
|
||||||
'format_id': m3u8_format['format_id'].replace('hls', 'webm'),
|
item = self._download_json(
|
||||||
'width': m3u8_format['width'],
|
# https://contentfeed.services.lego.com/api/v2/item/[VIDEO_ID]?culture=[LOCALE]&contentType=Video
|
||||||
'height': m3u8_format['height'],
|
'https://services.slingshot.lego.com/mediaplayer/v2',
|
||||||
'tbr': m3u8_format.get('tbr'),
|
video_id, query={
|
||||||
'ext': 'webm',
|
'videoId': '%s_%s' % (uuid.UUID(video_id), locale),
|
||||||
}
|
}, headers=self.geo_verification_headers())
|
||||||
formats.extend([web_f, mp4_f])
|
except ExtractorError as e:
|
||||||
|
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 451:
|
||||||
|
self.raise_geo_restricted(countries=countries)
|
||||||
|
raise
|
||||||
|
|
||||||
|
video = item['Video']
|
||||||
|
video_id = video['Id']
|
||||||
|
title = video['Title']
|
||||||
|
|
||||||
|
q = qualities(['Lowest', 'Low', 'Medium', 'High', 'Highest'])
|
||||||
|
formats = []
|
||||||
|
for video_source in item.get('VideoFormats', []):
|
||||||
|
video_source_url = video_source.get('Url')
|
||||||
|
if not video_source_url:
|
||||||
|
continue
|
||||||
|
video_source_format = video_source.get('Format')
|
||||||
|
if video_source_format == 'F4M':
|
||||||
|
formats.extend(self._extract_f4m_formats(
|
||||||
|
video_source_url, video_id,
|
||||||
|
f4m_id=video_source_format, fatal=False))
|
||||||
|
elif video_source_format == 'M3U8':
|
||||||
|
formats.extend(self._extract_m3u8_formats(
|
||||||
|
video_source_url, video_id, 'mp4', 'm3u8_native',
|
||||||
|
m3u8_id=video_source_format, fatal=False))
|
||||||
else:
|
else:
|
||||||
for bitrate in self._BITRATES:
|
video_source_quality = video_source.get('Quality')
|
||||||
for ext in ('web', 'mp4'):
|
format_id = []
|
||||||
formats.append({
|
for v in (video_source_format, video_source_quality):
|
||||||
'format_id': '%s-%s' % (ext, bitrate),
|
if v:
|
||||||
'url': '%spublic/%s_%d.%s' % (progressive_base, path, bitrate, ext),
|
format_id.append(v)
|
||||||
'tbr': bitrate,
|
f = {
|
||||||
'ext': ext,
|
'format_id': '-'.join(format_id),
|
||||||
})
|
'quality': q(video_source_quality),
|
||||||
|
'url': video_source_url,
|
||||||
|
}
|
||||||
|
quality = self._QUALITIES.get(video_source_quality)
|
||||||
|
if quality:
|
||||||
|
f.update({
|
||||||
|
'abr': quality[0],
|
||||||
|
'height': quality[1],
|
||||||
|
'width': quality[2],
|
||||||
|
}),
|
||||||
|
formats.append(f)
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats)
|
||||||
|
|
||||||
|
subtitles = {}
|
||||||
|
sub_file_id = video.get('SubFileId')
|
||||||
|
if sub_file_id and sub_file_id != '00000000-0000-0000-0000-000000000000':
|
||||||
|
net_storage_path = video.get('NetstoragePath')
|
||||||
|
invariant_id = video.get('InvariantId')
|
||||||
|
video_file_id = video.get('VideoFileId')
|
||||||
|
video_version = video.get('VideoVersion')
|
||||||
|
if net_storage_path and invariant_id and video_file_id and video_version:
|
||||||
|
subtitles.setdefault(locale[:2], []).append({
|
||||||
|
'url': 'https://lc-mediaplayerns-live-s.legocdn.com/public/%s/%s_%s_%s_%s_sub.srt' % (net_storage_path, invariant_id, video_file_id, locale, video_version),
|
||||||
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'title': title,
|
'title': title,
|
||||||
'description': self._html_search_meta('description', webpage),
|
'description': video.get('Description'),
|
||||||
'thumbnail': self._html_search_meta('thumbnail', webpage),
|
'thumbnail': video.get('GeneratedCoverImage') or video.get('GeneratedThumbnail'),
|
||||||
'duration': parse_duration(self._html_search_meta('duration', webpage)),
|
'duration': int_or_none(video.get('Length')),
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
|
'subtitles': subtitles,
|
||||||
|
'age_limit': int_or_none(video.get('AgeFrom')),
|
||||||
|
'season': video.get('SeasonTitle'),
|
||||||
|
'season_number': int_or_none(video.get('Season')) or None,
|
||||||
|
'episode_number': int_or_none(video.get('Episode')) or None,
|
||||||
}
|
}
|
||||||
|
|||||||
@ -20,10 +20,10 @@ class MailRuIE(InfoExtractor):
|
|||||||
IE_DESC = 'Видео@Mail.Ru'
|
IE_DESC = 'Видео@Mail.Ru'
|
||||||
_VALID_URL = r'''(?x)
|
_VALID_URL = r'''(?x)
|
||||||
https?://
|
https?://
|
||||||
(?:(?:www|m)\.)?my\.mail\.ru/
|
(?:(?:www|m)\.)?my\.mail\.ru/+
|
||||||
(?:
|
(?:
|
||||||
video/.*\#video=/?(?P<idv1>(?:[^/]+/){3}\d+)|
|
video/.*\#video=/?(?P<idv1>(?:[^/]+/){3}\d+)|
|
||||||
(?:(?P<idv2prefix>(?:[^/]+/){2})video/(?P<idv2suffix>[^/]+/\d+))\.html|
|
(?:(?P<idv2prefix>(?:[^/]+/+){2})video/(?P<idv2suffix>[^/]+/\d+))\.html|
|
||||||
(?:video/embed|\+/video/meta)/(?P<metaid>\d+)
|
(?:video/embed|\+/video/meta)/(?P<metaid>\d+)
|
||||||
)
|
)
|
||||||
'''
|
'''
|
||||||
@ -85,6 +85,14 @@ class MailRuIE(InfoExtractor):
|
|||||||
{
|
{
|
||||||
'url': 'http://my.mail.ru/+/video/meta/7949340477499637815',
|
'url': 'http://my.mail.ru/+/video/meta/7949340477499637815',
|
||||||
'only_matching': True,
|
'only_matching': True,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'url': 'https://my.mail.ru//list/sinyutin10/video/_myvideo/4.html',
|
||||||
|
'only_matching': True,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'url': 'https://my.mail.ru//list//sinyutin10/video/_myvideo/4.html',
|
||||||
|
'only_matching': True,
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -237,7 +245,7 @@ class MailRuMusicSearchBaseIE(InfoExtractor):
|
|||||||
class MailRuMusicIE(MailRuMusicSearchBaseIE):
|
class MailRuMusicIE(MailRuMusicSearchBaseIE):
|
||||||
IE_NAME = 'mailru:music'
|
IE_NAME = 'mailru:music'
|
||||||
IE_DESC = 'Музыка@Mail.Ru'
|
IE_DESC = 'Музыка@Mail.Ru'
|
||||||
_VALID_URL = r'https?://my\.mail\.ru/music/songs/[^/?#&]+-(?P<id>[\da-f]+)'
|
_VALID_URL = r'https?://my\.mail\.ru/+music/+songs/+[^/?#&]+-(?P<id>[\da-f]+)'
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'https://my.mail.ru/music/songs/%D0%BC8%D0%BB8%D1%82%D1%85-l-a-h-luciferian-aesthetics-of-herrschaft-single-2017-4e31f7125d0dfaef505d947642366893',
|
'url': 'https://my.mail.ru/music/songs/%D0%BC8%D0%BB8%D1%82%D1%85-l-a-h-luciferian-aesthetics-of-herrschaft-single-2017-4e31f7125d0dfaef505d947642366893',
|
||||||
'md5': '0f8c22ef8c5d665b13ac709e63025610',
|
'md5': '0f8c22ef8c5d665b13ac709e63025610',
|
||||||
@ -273,7 +281,7 @@ class MailRuMusicIE(MailRuMusicSearchBaseIE):
|
|||||||
class MailRuMusicSearchIE(MailRuMusicSearchBaseIE):
|
class MailRuMusicSearchIE(MailRuMusicSearchBaseIE):
|
||||||
IE_NAME = 'mailru:music:search'
|
IE_NAME = 'mailru:music:search'
|
||||||
IE_DESC = 'Музыка@Mail.Ru'
|
IE_DESC = 'Музыка@Mail.Ru'
|
||||||
_VALID_URL = r'https?://my\.mail\.ru/music/search/(?P<id>[^/?#&]+)'
|
_VALID_URL = r'https?://my\.mail\.ru/+music/+search/+(?P<id>[^/?#&]+)'
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'https://my.mail.ru/music/search/black%20shadow',
|
'url': 'https://my.mail.ru/music/search/black%20shadow',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
|
|||||||
@ -123,7 +123,7 @@ class MediasetIE(ThePlatformBaseIE):
|
|||||||
def _parse_smil_formats(self, smil, smil_url, video_id, namespace=None, f4m_params=None, transform_rtmp_url=None):
|
def _parse_smil_formats(self, smil, smil_url, video_id, namespace=None, f4m_params=None, transform_rtmp_url=None):
|
||||||
for video in smil.findall(self._xpath_ns('.//video', namespace)):
|
for video in smil.findall(self._xpath_ns('.//video', namespace)):
|
||||||
video.attrib['src'] = re.sub(r'(https?://vod05)t(-mediaset-it\.akamaized\.net/.+?.mpd)\?.+', r'\1\2', video.attrib['src'])
|
video.attrib['src'] = re.sub(r'(https?://vod05)t(-mediaset-it\.akamaized\.net/.+?.mpd)\?.+', r'\1\2', video.attrib['src'])
|
||||||
return super()._parse_smil_formats(smil, smil_url, video_id, namespace, f4m_params, transform_rtmp_url)
|
return super(MediasetIE, self)._parse_smil_formats(smil, smil_url, video_id, namespace, f4m_params, transform_rtmp_url)
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
guid = self._match_id(url)
|
guid = self._match_id(url)
|
||||||
|
|||||||
@ -4,8 +4,8 @@ from __future__ import unicode_literals
|
|||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
int_or_none,
|
int_or_none,
|
||||||
|
parse_iso8601,
|
||||||
smuggle_url,
|
smuggle_url,
|
||||||
parse_duration,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -18,16 +18,18 @@ class MiTeleIE(InfoExtractor):
|
|||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'FhYW1iNTE6J6H7NkQRIEzfne6t2quqPg',
|
'id': 'FhYW1iNTE6J6H7NkQRIEzfne6t2quqPg',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Tor, la web invisible',
|
'title': 'Diario de La redacción Programa 144',
|
||||||
'description': 'md5:3b6fce7eaa41b2d97358726378d9369f',
|
'description': 'md5:07c35a7b11abb05876a6a79185b58d27',
|
||||||
'series': 'Diario de',
|
'series': 'Diario de',
|
||||||
'season': 'La redacción',
|
'season': 'Season 14',
|
||||||
'season_number': 14,
|
'season_number': 14,
|
||||||
'season_id': 'diario_de_t14_11981',
|
'episode': 'Tor, la web invisible',
|
||||||
'episode': 'Programa 144',
|
|
||||||
'episode_number': 3,
|
'episode_number': 3,
|
||||||
'thumbnail': r're:(?i)^https?://.*\.jpg$',
|
'thumbnail': r're:(?i)^https?://.*\.jpg$',
|
||||||
'duration': 2913,
|
'duration': 2913,
|
||||||
|
'age_limit': 16,
|
||||||
|
'timestamp': 1471209401,
|
||||||
|
'upload_date': '20160814',
|
||||||
},
|
},
|
||||||
'add_ie': ['Ooyala'],
|
'add_ie': ['Ooyala'],
|
||||||
}, {
|
}, {
|
||||||
@ -39,13 +41,15 @@ class MiTeleIE(InfoExtractor):
|
|||||||
'title': 'Cuarto Milenio Temporada 6 Programa 226',
|
'title': 'Cuarto Milenio Temporada 6 Programa 226',
|
||||||
'description': 'md5:5ff132013f0cd968ffbf1f5f3538a65f',
|
'description': 'md5:5ff132013f0cd968ffbf1f5f3538a65f',
|
||||||
'series': 'Cuarto Milenio',
|
'series': 'Cuarto Milenio',
|
||||||
'season': 'Temporada 6',
|
'season': 'Season 6',
|
||||||
'season_number': 6,
|
'season_number': 6,
|
||||||
'season_id': 'cuarto_milenio_t06_12715',
|
'episode': 'Episode 24',
|
||||||
'episode': 'Programa 226',
|
|
||||||
'episode_number': 24,
|
'episode_number': 24,
|
||||||
'thumbnail': r're:(?i)^https?://.*\.jpg$',
|
'thumbnail': r're:(?i)^https?://.*\.jpg$',
|
||||||
'duration': 7313,
|
'duration': 7313,
|
||||||
|
'age_limit': 12,
|
||||||
|
'timestamp': 1471209021,
|
||||||
|
'upload_date': '20160814',
|
||||||
},
|
},
|
||||||
'params': {
|
'params': {
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
@ -54,67 +58,36 @@ class MiTeleIE(InfoExtractor):
|
|||||||
}, {
|
}, {
|
||||||
'url': 'http://www.mitele.es/series-online/la-que-se-avecina/57aac5c1c915da951a8b45ed/player',
|
'url': 'http://www.mitele.es/series-online/la-que-se-avecina/57aac5c1c915da951a8b45ed/player',
|
||||||
'only_matching': True,
|
'only_matching': True,
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.mitele.es/programas-tv/diario-de/la-redaccion/programa-144-40_1006364575251/player/',
|
||||||
|
'only_matching': True,
|
||||||
}]
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
video_id = self._match_id(url)
|
display_id = self._match_id(url)
|
||||||
|
webpage = self._download_webpage(url, display_id)
|
||||||
paths = self._download_json(
|
pre_player = self._parse_json(self._search_regex(
|
||||||
'https://www.mitele.es/amd/agp/web/metadata/general_configuration',
|
r'window\.\$REACTBASE_STATE\.prePlayer_mtweb\s*=\s*({.+})',
|
||||||
video_id, 'Downloading paths JSON')
|
webpage, 'Pre Player'), display_id)['prePlayer']
|
||||||
|
title = pre_player['title']
|
||||||
ooyala_s = paths['general_configuration']['api_configuration']['ooyala_search']
|
video = pre_player['video']
|
||||||
base_url = ooyala_s.get('base_url', 'cdn-search-mediaset.carbyne.ps.ooyala.com')
|
video_id = video['dataMediaId']
|
||||||
full_path = ooyala_s.get('full_path', '/search/v1/full/providers/')
|
content = pre_player.get('content') or {}
|
||||||
source = self._download_json(
|
info = content.get('info') or {}
|
||||||
'%s://%s%s%s/docs/%s' % (
|
|
||||||
ooyala_s.get('protocol', 'https'), base_url, full_path,
|
|
||||||
ooyala_s.get('provider_id', '104951'), video_id),
|
|
||||||
video_id, 'Downloading data JSON', query={
|
|
||||||
'include_titles': 'Series,Season',
|
|
||||||
'product_name': ooyala_s.get('product_name', 'test'),
|
|
||||||
'format': 'full',
|
|
||||||
})['hits']['hits'][0]['_source']
|
|
||||||
|
|
||||||
embedCode = source['offers'][0]['embed_codes'][0]
|
|
||||||
titles = source['localizable_titles'][0]
|
|
||||||
|
|
||||||
title = titles.get('title_medium') or titles['title_long']
|
|
||||||
|
|
||||||
description = titles.get('summary_long') or titles.get('summary_medium')
|
|
||||||
|
|
||||||
def get(key1, key2):
|
|
||||||
value1 = source.get(key1)
|
|
||||||
if not value1 or not isinstance(value1, list):
|
|
||||||
return
|
|
||||||
if not isinstance(value1[0], dict):
|
|
||||||
return
|
|
||||||
return value1[0].get(key2)
|
|
||||||
|
|
||||||
series = get('localizable_titles_series', 'title_medium')
|
|
||||||
|
|
||||||
season = get('localizable_titles_season', 'title_medium')
|
|
||||||
season_number = int_or_none(source.get('season_number'))
|
|
||||||
season_id = source.get('season_id')
|
|
||||||
|
|
||||||
episode = titles.get('title_sort_name')
|
|
||||||
episode_number = int_or_none(source.get('episode_number'))
|
|
||||||
|
|
||||||
duration = parse_duration(get('videos', 'duration'))
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'_type': 'url_transparent',
|
'_type': 'url_transparent',
|
||||||
# for some reason only HLS is supported
|
# for some reason only HLS is supported
|
||||||
'url': smuggle_url('ooyala:' + embedCode, {'supportedformats': 'm3u8,dash'}),
|
'url': smuggle_url('ooyala:' + video_id, {'supportedformats': 'm3u8,dash'}),
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'title': title,
|
'title': title,
|
||||||
'description': description,
|
'description': info.get('synopsis'),
|
||||||
'series': series,
|
'series': content.get('title'),
|
||||||
'season': season,
|
'season_number': int_or_none(info.get('season_number')),
|
||||||
'season_number': season_number,
|
'episode': content.get('subtitle'),
|
||||||
'season_id': season_id,
|
'episode_number': int_or_none(info.get('episode_number')),
|
||||||
'episode': episode,
|
'duration': int_or_none(info.get('duration')),
|
||||||
'episode_number': episode_number,
|
'thumbnail': video.get('dataPoster'),
|
||||||
'duration': duration,
|
'age_limit': int_or_none(info.get('rating')),
|
||||||
'thumbnail': get('images', 'url'),
|
'timestamp': parse_iso8601(pre_player.get('publishedTime')),
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,68 +1,33 @@
|
|||||||
# coding: utf-8
|
# coding: utf-8
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
import re
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
|
clean_html,
|
||||||
|
dict_get,
|
||||||
ExtractorError,
|
ExtractorError,
|
||||||
int_or_none,
|
int_or_none,
|
||||||
|
parse_duration,
|
||||||
|
try_get,
|
||||||
update_url_query,
|
update_url_query,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class NaverIE(InfoExtractor):
|
class NaverBaseIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://(?:m\.)?tv(?:cast)?\.naver\.com/v/(?P<id>\d+)'
|
_CAPTION_EXT_RE = r'\.(?:ttml|vtt)'
|
||||||
|
|
||||||
_TESTS = [{
|
def _extract_video_info(self, video_id, vid, key):
|
||||||
'url': 'http://tv.naver.com/v/81652',
|
|
||||||
'info_dict': {
|
|
||||||
'id': '81652',
|
|
||||||
'ext': 'mp4',
|
|
||||||
'title': '[9월 모의고사 해설강의][수학_김상희] 수학 A형 16~20번',
|
|
||||||
'description': '합격불변의 법칙 메가스터디 | 메가스터디 수학 김상희 선생님이 9월 모의고사 수학A형 16번에서 20번까지 해설강의를 공개합니다.',
|
|
||||||
'upload_date': '20130903',
|
|
||||||
},
|
|
||||||
}, {
|
|
||||||
'url': 'http://tv.naver.com/v/395837',
|
|
||||||
'md5': '638ed4c12012c458fefcddfd01f173cd',
|
|
||||||
'info_dict': {
|
|
||||||
'id': '395837',
|
|
||||||
'ext': 'mp4',
|
|
||||||
'title': '9년이 지나도 아픈 기억, 전효성의 아버지',
|
|
||||||
'description': 'md5:5bf200dcbf4b66eb1b350d1eb9c753f7',
|
|
||||||
'upload_date': '20150519',
|
|
||||||
},
|
|
||||||
'skip': 'Georestricted',
|
|
||||||
}, {
|
|
||||||
'url': 'http://tvcast.naver.com/v/81652',
|
|
||||||
'only_matching': True,
|
|
||||||
}]
|
|
||||||
|
|
||||||
def _real_extract(self, url):
|
|
||||||
video_id = self._match_id(url)
|
|
||||||
webpage = self._download_webpage(url, video_id)
|
|
||||||
|
|
||||||
vid = self._search_regex(
|
|
||||||
r'videoId["\']\s*:\s*(["\'])(?P<value>(?:(?!\1).)+)\1', webpage,
|
|
||||||
'video id', fatal=None, group='value')
|
|
||||||
in_key = self._search_regex(
|
|
||||||
r'inKey["\']\s*:\s*(["\'])(?P<value>(?:(?!\1).)+)\1', webpage,
|
|
||||||
'key', default=None, group='value')
|
|
||||||
|
|
||||||
if not vid or not in_key:
|
|
||||||
error = self._html_search_regex(
|
|
||||||
r'(?s)<div class="(?:nation_error|nation_box|error_box)">\s*(?:<!--.*?-->)?\s*<p class="[^"]+">(?P<msg>.+?)</p>\s*</div>',
|
|
||||||
webpage, 'error', default=None)
|
|
||||||
if error:
|
|
||||||
raise ExtractorError(error, expected=True)
|
|
||||||
raise ExtractorError('couldn\'t extract vid and key')
|
|
||||||
video_data = self._download_json(
|
video_data = self._download_json(
|
||||||
'http://play.rmcnmv.naver.com/vod/play/v2.0/' + vid,
|
'http://play.rmcnmv.naver.com/vod/play/v2.0/' + vid,
|
||||||
video_id, query={
|
video_id, query={
|
||||||
'key': in_key,
|
'key': key,
|
||||||
})
|
})
|
||||||
meta = video_data['meta']
|
meta = video_data['meta']
|
||||||
title = meta['subject']
|
title = meta['subject']
|
||||||
formats = []
|
formats = []
|
||||||
|
get_list = lambda x: try_get(video_data, lambda y: y[x + 's']['list'], list) or []
|
||||||
|
|
||||||
def extract_formats(streams, stream_type, query={}):
|
def extract_formats(streams, stream_type, query={}):
|
||||||
for stream in streams:
|
for stream in streams:
|
||||||
@ -73,7 +38,7 @@ class NaverIE(InfoExtractor):
|
|||||||
encoding_option = stream.get('encodingOption', {})
|
encoding_option = stream.get('encodingOption', {})
|
||||||
bitrate = stream.get('bitrate', {})
|
bitrate = stream.get('bitrate', {})
|
||||||
formats.append({
|
formats.append({
|
||||||
'format_id': '%s_%s' % (stream.get('type') or stream_type, encoding_option.get('id') or encoding_option.get('name')),
|
'format_id': '%s_%s' % (stream.get('type') or stream_type, dict_get(encoding_option, ('name', 'id'))),
|
||||||
'url': stream_url,
|
'url': stream_url,
|
||||||
'width': int_or_none(encoding_option.get('width')),
|
'width': int_or_none(encoding_option.get('width')),
|
||||||
'height': int_or_none(encoding_option.get('height')),
|
'height': int_or_none(encoding_option.get('height')),
|
||||||
@ -83,7 +48,7 @@ class NaverIE(InfoExtractor):
|
|||||||
'protocol': 'm3u8_native' if stream_type == 'HLS' else None,
|
'protocol': 'm3u8_native' if stream_type == 'HLS' else None,
|
||||||
})
|
})
|
||||||
|
|
||||||
extract_formats(video_data.get('videos', {}).get('list', []), 'H264')
|
extract_formats(get_list('video'), 'H264')
|
||||||
for stream_set in video_data.get('streams', []):
|
for stream_set in video_data.get('streams', []):
|
||||||
query = {}
|
query = {}
|
||||||
for param in stream_set.get('keys', []):
|
for param in stream_set.get('keys', []):
|
||||||
@ -101,28 +66,101 @@ class NaverIE(InfoExtractor):
|
|||||||
'mp4', 'm3u8_native', m3u8_id=stream_type, fatal=False))
|
'mp4', 'm3u8_native', m3u8_id=stream_type, fatal=False))
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats)
|
||||||
|
|
||||||
|
replace_ext = lambda x, y: re.sub(self._CAPTION_EXT_RE, '.' + y, x)
|
||||||
|
|
||||||
|
def get_subs(caption_url):
|
||||||
|
if re.search(self._CAPTION_EXT_RE, caption_url):
|
||||||
|
return [{
|
||||||
|
'url': replace_ext(caption_url, 'ttml'),
|
||||||
|
}, {
|
||||||
|
'url': replace_ext(caption_url, 'vtt'),
|
||||||
|
}]
|
||||||
|
else:
|
||||||
|
return [{'url': caption_url}]
|
||||||
|
|
||||||
|
automatic_captions = {}
|
||||||
subtitles = {}
|
subtitles = {}
|
||||||
for caption in video_data.get('captions', {}).get('list', []):
|
for caption in get_list('caption'):
|
||||||
caption_url = caption.get('source')
|
caption_url = caption.get('source')
|
||||||
if not caption_url:
|
if not caption_url:
|
||||||
continue
|
continue
|
||||||
subtitles.setdefault(caption.get('language') or caption.get('locale'), []).append({
|
sub_dict = automatic_captions if caption.get('type') == 'auto' else subtitles
|
||||||
'url': caption_url,
|
sub_dict.setdefault(dict_get(caption, ('locale', 'language')), []).extend(get_subs(caption_url))
|
||||||
})
|
|
||||||
|
|
||||||
upload_date = self._search_regex(
|
user = meta.get('user', {})
|
||||||
r'<span[^>]+class="date".*?(\d{4}\.\d{2}\.\d{2})',
|
|
||||||
webpage, 'upload date', fatal=False)
|
|
||||||
if upload_date:
|
|
||||||
upload_date = upload_date.replace('.', '')
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'title': title,
|
'title': title,
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
'subtitles': subtitles,
|
'subtitles': subtitles,
|
||||||
'description': self._og_search_description(webpage),
|
'automatic_captions': automatic_captions,
|
||||||
'thumbnail': meta.get('cover', {}).get('source') or self._og_search_thumbnail(webpage),
|
'thumbnail': try_get(meta, lambda x: x['cover']['source']),
|
||||||
'view_count': int_or_none(meta.get('count')),
|
'view_count': int_or_none(meta.get('count')),
|
||||||
'upload_date': upload_date,
|
'uploader_id': user.get('id'),
|
||||||
|
'uploader': user.get('name'),
|
||||||
|
'uploader_url': user.get('url'),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class NaverIE(NaverBaseIE):
|
||||||
|
_VALID_URL = r'https?://(?:m\.)?tv(?:cast)?\.naver\.com/(?:v|embed)/(?P<id>\d+)'
|
||||||
|
_GEO_BYPASS = False
|
||||||
|
_TESTS = [{
|
||||||
|
'url': 'http://tv.naver.com/v/81652',
|
||||||
|
'info_dict': {
|
||||||
|
'id': '81652',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'title': '[9월 모의고사 해설강의][수학_김상희] 수학 A형 16~20번',
|
||||||
|
'description': '메가스터디 수학 김상희 선생님이 9월 모의고사 수학A형 16번에서 20번까지 해설강의를 공개합니다.',
|
||||||
|
'timestamp': 1378200754,
|
||||||
|
'upload_date': '20130903',
|
||||||
|
'uploader': '메가스터디, 합격불변의 법칙',
|
||||||
|
'uploader_id': 'megastudy',
|
||||||
|
},
|
||||||
|
}, {
|
||||||
|
'url': 'http://tv.naver.com/v/395837',
|
||||||
|
'md5': '8a38e35354d26a17f73f4e90094febd3',
|
||||||
|
'info_dict': {
|
||||||
|
'id': '395837',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'title': '9년이 지나도 아픈 기억, 전효성의 아버지',
|
||||||
|
'description': 'md5:eb6aca9d457b922e43860a2a2b1984d3',
|
||||||
|
'timestamp': 1432030253,
|
||||||
|
'upload_date': '20150519',
|
||||||
|
'uploader': '4가지쇼 시즌2',
|
||||||
|
'uploader_id': 'wrappinguser29',
|
||||||
|
},
|
||||||
|
'skip': 'Georestricted',
|
||||||
|
}, {
|
||||||
|
'url': 'http://tvcast.naver.com/v/81652',
|
||||||
|
'only_matching': True,
|
||||||
|
}]
|
||||||
|
|
||||||
|
def _real_extract(self, url):
|
||||||
|
video_id = self._match_id(url)
|
||||||
|
content = self._download_json(
|
||||||
|
'https://tv.naver.com/api/json/v/' + video_id,
|
||||||
|
video_id, headers=self.geo_verification_headers())
|
||||||
|
player_info_json = content.get('playerInfoJson') or {}
|
||||||
|
current_clip = player_info_json.get('currentClip') or {}
|
||||||
|
|
||||||
|
vid = current_clip.get('videoId')
|
||||||
|
in_key = current_clip.get('inKey')
|
||||||
|
|
||||||
|
if not vid or not in_key:
|
||||||
|
player_auth = try_get(player_info_json, lambda x: x['playerOption']['auth'])
|
||||||
|
if player_auth == 'notCountry':
|
||||||
|
self.raise_geo_restricted(countries=['KR'])
|
||||||
|
elif player_auth == 'notLogin':
|
||||||
|
self.raise_login_required()
|
||||||
|
raise ExtractorError('couldn\'t extract vid and key')
|
||||||
|
info = self._extract_video_info(video_id, vid, in_key)
|
||||||
|
info.update({
|
||||||
|
'description': clean_html(current_clip.get('description')),
|
||||||
|
'timestamp': int_or_none(current_clip.get('firstExposureTime'), 1000),
|
||||||
|
'duration': parse_duration(current_clip.get('displayPlayTime')),
|
||||||
|
'like_count': int_or_none(current_clip.get('recommendPoint')),
|
||||||
|
'age_limit': 19 if current_clip.get('adult') else None,
|
||||||
|
})
|
||||||
|
return info
|
||||||
|
|||||||
@ -12,6 +12,7 @@ from ..utils import (
|
|||||||
ExtractorError,
|
ExtractorError,
|
||||||
int_or_none,
|
int_or_none,
|
||||||
JSON_LD_RE,
|
JSON_LD_RE,
|
||||||
|
js_to_json,
|
||||||
NO_DEFAULT,
|
NO_DEFAULT,
|
||||||
parse_age_limit,
|
parse_age_limit,
|
||||||
parse_duration,
|
parse_duration,
|
||||||
@ -105,6 +106,7 @@ class NRKBaseIE(InfoExtractor):
|
|||||||
MESSAGES = {
|
MESSAGES = {
|
||||||
'ProgramRightsAreNotReady': 'Du kan dessverre ikke se eller høre programmet',
|
'ProgramRightsAreNotReady': 'Du kan dessverre ikke se eller høre programmet',
|
||||||
'ProgramRightsHasExpired': 'Programmet har gått ut',
|
'ProgramRightsHasExpired': 'Programmet har gått ut',
|
||||||
|
'NoProgramRights': 'Ikke tilgjengelig',
|
||||||
'ProgramIsGeoBlocked': 'NRK har ikke rettigheter til å vise dette programmet utenfor Norge',
|
'ProgramIsGeoBlocked': 'NRK har ikke rettigheter til å vise dette programmet utenfor Norge',
|
||||||
}
|
}
|
||||||
message_type = data.get('messageType', '')
|
message_type = data.get('messageType', '')
|
||||||
@ -255,6 +257,17 @@ class NRKTVIE(NRKBaseIE):
|
|||||||
''' % _EPISODE_RE
|
''' % _EPISODE_RE
|
||||||
_API_HOSTS = ('psapi-ne.nrk.no', 'psapi-we.nrk.no')
|
_API_HOSTS = ('psapi-ne.nrk.no', 'psapi-we.nrk.no')
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
|
'url': 'https://tv.nrk.no/program/MDDP12000117',
|
||||||
|
'md5': '8270824df46ec629b66aeaa5796b36fb',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'MDDP12000117AA',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'title': 'Alarm Trolltunga',
|
||||||
|
'description': 'md5:46923a6e6510eefcce23d5ef2a58f2ce',
|
||||||
|
'duration': 2223,
|
||||||
|
'age_limit': 6,
|
||||||
|
},
|
||||||
|
}, {
|
||||||
'url': 'https://tv.nrk.no/serie/20-spoersmaal-tv/MUHH48000314/23-05-2014',
|
'url': 'https://tv.nrk.no/serie/20-spoersmaal-tv/MUHH48000314/23-05-2014',
|
||||||
'md5': '9a167e54d04671eb6317a37b7bc8a280',
|
'md5': '9a167e54d04671eb6317a37b7bc8a280',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
@ -266,6 +279,7 @@ class NRKTVIE(NRKBaseIE):
|
|||||||
'series': '20 spørsmål',
|
'series': '20 spørsmål',
|
||||||
'episode': '23.05.2014',
|
'episode': '23.05.2014',
|
||||||
},
|
},
|
||||||
|
'skip': 'NoProgramRights',
|
||||||
}, {
|
}, {
|
||||||
'url': 'https://tv.nrk.no/program/mdfp15000514',
|
'url': 'https://tv.nrk.no/program/mdfp15000514',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
@ -370,7 +384,24 @@ class NRKTVIE(NRKBaseIE):
|
|||||||
|
|
||||||
class NRKTVEpisodeIE(InfoExtractor):
|
class NRKTVEpisodeIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://tv\.nrk\.no/serie/(?P<id>[^/]+/sesong/\d+/episode/\d+)'
|
_VALID_URL = r'https?://tv\.nrk\.no/serie/(?P<id>[^/]+/sesong/\d+/episode/\d+)'
|
||||||
_TEST = {
|
_TESTS = [{
|
||||||
|
'url': 'https://tv.nrk.no/serie/hellums-kro/sesong/1/episode/2',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'MUHH36005220BA',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'title': 'Kro, krig og kjærlighet 2:6',
|
||||||
|
'description': 'md5:b32a7dc0b1ed27c8064f58b97bda4350',
|
||||||
|
'duration': 1563,
|
||||||
|
'series': 'Hellums kro',
|
||||||
|
'season_number': 1,
|
||||||
|
'episode_number': 2,
|
||||||
|
'episode': '2:6',
|
||||||
|
'age_limit': 6,
|
||||||
|
},
|
||||||
|
'params': {
|
||||||
|
'skip_download': True,
|
||||||
|
},
|
||||||
|
}, {
|
||||||
'url': 'https://tv.nrk.no/serie/backstage/sesong/1/episode/8',
|
'url': 'https://tv.nrk.no/serie/backstage/sesong/1/episode/8',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'MSUI14000816AA',
|
'id': 'MSUI14000816AA',
|
||||||
@ -386,7 +417,8 @@ class NRKTVEpisodeIE(InfoExtractor):
|
|||||||
'params': {
|
'params': {
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
}
|
'skip': 'ProgramRightsHasExpired',
|
||||||
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
display_id = self._match_id(url)
|
display_id = self._match_id(url)
|
||||||
@ -409,7 +441,7 @@ class NRKTVSerieBaseIE(InfoExtractor):
|
|||||||
(r'INITIAL_DATA(?:_V\d)?_*\s*=\s*({.+?})\s*;',
|
(r'INITIAL_DATA(?:_V\d)?_*\s*=\s*({.+?})\s*;',
|
||||||
r'({.+?})\s*,\s*"[^"]+"\s*\)\s*</script>'),
|
r'({.+?})\s*,\s*"[^"]+"\s*\)\s*</script>'),
|
||||||
webpage, 'config', default='{}' if not fatal else NO_DEFAULT),
|
webpage, 'config', default='{}' if not fatal else NO_DEFAULT),
|
||||||
display_id, fatal=False)
|
display_id, fatal=False, transform_source=js_to_json)
|
||||||
if not config:
|
if not config:
|
||||||
return
|
return
|
||||||
return try_get(
|
return try_get(
|
||||||
@ -479,6 +511,14 @@ class NRKTVSeriesIE(NRKTVSerieBaseIE):
|
|||||||
_VALID_URL = r'https?://(?:tv|radio)\.nrk(?:super)?\.no/serie/(?P<id>[^/]+)'
|
_VALID_URL = r'https?://(?:tv|radio)\.nrk(?:super)?\.no/serie/(?P<id>[^/]+)'
|
||||||
_ITEM_RE = r'(?:data-season=["\']|id=["\']season-)(?P<id>\d+)'
|
_ITEM_RE = r'(?:data-season=["\']|id=["\']season-)(?P<id>\d+)'
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
|
'url': 'https://tv.nrk.no/serie/blank',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'blank',
|
||||||
|
'title': 'Blank',
|
||||||
|
'description': 'md5:7664b4e7e77dc6810cd3bca367c25b6e',
|
||||||
|
},
|
||||||
|
'playlist_mincount': 30,
|
||||||
|
}, {
|
||||||
# new layout, seasons
|
# new layout, seasons
|
||||||
'url': 'https://tv.nrk.no/serie/backstage',
|
'url': 'https://tv.nrk.no/serie/backstage',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
@ -648,7 +688,7 @@ class NRKSkoleIE(InfoExtractor):
|
|||||||
|
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'https://www.nrk.no/skole/?page=search&q=&mediaId=14099',
|
'url': 'https://www.nrk.no/skole/?page=search&q=&mediaId=14099',
|
||||||
'md5': '6bc936b01f9dd8ed45bc58b252b2d9b6',
|
'md5': '18c12c3d071953c3bf8d54ef6b2587b7',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '6021',
|
'id': '6021',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
|
|||||||
@ -6,12 +6,14 @@ import re
|
|||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..compat import compat_str
|
from ..compat import compat_str
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
|
clean_html,
|
||||||
determine_ext,
|
determine_ext,
|
||||||
float_or_none,
|
float_or_none,
|
||||||
HEADRequest,
|
HEADRequest,
|
||||||
int_or_none,
|
int_or_none,
|
||||||
orderedSet,
|
orderedSet,
|
||||||
remove_end,
|
remove_end,
|
||||||
|
str_or_none,
|
||||||
strip_jsonp,
|
strip_jsonp,
|
||||||
unescapeHTML,
|
unescapeHTML,
|
||||||
unified_strdate,
|
unified_strdate,
|
||||||
@ -161,44 +163,48 @@ class ORFRadioIE(InfoExtractor):
|
|||||||
show_date = mobj.group('date')
|
show_date = mobj.group('date')
|
||||||
show_id = mobj.group('show')
|
show_id = mobj.group('show')
|
||||||
|
|
||||||
if station == 'fm4':
|
|
||||||
show_id = '4%s' % show_id
|
|
||||||
|
|
||||||
data = self._download_json(
|
data = self._download_json(
|
||||||
'http://audioapi.orf.at/%s/api/json/current/broadcast/%s/%s' % (station, show_id, show_date),
|
'http://audioapi.orf.at/%s/api/json/current/broadcast/%s/%s'
|
||||||
show_id
|
% (station, show_id, show_date), show_id)
|
||||||
)
|
|
||||||
|
|
||||||
def extract_entry_dict(info, title, subtitle):
|
entries = []
|
||||||
return {
|
for info in data['streams']:
|
||||||
'id': info['loopStreamId'].replace('.mp3', ''),
|
loop_stream_id = str_or_none(info.get('loopStreamId'))
|
||||||
'url': 'http://loopstream01.apa.at/?channel=%s&id=%s' % (station, info['loopStreamId']),
|
if not loop_stream_id:
|
||||||
|
continue
|
||||||
|
title = str_or_none(data.get('title'))
|
||||||
|
if not title:
|
||||||
|
continue
|
||||||
|
start = int_or_none(info.get('start'), scale=1000)
|
||||||
|
end = int_or_none(info.get('end'), scale=1000)
|
||||||
|
duration = end - start if end and start else None
|
||||||
|
entries.append({
|
||||||
|
'id': loop_stream_id.replace('.mp3', ''),
|
||||||
|
'url': 'http://loopstream01.apa.at/?channel=%s&id=%s' % (station, loop_stream_id),
|
||||||
'title': title,
|
'title': title,
|
||||||
'description': subtitle,
|
'description': clean_html(data.get('subtitle')),
|
||||||
'duration': (info['end'] - info['start']) / 1000,
|
'duration': duration,
|
||||||
'timestamp': info['start'] / 1000,
|
'timestamp': start,
|
||||||
'ext': 'mp3',
|
'ext': 'mp3',
|
||||||
'series': data.get('programTitle')
|
'series': data.get('programTitle'),
|
||||||
}
|
})
|
||||||
|
|
||||||
entries = [extract_entry_dict(t, data['title'], data['subtitle']) for t in data['streams']]
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'_type': 'playlist',
|
'_type': 'playlist',
|
||||||
'id': show_id,
|
'id': show_id,
|
||||||
'title': data['title'],
|
'title': data.get('title'),
|
||||||
'description': data['subtitle'],
|
'description': clean_html(data.get('subtitle')),
|
||||||
'entries': entries
|
'entries': entries,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class ORFFM4IE(ORFRadioIE):
|
class ORFFM4IE(ORFRadioIE):
|
||||||
IE_NAME = 'orf:fm4'
|
IE_NAME = 'orf:fm4'
|
||||||
IE_DESC = 'radio FM4'
|
IE_DESC = 'radio FM4'
|
||||||
_VALID_URL = r'https?://(?P<station>fm4)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>\w+)'
|
_VALID_URL = r'https?://(?P<station>fm4)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>4\w+)'
|
||||||
|
|
||||||
_TEST = {
|
_TEST = {
|
||||||
'url': 'http://fm4.orf.at/player/20170107/CC',
|
'url': 'http://fm4.orf.at/player/20170107/4CC',
|
||||||
'md5': '2b0be47375432a7ef104453432a19212',
|
'md5': '2b0be47375432a7ef104453432a19212',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '2017-01-07_2100_tl_54_7DaysSat18_31295',
|
'id': '2017-01-07_2100_tl_54_7DaysSat18_31295',
|
||||||
@ -209,7 +215,8 @@ class ORFFM4IE(ORFRadioIE):
|
|||||||
'timestamp': 1483819257,
|
'timestamp': 1483819257,
|
||||||
'upload_date': '20170107',
|
'upload_date': '20170107',
|
||||||
},
|
},
|
||||||
'skip': 'Shows from ORF radios are only available for 7 days.'
|
'skip': 'Shows from ORF radios are only available for 7 days.',
|
||||||
|
'only_matching': True,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,99 +0,0 @@
|
|||||||
# coding: utf-8
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
from .common import InfoExtractor
|
|
||||||
from ..utils import (
|
|
||||||
ExtractorError,
|
|
||||||
qualities,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class PandaTVIE(InfoExtractor):
|
|
||||||
IE_DESC = '熊猫TV'
|
|
||||||
_VALID_URL = r'https?://(?:www\.)?panda\.tv/(?P<id>[0-9]+)'
|
|
||||||
_TESTS = [{
|
|
||||||
'url': 'http://www.panda.tv/66666',
|
|
||||||
'info_dict': {
|
|
||||||
'id': '66666',
|
|
||||||
'title': 're:.+',
|
|
||||||
'uploader': '刘杀鸡',
|
|
||||||
'ext': 'flv',
|
|
||||||
'is_live': True,
|
|
||||||
},
|
|
||||||
'params': {
|
|
||||||
'skip_download': True,
|
|
||||||
},
|
|
||||||
'skip': 'Live stream is offline',
|
|
||||||
}, {
|
|
||||||
'url': 'https://www.panda.tv/66666',
|
|
||||||
'only_matching': True,
|
|
||||||
}]
|
|
||||||
|
|
||||||
def _real_extract(self, url):
|
|
||||||
video_id = self._match_id(url)
|
|
||||||
|
|
||||||
config = self._download_json(
|
|
||||||
'https://www.panda.tv/api_room_v2?roomid=%s' % video_id, video_id)
|
|
||||||
|
|
||||||
error_code = config.get('errno', 0)
|
|
||||||
if error_code != 0:
|
|
||||||
raise ExtractorError(
|
|
||||||
'%s returned error %s: %s'
|
|
||||||
% (self.IE_NAME, error_code, config['errmsg']),
|
|
||||||
expected=True)
|
|
||||||
|
|
||||||
data = config['data']
|
|
||||||
video_info = data['videoinfo']
|
|
||||||
|
|
||||||
# 2 = live, 3 = offline
|
|
||||||
if video_info.get('status') != '2':
|
|
||||||
raise ExtractorError(
|
|
||||||
'Live stream is offline', expected=True)
|
|
||||||
|
|
||||||
title = data['roominfo']['name']
|
|
||||||
uploader = data.get('hostinfo', {}).get('name')
|
|
||||||
room_key = video_info['room_key']
|
|
||||||
stream_addr = video_info.get(
|
|
||||||
'stream_addr', {'OD': '1', 'HD': '1', 'SD': '1'})
|
|
||||||
|
|
||||||
# Reverse engineered from web player swf
|
|
||||||
# (http://s6.pdim.gs/static/07153e425f581151.swf at the moment of
|
|
||||||
# writing).
|
|
||||||
plflag0, plflag1 = video_info['plflag'].split('_')
|
|
||||||
plflag0 = int(plflag0) - 1
|
|
||||||
if plflag1 == '21':
|
|
||||||
plflag0 = 10
|
|
||||||
plflag1 = '4'
|
|
||||||
live_panda = 'live_panda' if plflag0 < 1 else ''
|
|
||||||
|
|
||||||
plflag_auth = self._parse_json(video_info['plflag_list'], video_id)
|
|
||||||
sign = plflag_auth['auth']['sign']
|
|
||||||
ts = plflag_auth['auth']['time']
|
|
||||||
rid = plflag_auth['auth']['rid']
|
|
||||||
|
|
||||||
quality_key = qualities(['OD', 'HD', 'SD'])
|
|
||||||
suffix = ['_small', '_mid', '']
|
|
||||||
formats = []
|
|
||||||
for k, v in stream_addr.items():
|
|
||||||
if v != '1':
|
|
||||||
continue
|
|
||||||
quality = quality_key(k)
|
|
||||||
if quality <= 0:
|
|
||||||
continue
|
|
||||||
for pref, (ext, pl) in enumerate((('m3u8', '-hls'), ('flv', ''))):
|
|
||||||
formats.append({
|
|
||||||
'url': 'https://pl%s%s.live.panda.tv/live_panda/%s%s%s.%s?sign=%s&ts=%s&rid=%s'
|
|
||||||
% (pl, plflag1, room_key, live_panda, suffix[quality], ext, sign, ts, rid),
|
|
||||||
'format_id': '%s-%s' % (k, ext),
|
|
||||||
'quality': quality,
|
|
||||||
'source_preference': pref,
|
|
||||||
})
|
|
||||||
self._sort_formats(formats)
|
|
||||||
|
|
||||||
return {
|
|
||||||
'id': video_id,
|
|
||||||
'title': self._live_title(title),
|
|
||||||
'uploader': uploader,
|
|
||||||
'formats': formats,
|
|
||||||
'is_live': True,
|
|
||||||
}
|
|
||||||
@ -17,6 +17,7 @@ from ..utils import (
|
|||||||
determine_ext,
|
determine_ext,
|
||||||
ExtractorError,
|
ExtractorError,
|
||||||
int_or_none,
|
int_or_none,
|
||||||
|
NO_DEFAULT,
|
||||||
orderedSet,
|
orderedSet,
|
||||||
remove_quotes,
|
remove_quotes,
|
||||||
str_to_int,
|
str_to_int,
|
||||||
@ -227,12 +228,13 @@ class PornHubIE(PornHubBaseIE):
|
|||||||
else:
|
else:
|
||||||
thumbnail, duration = [None] * 2
|
thumbnail, duration = [None] * 2
|
||||||
|
|
||||||
if not video_urls:
|
def extract_js_vars(webpage, pattern, default=NO_DEFAULT):
|
||||||
tv_webpage = dl_webpage('tv')
|
|
||||||
|
|
||||||
assignments = self._search_regex(
|
assignments = self._search_regex(
|
||||||
r'(var.+?mediastring.+?)</script>', tv_webpage,
|
pattern, webpage, 'encoded url', default=default)
|
||||||
'encoded url').split(';')
|
if not assignments:
|
||||||
|
return {}
|
||||||
|
|
||||||
|
assignments = assignments.split(';')
|
||||||
|
|
||||||
js_vars = {}
|
js_vars = {}
|
||||||
|
|
||||||
@ -254,11 +256,35 @@ class PornHubIE(PornHubBaseIE):
|
|||||||
assn = re.sub(r'var\s+', '', assn)
|
assn = re.sub(r'var\s+', '', assn)
|
||||||
vname, value = assn.split('=', 1)
|
vname, value = assn.split('=', 1)
|
||||||
js_vars[vname] = parse_js_value(value)
|
js_vars[vname] = parse_js_value(value)
|
||||||
|
return js_vars
|
||||||
|
|
||||||
video_url = js_vars['mediastring']
|
def add_video_url(video_url):
|
||||||
if video_url not in video_urls_set:
|
v_url = url_or_none(video_url)
|
||||||
video_urls.append((video_url, None))
|
if not v_url:
|
||||||
video_urls_set.add(video_url)
|
return
|
||||||
|
if v_url in video_urls_set:
|
||||||
|
return
|
||||||
|
video_urls.append((v_url, None))
|
||||||
|
video_urls_set.add(v_url)
|
||||||
|
|
||||||
|
if not video_urls:
|
||||||
|
FORMAT_PREFIXES = ('media', 'quality')
|
||||||
|
js_vars = extract_js_vars(
|
||||||
|
webpage, r'(var\s+(?:%s)_.+)' % '|'.join(FORMAT_PREFIXES),
|
||||||
|
default=None)
|
||||||
|
if js_vars:
|
||||||
|
for key, format_url in js_vars.items():
|
||||||
|
if any(key.startswith(p) for p in FORMAT_PREFIXES):
|
||||||
|
add_video_url(format_url)
|
||||||
|
if not video_urls and re.search(
|
||||||
|
r'<[^>]+\bid=["\']lockedPlayer', webpage):
|
||||||
|
raise ExtractorError(
|
||||||
|
'Video %s is locked' % video_id, expected=True)
|
||||||
|
|
||||||
|
if not video_urls:
|
||||||
|
js_vars = extract_js_vars(
|
||||||
|
dl_webpage('tv'), r'(var.+?mediastring.+?)</script>')
|
||||||
|
add_video_url(js_vars['mediastring'])
|
||||||
|
|
||||||
for mobj in re.finditer(
|
for mobj in re.finditer(
|
||||||
r'<a[^>]+\bclass=["\']downloadBtn\b[^>]+\bhref=(["\'])(?P<url>(?:(?!\1).)+)\1',
|
r'<a[^>]+\bclass=["\']downloadBtn\b[^>]+\bhref=(["\'])(?P<url>(?:(?!\1).)+)\1',
|
||||||
@ -276,10 +302,16 @@ class PornHubIE(PornHubBaseIE):
|
|||||||
r'/(\d{6}/\d{2})/', video_url, 'upload data', default=None)
|
r'/(\d{6}/\d{2})/', video_url, 'upload data', default=None)
|
||||||
if upload_date:
|
if upload_date:
|
||||||
upload_date = upload_date.replace('/', '')
|
upload_date = upload_date.replace('/', '')
|
||||||
if determine_ext(video_url) == 'mpd':
|
ext = determine_ext(video_url)
|
||||||
|
if ext == 'mpd':
|
||||||
formats.extend(self._extract_mpd_formats(
|
formats.extend(self._extract_mpd_formats(
|
||||||
video_url, video_id, mpd_id='dash', fatal=False))
|
video_url, video_id, mpd_id='dash', fatal=False))
|
||||||
continue
|
continue
|
||||||
|
elif ext == 'm3u8':
|
||||||
|
formats.extend(self._extract_m3u8_formats(
|
||||||
|
video_url, video_id, 'mp4', entry_protocol='m3u8_native',
|
||||||
|
m3u8_id='hls', fatal=False))
|
||||||
|
continue
|
||||||
tbr = None
|
tbr = None
|
||||||
mobj = re.search(r'(?P<height>\d+)[pP]?_(?P<tbr>\d+)[kK]', video_url)
|
mobj = re.search(r'(?P<height>\d+)[pP]?_(?P<tbr>\d+)[kK]', video_url)
|
||||||
if mobj:
|
if mobj:
|
||||||
|
|||||||
@ -16,7 +16,7 @@ from ..utils import (
|
|||||||
|
|
||||||
|
|
||||||
class ProSiebenSat1BaseIE(InfoExtractor):
|
class ProSiebenSat1BaseIE(InfoExtractor):
|
||||||
_GEO_COUNTRIES = ['DE']
|
_GEO_BYPASS = False
|
||||||
_ACCESS_ID = None
|
_ACCESS_ID = None
|
||||||
_SUPPORTED_PROTOCOLS = 'dash:clear,hls:clear,progressive:clear'
|
_SUPPORTED_PROTOCOLS = 'dash:clear,hls:clear,progressive:clear'
|
||||||
_V4_BASE_URL = 'https://vas-v4.p7s1video.net/4.0/get'
|
_V4_BASE_URL = 'https://vas-v4.p7s1video.net/4.0/get'
|
||||||
@ -39,14 +39,18 @@ class ProSiebenSat1BaseIE(InfoExtractor):
|
|||||||
formats = []
|
formats = []
|
||||||
if self._ACCESS_ID:
|
if self._ACCESS_ID:
|
||||||
raw_ct = self._ENCRYPTION_KEY + clip_id + self._IV + self._ACCESS_ID
|
raw_ct = self._ENCRYPTION_KEY + clip_id + self._IV + self._ACCESS_ID
|
||||||
server_token = (self._download_json(
|
protocols = self._download_json(
|
||||||
self._V4_BASE_URL + 'protocols', clip_id,
|
self._V4_BASE_URL + 'protocols', clip_id,
|
||||||
'Downloading protocols JSON',
|
'Downloading protocols JSON',
|
||||||
headers=self.geo_verification_headers(), query={
|
headers=self.geo_verification_headers(), query={
|
||||||
'access_id': self._ACCESS_ID,
|
'access_id': self._ACCESS_ID,
|
||||||
'client_token': sha1((raw_ct).encode()).hexdigest(),
|
'client_token': sha1((raw_ct).encode()).hexdigest(),
|
||||||
'video_id': clip_id,
|
'video_id': clip_id,
|
||||||
}, fatal=False) or {}).get('server_token')
|
}, fatal=False, expected_status=(403,)) or {}
|
||||||
|
error = protocols.get('error') or {}
|
||||||
|
if error.get('title') == 'Geo check failed':
|
||||||
|
self.raise_geo_restricted(countries=['AT', 'CH', 'DE'])
|
||||||
|
server_token = protocols.get('server_token')
|
||||||
if server_token:
|
if server_token:
|
||||||
urls = (self._download_json(
|
urls = (self._download_json(
|
||||||
self._V4_BASE_URL + 'urls', clip_id, 'Downloading urls JSON', query={
|
self._V4_BASE_URL + 'urls', clip_id, 'Downloading urls JSON', query={
|
||||||
|
|||||||
@ -43,8 +43,15 @@ class RedTubeIE(InfoExtractor):
|
|||||||
webpage = self._download_webpage(
|
webpage = self._download_webpage(
|
||||||
'http://www.redtube.com/%s' % video_id, video_id)
|
'http://www.redtube.com/%s' % video_id, video_id)
|
||||||
|
|
||||||
if any(s in webpage for s in ['video-deleted-info', '>This video has been removed']):
|
ERRORS = (
|
||||||
raise ExtractorError('Video %s has been removed' % video_id, expected=True)
|
(('video-deleted-info', '>This video has been removed'), 'has been removed'),
|
||||||
|
(('private_video_text', '>This video is private', '>Send a friend request to its owner to be able to view it'), 'is private'),
|
||||||
|
)
|
||||||
|
|
||||||
|
for patterns, message in ERRORS:
|
||||||
|
if any(p in webpage for p in patterns):
|
||||||
|
raise ExtractorError(
|
||||||
|
'Video %s %s' % (video_id, message), expected=True)
|
||||||
|
|
||||||
info = self._search_json_ld(webpage, video_id, default={})
|
info = self._search_json_ld(webpage, video_id, default={})
|
||||||
|
|
||||||
|
|||||||
@ -165,7 +165,8 @@ class SafariIE(SafariBaseIE):
|
|||||||
kaltura_session = self._download_json(
|
kaltura_session = self._download_json(
|
||||||
'%s/player/kaltura_session/?reference_id=%s' % (self._API_BASE, reference_id),
|
'%s/player/kaltura_session/?reference_id=%s' % (self._API_BASE, reference_id),
|
||||||
video_id, 'Downloading kaltura session JSON',
|
video_id, 'Downloading kaltura session JSON',
|
||||||
'Unable to download kaltura session JSON', fatal=False)
|
'Unable to download kaltura session JSON', fatal=False,
|
||||||
|
headers={'Accept': 'application/json'})
|
||||||
if kaltura_session:
|
if kaltura_session:
|
||||||
session = kaltura_session.get('session')
|
session = kaltura_session.get('session')
|
||||||
if session:
|
if session:
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import re
|
|||||||
|
|
||||||
from .aws import AWSIE
|
from .aws import AWSIE
|
||||||
from .anvato import AnvatoIE
|
from .anvato import AnvatoIE
|
||||||
|
from .common import InfoExtractor
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
smuggle_url,
|
smuggle_url,
|
||||||
urlencode_postdata,
|
urlencode_postdata,
|
||||||
@ -102,3 +103,50 @@ class ScrippsNetworksWatchIE(AWSIE):
|
|||||||
'anvato:anvato_scripps_app_web_prod_0837996dbe373629133857ae9eb72e740424d80a:%s' % mcp_id,
|
'anvato:anvato_scripps_app_web_prod_0837996dbe373629133857ae9eb72e740424d80a:%s' % mcp_id,
|
||||||
{'geo_countries': ['US']}),
|
{'geo_countries': ['US']}),
|
||||||
AnvatoIE.ie_key(), video_id=mcp_id)
|
AnvatoIE.ie_key(), video_id=mcp_id)
|
||||||
|
|
||||||
|
|
||||||
|
class ScrippsNetworksIE(InfoExtractor):
|
||||||
|
_VALID_URL = r'https?://(?:www\.)?(?P<site>cookingchanneltv|discovery|(?:diy|food)network|hgtv|travelchannel)\.com/videos/[0-9a-z-]+-(?P<id>\d+)'
|
||||||
|
_TESTS = [{
|
||||||
|
'url': 'https://www.cookingchanneltv.com/videos/the-best-of-the-best-0260338',
|
||||||
|
'info_dict': {
|
||||||
|
'id': '0260338',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'title': 'The Best of the Best',
|
||||||
|
'description': 'Catch a new episode of MasterChef Canada Tuedsay at 9/8c.',
|
||||||
|
'timestamp': 1475678834,
|
||||||
|
'upload_date': '20161005',
|
||||||
|
'uploader': 'SCNI-SCND',
|
||||||
|
},
|
||||||
|
'add_ie': ['ThePlatform'],
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.diynetwork.com/videos/diy-barnwood-tablet-stand-0265790',
|
||||||
|
'only_matching': True,
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.foodnetwork.com/videos/chocolate-strawberry-cake-roll-7524591',
|
||||||
|
'only_matching': True,
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.hgtv.com/videos/cookie-decorating-101-0301929',
|
||||||
|
'only_matching': True,
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.travelchannel.com/videos/two-climates-one-bag-5302184',
|
||||||
|
'only_matching': True,
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.discovery.com/videos/guardians-of-the-glades-cooking-with-tom-cobb-5578368',
|
||||||
|
'only_matching': True,
|
||||||
|
}]
|
||||||
|
_ACCOUNT_MAP = {
|
||||||
|
'cookingchanneltv': 2433005105,
|
||||||
|
'discovery': 2706091867,
|
||||||
|
'diynetwork': 2433004575,
|
||||||
|
'foodnetwork': 2433005105,
|
||||||
|
'hgtv': 2433004575,
|
||||||
|
'travelchannel': 2433005739,
|
||||||
|
}
|
||||||
|
_TP_TEMPL = 'https://link.theplatform.com/s/ip77QC/media/guid/%d/%s?mbr=true'
|
||||||
|
|
||||||
|
def _real_extract(self, url):
|
||||||
|
site, guid = re.match(self._VALID_URL, url).groups()
|
||||||
|
return self.url_result(smuggle_url(
|
||||||
|
self._TP_TEMPL % (self._ACCOUNT_MAP[site], guid),
|
||||||
|
{'force_smil_url': True}), 'ThePlatform', guid)
|
||||||
|
|||||||
@ -9,10 +9,13 @@ from .common import (
|
|||||||
SearchInfoExtractor
|
SearchInfoExtractor
|
||||||
)
|
)
|
||||||
from ..compat import (
|
from ..compat import (
|
||||||
|
compat_HTTPError,
|
||||||
|
compat_kwargs,
|
||||||
compat_str,
|
compat_str,
|
||||||
compat_urlparse,
|
compat_urlparse,
|
||||||
)
|
)
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
|
error_to_compat_str,
|
||||||
ExtractorError,
|
ExtractorError,
|
||||||
float_or_none,
|
float_or_none,
|
||||||
HEADRequest,
|
HEADRequest,
|
||||||
@ -255,7 +258,6 @@ class SoundcloudIE(InfoExtractor):
|
|||||||
_API_BASE = 'https://api.soundcloud.com/'
|
_API_BASE = 'https://api.soundcloud.com/'
|
||||||
_API_V2_BASE = 'https://api-v2.soundcloud.com/'
|
_API_V2_BASE = 'https://api-v2.soundcloud.com/'
|
||||||
_BASE_URL = 'https://soundcloud.com/'
|
_BASE_URL = 'https://soundcloud.com/'
|
||||||
_CLIENT_ID = 'UW9ajvMgVdMMW3cdeBi8lPfN6dvOVGji'
|
|
||||||
_IMAGE_REPL_RE = r'-([0-9a-z]+)\.jpg'
|
_IMAGE_REPL_RE = r'-([0-9a-z]+)\.jpg'
|
||||||
|
|
||||||
_ARTWORK_MAP = {
|
_ARTWORK_MAP = {
|
||||||
@ -271,9 +273,49 @@ class SoundcloudIE(InfoExtractor):
|
|||||||
'original': 0,
|
'original': 0,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def _store_client_id(self, client_id):
|
||||||
|
self._downloader.cache.store('soundcloud', 'client_id', client_id)
|
||||||
|
|
||||||
|
def _update_client_id(self):
|
||||||
|
webpage = self._download_webpage('https://soundcloud.com/', None)
|
||||||
|
for src in reversed(re.findall(r'<script[^>]+src="([^"]+)"', webpage)):
|
||||||
|
script = self._download_webpage(src, None, fatal=False)
|
||||||
|
if script:
|
||||||
|
client_id = self._search_regex(
|
||||||
|
r'client_id\s*:\s*"([0-9a-zA-Z]{32})"',
|
||||||
|
script, 'client id', default=None)
|
||||||
|
if client_id:
|
||||||
|
self._CLIENT_ID = client_id
|
||||||
|
self._store_client_id(client_id)
|
||||||
|
return
|
||||||
|
raise ExtractorError('Unable to extract client id')
|
||||||
|
|
||||||
|
def _download_json(self, *args, **kwargs):
|
||||||
|
non_fatal = kwargs.get('fatal') is False
|
||||||
|
if non_fatal:
|
||||||
|
del kwargs['fatal']
|
||||||
|
query = kwargs.get('query', {}).copy()
|
||||||
|
for _ in range(2):
|
||||||
|
query['client_id'] = self._CLIENT_ID
|
||||||
|
kwargs['query'] = query
|
||||||
|
try:
|
||||||
|
return super(SoundcloudIE, self)._download_json(*args, **compat_kwargs(kwargs))
|
||||||
|
except ExtractorError as e:
|
||||||
|
if isinstance(e.cause, compat_HTTPError) and e.cause.code == 401:
|
||||||
|
self._store_client_id(None)
|
||||||
|
self._update_client_id()
|
||||||
|
continue
|
||||||
|
elif non_fatal:
|
||||||
|
self._downloader.report_warning(error_to_compat_str(e))
|
||||||
|
return False
|
||||||
|
raise
|
||||||
|
|
||||||
|
def _real_initialize(self):
|
||||||
|
self._CLIENT_ID = self._downloader.cache.load('soundcloud', 'client_id') or 'YUKXoArFcqrlQn9tfNHvvyfnDISj04zk'
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _resolv_url(cls, url):
|
def _resolv_url(cls, url):
|
||||||
return SoundcloudIE._API_V2_BASE + 'resolve?url=' + url + '&client_id=' + cls._CLIENT_ID
|
return SoundcloudIE._API_V2_BASE + 'resolve?url=' + url
|
||||||
|
|
||||||
def _extract_info_dict(self, info, full_title=None, secret_token=None, version=2):
|
def _extract_info_dict(self, info, full_title=None, secret_token=None, version=2):
|
||||||
track_id = compat_str(info['id'])
|
track_id = compat_str(info['id'])
|
||||||
@ -451,9 +493,7 @@ class SoundcloudIE(InfoExtractor):
|
|||||||
|
|
||||||
track_id = mobj.group('track_id')
|
track_id = mobj.group('track_id')
|
||||||
|
|
||||||
query = {
|
query = {}
|
||||||
'client_id': self._CLIENT_ID,
|
|
||||||
}
|
|
||||||
if track_id:
|
if track_id:
|
||||||
info_json_url = self._API_V2_BASE + 'tracks/' + track_id
|
info_json_url = self._API_V2_BASE + 'tracks/' + track_id
|
||||||
full_title = track_id
|
full_title = track_id
|
||||||
@ -536,7 +576,6 @@ class SoundcloudPagedPlaylistBaseIE(SoundcloudPlaylistBaseIE):
|
|||||||
def _extract_playlist(self, base_url, playlist_id, playlist_title):
|
def _extract_playlist(self, base_url, playlist_id, playlist_title):
|
||||||
COMMON_QUERY = {
|
COMMON_QUERY = {
|
||||||
'limit': 2000000000,
|
'limit': 2000000000,
|
||||||
'client_id': self._CLIENT_ID,
|
|
||||||
'linked_partitioning': '1',
|
'linked_partitioning': '1',
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -722,9 +761,7 @@ class SoundcloudPlaylistIE(SoundcloudPlaylistBaseIE):
|
|||||||
mobj = re.match(self._VALID_URL, url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
playlist_id = mobj.group('id')
|
playlist_id = mobj.group('id')
|
||||||
|
|
||||||
query = {
|
query = {}
|
||||||
'client_id': self._CLIENT_ID,
|
|
||||||
}
|
|
||||||
token = mobj.group('token')
|
token = mobj.group('token')
|
||||||
if token:
|
if token:
|
||||||
query['secret_token'] = token
|
query['secret_token'] = token
|
||||||
@ -761,7 +798,6 @@ class SoundcloudSearchIE(SearchInfoExtractor, SoundcloudIE):
|
|||||||
self._MAX_RESULTS_PER_PAGE)
|
self._MAX_RESULTS_PER_PAGE)
|
||||||
query.update({
|
query.update({
|
||||||
'limit': limit,
|
'limit': limit,
|
||||||
'client_id': self._CLIENT_ID,
|
|
||||||
'linked_partitioning': 1,
|
'linked_partitioning': 1,
|
||||||
'offset': 0,
|
'offset': 0,
|
||||||
})
|
})
|
||||||
|
|||||||
@ -4,6 +4,7 @@ import re
|
|||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
|
determine_ext,
|
||||||
ExtractorError,
|
ExtractorError,
|
||||||
merge_dicts,
|
merge_dicts,
|
||||||
orderedSet,
|
orderedSet,
|
||||||
@ -64,7 +65,7 @@ class SpankBangIE(InfoExtractor):
|
|||||||
url.replace('/%s/embed' % video_id, '/%s/video' % video_id),
|
url.replace('/%s/embed' % video_id, '/%s/video' % video_id),
|
||||||
video_id, headers={'Cookie': 'country=US'})
|
video_id, headers={'Cookie': 'country=US'})
|
||||||
|
|
||||||
if re.search(r'<[^>]+\bid=["\']video_removed', webpage):
|
if re.search(r'<[^>]+\b(?:id|class)=["\']video_removed', webpage):
|
||||||
raise ExtractorError(
|
raise ExtractorError(
|
||||||
'Video %s is not available' % video_id, expected=True)
|
'Video %s is not available' % video_id, expected=True)
|
||||||
|
|
||||||
@ -75,6 +76,15 @@ class SpankBangIE(InfoExtractor):
|
|||||||
if not f_url:
|
if not f_url:
|
||||||
return
|
return
|
||||||
f = parse_resolution(format_id)
|
f = parse_resolution(format_id)
|
||||||
|
ext = determine_ext(f_url)
|
||||||
|
if format_id.startswith('m3u8') or ext == 'm3u8':
|
||||||
|
formats.extend(self._extract_m3u8_formats(
|
||||||
|
f_url, video_id, 'mp4', entry_protocol='m3u8_native',
|
||||||
|
m3u8_id='hls', fatal=False))
|
||||||
|
elif format_id.startswith('mpd') or ext == 'mpd':
|
||||||
|
formats.extend(self._extract_mpd_formats(
|
||||||
|
f_url, video_id, mpd_id='dash', fatal=False))
|
||||||
|
elif ext == 'mp4' or f.get('width') or f.get('height'):
|
||||||
f.update({
|
f.update({
|
||||||
'url': f_url,
|
'url': f_url,
|
||||||
'format_id': format_id,
|
'format_id': format_id,
|
||||||
@ -93,28 +103,22 @@ class SpankBangIE(InfoExtractor):
|
|||||||
r'data-streamkey\s*=\s*(["\'])(?P<value>(?:(?!\1).)+)\1',
|
r'data-streamkey\s*=\s*(["\'])(?P<value>(?:(?!\1).)+)\1',
|
||||||
webpage, 'stream key', group='value')
|
webpage, 'stream key', group='value')
|
||||||
|
|
||||||
sb_csrf_session = self._get_cookies(
|
|
||||||
'https://spankbang.com')['sb_csrf_session'].value
|
|
||||||
|
|
||||||
stream = self._download_json(
|
stream = self._download_json(
|
||||||
'https://spankbang.com/api/videos/stream', video_id,
|
'https://spankbang.com/api/videos/stream', video_id,
|
||||||
'Downloading stream JSON', data=urlencode_postdata({
|
'Downloading stream JSON', data=urlencode_postdata({
|
||||||
'id': stream_key,
|
'id': stream_key,
|
||||||
'data': 0,
|
'data': 0,
|
||||||
'sb_csrf_session': sb_csrf_session,
|
|
||||||
}), headers={
|
}), headers={
|
||||||
'Referer': url,
|
'Referer': url,
|
||||||
'X-CSRFToken': sb_csrf_session,
|
'X-Requested-With': 'XMLHttpRequest',
|
||||||
})
|
})
|
||||||
|
|
||||||
for format_id, format_url in stream.items():
|
for format_id, format_url in stream.items():
|
||||||
if format_id.startswith(STREAM_URL_PREFIX):
|
|
||||||
if format_url and isinstance(format_url, list):
|
if format_url and isinstance(format_url, list):
|
||||||
format_url = format_url[0]
|
format_url = format_url[0]
|
||||||
extract_format(
|
extract_format(format_id, format_url)
|
||||||
format_id[len(STREAM_URL_PREFIX):], format_url)
|
|
||||||
|
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats, field_preference=('preference', 'height', 'width', 'fps', 'tbr', 'format_id'))
|
||||||
|
|
||||||
info = self._search_json_ld(webpage, video_id, default={})
|
info = self._search_json_ld(webpage, video_id, default={})
|
||||||
|
|
||||||
|
|||||||
@ -165,8 +165,12 @@ class TeachableIE(TeachableBaseIE):
|
|||||||
if any(re.search(p, webpage) for p in (
|
if any(re.search(p, webpage) for p in (
|
||||||
r'class=["\']lecture-contents-locked',
|
r'class=["\']lecture-contents-locked',
|
||||||
r'>\s*Lecture contents locked',
|
r'>\s*Lecture contents locked',
|
||||||
r'id=["\']lecture-locked')):
|
r'id=["\']lecture-locked',
|
||||||
|
# https://academy.tailoredtutors.co.uk/courses/108779/lectures/1955313
|
||||||
|
r'class=["\'](?:inner-)?lesson-locked',
|
||||||
|
r'>LESSON LOCKED<')):
|
||||||
self.raise_login_required('Lecture contents locked')
|
self.raise_login_required('Lecture contents locked')
|
||||||
|
raise ExtractorError('Unable to find video URL')
|
||||||
|
|
||||||
title = self._og_search_title(webpage, default=None)
|
title = self._og_search_title(webpage, default=None)
|
||||||
|
|
||||||
|
|||||||
@ -251,10 +251,10 @@ class TwitterIE(TwitterBaseIE):
|
|||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '700207533655363584',
|
'id': '700207533655363584',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Simon Vertugo - BEAT PROD: @suhmeduh #Damndaniel',
|
'title': 'simon vetugo - BEAT PROD: @suhmeduh #Damndaniel',
|
||||||
'description': 'BEAT PROD: @suhmeduh https://t.co/HBrQ4AfpvZ #Damndaniel https://t.co/byBooq2ejZ',
|
'description': 'BEAT PROD: @suhmeduh https://t.co/HBrQ4AfpvZ #Damndaniel https://t.co/byBooq2ejZ',
|
||||||
'thumbnail': r're:^https?://.*\.jpg',
|
'thumbnail': r're:^https?://.*\.jpg',
|
||||||
'uploader': 'Simon Vertugo',
|
'uploader': 'simon vetugo',
|
||||||
'uploader_id': 'simonvertugo',
|
'uploader_id': 'simonvertugo',
|
||||||
'duration': 30.0,
|
'duration': 30.0,
|
||||||
'timestamp': 1455777459,
|
'timestamp': 1455777459,
|
||||||
@ -376,6 +376,10 @@ class TwitterIE(TwitterBaseIE):
|
|||||||
# Twitch Clip Embed
|
# Twitch Clip Embed
|
||||||
'url': 'https://twitter.com/GunB1g/status/1163218564784017422',
|
'url': 'https://twitter.com/GunB1g/status/1163218564784017422',
|
||||||
'only_matching': True,
|
'only_matching': True,
|
||||||
|
}, {
|
||||||
|
# promo_video_website card
|
||||||
|
'url': 'https://twitter.com/GunB1g/status/1163218564784017422',
|
||||||
|
'only_matching': True,
|
||||||
}]
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
@ -458,10 +462,11 @@ class TwitterIE(TwitterBaseIE):
|
|||||||
return try_get(o, lambda x: x[x['type'].lower() + '_value'])
|
return try_get(o, lambda x: x[x['type'].lower() + '_value'])
|
||||||
|
|
||||||
card_name = card['name'].split(':')[-1]
|
card_name = card['name'].split(':')[-1]
|
||||||
if card_name == 'amplify':
|
if card_name in ('amplify', 'promo_video_website'):
|
||||||
formats = self._extract_formats_from_vmap_url(
|
is_amplify = card_name == 'amplify'
|
||||||
get_binding_value('amplify_url_vmap'),
|
vmap_url = get_binding_value('amplify_url_vmap') if is_amplify else get_binding_value('player_stream_url')
|
||||||
get_binding_value('amplify_content_id') or twid)
|
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)
|
self._sort_formats(formats)
|
||||||
|
|
||||||
thumbnails = []
|
thumbnails = []
|
||||||
|
|||||||
@ -1,35 +1,50 @@
|
|||||||
# coding: utf-8
|
# coding: utf-8
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import re
|
import functools
|
||||||
import time
|
|
||||||
import hashlib
|
import hashlib
|
||||||
import json
|
import json
|
||||||
import random
|
import random
|
||||||
|
import re
|
||||||
|
import time
|
||||||
|
|
||||||
from .adobepass import AdobePassIE
|
from .adobepass import AdobePassIE
|
||||||
from .youtube import YoutubeIE
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
|
from .youtube import YoutubeIE
|
||||||
from ..compat import (
|
from ..compat import (
|
||||||
compat_HTTPError,
|
compat_HTTPError,
|
||||||
compat_str,
|
compat_str,
|
||||||
)
|
)
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
|
clean_html,
|
||||||
ExtractorError,
|
ExtractorError,
|
||||||
int_or_none,
|
int_or_none,
|
||||||
|
OnDemandPagedList,
|
||||||
parse_age_limit,
|
parse_age_limit,
|
||||||
str_or_none,
|
str_or_none,
|
||||||
try_get,
|
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'
|
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 = [{
|
_TESTS = [{
|
||||||
'url': 'https://video.vice.com/en_us/video/pet-cremator/58c69e38a55424f1227dc3f7',
|
'url': 'https://video.vice.com/en_us/video/pet-cremator/58c69e38a55424f1227dc3f7',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '5e647f0125e145c9aef2069412c0cbde',
|
'id': '58c69e38a55424f1227dc3f7',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': '10 Questions You Always Wanted To Ask: Pet Cremator',
|
'title': '10 Questions You Always Wanted To Ask: Pet Cremator',
|
||||||
'description': 'md5:fe856caacf61fe0e74fab15ce2b07ca5',
|
'description': 'md5:fe856caacf61fe0e74fab15ce2b07ca5',
|
||||||
@ -43,17 +58,16 @@ class ViceIE(AdobePassIE):
|
|||||||
# m3u8 download
|
# m3u8 download
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
'add_ie': ['UplynkPreplay'],
|
|
||||||
}, {
|
}, {
|
||||||
# geo restricted to US
|
# geo restricted to US
|
||||||
'url': 'https://video.vice.com/en_us/video/the-signal-from-tolva/5816510690b70e6c5fd39a56',
|
'url': 'https://video.vice.com/en_us/video/the-signal-from-tolva/5816510690b70e6c5fd39a56',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '930c0ad1f47141cc955087eecaddb0e2',
|
'id': '5816510690b70e6c5fd39a56',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'uploader': 'waypoint',
|
'uploader': 'vice',
|
||||||
'title': 'The Signal From Tölva',
|
'title': 'The Signal From Tölva',
|
||||||
'description': 'md5:3927e3c79f9e8094606a2b3c5b5e55d5',
|
'description': 'md5:3927e3c79f9e8094606a2b3c5b5e55d5',
|
||||||
'uploader_id': '57f7d621e05ca860fa9ccaf9',
|
'uploader_id': '57a204088cb727dec794c67b',
|
||||||
'timestamp': 1477941983,
|
'timestamp': 1477941983,
|
||||||
'upload_date': '20161031',
|
'upload_date': '20161031',
|
||||||
},
|
},
|
||||||
@ -61,15 +75,14 @@ class ViceIE(AdobePassIE):
|
|||||||
# m3u8 download
|
# m3u8 download
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
'add_ie': ['UplynkPreplay'],
|
|
||||||
}, {
|
}, {
|
||||||
'url': 'https://video.vice.com/alps/video/ulfs-wien-beruchtigste-grafitti-crew-part-1/581b12b60a0e1f4c0fb6ea2f',
|
'url': 'https://video.vice.com/alps/video/ulfs-wien-beruchtigste-grafitti-crew-part-1/581b12b60a0e1f4c0fb6ea2f',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '581b12b60a0e1f4c0fb6ea2f',
|
'id': '581b12b60a0e1f4c0fb6ea2f',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'ULFs - Wien berüchtigste Grafitti Crew - Part 1',
|
'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>',
|
'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': 'vice',
|
||||||
'uploader_id': '57a204088cb727dec794c67b',
|
'uploader_id': '57a204088cb727dec794c67b',
|
||||||
'timestamp': 1485368119,
|
'timestamp': 1485368119,
|
||||||
'upload_date': '20170125',
|
'upload_date': '20170125',
|
||||||
@ -78,9 +91,7 @@ class ViceIE(AdobePassIE):
|
|||||||
'params': {
|
'params': {
|
||||||
# AES-encrypted m3u8
|
# AES-encrypted m3u8
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
'proxy': '127.0.0.1:8118',
|
|
||||||
},
|
},
|
||||||
'add_ie': ['UplynkPreplay'],
|
|
||||||
}, {
|
}, {
|
||||||
'url': 'https://video.vice.com/en_us/video/pizza-show-trailer/56d8c9a54d286ed92f7f30e4',
|
'url': 'https://video.vice.com/en_us/video/pizza-show-trailer/56d8c9a54d286ed92f7f30e4',
|
||||||
'only_matching': True,
|
'only_matching': True,
|
||||||
@ -98,7 +109,7 @@ class ViceIE(AdobePassIE):
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def _extract_urls(webpage):
|
def _extract_urls(webpage):
|
||||||
return re.findall(
|
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)
|
webpage)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
@ -109,31 +120,16 @@ class ViceIE(AdobePassIE):
|
|||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
locale, video_id = re.match(self._VALID_URL, url).groups()
|
locale, video_id = re.match(self._VALID_URL, url).groups()
|
||||||
|
|
||||||
webpage = self._download_webpage(
|
video = self._call_api('videos', 'id', video_id, locale, '''body
|
||||||
'https://video.vice.com/%s/embed/%s' % (locale, video_id),
|
locked
|
||||||
video_id)
|
rating
|
||||||
|
thumbnail_url
|
||||||
video = self._parse_json(
|
title''')[0]
|
||||||
self._search_regex(
|
title = video['title'].strip()
|
||||||
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')
|
|
||||||
rating = video.get('rating')
|
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 = {}
|
query = {}
|
||||||
if is_locked:
|
if video.get('locked'):
|
||||||
resource = self._get_mvpd_resource(
|
resource = self._get_mvpd_resource(
|
||||||
'VICELAND', title, video_id, rating)
|
'VICELAND', title, video_id, rating)
|
||||||
query['tvetoken'] = self._extract_mvpd_auth(
|
query['tvetoken'] = self._extract_mvpd_auth(
|
||||||
@ -148,12 +144,9 @@ class ViceIE(AdobePassIE):
|
|||||||
query.update({
|
query.update({
|
||||||
'exp': exp,
|
'exp': exp,
|
||||||
'sign': hashlib.sha512(('%s:GET:%d' % (video_id, exp)).encode()).hexdigest(),
|
'sign': hashlib.sha512(('%s:GET:%d' % (video_id, exp)).encode()).hexdigest(),
|
||||||
'_ad_blocked': None,
|
'skipadstitching': 1,
|
||||||
'_ad_unit': '',
|
|
||||||
'_debug': '',
|
|
||||||
'platform': 'desktop',
|
'platform': 'desktop',
|
||||||
'rn': random.randint(10000, 100000),
|
'rn': random.randint(10000, 100000),
|
||||||
'fbprebidtoken': '',
|
|
||||||
})
|
})
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@ -169,85 +162,94 @@ class ViceIE(AdobePassIE):
|
|||||||
raise
|
raise
|
||||||
|
|
||||||
video_data = preplay['video']
|
video_data = preplay['video']
|
||||||
base = video_data['base']
|
formats = self._extract_m3u8_formats(
|
||||||
uplynk_preplay_url = preplay['preplayURL']
|
preplay['playURL'], video_id, 'mp4', 'm3u8_native')
|
||||||
episode = video_data.get('episode', {})
|
self._sort_formats(formats)
|
||||||
channel = video_data.get('channel', {})
|
episode = video_data.get('episode') or {}
|
||||||
|
channel = video_data.get('channel') or {}
|
||||||
|
season = video_data.get('season') or {}
|
||||||
|
|
||||||
subtitles = {}
|
subtitles = {}
|
||||||
cc_url = preplay.get('ccURL')
|
for subtitle in preplay.get('subtitleURLs', []):
|
||||||
if cc_url:
|
cc_url = subtitle.get('url')
|
||||||
subtitles['en'] = [{
|
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,
|
'url': cc_url,
|
||||||
}]
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'_type': 'url_transparent',
|
'formats': formats,
|
||||||
'url': uplynk_preplay_url,
|
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'title': title,
|
'title': title,
|
||||||
'description': base.get('body') or base.get('display_body'),
|
'description': clean_html(video.get('body')),
|
||||||
'thumbnail': thumbnail,
|
'thumbnail': video.get('thumbnail_url'),
|
||||||
'duration': int_or_none(video_data.get('video_duration')) or duration,
|
'duration': int_or_none(video_data.get('video_duration')),
|
||||||
'timestamp': int_or_none(video_data.get('created_at'), 1000),
|
'timestamp': int_or_none(video_data.get('created_at'), 1000),
|
||||||
'age_limit': parse_age_limit(video_data.get('video_rating')),
|
'age_limit': parse_age_limit(video_data.get('video_rating') or rating),
|
||||||
'series': video_data.get('show_title') or series,
|
'series': try_get(video_data, lambda x: x['show']['base']['display_title'], compat_str),
|
||||||
'episode_number': int_or_none(episode.get('episode_number') or episode_number),
|
'episode_number': int_or_none(episode.get('episode_number')),
|
||||||
'episode_id': str_or_none(episode.get('id') or video_data.get('episode_id')),
|
'episode_id': str_or_none(episode.get('id') or video_data.get('episode_id')),
|
||||||
'season_number': int_or_none(season_number),
|
'season_number': int_or_none(season.get('season_number')),
|
||||||
'season_id': str_or_none(episode.get('season_id')),
|
'season_id': str_or_none(season.get('id') or video_data.get('season_id')),
|
||||||
'uploader': channel.get('base', {}).get('title') or channel.get('name') or uploader,
|
'uploader': channel.get('name'),
|
||||||
'uploader_id': str_or_none(channel.get('id')),
|
'uploader_id': str_or_none(channel.get('id')),
|
||||||
'subtitles': subtitles,
|
'subtitles': subtitles,
|
||||||
'ie_key': 'UplynkPreplay',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class ViceShowIE(InfoExtractor):
|
class ViceShowIE(ViceBaseIE):
|
||||||
IE_NAME = 'vice:show'
|
IE_NAME = 'vice:show'
|
||||||
_VALID_URL = r'https?://(?:.+?\.)?vice\.com/(?:[^/]+/)?show/(?P<id>[^/?#&]+)'
|
_VALID_URL = r'https?://(?:video\.vice|(?:www\.)?vice(?:land|tv))\.com/(?P<locale>[^/]+)/show/(?P<id>[^/?#&]+)'
|
||||||
|
_PAGE_SIZE = 25
|
||||||
_TEST = {
|
_TESTS = [{
|
||||||
'url': 'https://munchies.vice.com/en/show/fuck-thats-delicious-2',
|
'url': 'https://video.vice.com/en_us/show/fck-thats-delicious',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'fuck-thats-delicious-2',
|
'id': '57a2040c8cb727dec794c901',
|
||||||
'title': "Fuck, That's Delicious",
|
'title': 'F*ck, That’s Delicious',
|
||||||
'description': 'Follow the culinary adventures of rapper Action Bronson during his ongoing world tour.',
|
'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 _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'))
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
show_id = self._match_id(url)
|
locale, display_id = re.match(self._VALID_URL, url).groups()
|
||||||
webpage = self._download_webpage(url, show_id)
|
show = self._call_api('shows', 'slug', display_id, locale, '''dek
|
||||||
|
id
|
||||||
|
title''')[0]
|
||||||
|
show_id = show['id']
|
||||||
|
|
||||||
entries = [
|
entries = OnDemandPagedList(
|
||||||
self.url_result(video_url, ViceIE.ie_key())
|
functools.partial(self._fetch_page, locale, show_id),
|
||||||
for video_url, _ in re.findall(
|
self._PAGE_SIZE)
|
||||||
r'<h2[^>]+class="article-title"[^>]+data-id="\d+"[^>]*>\s*<a[^>]+href="(%s.*?)"'
|
|
||||||
% ViceIE._VALID_URL, webpage)]
|
|
||||||
|
|
||||||
title = self._search_regex(
|
return self.playlist_result(
|
||||||
r'<title>(.+?)</title>', webpage, 'title', default=None)
|
entries, show_id, show.get('title'), show.get('dek'))
|
||||||
if title:
|
|
||||||
title = re.sub(r'(.+)\s*\|\s*.+$', r'\1', title).strip()
|
|
||||||
description = self._html_search_meta(
|
|
||||||
'description', webpage, 'description')
|
|
||||||
|
|
||||||
return self.playlist_result(entries, show_id, title, description)
|
|
||||||
|
|
||||||
|
|
||||||
class ViceArticleIE(InfoExtractor):
|
class ViceArticleIE(ViceBaseIE):
|
||||||
IE_NAME = 'vice:article'
|
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 = [{
|
_TESTS = [{
|
||||||
'url': 'https://www.vice.com/en_us/article/on-set-with-the-woman-making-mormon-porn-in-utah',
|
'url': 'https://www.vice.com/en_us/article/on-set-with-the-woman-making-mormon-porn-in-utah',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '41eae2a47b174a1398357cec55f1f6fc',
|
'id': '58dc0a3dee202d2a0ccfcbd8',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Mormon War on Porn',
|
'title': 'Mormon War on Porn',
|
||||||
'description': 'md5:6394a8398506581d0346b9ab89093fef',
|
'description': 'md5:1c5d91fe25fa8aa304f9def118b92dbf',
|
||||||
'uploader': 'vice',
|
'uploader': 'vice',
|
||||||
'uploader_id': '57a204088cb727dec794c67b',
|
'uploader_id': '57a204088cb727dec794c67b',
|
||||||
'timestamp': 1491883129,
|
'timestamp': 1491883129,
|
||||||
@ -258,10 +260,10 @@ class ViceArticleIE(InfoExtractor):
|
|||||||
# AES-encrypted m3u8
|
# AES-encrypted m3u8
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
'add_ie': ['UplynkPreplay'],
|
'add_ie': [ViceIE.ie_key()],
|
||||||
}, {
|
}, {
|
||||||
'url': 'https://www.vice.com/en_us/article/how-to-hack-a-car',
|
'url': 'https://www.vice.com/en_us/article/how-to-hack-a-car',
|
||||||
'md5': '7fe8ebc4fa3323efafc127b82bd821d9',
|
'md5': '13010ee0bc694ea87ec40724397c2349',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '3jstaBeXgAs',
|
'id': '3jstaBeXgAs',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
@ -271,15 +273,15 @@ class ViceArticleIE(InfoExtractor):
|
|||||||
'uploader_id': 'MotherboardTV',
|
'uploader_id': 'MotherboardTV',
|
||||||
'upload_date': '20140529',
|
'upload_date': '20140529',
|
||||||
},
|
},
|
||||||
'add_ie': ['Youtube'],
|
'add_ie': [YoutubeIE.ie_key()],
|
||||||
}, {
|
}, {
|
||||||
'url': 'https://www.vice.com/en_us/article/znm9dx/karley-sciortino-slutever-reloaded',
|
'url': 'https://www.vice.com/en_us/article/znm9dx/karley-sciortino-slutever-reloaded',
|
||||||
'md5': 'a7ecf64ee4fa19b916c16f4b56184ae2',
|
'md5': 'a7ecf64ee4fa19b916c16f4b56184ae2',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'e2ed435eb67e43efb66e6ef9a6930a88',
|
'id': '57f41d3556a0a80f54726060',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': "Making The World's First Male Sex Doll",
|
'title': "Making The World's First Male Sex Doll",
|
||||||
'description': 'md5:916078ef0e032d76343116208b6cc2c4',
|
'description': 'md5:19b00b215b99961cf869c40fbe9df755',
|
||||||
'uploader': 'vice',
|
'uploader': 'vice',
|
||||||
'uploader_id': '57a204088cb727dec794c67b',
|
'uploader_id': '57a204088cb727dec794c67b',
|
||||||
'timestamp': 1476919911,
|
'timestamp': 1476919911,
|
||||||
@ -288,6 +290,7 @@ class ViceArticleIE(InfoExtractor):
|
|||||||
},
|
},
|
||||||
'params': {
|
'params': {
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
|
'format': 'bestvideo',
|
||||||
},
|
},
|
||||||
'add_ie': [ViceIE.ie_key()],
|
'add_ie': [ViceIE.ie_key()],
|
||||||
}, {
|
}, {
|
||||||
@ -299,14 +302,11 @@ class ViceArticleIE(InfoExtractor):
|
|||||||
}]
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
display_id = self._match_id(url)
|
locale, display_id = re.match(self._VALID_URL, url).groups()
|
||||||
|
|
||||||
webpage = self._download_webpage(url, display_id)
|
article = self._call_api('articles', 'slug', display_id, locale, '''body
|
||||||
|
embed_code''')[0]
|
||||||
prefetch_data = self._parse_json(self._search_regex(
|
body = article['body']
|
||||||
r'__APP_STATE\s*=\s*({.+?})(?:\s*\|\|\s*{}\s*)?;\s*\n',
|
|
||||||
webpage, 'app state'), display_id)['pageData']
|
|
||||||
body = prefetch_data['body']
|
|
||||||
|
|
||||||
def _url_res(video_url, ie_key):
|
def _url_res(video_url, ie_key):
|
||||||
return {
|
return {
|
||||||
@ -316,7 +316,7 @@ class ViceArticleIE(InfoExtractor):
|
|||||||
'ie_key': ie_key,
|
'ie_key': ie_key,
|
||||||
}
|
}
|
||||||
|
|
||||||
vice_url = ViceIE._extract_url(webpage)
|
vice_url = ViceIE._extract_url(body)
|
||||||
if vice_url:
|
if vice_url:
|
||||||
return _url_res(vice_url, ViceIE.ie_key())
|
return _url_res(vice_url, ViceIE.ie_key())
|
||||||
|
|
||||||
@ -332,6 +332,6 @@ class ViceArticleIE(InfoExtractor):
|
|||||||
|
|
||||||
video_url = self._html_search_regex(
|
video_url = self._html_search_regex(
|
||||||
r'data-video-url="([^"]+)"',
|
r'data-video-url="([^"]+)"',
|
||||||
prefetch_data['embed_code'], 'video URL')
|
article['embed_code'], 'video URL')
|
||||||
|
|
||||||
return _url_res(video_url, ViceIE.ie_key())
|
return _url_res(video_url, ViceIE.ie_key())
|
||||||
|
|||||||
@ -6,22 +6,18 @@ import time
|
|||||||
import itertools
|
import itertools
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..compat import (
|
from .naver import NaverBaseIE
|
||||||
compat_urllib_parse_urlencode,
|
from ..compat import compat_str
|
||||||
compat_str,
|
|
||||||
)
|
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
dict_get,
|
|
||||||
ExtractorError,
|
ExtractorError,
|
||||||
float_or_none,
|
merge_dicts,
|
||||||
int_or_none,
|
|
||||||
remove_start,
|
remove_start,
|
||||||
try_get,
|
try_get,
|
||||||
urlencode_postdata,
|
urlencode_postdata,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class VLiveIE(InfoExtractor):
|
class VLiveIE(NaverBaseIE):
|
||||||
IE_NAME = 'vlive'
|
IE_NAME = 'vlive'
|
||||||
_VALID_URL = r'https?://(?:(?:www|m)\.)?vlive\.tv/video/(?P<id>[0-9]+)'
|
_VALID_URL = r'https?://(?:(?:www|m)\.)?vlive\.tv/video/(?P<id>[0-9]+)'
|
||||||
_NETRC_MACHINE = 'vlive'
|
_NETRC_MACHINE = 'vlive'
|
||||||
@ -34,6 +30,7 @@ class VLiveIE(InfoExtractor):
|
|||||||
'title': "[V LIVE] Girl's Day's Broadcast",
|
'title': "[V LIVE] Girl's Day's Broadcast",
|
||||||
'creator': "Girl's Day",
|
'creator': "Girl's Day",
|
||||||
'view_count': int,
|
'view_count': int,
|
||||||
|
'uploader_id': 'muploader_a',
|
||||||
},
|
},
|
||||||
}, {
|
}, {
|
||||||
'url': 'http://www.vlive.tv/video/16937',
|
'url': 'http://www.vlive.tv/video/16937',
|
||||||
@ -44,6 +41,7 @@ class VLiveIE(InfoExtractor):
|
|||||||
'creator': 'EXO',
|
'creator': 'EXO',
|
||||||
'view_count': int,
|
'view_count': int,
|
||||||
'subtitles': 'mincount:12',
|
'subtitles': 'mincount:12',
|
||||||
|
'uploader_id': 'muploader_j',
|
||||||
},
|
},
|
||||||
'params': {
|
'params': {
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
@ -187,45 +185,9 @@ class VLiveIE(InfoExtractor):
|
|||||||
'This video is only available for CH+ subscribers')
|
'This video is only available for CH+ subscribers')
|
||||||
long_video_id, key = video_info['vid'], video_info['inkey']
|
long_video_id, key = video_info['vid'], video_info['inkey']
|
||||||
|
|
||||||
playinfo = self._download_json(
|
return merge_dicts(
|
||||||
'http://global.apis.naver.com/rmcnmv/rmcnmv/vod_play_videoInfo.json?%s'
|
self._get_common_fields(webpage),
|
||||||
% compat_urllib_parse_urlencode({
|
self._extract_video_info(video_id, long_video_id, key))
|
||||||
'videoId': long_video_id,
|
|
||||||
'key': key,
|
|
||||||
'ptc': 'http',
|
|
||||||
'doct': 'json', # document type (xml or json)
|
|
||||||
'cpt': 'vtt', # captions type (vtt or ttml)
|
|
||||||
}), video_id)
|
|
||||||
|
|
||||||
formats = [{
|
|
||||||
'url': vid['source'],
|
|
||||||
'format_id': vid.get('encodingOption', {}).get('name'),
|
|
||||||
'abr': float_or_none(vid.get('bitrate', {}).get('audio')),
|
|
||||||
'vbr': float_or_none(vid.get('bitrate', {}).get('video')),
|
|
||||||
'width': int_or_none(vid.get('encodingOption', {}).get('width')),
|
|
||||||
'height': int_or_none(vid.get('encodingOption', {}).get('height')),
|
|
||||||
'filesize': int_or_none(vid.get('size')),
|
|
||||||
} for vid in playinfo.get('videos', {}).get('list', []) if vid.get('source')]
|
|
||||||
self._sort_formats(formats)
|
|
||||||
|
|
||||||
view_count = int_or_none(playinfo.get('meta', {}).get('count'))
|
|
||||||
|
|
||||||
subtitles = {}
|
|
||||||
for caption in playinfo.get('captions', {}).get('list', []):
|
|
||||||
lang = dict_get(caption, ('locale', 'language', 'country', 'label'))
|
|
||||||
if lang and caption.get('source'):
|
|
||||||
subtitles[lang] = [{
|
|
||||||
'ext': 'vtt',
|
|
||||||
'url': caption['source']}]
|
|
||||||
|
|
||||||
info = self._get_common_fields(webpage)
|
|
||||||
info.update({
|
|
||||||
'id': video_id,
|
|
||||||
'formats': formats,
|
|
||||||
'view_count': view_count,
|
|
||||||
'subtitles': subtitles,
|
|
||||||
})
|
|
||||||
return info
|
|
||||||
|
|
||||||
def _download_init_page(self, video_id):
|
def _download_init_page(self, video_id):
|
||||||
return self._download_webpage(
|
return self._download_webpage(
|
||||||
|
|||||||
@ -6,8 +6,8 @@ from ..utils import unescapeHTML
|
|||||||
|
|
||||||
|
|
||||||
class VODPlatformIE(InfoExtractor):
|
class VODPlatformIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://(?:www\.)?vod-platform\.net/[eE]mbed/(?P<id>[^/?#]+)'
|
_VALID_URL = r'https?://(?:(?:www\.)?vod-platform\.net|embed\.kwikmotion\.com)/[eE]mbed/(?P<id>[^/?#]+)'
|
||||||
_TEST = {
|
_TESTS = [{
|
||||||
# from http://www.lbcgroup.tv/watch/chapter/29143/52844/%D8%A7%D9%84%D9%86%D8%B5%D8%B1%D8%A9-%D9%81%D9%8A-%D8%B6%D9%8A%D8%A7%D9%81%D8%A9-%D8%A7%D9%84%D9%80-cnn/ar
|
# from http://www.lbcgroup.tv/watch/chapter/29143/52844/%D8%A7%D9%84%D9%86%D8%B5%D8%B1%D8%A9-%D9%81%D9%8A-%D8%B6%D9%8A%D8%A7%D9%81%D8%A9-%D8%A7%D9%84%D9%80-cnn/ar
|
||||||
'url': 'http://vod-platform.net/embed/RufMcytHDolTH1MuKHY9Fw',
|
'url': 'http://vod-platform.net/embed/RufMcytHDolTH1MuKHY9Fw',
|
||||||
'md5': '1db2b7249ce383d6be96499006e951fc',
|
'md5': '1db2b7249ce383d6be96499006e951fc',
|
||||||
@ -16,7 +16,10 @@ class VODPlatformIE(InfoExtractor):
|
|||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'LBCi News_ النصرة في ضيافة الـ "سي.أن.أن"',
|
'title': 'LBCi News_ النصرة في ضيافة الـ "سي.أن.أن"',
|
||||||
}
|
}
|
||||||
}
|
}, {
|
||||||
|
'url': 'http://embed.kwikmotion.com/embed/RufMcytHDolTH1MuKHY9Fw',
|
||||||
|
'only_matching': True,
|
||||||
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
video_id = self._match_id(url)
|
video_id = self._match_id(url)
|
||||||
|
|||||||
@ -13,8 +13,7 @@ from ..utils import (
|
|||||||
|
|
||||||
class WistiaIE(InfoExtractor):
|
class WistiaIE(InfoExtractor):
|
||||||
_VALID_URL = r'(?:wistia:|https?://(?:fast\.)?wistia\.(?:net|com)/embed/(?:iframe|medias)/)(?P<id>[a-z0-9]{10})'
|
_VALID_URL = r'(?:wistia:|https?://(?:fast\.)?wistia\.(?:net|com)/embed/(?:iframe|medias)/)(?P<id>[a-z0-9]{10})'
|
||||||
_API_URL = 'http://fast.wistia.com/embed/medias/%s.json'
|
_EMBED_BASE_URL = 'http://fast.wistia.com/embed/'
|
||||||
_IFRAME_URL = 'http://fast.wistia.net/embed/iframe/%s'
|
|
||||||
|
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'http://fast.wistia.net/embed/iframe/sh7fpupwlt',
|
'url': 'http://fast.wistia.net/embed/iframe/sh7fpupwlt',
|
||||||
@ -67,10 +66,10 @@ class WistiaIE(InfoExtractor):
|
|||||||
video_id = self._match_id(url)
|
video_id = self._match_id(url)
|
||||||
|
|
||||||
data_json = self._download_json(
|
data_json = self._download_json(
|
||||||
self._API_URL % video_id, video_id,
|
self._EMBED_BASE_URL + 'medias/%s.json' % video_id, video_id,
|
||||||
# Some videos require this.
|
# Some videos require this.
|
||||||
headers={
|
headers={
|
||||||
'Referer': url if url.startswith('http') else self._IFRAME_URL % video_id,
|
'Referer': url if url.startswith('http') else self._EMBED_BASE_URL + 'iframe/' + video_id,
|
||||||
})
|
})
|
||||||
|
|
||||||
if data_json.get('error'):
|
if data_json.get('error'):
|
||||||
@ -95,27 +94,61 @@ class WistiaIE(InfoExtractor):
|
|||||||
'url': aurl,
|
'url': aurl,
|
||||||
'width': int_or_none(a.get('width')),
|
'width': int_or_none(a.get('width')),
|
||||||
'height': int_or_none(a.get('height')),
|
'height': int_or_none(a.get('height')),
|
||||||
|
'filesize': int_or_none(a.get('size')),
|
||||||
})
|
})
|
||||||
else:
|
else:
|
||||||
aext = a.get('ext')
|
aext = a.get('ext')
|
||||||
is_m3u8 = a.get('container') == 'm3u8' or aext == 'm3u8'
|
display_name = a.get('display_name')
|
||||||
formats.append({
|
format_id = atype
|
||||||
'format_id': atype,
|
if atype and atype.endswith('_video') and display_name:
|
||||||
|
format_id = '%s-%s' % (atype[:-6], display_name)
|
||||||
|
f = {
|
||||||
|
'format_id': format_id,
|
||||||
'url': aurl,
|
'url': aurl,
|
||||||
'tbr': int_or_none(a.get('bitrate')),
|
'tbr': int_or_none(a.get('bitrate')) or None,
|
||||||
'vbr': int_or_none(a.get('opt_vbitrate')),
|
'preference': 1 if atype == 'original' else None,
|
||||||
|
}
|
||||||
|
if display_name == 'Audio':
|
||||||
|
f.update({
|
||||||
|
'vcodec': 'none',
|
||||||
|
})
|
||||||
|
else:
|
||||||
|
f.update({
|
||||||
'width': int_or_none(a.get('width')),
|
'width': int_or_none(a.get('width')),
|
||||||
'height': int_or_none(a.get('height')),
|
'height': int_or_none(a.get('height')),
|
||||||
'filesize': int_or_none(a.get('size')),
|
|
||||||
'vcodec': a.get('codec'),
|
'vcodec': a.get('codec'),
|
||||||
'container': a.get('container'),
|
|
||||||
'ext': 'mp4' if is_m3u8 else aext,
|
|
||||||
'protocol': 'm3u8' if is_m3u8 else None,
|
|
||||||
'preference': 1 if atype == 'original' else None,
|
|
||||||
})
|
})
|
||||||
|
if a.get('container') == 'm3u8' or aext == 'm3u8':
|
||||||
|
ts_f = f.copy()
|
||||||
|
ts_f.update({
|
||||||
|
'ext': 'ts',
|
||||||
|
'format_id': f['format_id'].replace('hls-', 'ts-'),
|
||||||
|
'url': f['url'].replace('.bin', '.ts'),
|
||||||
|
})
|
||||||
|
formats.append(ts_f)
|
||||||
|
f.update({
|
||||||
|
'ext': 'mp4',
|
||||||
|
'protocol': 'm3u8_native',
|
||||||
|
})
|
||||||
|
else:
|
||||||
|
f.update({
|
||||||
|
'container': a.get('container'),
|
||||||
|
'ext': aext,
|
||||||
|
'filesize': int_or_none(a.get('size')),
|
||||||
|
})
|
||||||
|
formats.append(f)
|
||||||
|
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats)
|
||||||
|
|
||||||
|
subtitles = {}
|
||||||
|
for caption in data.get('captions', []):
|
||||||
|
language = caption.get('language')
|
||||||
|
if not language:
|
||||||
|
continue
|
||||||
|
subtitles[language] = [{
|
||||||
|
'url': self._EMBED_BASE_URL + 'captions/' + video_id + '.vtt?language=' + language,
|
||||||
|
}]
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'title': title,
|
'title': title,
|
||||||
@ -124,4 +157,5 @@ class WistiaIE(InfoExtractor):
|
|||||||
'thumbnails': thumbnails,
|
'thumbnails': thumbnails,
|
||||||
'duration': float_or_none(data.get('duration')),
|
'duration': float_or_none(data.get('duration')),
|
||||||
'timestamp': int_or_none(data.get('createdAt')),
|
'timestamp': int_or_none(data.get('createdAt')),
|
||||||
|
'subtitles': subtitles,
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
__version__ = '2019.11.28'
|
__version__ = '2020.01.01'
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user