projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[YoutubeDL] Filter requested info fields on `--load-info` as well
[youtube-dl]
/
youtube_dl
/
downloader
/
common.py
diff --git
a/youtube_dl/downloader/common.py
b/youtube_dl/downloader/common.py
index 3ae90021a28e661ab532a2d42a7c4e0826d1f46f..97e755d4baa56972a9a4e5223a6871edd8bf0565 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,
)
@@
-42,6
+43,8
@@
class FileDownloader(object):
max_filesize: Skip files larger than this size
xattr_set_filesize: Set ytdl.filesize user xattribute with expected size.
(experimenatal)
max_filesize: Skip files larger than this size
xattr_set_filesize: Set ytdl.filesize user xattribute with expected size.
(experimenatal)
+ external_downloader_args: A list of additional command-line arguments for the
+ external downloader.
Subclasses of this one must re-define the real_download method.
"""
Subclasses of this one must re-define the real_download method.
"""
@@
-202,7
+205,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
@@
-316,7
+319,7
@@
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)
)
os.path.isfile(encodeFilename(filename)) and
not self.params.get('nopart', False)
)
@@
-351,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))