Bugfix/65023 #458
Merged
Bugfix/65023 #458
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
This commit improves the conflict resolution logic when moving or copying files and folders. Instead of checking for conflicts against the ProviderEntry field only, it now also checks the FileConflictResolveType. This change helps to better handle occurrences of duplicate files or folders and to skip certain items as required by the conflict resolution type. Additionally, an empty folders check is included in FolderDao to avoid unnecessary operations.
Two member variables, FileEntryType, were added to two models: FileDto and FolderDto. This type designation simplifies and clarifies the distinction between file and folder entries within these data transfer objects. Additionally, an abstract FileEntryType was added to the FileEntryDto class.
The code previously assigned an empty string to the result on conflict. Now, it correctly assigns the folder ID to ensure proper handling and consistency. This change corrects a logical error that could cause issues in folder management.
Revised the conflict handling to simplify the logic by removing unnecessary checks for the Skip resolution type. The condition now specifically checks for the Overwrite type when processing folders. This change streamlines the code and increases readability.
# Conflicts: # products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# Conflicts: # products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
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.
No description provided.