diff options
author | Philipp Hagemeister <[email protected]> | 2014-07-11 10:57:08 +0200 |
---|---|---|
committer | Philipp Hagemeister <[email protected]> | 2014-07-11 10:57:40 +0200 |
commit | 4094b6e36d03a6230689657d87de7a58f3f0b581 (patch) | |
tree | 795371cae386b80e0d86a0b3f96e7f7033097cab /youtube_dl/extractor/vodlocker.py | |
parent | c09cbf0ed91ed54882abe6633b1e70e8a8b7db2d (diff) | |
download | youtube-dl-4094b6e36d03a6230689657d87de7a58f3f0b581.tar.gz youtube-dl-4094b6e36d03a6230689657d87de7a58f3f0b581.zip |
[vodlocker] PEP8, generalization, and simplification (#3223)
Diffstat (limited to 'youtube_dl/extractor/vodlocker.py')
-rw-r--r-- | youtube_dl/extractor/vodlocker.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/youtube_dl/extractor/vodlocker.py b/youtube_dl/extractor/vodlocker.py index fdab0e7bf..dfc570930 100644 --- a/youtube_dl/extractor/vodlocker.py +++ b/youtube_dl/extractor/vodlocker.py @@ -28,9 +28,6 @@ class VodlockerIE(InfoExtractor): def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) video_id = mobj.group('id') - - url = 'http://vodlocker.com/%s' % video_id - webpage = self._download_webpage(url, video_id) fields = dict(re.findall(r'''(?x)<input\s+ @@ -41,21 +38,23 @@ class VodlockerIE(InfoExtractor): ''', webpage)) if fields['op'] == 'download1': - time.sleep(3) #they do detect when requests happen too fast! + self._sleep(3, video_id) # they do detect when requests happen too fast! post = compat_urllib_parse.urlencode(fields) req = compat_urllib_request.Request(url, post) req.add_header('Content-type', 'application/x-www-form-urlencoded') - webpage = self._download_webpage(req, video_id, 'Downloading video page') + webpage = self._download_webpage( + req, video_id, 'Downloading video page') - title = self._search_regex(r'id="file_title".*?>\s*(.*?)\s*<span', webpage, 'title') - thumbnail = self._search_regex(r'image:\s*"(http[^\"]+)",', webpage, 'thumbnail') - url = self._search_regex(r'file:\s*"(http[^\"]+)",', webpage, 'file url') + title = self._search_regex( + r'id="file_title".*?>\s*(.*?)\s*<span', webpage, 'title') + thumbnail = self._search_regex( + r'image:\s*"(http[^\"]+)",', webpage, 'thumbnail') + url = self._search_regex( + r'file:\s*"(http[^\"]+)",', webpage, 'file url') formats = [{ 'format_id': 'sd', 'url': url, - 'ext': determine_ext(url), - 'quality': 1, }] return { |