ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2531 from Trial97/relax_fat

Browse Source 
relax fat FS filename restrictions
This commit is contained in:
Alexandru Ionut Tripon 2024-06-18 12:51:22 +03:00 committed by GitHub
commit 3f68b68691
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
launcher/FileSystem.cpp
View File

@ -815,20 +815,11 @@ QString NormalizePath(QString path)
} }
} }
QString removeDuplicates(QString a) static const QString BAD_WIN_CHARS = "<>:\"|?*\r\n";
{
auto b = a.split("");
b.removeDuplicates();
return b.join("");
}
static const QString BAD_WIN_CHARS = "\"?<>:*|\r\n";
static const QString BAD_FAT_CHARS = "<>:\"|?*+.,;=[]!";
static const QString BAD_NTFS_CHARS = "<>:\"|?*"; static const QString BAD_NTFS_CHARS = "<>:\"|?*";
static const QString BAD_HFS_CHARS = ":"; static const QString BAD_HFS_CHARS = ":";
static const QString BAD_FILENAME_CHARS = removeDuplicates(BAD_WIN_CHARS + BAD_FAT_CHARS + BAD_NTFS_CHARS + BAD_HFS_CHARS) + "\\/"; static const QString BAD_FILENAME_CHARS = BAD_WIN_CHARS + "\\/";
QString RemoveInvalidFilenameChars(QString string, QChar replaceWith) QString RemoveInvalidFilenameChars(QString string, QChar replaceWith)
{ {
@ -847,9 +838,8 @@ QString RemoveInvalidPathChars(QString path, QChar replaceWith)
// the null character is ignored in this check as it was not a problem until now // the null character is ignored in this check as it was not a problem until now
switch (statFS(path).fsType) { switch (statFS(path).fsType) {
case FilesystemType::FAT: case FilesystemType::FAT: // similar to NTFS
invalidChars += BAD_FAT_CHARS; /* fallthrough */
break;
case FilesystemType::NTFS: case FilesystemType::NTFS:
/* fallthrough */ /* fallthrough */
case FilesystemType::REFS: // similar to NTFS(should be available only on windows) case FilesystemType::REFS: // similar to NTFS(should be available only on windows)