X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fvodlocker.py;h=affef650726d716b7e80aaab5c66dab3bc3ddc28;hb=8c25f81beea169c9d6540eea1a6f71dc045da6ed;hp=fdab0e7bf662a0047331163654ac935f9da91c2b;hpb=537ba6f3818004ef43e0067fd1be8dbd1bbeed46;p=youtube-dl

diff --git a/youtube_dl/extractor/vodlocker.py b/youtube_dl/extractor/vodlocker.py
index fdab0e7bf..affef6507 100644
--- a/youtube_dl/extractor/vodlocker.py
+++ b/youtube_dl/extractor/vodlocker.py
@@ -2,17 +2,15 @@
 from __future__ import unicode_literals
 
 import re
-import time
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
     compat_urllib_parse,
     compat_urllib_request,
 )
 
 
 class VodlockerIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?vodlocker.com/(?P<id>[0-9a-zA-Z]+)(?:\..*?)?'
+    _VALID_URL = r'https?://(?:www\.)?vodlocker\.com/(?P<id>[0-9a-zA-Z]+)(?:\..*?)?'
 
     _TESTS = [{
         'url': 'http://vodlocker.com/e8wvyzz4sl42',
@@ -28,9 +26,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 +36,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*<(?:br|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 {