PICARD-972: Avoid save if file removed #609
Conversation
Handles both removal before save starts and removal whilst file is being saved.
picard/file.py
Outdated
| @@ -222,6 +225,9 @@ def _rmdir(dir): | |||
| raise OSError | |||
|
|
|||
| def _saving_finished(self, result=None, error=None): | |||
| # Handle file removed | |||
| if self.state == File.REMOVED and not result: | |||
There was a problem hiding this comment.
In the previous comment, please explain and not result
| @@ -247,8 +253,9 @@ def _saving_finished(self, result=None, error=None): | |||
| self.clear_pending() | |||
| self._add_path_to_metadata(self.orig_metadata) | |||
|
|
|||
| del self.tagger.files[old_filename] | |||
| self.tagger.files[new_filename] = self | |||
| if self.state != File.REMOVED: | |||
There was a problem hiding this comment.
Any reason we are checking here again? Didn't we already return earlier?
There was a problem hiding this comment.
Yes - we get here if file was removed during the save - and we only add the file to the tagger if it wasn't removed.
|
I still need to test this latest incarnation, but providing it is working OK it will be ready to merge. |
|
I still need to test this - so please wait on the merge until I do so later today. |
|
Ok - I have tested this - and the functionality works,fine. So it is ready for merge. But it has identified another bug which is that the log.debug messages are not flushed to stderr before the executable quits. |
Handles both removal before save starts and removal whilst file is being
saved.
Resolves PICARD-972.