Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-12 20:55:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

use json to read local file

Browse source
This commit is contained in:
georgemoralis 2025-06-13 19:10:42 +03:00
parent 4bccf7a2db
commit 7b0d6c4bf8
5 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -106,3 +106,6 @@
[submodule "externals/libusb"] [submodule "externals/libusb"]
path = externals/libusb path = externals/libusb
url = https://github.com/libusb/libusb-cmake.git url = https://github.com/libusb/libusb-cmake.git
[submodule "externals/json"]
path = externals/json
url = https://github.com/nlohmann/json.git

2
CMakeLists.txt
View file

@ -1104,7 +1104,7 @@ endif()
create_target_directory_groups(shadps4) create_target_directory_groups(shadps4)
target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 tsl::robin_map xbyak::xbyak Tracy::TracyClient RenderDoc::API FFmpeg::ffmpeg Dear_ImGui gcn half::half ZLIB::ZLIB PNG::PNG) target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 tsl::robin_map xbyak::xbyak Tracy::TracyClient RenderDoc::API FFmpeg::ffmpeg Dear_ImGui gcn half::half ZLIB::ZLIB PNG::PNG)
target_link_libraries(shadps4 PRIVATE Boost::headers GPUOpen::VulkanMemoryAllocator LibAtrac9 sirit Vulkan::Headers xxHash::xxhash Zydis::Zydis glslang::glslang SDL3::SDL3 pugixml::pugixml stb::headers libusb::usb) target_link_libraries(shadps4 PRIVATE Boost::headers GPUOpen::VulkanMemoryAllocator LibAtrac9 sirit Vulkan::Headers xxHash::xxhash Zydis::Zydis glslang::glslang SDL3::SDL3 pugixml::pugixml stb::headers libusb::usb nlohmann_json::nlohmann_json)
target_compile_definitions(shadps4 PRIVATE IMGUI_USER_CONFIG="imgui/imgui_config.h") target_compile_definitions(shadps4 PRIVATE IMGUI_USER_CONFIG="imgui/imgui_config.h")
target_compile_definitions(Dear_ImGui PRIVATE IMGUI_USER_CONFIG="${PROJECT_SOURCE_DIR}/src/imgui/imgui_config.h") target_compile_definitions(Dear_ImGui PRIVATE IMGUI_USER_CONFIG="${PROJECT_SOURCE_DIR}/src/imgui/imgui_config.h")

4
externals/CMakeLists.txt vendored
View file

@ -230,3 +230,7 @@ if (APPLE)
add_subdirectory(MoltenVK) add_subdirectory(MoltenVK)
endif() endif()
endif() endif()
#nlohmann json
set(JSON_BuildTests OFF CACHE INTERNAL "")
add_subdirectory(json)

1
externals/json vendored Submodule

@ -0,0 +1 @@
Subproject commit 568b708fd46deeb23a959381393a7564f1586588

26
src/core/user_account.cpp
View file

@ -2,12 +2,36 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <filesystem> #include <filesystem>
#include <common/io_file.h>
#include <common/path_util.h>
#include <nlohmann/json.hpp>
#include "common/config.h"
#include "user_account.h" #include "user_account.h"
using json = nlohmann::json;
user_account::user_account(const std::string& user_id) { user_account::user_account(const std::string& user_id) {
// Setting userId. // Setting userId.
m_user_id = user_id; m_user_id = user_id;
// TODO
m_user_dir = Common::FS::GetUserPathString(Common::FS::PathType::HomeDir) + "/" +
Config::getDefaultUserId() + "/";
Common::FS::IOFile userfile(m_user_dir + "localuser.json", Common::FS::FileAccessMode::Read);
if (userfile.IsOpen()) {
nlohmann::json jsonfile;
try {
jsonfile = nlohmann::json::parse(userfile.ReadString(userfile.GetSize()));
} catch (const nlohmann::json::parse_error& e) {
// TODO error code
}
userfile.Close();
m_username = jsonfile.value("username", "shadps4");
if (m_username.length() > 16) // max of 16 chars allowed
{
m_username = m_username.substr(0, 16); // substring 16 only characters to display
}
}
} }
std::map<u32, user_account> user_account::GetUserAccounts(const std::string& base_dir) { std::map<u32, user_account> user_account::GetUserAccounts(const std::string& base_dir) {