projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[go] Add support for abc.com and freeform.com (closes #22823, closes #22864)
[youtube-dl]
/
youtube_dl
/
extractor
/
eporner.py
diff --git
a/youtube_dl/extractor/eporner.py
b/youtube_dl/extractor/eporner.py
index f3734e9f8984ab5a1a723bbb0be171c3fd9cf7b5..c050bf9df3fb7ececed5b3e03a70aea9b2c37417 100644
(file)
--- a/
youtube_dl/extractor/eporner.py
+++ b/
youtube_dl/extractor/eporner.py
@@
-9,13
+9,15
@@
from ..utils import (
encode_base_n,
ExtractorError,
int_or_none,
encode_base_n,
ExtractorError,
int_or_none,
+ merge_dicts,
parse_duration,
str_to_int,
parse_duration,
str_to_int,
+ url_or_none,
)
class EpornerIE(InfoExtractor):
)
class EpornerIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?eporner\.com/
hd-porn
/(?P<id>\w+)(?:/(?P<display_id>[\w-]+))?'
+ _VALID_URL = r'https?://(?:www\.)?eporner\.com/
(?:hd-porn|embed)
/(?P<id>\w+)(?:/(?P<display_id>[\w-]+))?'
_TESTS = [{
'url': 'http://www.eporner.com/hd-porn/95008/Infamous-Tiffany-Teen-Strip-Tease-Video/',
'md5': '39d486f046212d8e1b911c52ab4691f8',
_TESTS = [{
'url': 'http://www.eporner.com/hd-porn/95008/Infamous-Tiffany-Teen-Strip-Tease-Video/',
'md5': '39d486f046212d8e1b911c52ab4691f8',
@@
-24,10
+26,16
@@
class EpornerIE(InfoExtractor):
'display_id': 'Infamous-Tiffany-Teen-Strip-Tease-Video',
'ext': 'mp4',
'title': 'Infamous Tiffany Teen Strip Tease Video',
'display_id': 'Infamous-Tiffany-Teen-Strip-Tease-Video',
'ext': 'mp4',
'title': 'Infamous Tiffany Teen Strip Tease Video',
+ 'description': 'md5:764f39abf932daafa37485eb46efa152',
+ 'timestamp': 1232520922,
+ 'upload_date': '20090121',
'duration': 1838,
'view_count': int,
'age_limit': 18,
},
'duration': 1838,
'view_count': int,
'age_limit': 18,
},
+ 'params': {
+ 'proxy': '127.0.0.1:8118'
+ }
}, {
# New (May 2016) URL layout
'url': 'http://www.eporner.com/hd-porn/3YRUtzMcWn0/Star-Wars-XXX-Parody/',
}, {
# New (May 2016) URL layout
'url': 'http://www.eporner.com/hd-porn/3YRUtzMcWn0/Star-Wars-XXX-Parody/',
@@
-35,6
+43,9
@@
class EpornerIE(InfoExtractor):
}, {
'url': 'http://www.eporner.com/hd-porn/3YRUtzMcWn0',
'only_matching': True,
}, {
'url': 'http://www.eporner.com/hd-porn/3YRUtzMcWn0',
'only_matching': True,
+ }, {
+ 'url': 'http://www.eporner.com/hd-porn/3YRUtzMcWn0',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-79,8
+90,8
@@
class EpornerIE(InfoExtractor):
for format_id, format_dict in formats_dict.items():
if not isinstance(format_dict, dict):
continue
for format_id, format_dict in formats_dict.items():
if not isinstance(format_dict, dict):
continue
- src =
format_dict.get('src'
)
- if not
isinstance(src, compat_str)
or not src.startswith('http'):
+ src =
url_or_none(format_dict.get('src')
)
+ if not
src
or not src.startswith('http'):
continue
if kind == 'hls':
formats.extend(self._extract_m3u8_formats(
continue
if kind == 'hls':
formats.extend(self._extract_m3u8_formats(
@@
-100,12
+111,15
@@
class EpornerIE(InfoExtractor):
})
self._sort_formats(formats)
})
self._sort_formats(formats)
- duration = parse_duration(self._html_search_meta('duration', webpage))
+ json_ld = self._search_json_ld(webpage, display_id, default={})
+
+ duration = parse_duration(self._html_search_meta(
+ 'duration', webpage, default=None))
view_count = str_to_int(self._search_regex(
r'id="cinemaviews">\s*([0-9,]+)\s*<small>views',
webpage, 'view count', fatal=False))
view_count = str_to_int(self._search_regex(
r'id="cinemaviews">\s*([0-9,]+)\s*<small>views',
webpage, 'view count', fatal=False))
- return {
+ return
merge_dicts(json_ld,
{
'id': video_id,
'display_id': display_id,
'title': title,
'id': video_id,
'display_id': display_id,
'title': title,
@@
-113,4
+127,4
@@
class EpornerIE(InfoExtractor):
'view_count': view_count,
'formats': formats,
'age_limit': 18,
'view_count': view_count,
'formats': formats,
'age_limit': 18,
- }
+ }
)