depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-25 19:52:11 +00:00
Code Issues Releases Wiki Activity

Some pep8 style fixes

Browse source
This commit is contained in:
Jaime Marquínez Ferrándiz 2014-01-25 12:02:43 +01:00
parent 944d65c762
commit f89197d73e
5 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
youtube_dl/YoutubeDL.py
View file

@ -331,7 +331,7 @@ class YoutubeDL(object):
def __exit__(self, *args): def __exit__(self, *args):
self.restore_console_title() self.restore_console_title()
if self.params.get('cookiefile') is not None: if self.params.get('cookiefile') is not None:
self.cookiejar.save() self.cookiejar.save()
@ -710,10 +710,10 @@ class YoutubeDL(object):
# TODO Central sorting goes here # TODO Central sorting goes here
if formats[0] is not info_dict: if formats[0] is not info_dict:
# only set the 'formats' fields if the original info_dict list them # only set the 'formats' fields if the original info_dict list them
# otherwise we end up with a circular reference, the first (and unique) # otherwise we end up with a circular reference, the first (and unique)
# element in the 'formats' field in info_dict is info_dict itself, # element in the 'formats' field in info_dict is info_dict itself,
# wich can't be exported to json # wich can't be exported to json
info_dict['formats'] = formats info_dict['formats'] = formats
if self.params.get('listformats', None): if self.params.get('listformats', None):

2
youtube_dl/downloader/__init__.py
View file

@ -8,6 +8,7 @@ from ..utils import (
determine_ext, determine_ext,
) )
def get_suitable_downloader(info_dict): def get_suitable_downloader(info_dict):
"""Get the downloader class that can handle the info dict.""" """Get the downloader class that can handle the info dict."""
url = info_dict['url'] url = info_dict['url']
@ -20,4 +21,3 @@ def get_suitable_downloader(info_dict):
return MplayerFD return MplayerFD
else: else:
return HttpFD return HttpFD

1
youtube_dl/downloader/common.py
View file

@ -314,4 +314,3 @@ class FileDownloader(object):
if the download is successful. if the download is successful.
""" """
self._progress_hooks.append(ph) self._progress_hooks.append(ph)

6
youtube_dl/downloader/http.py
View file

@ -27,7 +27,7 @@ class HttpFD(FileDownloader):
request = compat_urllib_request.Request(url, None, headers) request = compat_urllib_request.Request(url, None, headers)
if self.params.get('test', False): if self.params.get('test', False):
request.add_header('Range','bytes=0-10240') request.add_header('Range', 'bytes=0-10240')
# Establish possible resume length # Establish possible resume length
if os.path.isfile(encodeFilename(tmpfilename)): if os.path.isfile(encodeFilename(tmpfilename)):
@ -39,7 +39,7 @@ class HttpFD(FileDownloader):
if resume_len != 0: if resume_len != 0:
if self.params.get('continuedl', False): if self.params.get('continuedl', False):
self.report_resuming_byte(resume_len) self.report_resuming_byte(resume_len)
request.add_header('Range','bytes=%d-' % resume_len) request.add_header('Range', 'bytes=%d-' % resume_len)
open_mode = 'ab' open_mode = 'ab'
else: else:
resume_len = 0 resume_len = 0
@ -100,7 +100,7 @@ class HttpFD(FileDownloader):
if data_len is not None: if data_len is not None:
data_len = int(data_len) + resume_len data_len = int(data_len) + resume_len
min_data_len = self.params.get("min_filesize", None) min_data_len = self.params.get("min_filesize", None)
max_data_len = self.params.get("max_filesize", None) max_data_len = self.params.get("max_filesize", None)
if min_data_len is not None and data_len < min_data_len: if min_data_len is not None and data_len < min_data_len:
self.to_screen(u'\r[download] File is smaller than min-filesize (%s bytes < %s bytes). Aborting.' % (data_len, min_data_len)) self.to_screen(u'\r[download] File is smaller than min-filesize (%s bytes < %s bytes). Aborting.' % (data_len, min_data_len))
return False return False

4
youtube_dl/downloader/mplayer.py
View file

@ -18,10 +18,10 @@ class MplayerFD(FileDownloader):
try: try:
subprocess.call(['mplayer', '-h'], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT) subprocess.call(['mplayer', '-h'], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT)
except (OSError, IOError): except (OSError, IOError):
self.report_error(u'MMS or RTSP download detected but "%s" could not be run' % args[0] ) self.report_error(u'MMS or RTSP download detected but "%s" could not be run' % args[0])
return False return False
# Download using mplayer. # Download using mplayer.
retval = subprocess.call(args) retval = subprocess.call(args)
if retval == 0: if retval == 0:
fsize = os.path.getsize(encodeFilename(tmpfilename)) fsize = os.path.getsize(encodeFilename(tmpfilename))