nx: rescan user accounts on opendir in save, option to skip converting to ascii for save zips.

ITotalJustice · ITotalJustice · commit c6aa52255e88 · 2025-07-30T17:53:21.000+01:00
fixes #11
diff --git a/assets/config.ini.template b/assets/config.ini.template
@@ -49,6 +49,9 @@ mount_bis = 0
 # enables led on the controller to light flash
 led = 0
 
+# set to disable convert non-ascii characters to _
+skip_ascii_convert = 0
+
 # options specific to Nintendo Switch App
 [Nx-App]
 ; anon = 0
diff --git a/src/platform/nx/main.c b/src/platform/nx/main.c
@@ -154,6 +154,7 @@ int main(int argc, char** argv) {
     bool mount_bis = ini_getbool("Nx", "mount_bis", 0, INI_PATH);
     bool save_writable = ini_getbool("Nx", "save_writable", 0, INI_PATH);
     g_led_enabled = ini_getbool("Nx", "led", 1, INI_PATH);
+    bool skip_ascii_convert = ini_getbool("Nx", "skip_ascii_convert", 0, INI_PATH);
     g_ftpsrv_config.port = ini_getl("Nx", "app_port", g_ftpsrv_config.port, INI_PATH); // compat
 
     // get Nx-App overrides
@@ -187,7 +188,7 @@ int main(int argc, char** argv) {
         return error_loop("failed to get current ip address");
     }
 
-    vfs_nx_init(NULL, mount_devices, save_writable, mount_bis);
+    vfs_nx_init(NULL, mount_devices, save_writable, mount_bis, skip_ascii_convert);
 
     const struct in_addr addr = {ip};
     printf(TEXT_YELLOW "ip: %s\n", inet_ntoa(addr));
diff --git a/src/platform/nx/main_sysmod.c b/src/platform/nx/main_sysmod.c
@@ -45,6 +45,7 @@ int main(void) {
     bool mount_bis = ini_getbool("Nx", "mount_bis", 0, INI_PATH);
     bool save_writable = ini_getbool("Nx", "save_writable", 0, INI_PATH);
     g_led_enabled = ini_getbool("Nx", "led", 1, INI_PATH);
+    bool skip_ascii_convert = ini_getbool("Nx", "skip_ascii_convert", 0, INI_PATH);
     g_ftpsrv_config.port = ini_getl("Nx", "sys_port", g_ftpsrv_config.port, INI_PATH); // compat
 
     // get Nx-Sys overrides
@@ -70,7 +71,7 @@ int main(void) {
         return EXIT_FAILURE;
     }
 
-    vfs_nx_init(NULL, mount_devices, save_writable, mount_bis);
+    vfs_nx_init(NULL, mount_devices, save_writable, mount_bis, skip_ascii_convert);
 
     int timeout = -1;
     if (g_ftpsrv_config.timeout) {
diff --git a/src/platform/nx/vfs/vfs_nx_save.c b/src/platform/nx/vfs/vfs_nx_save.c
@@ -429,59 +429,6 @@ static struct SaveAcc g_acc_profile[12];
 static s32 g_acc_count;
 static bool g_writable;
 
-// list of all characters that are invalid for fat,
-// these are coverted to "_"
-static const char INVALID_CHAR_TABLE[] = {
-    '<',
-    '>',
-    ':',
-    '"',
-    '/',
-    '\\',
-    '|',
-    '?',
-    '*',
-    '.',
-    ',',
-    ';',
-    '+',
-    '=',
-    '&',
-    '%', // probably invalid
-};
-
-static void make_zip_string_valid(char* str) {
-    for (int i = 0; str[i]; i++) {
-        const unsigned char c = str[i];
-        const unsigned char c2 = str[i + 1];
-        if (c < 0x20 || c >= 0x80) {
-            if (c == 195 && c2 == 169) {
-                str[i + 1] = 'e';
-                memcpy(str + i, str + i + 1, strlen(str) - i);
-            } else if (c == 226 && c2 == 128 && (unsigned char)str[i + 2] == 153) {
-                str[i + 2] = '\'';
-                memcpy(str + i, str + i + 2, strlen(str) - i);
-            } else {
-                str[i] = '_';
-            }
-        } else {
-            for (int j = 0; j < ARRAY_SIZE(INVALID_CHAR_TABLE); j++) {
-                if (c == INVALID_CHAR_TABLE[j]) {
-                    // see what the next character is
-                    if (str[i + 1] == '\0') {
-                        str[i] = '\0';
-                    } else if (str[i + 1] != ' ') {
-                        str[i] = '_';
-                    } else {
-                        memcpy(str + i, str + i + 1, strlen(str) - i);
-                    }
-                    break;
-                }
-            }
-        }
-    }
-}
-
 static FsFileSystem* mount_save_fs(const struct SavePathData* d) {
     for (int i = 0; i < ARRAY_SIZE(g_save_cache); i++) {
         struct SaveCacheEntry* entry = &g_save_cache[i];
@@ -613,6 +560,40 @@ static void build_native_path(char out[FS_MAX_PATH], const char* path, const str
     }
 }
 
+static void rescan_users(void) {
+    memset(g_acc_profile, 0, sizeof(g_acc_profile));
+    g_acc_count = 0;
+
+    AccountUid uids[8];
+    s32 count;
+    Result rc;
+    if (R_FAILED(rc = accountListAllUsers(uids, 8, &count))) {
+        log_file_fwrite("failed: accountListAllUsers() 0x%X\n", rc);
+    } else {
+        for (int i = 0; i < count; i++) {
+            AccountProfile profile;
+            if (R_FAILED(rc = accountGetProfile(&profile, uids[i]))) {
+                log_file_fwrite("failed: accountGetProfile() 0x%X\n", rc);
+            } else {
+                AccountProfileBase base;
+                if (R_FAILED(rc = accountProfileGet(&profile, NULL, &base))) {
+                    log_file_fwrite("failed: accountProfileGet() 0x%X\n", rc);
+                } else {
+                    strcpy(g_acc_profile[g_acc_count].name, base.nickname);
+                    g_acc_profile[g_acc_count].uid = uids[i];
+                    g_acc_count++;
+                }
+                accountProfileClose(&profile);
+            }
+        }
+    }
+
+    strcpy(g_acc_profile[g_acc_count++].name, "bcat");
+    strcpy(g_acc_profile[g_acc_count++].name, "cache");
+    strcpy(g_acc_profile[g_acc_count++].name, "device");
+    strcpy(g_acc_profile[g_acc_count++].name, "system");
+}
+
 static int vfs_save_open(void* user, const char* path, enum FtpVfsOpenMode mode) {
     struct VfsSaveFile* f = user;
     f->data = get_type(path);
@@ -727,6 +708,9 @@ static int vfs_save_opendir(void* user, const char* path) {
         default: return -1;
 
         case SaveDirType_Root:
+            rescan_users();
+            break;
+
         case SaveDirType_User1:
             break;
 
@@ -822,7 +806,7 @@ static const char* vfs_save_readdir(void* user, void* user_entry) {
                 snprintf(entry->name, sizeof(entry->name), "[%016lX]%s", entry->info.application_id, ext);
             } else {
                 if (f->data.type == SaveDirType_Zip) {
-                    make_zip_string_valid(name.str);
+                    utilsReplaceIllegalCharacters(name.str, true);
                 }
                 snprintf(entry->name, sizeof(entry->name), "%s [%016lX]%s", name.str, entry->info.application_id, ext);
             }
@@ -1023,35 +1007,7 @@ static int vfs_save_rename(const char* src, const char* dst) {
 
 void vfs_save_init(bool save_writable) {
     g_writable = save_writable;
-
-    AccountUid uids[8];
-    s32 count;
-    Result rc;
-    if (R_FAILED(rc = accountListAllUsers(uids, 8, &count))) {
-        log_file_fwrite("failed: accountListAllUsers() 0x%X\n", rc);
-    } else {
-        for (int i = 0; i < count; i++) {
-            AccountProfile profile;
-            if (R_FAILED(rc = accountGetProfile(&profile, uids[i]))) {
-                log_file_fwrite("failed: accountGetProfile() 0x%X\n", rc);
-            } else {
-                AccountProfileBase base;
-                if (R_FAILED(rc = accountProfileGet(&profile, NULL, &base))) {
-                    log_file_fwrite("failed: accountProfileGet() 0x%X\n", rc);
-                } else {
-                    strcpy(g_acc_profile[g_acc_count].name, base.nickname);
-                    g_acc_profile[g_acc_count].uid = base.uid;
-                    g_acc_count++;
-                }
-                accountProfileClose(&profile);
-            }
-        }
-    }
-
-    strcpy(g_acc_profile[g_acc_count++].name, "bcat");
-    strcpy(g_acc_profile[g_acc_count++].name, "cache");
-    strcpy(g_acc_profile[g_acc_count++].name, "device");
-    strcpy(g_acc_profile[g_acc_count++].name, "system");
+    rescan_users();
 }
 
 void vfs_save_exit(void) {
@@ -1064,6 +1020,9 @@ void vfs_save_exit(void) {
             fsFsClose(&entry->fs);
         }
     }
+
+    memset(g_acc_profile, 0, sizeof(g_acc_profile));
+    g_acc_count = 0;
 }
 
 const FtpVfs g_vfs_save = {
diff --git a/src/platform/nx/vfs_nx.c b/src/platform/nx/vfs_nx.c
@@ -21,6 +21,7 @@ static NcmContentMetaDatabase g_db[NCM_SIZE];
 static struct VfsDeviceEntry g_device[DEVICE_NUM];
 static enum VFS_TYPE g_device_type[DEVICE_NUM];
 static u32 g_device_count;
+static bool g_skip_ascii_convert = false;
 
 static const FtpVfs* g_vfs[] = {
     [VFS_TYPE_NONE] = &g_vfs_none,
@@ -289,6 +290,50 @@ Result get_app_name(u64 app_id, NcmContentId* id, struct AppName* name) {
     return rc;
 }
 
+// taken from nxdumptool.
+void utilsReplaceIllegalCharacters(char *str, bool ascii_only)
+{
+    static const char g_illegalFileSystemChars[] = "\\/:*?\"<>|";
+
+    if (g_skip_ascii_convert) {
+        return;
+    }
+
+    size_t str_size = 0, cur_pos = 0;
+
+    if (!str || !(str_size = strlen(str))) return;
+
+    u8 *ptr1 = (u8*)str, *ptr2 = ptr1;
+    ssize_t units = 0;
+    u32 code = 0;
+    bool repl = false;
+
+    while(cur_pos < str_size)
+    {
+        units = decode_utf8(&code, ptr1);
+        if (units < 0) break;
+
+        if (code < 0x20 || (!ascii_only && code == 0x7F) || (ascii_only && code >= 0x7F) || \
+            (units == 1 && memchr(g_illegalFileSystemChars, (int)code, sizeof(g_illegalFileSystemChars))))
+        {
+            if (!repl)
+            {
+                *ptr2++ = '_';
+                repl = true;
+            }
+        } else {
+            if (ptr2 != ptr1) memmove(ptr2, ptr1, (size_t)units);
+            ptr2 += units;
+            repl = false;
+        }
+
+        ptr1 += units;
+        cur_pos += (size_t)units;
+    }
+
+    *ptr2 = '\0';
+}
+
 struct MountEntry {
     const char* name;
     FsBisPartitionId id;
@@ -301,8 +346,10 @@ static const struct MountEntry BIS_NAMES[] = {
     { "bis_system", FsBisPartitionId_System },
 };
 
-void vfs_nx_init(const struct VfsNxCustomPath* custom, bool enable_devices, bool save_writable, bool mount_bis) {
+void vfs_nx_init(const struct VfsNxCustomPath* custom, bool enable_devices, bool save_writable, bool mount_bis, bool skip_ascii_convert) {
     g_enabled_devices = enable_devices;
+    g_skip_ascii_convert = skip_ascii_convert;
+
     if (g_enabled_devices) {
         vfs_nx_add_device("sdmc", VFS_TYPE_FS);
 
diff --git a/src/platform/nx/vfs_nx.h b/src/platform/nx/vfs_nx.h
@@ -163,13 +163,16 @@ struct VfsNxCustomPath {
     FtpVfs* func;
 };
 
-void vfs_nx_init(const struct VfsNxCustomPath* custom, bool enable_devices, bool save_writable, bool mount_bis);
+void vfs_nx_init(const struct VfsNxCustomPath* custom, bool enable_devices, bool save_writable, bool mount_bis, bool skip_ascii_convert);
 void vfs_nx_exit(void);
 void vfs_nx_add_device(const char* name, enum VFS_TYPE type);
 
 Result get_app_name(u64 app_id, NcmContentId* id, struct AppName* name);
 Result get_app_name2(u64 app_id, NcmContentMetaDatabase* db, NcmContentStorage* cs, NcmContentId* id, struct AppName* name);
 
+// taken from nxdumptool.
+void utilsReplaceIllegalCharacters(char *str, bool ascii_only);
+
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
 
 #ifdef __cplusplus
