fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-02-21 07:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

PICARD-1559: Create directories when moving files

Browse Source 
Use the renaming script for the directory part if only moving files without renaming file is set. Keep the filename in this case.
This commit is contained in:
Philipp Wolfer
2019-08-05 18:12:38 +02:00
parent ed937fab90
commit 705fa2b52c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
picard/file.py
View File

@@ -375,6 +375,7 @@ class File(QtCore.QObject, Item):
def _format_filename(self, new_dirname, new_filename, metadata, settings):
# TODO: tests !!
old_filename = new_filename
new_filename, ext = self._fixed_splitext(new_filename)
ext = ext.lower()
new_filename = new_filename + ext
@@ -385,6 +386,8 @@ class File(QtCore.QObject, Item):
new_filename = self._script_to_filename(naming_format, metadata, settings)
# NOTE: the _script_to_filename strips the extension away
new_filename = new_filename + ext
if not settings['rename_files']:
new_filename = os.path.join(os.path.dirname(new_filename), old_filename)
if not settings['move_files']:
new_filename = os.path.basename(new_filename)
win_compat = IS_WIN or settings['windows_compatibility']
@@ -416,7 +419,7 @@ class File(QtCore.QObject, Item):
new_dirname = os.path.dirname(filename)
new_filename = os.path.basename(filename)
if settings["rename_files"]:
if settings["rename_files"] or settings["move_files"]:
new_filename = self._format_filename(new_dirname, new_filename, metadata, settings)
new_path = os.path.join(new_dirname, new_filename)