octo/yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Typing and formatting errors fixed.

Browse Source
This commit is contained in:
boludoz
2023-10-15 20:57:06 -03:00
parent 4d4fe69223
commit 9ffa1801c7
6 changed files with 43 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/common/fs/fs_util.cpp
View File

@ -36,21 +36,21 @@ std::string PathToUTF8String(const std::filesystem::path& path) {
return ToUTF8String(path.u8string());
}
std::u8string U8FilenameSantizer(const std::u8string_view u8filename) {
std::u8string u8path_santized{u8filename.begin(), u8filename.end()};
size_t eSizeSanitized = u8path_santized.size();
std::u8string U8FilenameSanitizer(const std::u8string_view u8filename) {
std::u8string u8path_sanitized{u8filename.begin(), u8filename.end()};
size_t eSizeSanitized = u8path_sanitized.size();
// Special case for ":", for example: 'Pepe: La secuela' --> 'Pepe - La
// secuela' or 'Pepe : La secuela' --> 'Pepe - La secuela'
// The name is improved to make it look more beautiful and prohibited characters and shapes are
// removed. Switch is used since it is better with many conditions.
for (size_t i = 0; i < eSizeSanitized; i++) {
switch (u8path_santized[i]) {
switch (u8path_sanitized[i]) {
case u8':':
if (i == 0 || i == eSizeSanitized - 1) {
u8path_santized.replace(i, 1, u8"_");
} else if (u8path_santized[i - 1] == u8' ') {
u8path_santized.replace(i, 1, u8"-");
u8path_sanitized.replace(i, 1, u8"_");
} else if (u8path_sanitized[i - 1] == u8' ') {
u8path_sanitized.replace(i, 1, u8"-");
} else {
u8path_santized.replace(i, 1, u8" -");
u8path_sanitized.replace(i, 1, u8" -");
eSizeSanitized++;
}
break;
@ -63,36 +63,36 @@ std::u8string U8FilenameSantizer(const std::u8string_view u8filename) {
case u8'>':
case u8'|':
case u8'\0':
u8path_santized.replace(i, 1, u8"_");
u8path_sanitized.replace(i, 1, u8"_");
break;
default:
break;
}
}
// Delete duplicated spaces || Delete duplicated dots (MacOS i think)
// Delete duplicated spaces and dots
for (size_t i = 0; i < eSizeSanitized - 1; i++) {
if ((u8path_santized[i] == u8' ' && u8path_santized[i + 1] == u8' ') ||
(u8path_santized[i] == u8'.' && u8path_santized[i + 1] == u8'.')) {
u8path_santized.erase(i, 1);
if ((u8path_sanitized[i] == u8' ' && u8path_sanitized[i + 1] == u8' ') ||
(u8path_sanitized[i] == u8'.' && u8path_sanitized[i + 1] == u8'.')) {
u8path_sanitized.erase(i, 1);
i--;
}
}
// Delete all spaces and dots at the end (Windows almost)
while (u8path_santized.back() == u8' ' || u8path_santized.back() == u8'.') {
u8path_santized.pop_back();
// Delete all spaces and dots at the end of the name
while (u8path_sanitized.back() == u8' ' || u8path_sanitized.back() == u8'.') {
u8path_sanitized.pop_back();
}
if (u8path_santized.empty()) {
if (u8path_sanitized.empty()) {
return u8"";
}
return u8path_santized;
return u8path_sanitized;
}
std::string UTF8FilenameSantizer(const std::string_view filename) {
return ToUTF8String(U8FilenameSantizer(ToU8String(filename)));
std::string UTF8FilenameSanitizer(const std::string_view filename) {
return ToUTF8String(U8FilenameSanitizer(ToU8String(filename)));
}
} // namespace Common::FS