mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2025-07-09 14:58:32 +00:00
Use --trim-filenames option
This commit is contained in:
parent
8c01f4a92d
commit
fa6e2f83aa
@ -267,7 +267,6 @@ class YoutubeDL:
|
|||||||
outtmpl_na_placeholder: Placeholder for unavailable meta fields.
|
outtmpl_na_placeholder: Placeholder for unavailable meta fields.
|
||||||
restrictfilenames: Do not allow "&" and spaces in file names
|
restrictfilenames: Do not allow "&" and spaces in file names
|
||||||
trim_file_name: Limit length of filename (extension excluded)
|
trim_file_name: Limit length of filename (extension excluded)
|
||||||
max_file_name: Limit length of filename (extension included)
|
|
||||||
filesystem_encoding: Encoding to use when calculating filename length in bytes
|
filesystem_encoding: Encoding to use when calculating filename length in bytes
|
||||||
windowsfilenames: True: Force filenames to be Windows compatible
|
windowsfilenames: True: Force filenames to be Windows compatible
|
||||||
False: Sanitize filenames only minimally
|
False: Sanitize filenames only minimally
|
||||||
@ -1441,31 +1440,31 @@ def evaluate_outtmpl_for_filename(self, outtmpl, info_dict, *args, **kwargs):
|
|||||||
filename = outtmpl % info_dict
|
filename = outtmpl % info_dict
|
||||||
|
|
||||||
def parse_max_file_name(max_file_name: str):
|
def parse_max_file_name(max_file_name: str):
|
||||||
|
# old --trim-filenames format
|
||||||
|
try:
|
||||||
|
return 'c', int(max_file_name)
|
||||||
|
except ValueError:
|
||||||
|
pass
|
||||||
|
|
||||||
try:
|
try:
|
||||||
max_length = int(max_file_name[:-1])
|
max_length = int(max_file_name[:-1])
|
||||||
except ValueError:
|
except ValueError:
|
||||||
raise ValueError('Invalid --max-filename-length specified')
|
raise ValueError('Invalid --trim-filenames specified')
|
||||||
|
|
||||||
if max_file_name[-1].lower() == 'c':
|
if max_file_name[-1].lower() == 'c':
|
||||||
return 'c', max_length
|
return 'c', max_length
|
||||||
elif max_file_name[-1].lower() == 'b':
|
elif max_file_name[-1].lower() == 'b':
|
||||||
return 'b', max_length
|
return 'b', max_length
|
||||||
else:
|
else:
|
||||||
raise ValueError("--max-filename-length must end with 'b' or 'c'")
|
raise ValueError("--trim-filenames must end with 'b' or 'c'")
|
||||||
|
|
||||||
max_file_name = self.params.get('max_file_name', DEFAULT_MAX_FILE_NAME)
|
max_file_name = self.params.get('trim_file_name') or DEFAULT_MAX_FILE_NAME
|
||||||
mode, max_file_name = parse_max_file_name(max_file_name)
|
mode, max_file_name = parse_max_file_name(max_file_name)
|
||||||
encoding = self.params.get('filesystem_encoding', sys.getfilesystemencoding())
|
if max_file_name < 1:
|
||||||
|
raise ValueError('Invalid --trim-filenames specified')
|
||||||
# extension may be replaced later
|
encoding = self.params.get('filesystem_encoding') or sys.getfilesystemencoding()
|
||||||
if mode == 'b':
|
|
||||||
max_suffix_len = len('.annotations.xml'.encode(encoding))
|
|
||||||
else:
|
|
||||||
max_suffix_len = len('.annotations.xml')
|
|
||||||
|
|
||||||
def trim_filename(name: str, length: int):
|
def trim_filename(name: str, length: int):
|
||||||
if length < 1:
|
|
||||||
raise ValueError('Cannot trim filename to such short length')
|
|
||||||
if mode == 'b':
|
if mode == 'b':
|
||||||
name = name.encode(encoding)
|
name = name.encode(encoding)
|
||||||
name = name[:length]
|
name = name[:length]
|
||||||
@ -1475,7 +1474,7 @@ def trim_filename(name: str, length: int):
|
|||||||
|
|
||||||
# only trim last component of path - assume the directories are valid names
|
# only trim last component of path - assume the directories are valid names
|
||||||
head, tail = os.path.split(filename)
|
head, tail = os.path.split(filename)
|
||||||
tail = trim_filename(tail, max_file_name - max_suffix_len)
|
tail = trim_filename(tail, max_file_name)
|
||||||
filename = os.path.join(head, tail)
|
filename = os.path.join(head, tail)
|
||||||
return filename + suffix
|
return filename + suffix
|
||||||
|
|
||||||
@ -1498,13 +1497,6 @@ def _prepare_filename(self, info_dict, *, outtmpl=None, tmpl_type=None):
|
|||||||
force_ext = OUTTMPL_TYPES[tmpl_type]
|
force_ext = OUTTMPL_TYPES[tmpl_type]
|
||||||
if force_ext:
|
if force_ext:
|
||||||
filename = replace_extension(filename, force_ext, info_dict.get('ext'))
|
filename = replace_extension(filename, force_ext, info_dict.get('ext'))
|
||||||
|
|
||||||
# https://github.com/blackjack4494/youtube-dlc/issues/85
|
|
||||||
trim_file_name = self.params.get('trim_file_name', False)
|
|
||||||
if trim_file_name:
|
|
||||||
no_ext, *ext = filename.rsplit('.', 2)
|
|
||||||
filename = join_nonempty(no_ext[:trim_file_name], *ext, delim='.')
|
|
||||||
|
|
||||||
return filename
|
return filename
|
||||||
except ValueError as err:
|
except ValueError as err:
|
||||||
self.report_error('Error in output template: ' + str(err) + ' (encoding: ' + repr(preferredencoding()) + ')')
|
self.report_error('Error in output template: ' + str(err) + ' (encoding: ' + repr(preferredencoding()) + ')')
|
||||||
|
@ -886,7 +886,6 @@ def parse_options(argv=None):
|
|||||||
'max_downloads': opts.max_downloads,
|
'max_downloads': opts.max_downloads,
|
||||||
'prefer_free_formats': opts.prefer_free_formats,
|
'prefer_free_formats': opts.prefer_free_formats,
|
||||||
'trim_file_name': opts.trim_file_name,
|
'trim_file_name': opts.trim_file_name,
|
||||||
'max_file_name': opts.max_file_name,
|
|
||||||
'filesystem_encoding': opts.filesystem_encoding,
|
'filesystem_encoding': opts.filesystem_encoding,
|
||||||
'verbose': opts.verbose,
|
'verbose': opts.verbose,
|
||||||
'dump_intermediate_pages': opts.dump_intermediate_pages,
|
'dump_intermediate_pages': opts.dump_intermediate_pages,
|
||||||
|
@ -1378,12 +1378,8 @@ def _alias_callback(option, opt_str, value, parser, opts, nargs):
|
|||||||
help='Sanitize filenames only minimally')
|
help='Sanitize filenames only minimally')
|
||||||
filesystem.add_option(
|
filesystem.add_option(
|
||||||
'--trim-filenames', '--trim-file-names', metavar='LENGTH',
|
'--trim-filenames', '--trim-file-names', metavar='LENGTH',
|
||||||
dest='trim_file_name', default=0, type=int,
|
dest='trim_file_name',
|
||||||
help='Limit the filename length (excluding extension) to the specified number of characters')
|
help='Limit the filename length (excluding extension) to the specified number of characters or bytes')
|
||||||
filesystem.add_option(
|
|
||||||
'--max-filename-length', metavar='LENGTH',
|
|
||||||
dest='max_file_name',
|
|
||||||
help='Limit the filename length (including extension) to the specified number of characters or bytes')
|
|
||||||
filesystem.add_option(
|
filesystem.add_option(
|
||||||
'--filesystem-encoding', metavar='ENCODING',
|
'--filesystem-encoding', metavar='ENCODING',
|
||||||
dest='filesystem_encoding',
|
dest='filesystem_encoding',
|
||||||
|
@ -2854,9 +2854,9 @@ def q(qid):
|
|||||||
|
|
||||||
# https://en.m.wikipedia.org/wiki/Comparison_of_file_systems#Limits
|
# https://en.m.wikipedia.org/wiki/Comparison_of_file_systems#Limits
|
||||||
if platform.system() in ('Darwin', 'Windows'):
|
if platform.system() in ('Darwin', 'Windows'):
|
||||||
DEFAULT_MAX_FILE_NAME = '255c'
|
DEFAULT_MAX_FILE_NAME = f'{255 - len(".annotations.xml")}c'
|
||||||
else:
|
else:
|
||||||
DEFAULT_MAX_FILE_NAME = '255b'
|
DEFAULT_MAX_FILE_NAME = f'{255 - len(".annotations.xml".encode(sys.getfilesystemencoding()))}b'
|
||||||
|
|
||||||
# As of [1] format syntax is:
|
# As of [1] format syntax is:
|
||||||
# %[mapping_key][conversion_flags][minimum_width][.precision][length_modifier]type
|
# %[mapping_key][conversion_flags][minimum_width][.precision][length_modifier]type
|
||||||
|
Loading…
Reference in New Issue
Block a user