Fix: Fixed an issue where the conflicts dialog didn't append numbers when pasting files

[ashrafmansuri]

Resolved / Related Issues

• Were these changes approved in an issue or discussion with the project maintainers? In order to prevent extra work, feature requests and changes to the codebase must be approved before the pull request will be reviewed. This prevents extra work for the contributors and maintainers.
  Close Bug: Generating new name for conflict is appending "copy" instead of a number "(#)"  #11697

Validation
How did you test these changes?

• Did you build the app and test your changes?
• Did you check for accessibility? You can use Accessibility Insights for this.
• Did you remove any strings from the en-us resource file?
  • Did you search the solution to see if the string is still being used?
• Did you implement any design changes to an existing feature?
  • Was this change approved?
• Are there any other steps that were used to validate these changes?
  1. Open app ...
  2. Copy a file or folder from a similar source and destination the filename has -Copy and file behaves similar to Explorer ...
  3. Now copy a file or folder from a source different than destination the filename has (#) appended to it.

Screenshots (optional)
Add screenshots here.

[ashrafmansuri]

I have tried to make changes. Let me know if there are improvements

[gave92]

The copypaste test would need to be updated because it checks for a file named "- Copy".

[0x5bfa]

Please modify here too

Files/tests/Files.InteractionTests/Tests/FolderTests.cs

Line 142 in 516ceb2

TestHelper.InvokeButtonByName("Renamed Folder - Copy");

[QuaintMako]

Few feedback on the formatting! :)

[hishitetsu]

• Your PR appends the number after the file extension, but it should be appended before the file extension.
• If you want to match the behavior with Explorer, the hyphen in front of the number is not necessary.
• This change should only be applied when copying files to a folder different from the source. The behavior when pasting into the same folder should not be changed from the current behavior. (- Copy, - Copy (2), - Copy (3), ...)

[ashrafmansuri]

Few feedback on the formatting! :)

Thank you :) working on it as soon as I get home.

[ashrafmansuri]

• Your PR appends the number after the file extension, but it should be appended before the file extension.

• If you want to match the behavior with Explorer, the hyphen in front of the number is not necessary.

• This change should only be applied when copying files to a folder different from the source. The behavior when pasting into the same folder should not be changed from the current behavior. (- Copy, - Copy (2), - Copy (3), ...)

Understood! Gonna make the necessary changes :)

[ashrafmansuri]

I have made a commit. Looks fine for a file but not a directory. working on it mean while let me know if there are any suggestions.

[ashrafmansuri]

The last commit seems to be working as expected. Please review and let me know if there are any suggestions. Thank you :)

[ashrafmansuri]

Thank you for the suggestions :)

[0x5bfa]

Some suggestions for codebase quality.

Here's too:
#15267 (comment)

[ashrafmansuri]

Test might be failing because it apparently copies in same directory. So by default it appends - Copy in the end.

[hishitetsu]

It works well! There are a few more things in terms of code quality.

[ashrafmansuri]

It works well! There are a few more things in terms of code quality.

I was thinking whether I should declare a variable or directly call the function? My only deciding factor was declaring variable in this case makes it more easy to read. What do you suggest?

[hishitetsu]

I was thinking whether I should declare a variable or directly call the function? My only deciding factor was declaring variable in this case makes it more easy to read. What do you suggest?

Are you talking about Func<int, string> genFilePath? I think it's fine.

[ashrafmansuri]

I was thinking whether I should declare a variable or directly call the function? My only deciding factor was declaring variable in this case makes it more easy to read. What do you suggest?

Are you talking about Func<int, string> genFilePath? I think it's fine.

Oh no no I was saying about var fileName.

[hishitetsu]

Oh no no I was saying about var fileName.

There is no problem as it is 👍

[ashrafmansuri]

Oh no no I was saying about var fileName.

There is no problem as it is 👍

Alright! Thank you so much! I have committed suggested changes!

[hishitetsu]

Thank you! LGTM

[hishitetsu]

@ashrafmansuri there are lines with extra spaces, please remove them if you have time.

[ashrafmansuri]

@ashrafmansuri there are lines with extra spaces, please remove them if you have time.

Done! Thanks! 👍

[yaira2]

Nice work! Thank you for contributing to Files.

[ashrafmansuri]

Nice work! Thank you for contributing to Files.

Thank you! My pleasure! ✌🏻