godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #71599 from Faless/web/4.x_userfs_path 

[Web] User FS (user://) now correctly uses project name.
This commit is contained in:
Rémi Verschelde 2023-01-18 17:32:25 +01:00
parent b143e03597 4707e78d6d
commit 30ba2c0629
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
platform/web/os_web.cpp
View File

@ -30,6 +30,7 @@
#include "os_web.h" #include "os_web.h"
#include "core/config/project_settings.h"
#include "core/debugger/engine_debugger.h" #include "core/debugger/engine_debugger.h"
#include "drivers/unix/dir_access_unix.h" #include "drivers/unix/dir_access_unix.h"
#include "drivers/unix/file_access_unix.h" #include "drivers/unix/file_access_unix.h"
@ -157,7 +158,22 @@ void OS_Web::vibrate_handheld(int p_duration_ms) {
} }
String OS_Web::get_user_data_dir() const { String OS_Web::get_user_data_dir() const {
return "/userfs"; String userfs = "/userfs";
String appname = get_safe_dir_name(GLOBAL_GET("application/config/name"));
if (!appname.is_empty()) {
bool use_custom_dir = GLOBAL_GET("application/config/use_custom_user_dir");
if (use_custom_dir) {
String custom_dir = get_safe_dir_name(GLOBAL_GET("application/config/custom_user_dir_name"), true);
if (custom_dir.is_empty()) {
custom_dir = appname;
}
return userfs.path_join(custom_dir).replace("\\", "/");
} else {
return userfs.path_join(get_godot_dir_name()).path_join("app_userdata").path_join(appname).replace("\\", "/");
}
}
return userfs.path_join(get_godot_dir_name()).path_join("app_userdata").path_join("[unnamed project]");
} }
String OS_Web::get_cache_path() const { String OS_Web::get_cache_path() const {