Correctly remove media folders after removing all media files #3688
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
StyxUA
changed the title
|
Thanks! |
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.
If the media model has conversions and/or responsive images, then
DefaultFileRemoverwill not remove the media folder upon removing all files.The reason of this issue lies in order of removing folders. It tries to remove media folder first, then conversions folder, and then responsive images folder (removing empty directories if there are no files left). Although, conversions/responsive images folders reside inside media folder, thus preventing it from being removed.
This PR fixes this issue by changing the order of removing these folders, moving removing media folder to the last, after all other folders have been removed.
Existing tests weren't catching this issue because they used models without conversions/responsive images. New tests have been added to solve this.