From c209919a47475ce4030558c2fb4f2b3671d7699c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20G=C3=BCthler?= Date: Thu, 29 Aug 2019 08:33:38 +0200 Subject: [PATCH] Restore yourporn extractor --- youtube_dl/extractor/extractors.py | 3 +- youtube_dl/extractor/yourporn.py | 57 ++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 youtube_dl/extractor/yourporn.py diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index c975daad7..bcf3b9992 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -1096,6 +1096,7 @@ from .svt import ( SVTSeriesIE, ) from .swrmediathek import SWRMediathekIE +from .sxyprn import SxyPrnIE from .syfy import SyfyIE from .sztvhu import SztvHuIE from .tagesschau import ( @@ -1472,7 +1473,7 @@ from .younow import ( YouNowMomentIE, ) from .youporn import YouPornIE -from .sxyprn import SxyPrnIE +from .yourporn import YourPornIE from .yourupload import YourUploadIE from .youtube import ( YoutubeIE, diff --git a/youtube_dl/extractor/yourporn.py b/youtube_dl/extractor/yourporn.py new file mode 100644 index 000000000..8a2d5f63b --- /dev/null +++ b/youtube_dl/extractor/yourporn.py @@ -0,0 +1,57 @@ +from __future__ import unicode_literals + +from .common import InfoExtractor +from ..utils import ( + parse_duration, + urljoin, +) + + +class YourPornIE(InfoExtractor): + _VALID_URL = r'https?://(?:www\.)?(?:yourporn\.sexy|sxyprn\.com)/post/(?P[^/?#&.]+)' + _TESTS = [{ + 'url': 'https://yourporn.sexy/post/57ffcb2e1179b.html', + 'md5': '6f8682b6464033d87acaa7a8ff0c092e', + 'info_dict': { + 'id': '57ffcb2e1179b', + 'ext': 'mp4', + 'title': 'md5:c9f43630bd968267672651ba905a7d35', + 'thumbnail': r're:^https?://.*\.jpg$', + 'duration': 165, + 'age_limit': 18, + }, + 'params': { + 'skip_download': True, + }, + }, { + 'url': 'https://sxyprn.com/post/57ffcb2e1179b.html', + 'only_matching': True, + }] + + def _real_extract(self, url): + video_id = self._match_id(url) + + webpage = self._download_webpage(url, video_id) + + video_url = urljoin(url, self._parse_json( + self._search_regex( + r'data-vnfo=(["\'])(?P{.+?})\1', webpage, 'data info', + group='data'), + video_id)[video_id]).replace('/cdn/', '/cdn5/') + + title = (self._search_regex( + r'<[^>]+\bclass=["\']PostEditTA[^>]+>([^<]+)', webpage, 'title', + default=None) or self._og_search_description(webpage)).strip() + thumbnail = self._og_search_thumbnail(webpage) + duration = parse_duration(self._search_regex( + r'duration\s*:\s*<[^>]+>([\d:]+)', webpage, 'duration', + default=None)) + + return { + 'id': video_id, + 'url': video_url, + 'title': title, + 'thumbnail': thumbnail, + 'duration': duration, + 'age_limit': 18, + }