aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/keezmovies.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2015-02-01 15:13:41 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2015-02-01 15:13:44 +0100
commit9f281cacd2bb1de0dc11dac35685f04dcb5f447c (patch)
treefd66d4347f055a481f263f3d2d2777bdad5908f8 /youtube_dl/extractor/keezmovies.py
parent748a0fab8a35fdfde03407d49eb4b41e4be3a1fc (diff)
[keezmovies] Fix extraction and modernize test
Diffstat (limited to 'youtube_dl/extractor/keezmovies.py')
-rw-r--r--youtube_dl/extractor/keezmovies.py16
1 files changed, 6 insertions, 10 deletions
diff --git a/youtube_dl/extractor/keezmovies.py b/youtube_dl/extractor/keezmovies.py
index 97dcb518a..82eddec51 100644
--- a/youtube_dl/extractor/keezmovies.py
+++ b/youtube_dl/extractor/keezmovies.py
@@ -7,10 +7,6 @@ from .common import InfoExtractor
from ..compat import (
compat_urllib_parse_urlparse,
compat_urllib_request,
- compat_urllib_parse,
-)
-from ..aes import (
- aes_decrypt_text
)
@@ -18,9 +14,10 @@ class KeezMoviesIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?keezmovies\.com/video/.+?(?P<id>[0-9]+)(?:[/?&]|$)'
_TEST = {
'url': 'http://www.keezmovies.com/video/petite-asian-lady-mai-playing-in-bathtub-1214711',
- 'file': '1214711.mp4',
'md5': '6e297b7e789329923fcf83abb67c9289',
'info_dict': {
+ 'id': '1214711',
+ 'ext': 'mp4',
'title': 'Petite Asian Lady Mai Playing In Bathtub',
'age_limit': 18,
}
@@ -39,11 +36,10 @@ class KeezMoviesIE(InfoExtractor):
embedded_url = mobj.group(1)
return self.url_result(embedded_url)
- video_title = self._html_search_regex(r'<h1 [^>]*>([^<]+)', webpage, 'title')
- video_url = compat_urllib_parse.unquote(self._html_search_regex(r'video_url=(.+?)&amp;', webpage, 'video_url'))
- if 'encrypted=true' in webpage:
- password = self._html_search_regex(r'video_title=(.+?)&amp;', webpage, 'password')
- video_url = aes_decrypt_text(video_url, password, 32).decode('utf-8')
+ video_title = self._html_search_regex(
+ r'<h1 [^>]*>([^<]+)', webpage, 'title')
+ video_url = self._html_search_regex(
+ r'(?s)html5VideoPlayer = .*?src="([^"]+)"', webpage, 'video URL')
path = compat_urllib_parse_urlparse(video_url).path
extension = os.path.splitext(path)[1][1:]
format = path.split('/')[4].split('_')[:2]