X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fbliptv.py;h=c7e0a53c12d61bd450438d67bf1f5b538c13e665;hb=41cc67c542046d300fc0a8a6bfb6c471db2db6b2;hp=0e63208dfbe5a68b758a683a77bf0e09911ba282;hpb=f82b18efc1b8b58201362b6a1965b177cdc7da44;p=youtube-dl

diff --git a/youtube_dl/extractor/bliptv.py b/youtube_dl/extractor/bliptv.py
index 0e63208df..c7e0a53c1 100644
--- a/youtube_dl/extractor/bliptv.py
+++ b/youtube_dl/extractor/bliptv.py
@@ -1,6 +1,5 @@
 import datetime
 import json
-import os
 import re
 import socket
 
@@ -21,7 +20,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 +57,6 @@ class BlipTVIE(InfoExtractor):
             url = 'http://blip.tv/a/a-' + file_id
             return self._real_extract(url)
 
-
         if '?' in url:
             cchar = '&'
         else:
@@ -67,26 +65,9 @@ class BlipTVIE(InfoExtractor):
         request = compat_urllib_request.Request(json_url)
         request.add_header('User-Agent', 'iTunes/10.6.1')
         self.report_extraction(mobj.group(1))
-        info = None
         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')