mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-05 22:15:13 +02:00
[xhamster] Add support for new URL schema (closes #13593)
This commit is contained in:
parent
8a04ade86b
commit
00e5c36315
@ -14,7 +14,15 @@
|
|||||||
|
|
||||||
|
|
||||||
class XHamsterIE(InfoExtractor):
|
class XHamsterIE(InfoExtractor):
|
||||||
_VALID_URL = r'(?P<proto>https?)://(?:.+?\.)?xhamster\.com/movies/(?P<id>[0-9]+)/(?P<seo>.*?)\.html(?:\?.*)?'
|
_VALID_URL = r'''(?x)
|
||||||
|
https?://
|
||||||
|
(?:.+?\.)?xhamster\.com/
|
||||||
|
(?:
|
||||||
|
movies/(?P<id>\d+)/(?P<display_id>[^/]*)\.html|
|
||||||
|
videos/(?P<display_id_2>[^/]*)-(?P<id_2>\d+)
|
||||||
|
)
|
||||||
|
'''
|
||||||
|
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'http://xhamster.com/movies/1509445/femaleagent_shy_beauty_takes_the_bait.html',
|
'url': 'http://xhamster.com/movies/1509445/femaleagent_shy_beauty_takes_the_bait.html',
|
||||||
'md5': '8281348b8d3c53d39fffb377d24eac4e',
|
'md5': '8281348b8d3c53d39fffb377d24eac4e',
|
||||||
@ -66,6 +74,10 @@ class XHamsterIE(InfoExtractor):
|
|||||||
# This video is visible for marcoalfa123456's friends only
|
# This video is visible for marcoalfa123456's friends only
|
||||||
'url': 'https://it.xhamster.com/movies/7263980/la_mia_vicina.html',
|
'url': 'https://it.xhamster.com/movies/7263980/la_mia_vicina.html',
|
||||||
'only_matching': True,
|
'only_matching': True,
|
||||||
|
}, {
|
||||||
|
# new URL schema
|
||||||
|
'url': 'https://pt.xhamster.com/videos/euro-pedal-pumping-7937821',
|
||||||
|
'only_matching': True,
|
||||||
}]
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
@ -81,11 +93,10 @@ def is_hd(webpage):
|
|||||||
|
|
||||||
mobj = re.match(self._VALID_URL, url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
|
|
||||||
video_id = mobj.group('id')
|
video_id = mobj.group('id') or mobj.group('id_2')
|
||||||
seo = mobj.group('seo')
|
display_id = mobj.group('display_id') or mobj.group('display_id_2')
|
||||||
proto = mobj.group('proto')
|
|
||||||
mrss_url = '%s://xhamster.com/movies/%s/%s.html' % (proto, video_id, seo)
|
webpage = self._download_webpage(url, video_id)
|
||||||
webpage = self._download_webpage(mrss_url, video_id)
|
|
||||||
|
|
||||||
error = self._html_search_regex(
|
error = self._html_search_regex(
|
||||||
r'<div[^>]+id=["\']videoClosed["\'][^>]*>(.+?)</div>',
|
r'<div[^>]+id=["\']videoClosed["\'][^>]*>(.+?)</div>',
|
||||||
|
Loading…
Reference in New Issue
Block a user