From: rzhxeo <rzhxeot7z81b4700@mailcatch.com>
Date: Sat, 26 Oct 2013 21:33:32 +0000 (+0200)
Subject: [YouPornIE] Make webpage download more robust
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=6e76104d66624a8f742d1e0d210a35452a79aec8;p=youtube-dl.git

[YouPornIE] Make webpage download more robust
---

diff --git a/youtube_dl/extractor/youporn.py b/youtube_dl/extractor/youporn.py
index 704ee89dc..e46a9b4d6 100644
--- a/youtube_dl/extractor/youporn.py
+++ b/youtube_dl/extractor/youporn.py
@@ -17,7 +17,7 @@ from ..aes import (
 )
 
 class YouPornIE(InfoExtractor):
-    _VALID_URL = r'^(?:https?://)?(?:\w+\.)?youporn\.com/watch/(?P<videoid>[0-9]+)/(?P<title>[^/]+)'
+    _VALID_URL = r'^(?:https?://)?(?:www\.)?(?P<url>youporn\.com/watch/(?P<videoid>[0-9]+)/(?P<title>[^/]+))'
     _TEST = {
         u'url': u'http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/',
         u'file': u'505835.mp4',
@@ -34,6 +34,7 @@ class YouPornIE(InfoExtractor):
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
         video_id = mobj.group('videoid')
+        url = 'http://www.' + mobj.group('url')
 
         req = compat_urllib_request.Request(url)
         req.add_header('Cookie', 'age_verified=1')