From 32fcd80a66923544f5e6ebc1bb27dbebb9a162e6 Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Fri, 13 Jun 2025 21:02:07 +0300 Subject: [PATCH] added createdDefaultUser --- src/core/user_account.cpp | 22 ++++++++++++++++++++-- src/core/user_account.h | 1 + src/main.cpp | 3 +++ src/qt_gui/main.cpp | 7 ++----- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/core/user_account.cpp b/src/core/user_account.cpp index 83bd9bf4c..bbf703fe2 100644 --- a/src/core/user_account.cpp +++ b/src/core/user_account.cpp @@ -14,8 +14,8 @@ user_account::user_account(const std::string& user_id) { // Setting userId. m_user_id = user_id; - m_user_dir = Common::FS::GetUserPathString(Common::FS::PathType::HomeDir) + "/" + - Config::getDefaultUserId() + "/"; + m_user_dir = + Common::FS::GetUserPathString(Common::FS::PathType::HomeDir) + "/" + m_user_id + "/"; Common::FS::IOFile userfile(m_user_dir + "localuser.json", Common::FS::FileAccessMode::Read); if (userfile.IsOpen()) { @@ -40,3 +40,21 @@ std::map user_account::GetUserAccounts(const std::string& bas return user_list; } + +void user_account::createdDefaultUser() { + const auto& default_user_dir = + Common::FS::GetUserPath(Common::FS::PathType::HomeDir) / Config::getDefaultUserId(); + if (!std::filesystem::exists(default_user_dir)) { + std::filesystem::create_directory(default_user_dir); + Common::FS::IOFile userfile(default_user_dir / "localuser.json", + Common::FS::FileAccessMode::Write); + nlohmann::json jsonfile; + + // Assign values + jsonfile["username"] = "shadps4"; + + std::string jsonStr = jsonfile.dump(4); + userfile.WriteString(jsonStr); + userfile.Close(); + } +} diff --git a/src/core/user_account.h b/src/core/user_account.h index 1689c416d..fb965c0a3 100644 --- a/src/core/user_account.h +++ b/src/core/user_account.h @@ -21,6 +21,7 @@ public: } static std::map GetUserAccounts(const std::string& base_dir); + static void createdDefaultUser(); private: std::string m_user_id; diff --git a/src/main.cpp b/src/main.cpp index fe245d104..931709cdc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,6 +7,7 @@ #include "system_error" #include "unordered_map" +#include #include #include "common/config.h" #include "common/memory_patcher.h" @@ -27,6 +28,8 @@ int main(int argc, char* argv[]) { const auto user_dir = Common::FS::GetUserPath(Common::FS::PathType::UserDir); Config::load(user_dir / "config.toml"); + user_account::createdDefaultUser(); + bool has_game_argument = false; std::string game_path; std::vector game_args{}; diff --git a/src/qt_gui/main.cpp b/src/qt_gui/main.cpp index a527874ee..0fe2325f0 100644 --- a/src/qt_gui/main.cpp +++ b/src/qt_gui/main.cpp @@ -5,6 +5,7 @@ #include "system_error" #include "unordered_map" +#include #include "common/config.h" #include "common/memory_patcher.h" #include "core/file_sys/fs.h" @@ -32,11 +33,7 @@ int main(int argc, char* argv[]) { const auto user_dir = Common::FS::GetUserPath(Common::FS::PathType::UserDir); Config::load(user_dir / "config.toml"); - const auto& default_user_dir = - Common::FS::GetUserPath(Common::FS::PathType::HomeDir) / Config::getDefaultUserId(); - if (!std::filesystem::exists(default_user_dir)) { - std::filesystem::create_directory(default_user_dir); - } + user_account::createdDefaultUser(); bool has_command_line_argument = argc > 1; bool show_gui = false, has_game_argument = false;