From 1d57b2520c66908a4e21640b5105e16fd4d4e374 Mon Sep 17 00:00:00 2001
From: peugeot <peugeot@psa.fr>
Date: Sat, 30 Aug 2014 22:28:53 +0200
Subject: [PATCH 1/2] Add support for Eporner

---
 youtube_dl/extractor/__init__.py |  1 +
 youtube_dl/extractor/eporner.py  | 45 ++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 youtube_dl/extractor/eporner.py

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 1479d998a2..94e4693897 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -85,6 +85,7 @@ from .ellentv import (
 from .elpais import ElPaisIE
 from .empflix import EmpflixIE
 from .engadget import EngadgetIE
+from .eporner import EpornerIE
 from .escapist import EscapistIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE
diff --git a/youtube_dl/extractor/eporner.py b/youtube_dl/extractor/eporner.py
new file mode 100644
index 0000000000..3071da6dbb
--- /dev/null
+++ b/youtube_dl/extractor/eporner.py
@@ -0,0 +1,45 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+import re
+
+from .common import InfoExtractor
+from ..utils import int_or_none
+
+class EpornerIE(InfoExtractor):
+    _VALID_URL = r'http?://(?:www\.)?eporner\.com/hd-porn/(?P<id>\d+)/(?P<title_dash>[\w-]+)/?'
+    _TEST = {
+        'url': 'http://www.eporner.com/hd-porn/95008/Infamous-Tiffany-Teen-Strip-Tease-Video/',
+        'md5': '3b427ae4b9d60619106de3185c2987cd',
+        'info_dict': {
+            'id': '95008',
+            'ext': 'flv',
+            'title': 'Infamous Tiffany Teen Strip Tease Video',
+            'duration': 194
+        }
+    }
+
+    def _real_extract(self, url):
+        mobj = re.match(self._VALID_URL, url)
+        video_id = mobj.group('id')
+        webpage = self._download_webpage(url, video_id)
+        title = self._html_search_regex(r'<title>(.*?) - EPORNER', webpage, 'title')
+
+        redirect_code = self._html_search_regex(r'<script type="text/javascript" src="/config5/'+str(video_id)+'/([a-f\d]+)/">', webpage, 'redirect_code')
+        redirect_url = 'http://www.eporner.com/config5/' + str(video_id) +'/'+ redirect_code
+        webpage2 = self._download_webpage(redirect_url, video_id)
+        video_url = self._html_search_regex(r'file: "(.*?)",', webpage2, 'video_url')
+
+        mobj = re.search(r'class="mbtim">(?P<minutes>\d+):(?P<seconds>\d+)</div>', webpage)
+        duration = int(mobj.group('minutes')) * 60 + int(mobj.group('seconds')) if mobj else None
+
+        mobj = re.search(r'id="cinemaviews">((?P<thousands>\d+),)?(?P<units>\d+)<small>views', webpage)
+        view_count = int(mobj.group('thousands')) * 1000 + int(mobj.group('units')) if mobj else None
+
+        return {
+            'id': video_id,
+            'url': video_url,
+            'title': title,
+            'duration': int_or_none(duration),
+            'view_count': int_or_none(view_count),
+        }

From 8a6c59865d2ab6e69792488567f993096f8f7695 Mon Sep 17 00:00:00 2001
From: peugeot <peugeot@psa.fr>
Date: Sat, 30 Aug 2014 23:03:37 +0200
Subject: [PATCH 2/2] Fix exception with n_views<1000

---
 youtube_dl/extractor/eporner.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/eporner.py b/youtube_dl/extractor/eporner.py
index 3071da6dbb..72c3850b73 100644
--- a/youtube_dl/extractor/eporner.py
+++ b/youtube_dl/extractor/eporner.py
@@ -34,7 +34,11 @@ class EpornerIE(InfoExtractor):
         duration = int(mobj.group('minutes')) * 60 + int(mobj.group('seconds')) if mobj else None
 
         mobj = re.search(r'id="cinemaviews">((?P<thousands>\d+),)?(?P<units>\d+)<small>views', webpage)
-        view_count = int(mobj.group('thousands')) * 1000 + int(mobj.group('units')) if mobj else None
+        try:
+            view_count = int(mobj.group('units'))
+            view_count += int(mobj.group('thousands')) * 1000
+        except:
+            pass
 
         return {
             'id': video_id,