From 9a2cf56d512d0a459af652b1262255601b4a86e8 Mon Sep 17 00:00:00 2001 From: Jeff Crouse Date: Sat, 15 Dec 2012 23:22:07 -0500 Subject: [PATCH] Fixed a problem with the XNXXIE Regex --- youtube_dl/InfoExtractors.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 15dd15307..c44fc852c 100644 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -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=(.*?)&' VIDEO_TITLE_RE = r'(.*?)\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)