R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change common.py to allow pornflip.com hd videos

Browse Source 
Changed how the HTML5 Media Tag is processed so that pornflip.com's HD
videos can also be processed by pornflip.com.
This commit is contained in:
nindogo 2019-05-30 17:53:31 +03:00
parent 752db1a166
commit b5fb03b763
3 changed files with 2976 additions and 3083 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5952
youtube_dl/extractor/common.py
View File

File diff suppressed because it is too large Load Diff

1
youtube_dl/extractor/extractors.py
View File

@ -888,7 +888,6 @@ from .polskieradio import (
from .popcorntv import PopcornTVIE
from .porn91 import Porn91IE
from .porncom import PornComIE
from .pornflip import PornFlipIE
from .pornhd import PornHdIE
from .pornhub import (
PornHubIE,

106
youtube_dl/extractor/pornflip.py
View File

@ -1,106 +0,0 @@
# coding: utf-8
from __future__ import unicode_literals
from .common import InfoExtractor
from ..utils import (
int_or_none,
unified_timestamp,
unified_strdate,
parse_duration,
str_to_int,
)
class PornFlipIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?pornflip\.com(?:/v||/embed)/(?P<id>[^/?#&]+)'
_TESTS = [{
'url': 'https://www.pornflip.com/k27gGfg7cqt/green-hair',
'info_dict': {
'id': 'k27gGfg7cqt',
'ext': 'mp4',
'title': 'Green hair',
'thumbnail': r're:^https?://.*\.jpg$',
'duration': 992,
'timestamp': 1555970182,
'upload_date': '20190422',
'uploader_id': '402056',
'uploader': 'berserk993',
'view_count': int,
'age_limit': 18,
'only_matching': True
},
'params': {
'skip_download': False,
}
}, {
'url': 'https://www.pornflip.com/v/wz7DfNhMmep',
'md5': '98c46639849145ae1fd77af532a9278c',
'info_dict': {
'id': 'wz7DfNhMmep',
'ext': 'mp4',
'title': '2 Amateurs swallow make his dream cumshots true',
'thumbnail': r're:^https?://.*\.jpg$',
'duration': 112,
'timestamp': 1481655502,
'upload_date': '20161213',
'uploader_id': '106786',
'uploader': 'figifoto',
'view_count': int,
'age_limit': 18,
'only_matching': True
},
'params': {
'skip_download': True,
}
}, {
'url': 'https://www.pornflip.com/embed/wz7DfNhMmep',
'only_matching': True,
}, {
'url': 'https://www.pornflip.com/v/EkRD6-vS2-s',
'only_matching': True,
}, {
'url': 'https://www.pornflip.com/embed/EkRD6-vS2-s',
'only_matching': True,
}, {
'url': 'https://www.pornflip.com/v/NG9q6Pb_iK8',
'only_matching': True,
}]
def _real_extract(self, url):
video_id = self._match_id(url)
webpage = self._download_webpage(
'https://www.pornflip.com/v/%s' % video_id, video_id)
mpd_url = self._search_regex(r'data-src=[\'\"](.*?)[\'\"]', webpage, 'mpd_url', fatal=False).replace(r'&amp;', r'&')
mpd_id = (mpd_url.split('/')[-2] or 'DASH')
formats = list()
formats.extend(self._extract_mpd_formats(mpd_url, video_id, mpd_id=mpd_id,))
self._sort_formats(formats)
title, uploader = self._search_regex('<title>(.*?)</title>', webpage, 'title').rsplit(',', 1)
title = title.strip()
uploader = uploader.strip()
thumbnail = self._search_regex(r'background:\s*?url\((.*?)\)', webpage, 'thumbnail', default=None)
view_count = str_to_int(self._search_regex(r'class=[\'\"]views[\'\"]>\s*?<span>(.*?)</span>', webpage, 'view_count'))
uploader_id = int_or_none(self._search_regex(r'item=(\d+?)\&', webpage, 'uploader_id'))
iso_8601_datetime_extended = self._html_search_meta('uploadDate', webpage, 'iso_8601_datetime_extended')
'''http://support.sas.com/documentation/cdl/en/lrdict/64316/HTML/default/viewer.htm#a003169814.htm'''
return {
'id': video_id,
'formats': formats,
'title': title,
'url': mpd_url,
'thumbnail': thumbnail,
'duration': int_or_none(parse_duration(self._html_search_meta(
'duration', webpage, 'duration'))),
'timestamp': unified_timestamp(iso_8601_datetime_extended),
'upload_date': unified_strdate(iso_8601_datetime_extended),
'uploader_id': uploader_id,
'uploader': uploader,
'view_count': int_or_none(view_count),
'age_limit': 18,
}