Compare commits

..

3 Commits

Author SHA1 Message Date
504c668d3b release 2013.12.23.2 2013-12-23 04:31:45 +01:00
466617f539 [bliptv] Simplify (From #2000) 2013-12-23 04:31:38 +01:00
196938835a Remove debugging code
Introduced by accident in 5d681e960d
2013-12-23 04:30:57 +01:00
3 changed files with 40 additions and 43 deletions

View File

@ -192,7 +192,6 @@ class YoutubeDL(object):
['bidiv'] + width_args, **sp_kwargs
)
except OSError:
print('Falling back to fribidi')
self._output_process = subprocess.Popen(
['fribidi', '-c', 'UTF-8'] + width_args, **sp_kwargs)
self._output_channel = os.fdopen(master, 'rb')
@ -251,7 +250,6 @@ class YoutubeDL(object):
def _bidi_workaround(self, message):
if not hasattr(self, '_output_channel'):
print('WORKAROUND NOT ENABLED')
return message
assert hasattr(self, '_output_process')

View File

@ -70,13 +70,14 @@ class BlipTVIE(InfoExtractor):
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)
info = {
return {
'id': title,
'url': url,
'uploader': None,
@ -85,7 +86,7 @@ class BlipTVIE(InfoExtractor):
'ext': ext,
'urlhandle': urlh
}
if info is None: # Regular URL
try:
json_code_bytes = urlh.read()
json_code = json_code_bytes.decode('utf-8')
@ -111,7 +112,7 @@ class BlipTVIE(InfoExtractor):
raise ValueError('Can not determine filename extension')
ext = umobj.group(1)
info = {
return {
'id': compat_str(data['item_id']),
'url': video_url,
'uploader': data['display_name'],
@ -127,8 +128,6 @@ class BlipTVIE(InfoExtractor):
except (ValueError, KeyError) as err:
raise ExtractorError(u'Unable to parse video information: %s' % repr(err))
return [info]
class BlipTVUserIE(InfoExtractor):
"""Information Extractor for blip.tv users."""

View File

@ -1,2 +1,2 @@
__version__ = '2013.12.23.1'
__version__ = '2013.12.23.2'