From 9bf803c8c28847e0b7efeaf3ce8a4433e4e483bc Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Fri, 15 Mar 2019 10:35:16 +0100 Subject: [PATCH] Use intermediate variable win_compat, improve consistency --- picard/file.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/picard/file.py b/picard/file.py index 7a51e953a..2146c84cb 100644 --- a/picard/file.py +++ b/picard/file.py @@ -336,12 +336,13 @@ class File(QtCore.QObject, Item): new_filename = new_filename + ext if not settings['move_files']: new_filename = os.path.basename(new_filename) + win_compat = IS_WIN or settings['windows_compatibility'] new_filename = make_short_filename(new_dirname, new_filename, - settings['windows_compatibility']) + win_compat) # TODO: move following logic under util.filenaming # (and reconsider its necessity) # win32 compatibility fixes - if settings['windows_compatibility'] or IS_WIN: + if win_compat: new_filename = new_filename.replace('./', '_/').replace('.\\', '_\\') # replace . at the beginning of file and directory names new_filename = new_filename.replace('/.', '/_').replace('\\.', '\\_')