Don't leave lingering worldname/maps directories #25721
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Qrox
reviewed
Sep 20, 2018
src/worldfactory.cpp
Outdated
| void worldfactory::delete_world( const std::string &worldname, const bool delete_folder ) | ||
| { | ||
| std::string worldpath = get_world( worldname )->folder_path(); | ||
| std::set<std::string> directory_paths; | ||
| std::set<std::string, directory_pathname_length_sorter> directory_paths; |
There was a problem hiding this comment.
This will end up badly for different paths with the same length. I think you can just delete the directories using reverse iterator since the default sorter compares strings by lexicographical order. (Or alternatively, use std::greater as the sorter.)
There was a problem hiding this comment.
Ah, gotcha, thanks. Didn't realize that the test was used for set uniqueness as well, but that does make a good deal more sense.
At least on the Linux target, once a maps directory had been created for a world, when the world was deleted, the world directory and maps directory could be left behind. This was caused when Cataclysm attempted to delete non-empty parent directories before child directories, which silently failed. Iterate over directories being deleted during world deletion in reverse order, so that children will always be deleted before parent directories.
mark7
force-pushed
the
wb-clean-world-deletion
branch
from
09f793d
to
9cda0a3
Compare
|
Yay, I'd noticed this issue on macOS as well |
|
can confirm it happened on Windows as well. hopefully this finally fixes it |
nexusmrsep
added
the
Code: Infrastructure / Style / Static Analysis
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: Bugfixes "Don't leave lingering worldname/maps directories"
Purpose of change
At least on the Linux target, once a maps directory had been created
for a world, when the world was deleted, the world directory and maps
directory could be left behind. This was caused when Cataclysm
attempted to delete non-empty parent directories before child
directories, which silently failed.
Describe the solution
Iterate over directories being deleted during world deletion by
pathname length, so that children will always be deleted before parent
directories.
Describe alternatives you've considered
Additional context