Merge tag 'upstream/2015.07.21'

[youtubedl] / youtube_dl / extractor / eporner.py

diff --git a/youtube_dl/extractor/eporner.py b/youtube_dl/extractor/eporner.py
index bb231ecb1cd81577d41c9c16ec3e0156c4abcf3e..e006921ec3f8d2a0aff0e6bb0595148469b1c256 100644 (file)
--- a/youtube_dl/extractor/eporner.py
+++ b/youtube_dl/extractor/eporner.py
@@ -20,7 +20,7 @@ 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',

-            'duration': 194,
+            'duration': 1838,

             'view_count': int,
             'age_limit': 18,
         }
             'view_count': int,
             'age_limit': 18,
         }


@@ -35,10 +35,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 +54,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 +66,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,

         }
         }