diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index 376d07727..7bd0627f7 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -1072,6 +1072,7 @@ from .svt import ( SVTSeriesIE, ) from .swrmediathek import SWRMediathekIE +from .sxyprn import SxyPrnIE from .syfy import SyfyIE from .sztvhu import SztvHuIE from .tagesschau import ( @@ -1455,7 +1456,6 @@ from .younow import ( YouNowMomentIE, ) from .youporn import YouPornIE -from .yourporn import YourPornIE from .yourupload import YourUploadIE from .youtube import ( YoutubeIE, diff --git a/youtube_dl/extractor/yourporn.py b/youtube_dl/extractor/sxyprn.py similarity index 75% rename from youtube_dl/extractor/yourporn.py rename to youtube_dl/extractor/sxyprn.py index 8a2d5f63b..4379cedcf 100644 --- a/youtube_dl/extractor/yourporn.py +++ b/youtube_dl/extractor/sxyprn.py @@ -7,10 +7,10 @@ from ..utils import ( ) -class YourPornIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?(?:yourporn\.sexy|sxyprn\.com)/post/(?P[^/?#&.]+)' +class SxyPrnIE(InfoExtractor): + _VALID_URL = r'https?://(?:www\.)?sxyprn\.com/post/(?P[^/?#&.]+)' _TESTS = [{ - 'url': 'https://yourporn.sexy/post/57ffcb2e1179b.html', + 'url': 'https://sxyprn.com/post/57ffcb2e1179b.html', 'md5': '6f8682b6464033d87acaa7a8ff0c092e', 'info_dict': { 'id': '57ffcb2e1179b', @@ -33,11 +33,19 @@ class YourPornIE(InfoExtractor): webpage = self._download_webpage(url, video_id) - video_url = urljoin(url, self._parse_json( + parts = self._parse_json( self._search_regex( r'data-vnfo=(["\'])(?P{.+?})\1', webpage, 'data info', group='data'), - video_id)[video_id]).replace('/cdn/', '/cdn5/') + video_id)[video_id].split("/") + + num = 0 + for c in parts[6]+parts[7]: + if c.isnumeric(): + num += int(c) + parts[5] = str(int(parts[5])-num) + parts[1] += "8" + video_url = urljoin(url, "/".join(parts)) title = (self._search_regex( r'<[^>]+\bclass=["\']PostEditTA[^>]+>([^<]+)', webpage, 'title', @@ -54,4 +62,5 @@ class YourPornIE(InfoExtractor): 'thumbnail': thumbnail, 'duration': duration, 'age_limit': 18, + 'ext': 'mp4', }