Fixed a problem with the XNXXIE Regex
authorJeff Crouse <jefftimesten@gmail.com>
Sun, 16 Dec 2012 04:22:07 +0000 (23:22 -0500)
committerJeff Crouse <jefftimesten@gmail.com>
Sun, 16 Dec 2012 04:22:07 +0000 (23:22 -0500)
youtube_dl/InfoExtractors.py

index 15dd1530797f6955c98ce33943a3dba0fa7a8a0e..c44fc852c41317ce2fa9da594d1c49e5aedd0d51 100644 (file)
@@ -3186,7 +3186,7 @@ class YoukuIE(InfoExtractor):
 class XNXXIE(InfoExtractor):
        """Information extractor for xnxx.com"""
 
-       _VALID_URL = r'^http://video\.xnxx\.com/video([0-9]+)/(.*)'
+       _VALID_URL = r'^(?:https?://)?video\.xnxx\.com/video([0-9]+)/(.*)'
        IE_NAME = u'xnxx'
        VIDEO_URL_RE = r'flv_url=(.*?)&amp;'
        VIDEO_TITLE_RE = r'<title>(.*?)\s+-\s+XNXX.COM'
@@ -3509,7 +3509,7 @@ class YouPornIE(InfoExtractor):
                        })
 
                if self._downloader.params.get('listformats', None):
-                       self._print_formats(results)
+                       self._print_formats(formats)
                        return
 
                req_format = self._downloader.params.get('format', None)