projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MTV] move German mtv site to new class
[youtube-dl]
/
youtube_dl
/
extractor
/
mofosex.py
diff --git
a/youtube_dl/extractor/mofosex.py
b/youtube_dl/extractor/mofosex.py
index d658647e6ca6d9b7675dd76ea55c58f52887374d..9bf99a54a98c4838c2b878db3ec165c867602110 100644
(file)
--- a/
youtube_dl/extractor/mofosex.py
+++ b/
youtube_dl/extractor/mofosex.py
@@
-4,15
+4,15
@@
import os
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from ..utils import (
+from ..compat import (
+ compat_urllib_parse_unquote,
compat_urllib_parse_urlparse,
compat_urllib_request,
compat_urllib_parse_urlparse,
compat_urllib_request,
- compat_urllib_parse,
)
class MofosexIE(InfoExtractor):
)
class MofosexIE(InfoExtractor):
- _VALID_URL = r'
^https?://(?:www\.)?(?P<url>mofosex\.com/videos/(?P<video
id>[0-9]+)/.*?\.html)'
+ _VALID_URL = r'
https?://(?:www\.)?(?P<url>mofosex\.com/videos/(?P<
id>[0-9]+)/.*?\.html)'
_TEST = {
'url': 'http://www.mofosex.com/videos/5018/japanese-teen-music-video.html',
'md5': '1b2eb47ac33cc75d4a80e3026b613c5a',
_TEST = {
'url': 'http://www.mofosex.com/videos/5018/japanese-teen-music-video.html',
'md5': '1b2eb47ac33cc75d4a80e3026b613c5a',
@@
-26,7
+26,7
@@
class MofosexIE(InfoExtractor):
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('
video
id')
+ video_id = mobj.group('id')
url = 'http://www.' + mobj.group('url')
req = compat_urllib_request.Request(url)
url = 'http://www.' + mobj.group('url')
req = compat_urllib_request.Request(url)
@@
-34,7
+34,7
@@
class MofosexIE(InfoExtractor):
webpage = self._download_webpage(req, video_id)
video_title = self._html_search_regex(r'<h1>(.+?)<', webpage, 'title')
webpage = self._download_webpage(req, video_id)
video_title = self._html_search_regex(r'<h1>(.+?)<', webpage, 'title')
- video_url = compat_urllib_parse
.
unquote(self._html_search_regex(r'flashvars.video_url = \'([^\']+)', webpage, 'video_url'))
+ video_url = compat_urllib_parse
_
unquote(self._html_search_regex(r'flashvars.video_url = \'([^\']+)', webpage, 'video_url'))
path = compat_urllib_parse_urlparse(video_url).path
extension = os.path.splitext(path)[1][1:]
format = path.split('/')[5].split('_')[:2]
path = compat_urllib_parse_urlparse(video_url).path
extension = os.path.splitext(path)[1][1:]
format = path.split('/')[5].split('_')[:2]