[bliptv] Remove support for direct downloads

[youtube-dl] / youtube_dl / extractor / bliptv.py

diff --git a/youtube_dl/extractor/bliptv.py b/youtube_dl/extractor/bliptv.py
index 0e63208dfbe5a68b758a683a77bf0e09911ba282..a32891c1749f286873fd6b966ccaf8e9808633fb 100644 (file)
--- a/youtube_dl/extractor/bliptv.py
+++ b/youtube_dl/extractor/bliptv.py
@@ -21,7 +21,7 @@ from ..utils import (
 class BlipTVIE(InfoExtractor):
     """Information extractor for blip.tv"""
 
-    _VALID_URL = r'^(?:https?://)?(?:\w+\.)?blip\.tv/((.+/)|(play/)|(api\.swf#))(.+)$'
+    _VALID_URL = r'^(?:https?://)?(?:www\.)?blip\.tv/((.+/)|(play/)|(api\.swf#))(.+)$'
     _URL_EXT = r'^.*\.([a-z0-9]+)$'
     IE_NAME = u'blip.tv'
     _TEST = {
@@ -58,7 +58,6 @@ class BlipTVIE(InfoExtractor):
             url = 'http://blip.tv/a/a-' + file_id
             return self._real_extract(url)
 
-
         if '?' in url:
             cchar = '&'
         else:
@@ -71,22 +70,6 @@ class BlipTVIE(InfoExtractor):
         urlh = self._request_webpage(request, None, False,
             u'unable to download video info webpage')
 
-        if urlh.headers.get('Content-Type', '').startswith('video/'): # Direct download
-            basename = url.split('/')[-1]
-            title,ext = os.path.splitext(basename)
-            title = title.decode('UTF-8')
-            ext = ext.replace('.', '')
-            self.report_direct_download(title)
-            return {
-                'id': title,
-                'url': url,
-                'uploader': None,
-                'upload_date': None,
-                'title': title,
-                'ext': ext,
-                'urlhandle': urlh
-            }
-
         try:
             json_code_bytes = urlh.read()
             json_code = json_code_bytes.decode('utf-8')