Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #5876 - Fix filename conflict issue by appending numbers in parentheses #5892

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

junnzhuu
Copy link

This PR resolves issue #5876 by modifying the filename conflict resolution.
Previously, numbers were appended directly to filenames which could alter their meaning.
Now, the numbers are enclosed in parentheses to avoid changing the original meaning.

Changes made:

  • Modified findUniqueFileName in UploadWorker.kt to append sequence numbers in parentheses.
  • Updated regular expression handling to support filenames with and without extensions.

Tested the changes with multiple uploads, and filenames are now correctly generated.

@nicolas-raoul
Copy link
Member

Sorry @junnzhuu the code that generates the number changed a bit, which means there is now a conflict...
Would you mind solving the conflict? I will then be able to merge. :-)
Thanks for your understanding!

Copy link
Member

@nicolas-raoul nicolas-raoul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

conflict

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants