projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5f7ad21
)
Fixed a problem with the XNXXIE Regex
author
Jeff Crouse
<jefftimesten@gmail.com>
Sun, 16 Dec 2012 04:22:07 +0000
(23:22 -0500)
committer
Jeff Crouse
<jefftimesten@gmail.com>
Sun, 16 Dec 2012 04:22:07 +0000
(23:22 -0500)
youtube_dl/InfoExtractors.py
patch
|
blob
|
history
diff --git
a/youtube_dl/InfoExtractors.py
b/youtube_dl/InfoExtractors.py
index 15dd1530797f6955c98ce33943a3dba0fa7a8a0e..c44fc852c41317ce2fa9da594d1c49e5aedd0d51 100644
(file)
--- 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"""
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'<title>(.*?)\s+-\s+XNXX.COM'
IE_NAME = u'xnxx'
VIDEO_URL_RE = r'flv_url=(.*?)&'
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(
resul
ts)
+ self._print_formats(
forma
ts)
return
req_format = self._downloader.params.get('format', None)
return
req_format = self._downloader.params.get('format', None)