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

WIP: Normalize file names before using them as keys #12002

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

erikjv
Copy link
Collaborator

@erikjv erikjv commented Dec 4, 2024

No description provided.

@erikjv erikjv self-assigned this Dec 4, 2024
@erikjv erikjv marked this pull request as draft December 4, 2024 15:12
@erikjv erikjv force-pushed the work/fix-filename-normalization2 branch 3 times, most recently from dd40586 to 039c965 Compare December 5, 2024 16:45
@erikjv erikjv force-pushed the work/fix-filename-normalization2 branch from 039c965 to 3641217 Compare December 18, 2024 18:55
@@ -545,6 +545,9 @@ Folder *FolderMan::addFolderInternal(
Folder *FolderMan::folderForPath(const QString &path, QString *relativePath)
{
QString absolutePath = QDir::cleanPath(path) + QLatin1Char('/');
if (!Utility::isLinux()) {
Copy link
Member

Choose a reason for hiding this comment

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

Out of curiosity: why not use an ifdef? These are all ifs which never change at runtime.

erikjv and others added 3 commits December 19, 2024 12:12
On macOS the filenames on disk are stored in NFD form. When the original
filename on the server was in NFC form, the filenames wouldn't match,
and a MOVE or DELETE+PUT would be triggered.

This changes converts all filenames to NFC form during local discovery.
@DeepDiver1975 DeepDiver1975 force-pushed the work/fix-filename-normalization2 branch from 3641217 to 526a4a7 Compare December 19, 2024 11:14
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