projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ytsearch] Fix extraction (closes #26920)
[youtube-dl]
/
youtube_dl
/
extractor
/
eporner.py
diff --git
a/youtube_dl/extractor/eporner.py
b/youtube_dl/extractor/eporner.py
index 81f2e2ee1c4ac599d8844965fb9271e745293268..fe42821c731c711e8f0974fd4ce48f5c9aee8e8f 100644
(file)
--- a/
youtube_dl/extractor/eporner.py
+++ b/
youtube_dl/extractor/eporner.py
@@
-4,13
+4,14
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from ..compat import compat_str
from ..utils import (
encode_base_n,
ExtractorError,
int_or_none,
from ..utils import (
encode_base_n,
ExtractorError,
int_or_none,
+ merge_dicts,
parse_duration,
str_to_int,
parse_duration,
str_to_int,
+ url_or_none,
)
)
@@
-24,10
+25,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/',
@@
-47,7
+54,7
@@
class EpornerIE(InfoExtractor):
webpage, urlh = self._download_webpage_handle(url, display_id)
webpage, urlh = self._download_webpage_handle(url, display_id)
- video_id = self._match_id(
compat_str(urlh.geturl()
))
+ video_id = self._match_id(
urlh.geturl(
))
hash = self._search_regex(
r'hash\s*:\s*["\']([\da-f]{32})', webpage, 'hash')
hash = self._search_regex(
r'hash\s*:\s*["\']([\da-f]{32})', webpage, 'hash')
@@
-82,8
+89,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(
@@
-103,12
+110,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,
@@
-116,4
+126,4
@@
class EpornerIE(InfoExtractor):
'view_count': view_count,
'formats': formats,
'age_limit': 18,
'view_count': view_count,
'formats': formats,
'age_limit': 18,
- }
+ }
)