projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dailymotion] Error spelling
[youtube-dl]
/
youtube_dl
/
extractor
/
xnxx.py
diff --git
a/youtube_dl/extractor/xnxx.py
b/youtube_dl/extractor/xnxx.py
index 53ed7ef5a6ea95826d0324bac53a71bea4913fa4..5a41f8ffa0c5a46a3d0431a6aac8e93ba8ca1cb9 100644
(file)
--- a/
youtube_dl/extractor/xnxx.py
+++ b/
youtube_dl/extractor/xnxx.py
@@
-1,12
+1,8
@@
# encoding: utf-8
from __future__ import unicode_literals
# encoding: utf-8
from __future__ import unicode_literals
-import re
-
from .common import InfoExtractor
from .common import InfoExtractor
-from ..utils import (
- compat_urllib_parse,
-)
+from ..compat import compat_urllib_parse_unquote
class XNXXIE(InfoExtractor):
class XNXXIE(InfoExtractor):
@@
-23,15
+19,12
@@
class XNXXIE(InfoExtractor):
}
def _real_extract(self, url):
}
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('id')
-
- # Get webpage content
+ video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
video_url = self._search_regex(r'flv_url=(.*?)&',
webpage, 'video URL')
webpage = self._download_webpage(url, video_id)
video_url = self._search_regex(r'flv_url=(.*?)&',
webpage, 'video URL')
- video_url = compat_urllib_parse
.
unquote(video_url)
+ video_url = compat_urllib_parse
_
unquote(video_url)
video_title = self._html_search_regex(r'<title>(.*?)\s+-\s+XNXX.COM',
webpage, 'title')
video_title = self._html_search_regex(r'<title>(.*?)\s+-\s+XNXX.COM',
webpage, 'title')