Skip to content

Commit

Permalink
[yourporn] Fix extraction (closes #21645, closes #22255, closes #23459)
Browse files Browse the repository at this point in the history
  • Loading branch information
Moritz Patelscheck authored and pareronia committed Jun 22, 2020
1 parent 809dd14 commit 4076cf7
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions youtube_dl/extractor/yourporn.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
from __future__ import unicode_literals

from .common import InfoExtractor
from ..compat import compat_str
from ..utils import (
parse_duration,
urljoin,
)


class YourPornIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?(?:yourporn\.sexy|sxyprn\.com)/post/(?P<id>[^/?#&.]+)'
_VALID_URL = r'https?://(?:www\.)?sxyprn\.com/post/(?P<id>[^/?#&.]+)'
_TESTS = [{
'url': 'https://yourporn.sexy/post/57ffcb2e1179b.html',
'url': 'https://sxyprn.com/post/57ffcb2e1179b.html',
'md5': '6f8682b6464033d87acaa7a8ff0c092e',
'info_dict': {
'id': '57ffcb2e1179b',
Expand All @@ -33,11 +34,19 @@ def _real_extract(self, url):

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<data>{.+?})\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] = compat_str(int(parts[5]) - num)
parts[1] += '8'
video_url = urljoin(url, '/'.join(parts))

title = (self._search_regex(
r'<[^>]+\bclass=["\']PostEditTA[^>]+>([^<]+)', webpage, 'title',
Expand All @@ -54,4 +63,5 @@ def _real_extract(self, url):
'thumbnail': thumbnail,
'duration': duration,
'age_limit': 18,
'ext': 'mp4',
}

0 comments on commit 4076cf7

Please sign in to comment.