fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-03-09 06:45:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

_apply_additional_files_moves(): call _get_additional_files_moves() directly

Browse Source 
- pass old_path, new_path, config instead of moves
This commit is contained in:
Laurent Monin
2021-11-09 17:58:05 +01:00
parent 725033c55e
commit 1486bdb0f0
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
picard/file.py
View File

@@ -554,8 +554,7 @@ class File(QtCore.QObject, Item):
if new_path == old_path:
# skip, same directory, nothing to move
return
moves = self._get_additional_files_moves(old_path, new_path, config)
self._apply_additional_files_moves(moves)
self._apply_additional_files_moves(old_path, new_path, config)
def _compile_move_additional_files_pattern(self, config):
return {
@@ -582,8 +581,8 @@ class File(QtCore.QObject, Item):
log.error("Failed to scan %r: %s", old_path, why)
return moves
def _apply_additional_files_moves(self, moves):
for old_file_path, new_file_path in moves:
def _apply_additional_files_moves(self, old_path, new_path, config):
for old_file_path, new_file_path in self._get_additional_files_moves(old_path, new_path, config):
# FIXME we shouldn't do this from a thread!
if self.tagger.files.get(decode_filename(old_file_path)):
log.debug("File loaded in the tagger, not moving %r", old_file_path)