projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Fix 141 format tests
[youtube-dl]
/
youtube_dl
/
extractor
/
eporner.py
diff --git
a/youtube_dl/extractor/eporner.py
b/youtube_dl/extractor/eporner.py
index 522aa3d639d6a05f9aca15171b80fa97a0eb0715..ac5d0fe2426a8e3fb213b2bb6d8f59fa8acc5fba 100644
(file)
--- a/
youtube_dl/extractor/eporner.py
+++ b/
youtube_dl/extractor/eporner.py
@@
-11,20
+11,24
@@
from ..utils import (
class EpornerIE(InfoExtractor):
class EpornerIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?eporner\.com/hd-porn/(?P<id>\
d
+)/(?P<display_id>[\w-]+)'
- _TEST
=
{
+ _VALID_URL = r'https?://(?:www\.)?eporner\.com/hd-porn/(?P<id>\
w
+)/(?P<display_id>[\w-]+)'
+ _TEST
S = [
{
'url': 'http://www.eporner.com/hd-porn/95008/Infamous-Tiffany-Teen-Strip-Tease-Video/',
'url': 'http://www.eporner.com/hd-porn/95008/Infamous-Tiffany-Teen-Strip-Tease-Video/',
- 'md5': '3
b427ae4b9d60619106de3185c2987cd
',
+ 'md5': '3
9d486f046212d8e1b911c52ab4691f8
',
'info_dict': {
'id': '95008',
'display_id': 'Infamous-Tiffany-Teen-Strip-Tease-Video',
'info_dict': {
'id': '95008',
'display_id': 'Infamous-Tiffany-Teen-Strip-Tease-Video',
- 'ext': '
flv
',
+ 'ext': '
mp4
',
'title': 'Infamous Tiffany Teen Strip Tease Video',
'title': 'Infamous Tiffany Teen Strip Tease Video',
- 'duration': 1
94
,
+ 'duration': 1
838
,
'view_count': int,
'age_limit': 18,
'view_count': int,
'age_limit': 18,
- }
- }
+ },
+ }, {
+ # New (May 2016) URL layout
+ 'url': 'http://www.eporner.com/hd-porn/3YRUtzMcWn0/Star-Wars-XXX-Parody/',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
@@
-35,10
+39,7
@@
class EpornerIE(InfoExtractor):
title = self._html_search_regex(
r'<title>(.*?) - EPORNER', webpage, 'title')
title = self._html_search_regex(
r'<title>(.*?) - EPORNER', webpage, 'title')
- redirect_code = self._html_search_regex(
- r'<script type="text/javascript" src="/config5/%s/([a-f\d]+)/">' % video_id,
- webpage, 'redirect_code')
- redirect_url = 'http://www.eporner.com/config5/%s/%s' % (video_id, redirect_code)
+ redirect_url = 'http://www.eporner.com/config5/%s' % video_id
player_code = self._download_webpage(
redirect_url, display_id, note='Downloading player config')
player_code = self._download_webpage(
redirect_url, display_id, note='Downloading player config')
@@
-57,9
+58,7
@@
class EpornerIE(InfoExtractor):
formats.append(fmt)
self._sort_formats(formats)
formats.append(fmt)
self._sort_formats(formats)
- duration = parse_duration(self._search_regex(
- r'class="mbtim">([0-9:]+)</div>', webpage, 'duration',
- fatal=False))
+ duration = parse_duration(self._html_search_meta('duration', webpage))
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))
@@
-71,5
+70,5
@@
class EpornerIE(InfoExtractor):
'duration': duration,
'view_count': view_count,
'formats': formats,
'duration': duration,
'view_count': view_count,
'formats': formats,
- 'age_limit':
self._rta_search(webpage)
,
+ 'age_limit':
18
,
}
}