mirror of
https://github.com/ytdl-org/youtube-dl
synced 2025-02-10 12:40:09 +09:00
Compare commits
No commits in common. "aed617e311b95d771e10f48cc8dcde25d7816224" and "365b3cc72dc265d20ece3e57f6abe590eb026544" have entirely different histories.
aed617e311
...
365b3cc72d
@ -80,8 +80,7 @@ class AMCNetworksIE(ThePlatformIE):
|
|||||||
title = theplatform_metadata['title']
|
title = theplatform_metadata['title']
|
||||||
rating = try_get(
|
rating = try_get(
|
||||||
theplatform_metadata, lambda x: x['ratings'][0]['rating'])
|
theplatform_metadata, lambda x: x['ratings'][0]['rating'])
|
||||||
video_category = properties.get('videoCategory')
|
if properties.get('videoCategory') == 'TVE-Auth':
|
||||||
if video_category and video_category.endswith('-Auth'):
|
|
||||||
resource = self._get_mvpd_resource(
|
resource = self._get_mvpd_resource(
|
||||||
requestor_id, title, video_id, rating)
|
requestor_id, title, video_id, rating)
|
||||||
query['auth'] = self._extract_mvpd_auth(
|
query['auth'] = self._extract_mvpd_auth(
|
||||||
|
@ -67,10 +67,7 @@ from .tube8 import Tube8IE
|
|||||||
from .mofosex import MofosexEmbedIE
|
from .mofosex import MofosexEmbedIE
|
||||||
from .spankwire import SpankwireIE
|
from .spankwire import SpankwireIE
|
||||||
from .youporn import YouPornIE
|
from .youporn import YouPornIE
|
||||||
from .vimeo import (
|
from .vimeo import VimeoIE
|
||||||
VimeoIE,
|
|
||||||
VHXEmbedIE,
|
|
||||||
)
|
|
||||||
from .dailymotion import DailymotionIE
|
from .dailymotion import DailymotionIE
|
||||||
from .dailymail import DailyMailIE
|
from .dailymail import DailyMailIE
|
||||||
from .onionstudios import OnionStudiosIE
|
from .onionstudios import OnionStudiosIE
|
||||||
@ -2196,18 +2193,7 @@ class GenericIE(InfoExtractor):
|
|||||||
# 'params': {
|
# 'params': {
|
||||||
# 'force_generic_extractor': True,
|
# 'force_generic_extractor': True,
|
||||||
# },
|
# },
|
||||||
# },
|
# }
|
||||||
{
|
|
||||||
# VHX Embed
|
|
||||||
'url': 'https://demo.vhx.tv/category-c/videos/file-example-mp4-480-1-5mg-copy',
|
|
||||||
'info_dict': {
|
|
||||||
'id': '858208',
|
|
||||||
'ext': 'mp4',
|
|
||||||
'title': 'Untitled',
|
|
||||||
'uploader_id': 'user80538407',
|
|
||||||
'uploader': 'OTT Videos',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
]
|
]
|
||||||
|
|
||||||
def report_following_redirect(self, new_url):
|
def report_following_redirect(self, new_url):
|
||||||
@ -2585,10 +2571,6 @@ class GenericIE(InfoExtractor):
|
|||||||
if vimeo_urls:
|
if vimeo_urls:
|
||||||
return self.playlist_from_matches(vimeo_urls, video_id, video_title, ie=VimeoIE.ie_key())
|
return self.playlist_from_matches(vimeo_urls, video_id, video_title, ie=VimeoIE.ie_key())
|
||||||
|
|
||||||
vhx_url = VHXEmbedIE._extract_url(webpage)
|
|
||||||
if vhx_url:
|
|
||||||
return self.url_result(vhx_url, VHXEmbedIE.ie_key())
|
|
||||||
|
|
||||||
vid_me_embed_url = self._search_regex(
|
vid_me_embed_url = self._search_regex(
|
||||||
r'src=[\'"](https?://vid\.me/[^\'"]+)[\'"]',
|
r'src=[\'"](https?://vid\.me/[^\'"]+)[\'"]',
|
||||||
webpage, 'vid.me embed', default=None)
|
webpage, 'vid.me embed', default=None)
|
||||||
|
@ -1119,12 +1119,6 @@ class VHXEmbedIE(VimeoBaseInfoExtractor):
|
|||||||
IE_NAME = 'vhx:embed'
|
IE_NAME = 'vhx:embed'
|
||||||
_VALID_URL = r'https?://embed\.vhx\.tv/videos/(?P<id>\d+)'
|
_VALID_URL = r'https?://embed\.vhx\.tv/videos/(?P<id>\d+)'
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _extract_url(webpage):
|
|
||||||
mobj = re.search(
|
|
||||||
r'<iframe[^>]+src="(https?://embed\.vhx\.tv/videos/\d+[^"]*)"', webpage)
|
|
||||||
return unescapeHTML(mobj.group(1)) if mobj else None
|
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
video_id = self._match_id(url)
|
video_id = self._match_id(url)
|
||||||
webpage = self._download_webpage(url, video_id)
|
webpage = self._download_webpage(url, video_id)
|
||||||
@ -1133,6 +1127,5 @@ class VHXEmbedIE(VimeoBaseInfoExtractor):
|
|||||||
'ott data'), video_id, js_to_json)['config_url']
|
'ott data'), video_id, js_to_json)['config_url']
|
||||||
config = self._download_json(config_url, video_id)
|
config = self._download_json(config_url, video_id)
|
||||||
info = self._parse_config(config, video_id)
|
info = self._parse_config(config, video_id)
|
||||||
info['id'] = video_id
|
|
||||||
self._vimeo_sort_formats(info['formats'])
|
self._vimeo_sort_formats(info['formats'])
|
||||||
return info
|
return info
|
||||||
|
Loading…
Reference in New Issue
Block a user