projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[arte] PEP 8
[youtube-dl]
/
youtube_dl
/
downloader
/
common.py
diff --git
a/youtube_dl/downloader/common.py
b/youtube_dl/downloader/common.py
index 8ed5c19a6b8079c9807faa4fa7a505a398974975..2d51540518f7ee40c7d002d632007d5aa9542697 100644
(file)
--- a/
youtube_dl/downloader/common.py
+++ b/
youtube_dl/downloader/common.py
@@
-5,9
+5,10
@@
import re
import sys
import time
import sys
import time
-from ..compat import compat_str
from ..utils import (
encodeFilename,
from ..utils import (
encodeFilename,
+ error_to_compat_str,
+ decodeArgument,
format_bytes,
timeconvert,
)
format_bytes,
timeconvert,
)
@@
-41,9
+42,10
@@
class FileDownloader(object):
min_filesize: Skip files smaller than this size
max_filesize: Skip files larger than this size
xattr_set_filesize: Set ytdl.filesize user xattribute with expected size.
min_filesize: Skip files smaller than this size
max_filesize: Skip files larger than this size
xattr_set_filesize: Set ytdl.filesize user xattribute with expected size.
- (experimen
a
tal)
+ (experimental)
external_downloader_args: A list of additional command-line arguments for the
external downloader.
external_downloader_args: A list of additional command-line arguments for the
external downloader.
+ hls_use_mpegts: Use the mpegts container for HLS videos.
Subclasses of this one must re-define the real_download method.
"""
Subclasses of this one must re-define the real_download method.
"""
@@
-155,7
+157,7
@@
class FileDownloader(object):
def slow_down(self, start_time, now, byte_counter):
"""Sleep if the download speed is over the rate limit."""
def slow_down(self, start_time, now, byte_counter):
"""Sleep if the download speed is over the rate limit."""
- rate_limit = self.params.get('ratelimit'
, None
)
+ rate_limit = self.params.get('ratelimit')
if rate_limit is None or byte_counter == 0:
return
if now is None:
if rate_limit is None or byte_counter == 0:
return
if now is None:
@@
-185,7
+187,7
@@
class FileDownloader(object):
return
os.rename(encodeFilename(old_filename), encodeFilename(new_filename))
except (IOError, OSError) as err:
return
os.rename(encodeFilename(old_filename), encodeFilename(new_filename))
except (IOError, OSError) as err:
- self.report_error('unable to rename file: %s' % compat_str(err))
+ self.report_error('unable to rename file: %s' %
error_to_
compat_str(err))
def try_utime(self, filename, last_modified_hdr):
"""Try to set the last-modified time of the given file."""
def try_utime(self, filename, last_modified_hdr):
"""Try to set the last-modified time of the given file."""
@@
-204,7
+206,7
@@
class FileDownloader(object):
return
try:
os.utime(filename, (time.time(), filetime))
return
try:
os.utime(filename, (time.time(), filetime))
- except:
+ except
Exception
:
pass
return filetime
pass
return filetime
@@
-294,7
+296,7
@@
class FileDownloader(object):
def report_retry(self, count, retries):
"""Report retry in case of HTTP error 5xx"""
def report_retry(self, count, retries):
"""Report retry in case of HTTP error 5xx"""
- self.to_screen('[download] Got server HTTP error. Retrying (attempt %d of %
d
)...' % (count, retries))
+ self.to_screen('[download] Got server HTTP error. Retrying (attempt %d of %
.0f
)...' % (count, retries))
def report_file_already_downloaded(self, file_name):
"""Report file has already been fully downloaded."""
def report_file_already_downloaded(self, file_name):
"""Report file has already been fully downloaded."""
@@
-318,13
+320,13
@@
class FileDownloader(object):
)
continuedl_and_exists = (
)
continuedl_and_exists = (
- self.params.get('continuedl',
Fals
e) and
+ self.params.get('continuedl',
Tru
e) and
os.path.isfile(encodeFilename(filename)) and
not self.params.get('nopart', False)
)
# Check file already present
os.path.isfile(encodeFilename(filename)) and
not self.params.get('nopart', False)
)
# Check file already present
- if filename != '-' and
nooverwrites_and_exists or continuedl_and_exists
:
+ if filename != '-' and
(nooverwrites_and_exists or continuedl_and_exists)
:
self.report_file_already_downloaded(filename)
self._hook_progress({
'filename': filename,
self.report_file_already_downloaded(filename)
self._hook_progress({
'filename': filename,
@@
-353,19
+355,15
@@
class FileDownloader(object):
# this interface
self._progress_hooks.append(ph)
# this interface
self._progress_hooks.append(ph)
- def _debug_cmd(self, args,
subprocess_encoding,
exe=None):
+ def _debug_cmd(self, args, exe=None):
if not self.params.get('verbose', False):
return
if not self.params.get('verbose', False):
return
+ str_args = [decodeArgument(a) for a in args]
+
if exe is None:
if exe is None:
- exe = os.path.basename(args[0])
+ exe = os.path.basename(
str_
args[0])
- if subprocess_encoding:
- str_args = [
- a.decode(subprocess_encoding) if isinstance(a, bytes) else a
- for a in args]
- else:
- str_args = args
try:
import pipes
shell_quote = lambda args: ' '.join(map(pipes.quote, str_args))
try:
import pipes
shell_quote = lambda args: ' '.join(map(pipes.quote, str_args))