From a62b41a515ad19140d5bbb12a8c1c85af1c4c484 Mon Sep 17 00:00:00 2001
From: vdelta <vdelta@uber.space>
Date: Wed, 28 Aug 2019 14:04:42 +0200
Subject: [PATCH 1/2] [sxyprn] Add new extractor (closes #21645)

---
 youtube_dl/extractor/extractors.py              |  2 +-
 youtube_dl/extractor/{yourporn.py => sxyprn.py} | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)
 rename youtube_dl/extractor/{yourporn.py => sxyprn.py} (82%)

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 06de556b7..c975daad7 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -1472,7 +1472,7 @@ from .younow import (
     YouNowMomentIE,
 )
 from .youporn import YouPornIE
-from .yourporn import YourPornIE
+from .sxyprn import SxyPrnIE
 from .yourupload import YourUploadIE
 from .youtube import (
     YoutubeIE,
diff --git a/youtube_dl/extractor/yourporn.py b/youtube_dl/extractor/sxyprn.py
similarity index 82%
rename from youtube_dl/extractor/yourporn.py
rename to youtube_dl/extractor/sxyprn.py
index cc98b1e5a..edc3a3b92 100644
--- a/youtube_dl/extractor/yourporn.py
+++ b/youtube_dl/extractor/sxyprn.py
@@ -6,10 +6,10 @@ from ..utils import (
 )
 
 
-class YourPornIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?(?:yourporn\.sexy|sxyprn\.com)/post/(?P<id>[^/?#&.]+)'
-    _TESTS = [{
-        'url': 'https://yourporn.sexy/post/57ffcb2e1179b.html',
+class SxyPrnIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?sxyprn\.com/post/(?P<id>[^/?#&.]+)'
+    _TEST = {
+        'url': 'https://sxyprn.com/post/57ffcb2e1179b.html',
         'md5': '6f8682b6464033d87acaa7a8ff0c092e',
         'info_dict': {
             'id': '57ffcb2e1179b',
@@ -21,11 +21,8 @@ class YourPornIE(InfoExtractor):
         },
         '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)
@@ -35,7 +32,7 @@ class YourPornIE(InfoExtractor):
         url_parts = self._parse_json(self._search_regex(
             r'data-vnfo=(["\'])(?P<data>{.+?})\1', webpage, 'data info', group='data'), video_id)[video_id].split("/")
 
-        aid = self._search_regex(r'data-aid=\'([a-z0-9]+)\'', webpage, 'aid')
+        aid = self._search_regex(r'data-aid=\'(.*?)\'', webpage, 'aid')
 
         video_url = 'https://' + url_parts[2] + '.trafficdeposit.com/video/' + url_parts[3] + '/' + url_parts[
             4] + '/' + url_parts[5] + '/' + aid + '/' + video_id + '.mp4'

From c209919a47475ce4030558c2fb4f2b3671d7699c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20G=C3=BCthler?= <mg@webfactory.de>
Date: Thu, 29 Aug 2019 08:33:38 +0200
Subject: [PATCH 2/2] 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<id>[^/?#&.]+)'
+    _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<data>{.+?})\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,
+        }