projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[utils] Improve parse_iso8601
[youtube-dl]
/
youtube_dl
/
downloader
/
common.py
diff --git
a/youtube_dl/downloader/common.py
b/youtube_dl/downloader/common.py
index a0fc5ead06a4e8adba7886d2a4087d28ca9cdbcb..29a4500d3a02920ec586d38338c659ff4c43124c 100644
(file)
--- a/
youtube_dl/downloader/common.py
+++ b/
youtube_dl/downloader/common.py
@@
-8,6
+8,7
@@
import time
from ..compat import compat_str
from ..utils import (
encodeFilename,
from ..compat import compat_str
from ..utils import (
encodeFilename,
+ decodeArgument,
format_bytes,
timeconvert,
)
format_bytes,
timeconvert,
)
@@
-324,7
+325,7
@@
class FileDownloader(object):
)
# Check file already present
)
# 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
+354,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))