Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Save to disk: Fix path shortening being applied to entire save template even when saving to singe directory. Fixes #1665964 [Saving books to single directory has truncate issue](https://bugs.launchpad.net/calibre/+bug/1665964)

Browse Source
This commit is contained in:
Kovid Goyal 2017-02-20 19:51:44 +05:30
parent 84ea982525
commit 6678d4ccae
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/library/save_to_disk.py
View File

@ -173,8 +173,8 @@ class Formatter(TemplateFormatter):
def get_components(template, mi, id, timefmt='%b %Y', length=250, def get_components(template, mi, id, timefmt='%b %Y', length=250,
sanitize_func=ascii_filename, replace_whitespace=False, sanitize_func=ascii_filename, replace_whitespace=False,
to_lowercase=False, safe_format=True, last_has_extension=True): to_lowercase=False, safe_format=True, last_has_extension=True,
single_dir=False):
tsorder = tweaks['save_template_title_series_sorting'] tsorder = tweaks['save_template_title_series_sorting']
format_args = FORMAT_ARGS.copy() format_args = FORMAT_ARGS.copy()
format_args.update(mi.all_non_none_fields()) format_args.update(mi.all_non_none_fields())
@ -252,6 +252,8 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250,
if replace_whitespace: if replace_whitespace:
components = [re.sub(r'\s', '_', x) for x in components] components = [re.sub(r'\s', '_', x) for x in components]
if single_dir:
components = components[-1:]
return shorten_components_to(length, components, last_has_extension=last_has_extension) return shorten_components_to(length, components, last_has_extension=last_has_extension)
@ -292,13 +294,11 @@ def get_path_components(opts, mi, book_id, path_length):
ascii_filename if opts.asciiize else sanitize_file_name_unicode, ascii_filename if opts.asciiize else sanitize_file_name_unicode,
to_lowercase=opts.to_lowercase, to_lowercase=opts.to_lowercase,
replace_whitespace=opts.replace_whitespace, safe_format=False, replace_whitespace=opts.replace_whitespace, safe_format=False,
last_has_extension=False) last_has_extension=False, single_dir=opts.single_dir)
except Exception, e: except Exception, e:
raise ValueError(_('Failed to calculate path for ' raise ValueError(_('Failed to calculate path for '
'save to disk. Template: %(templ)s\n' 'save to disk. Template: %(templ)s\n'
'Error: %(err)s')%dict(templ=opts.template, err=e)) 'Error: %(err)s')%dict(templ=opts.template, err=e))
if opts.single_dir:
components = components[-1:]
if not components: if not components:
raise ValueError(_('Template evaluation resulted in no' raise ValueError(_('Template evaluation resulted in no'
' path components. Template: %s')%opts.template) ' path components. Template: %s')%opts.template)