Fixed a problem with the XNXXIE Regex

This commit is contained in:
Jeff Crouse 2012-12-15 23:22:07 -05:00
parent 5f7ad21633
commit 9a2cf56d51

View File

@ -3186,7 +3186,7 @@ class YoukuIE(InfoExtractor):
class XNXXIE(InfoExtractor): class XNXXIE(InfoExtractor):
"""Information extractor for xnxx.com""" """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' IE_NAME = u'xnxx'
VIDEO_URL_RE = r'flv_url=(.*?)&' VIDEO_URL_RE = r'flv_url=(.*?)&'
VIDEO_TITLE_RE = r'<title>(.*?)\s+-\s+XNXX.COM' VIDEO_TITLE_RE = r'<title>(.*?)\s+-\s+XNXX.COM'
@ -3509,7 +3509,7 @@ class YouPornIE(InfoExtractor):
}) })
if self._downloader.params.get('listformats', None): if self._downloader.params.get('listformats', None):
self._print_formats(results) self._print_formats(formats)
return return
req_format = self._downloader.params.get('format', None) req_format = self._downloader.params.get('format', None)