RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 12:12:50 +01:00
Code Issues Releases Wiki Activity

sys: fix games.yml hdd paths

Browse Source
This commit is contained in:
Megamouse 2024-01-01 23:59:27 +01:00
parent d6dde225bd
commit d03393ffe9
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Utilities/StrFmt.cpp
View File

@ -612,7 +612,7 @@ std::vector<std::string> fmt::split(std::string_view source, std::initializer_li
std::string fmt::trim(const std::string& source, std::string_view values) std::string fmt::trim(const std::string& source, std::string_view values)
{ {
usz begin = source.find_first_not_of(values); const usz begin = source.find_first_not_of(values);
if (begin == source.npos) if (begin == source.npos)
return {}; return {};
@ -620,6 +620,16 @@ std::string fmt::trim(const std::string& source, std::string_view values)
return source.substr(begin, source.find_last_not_of(values) + 1); return source.substr(begin, source.find_last_not_of(values) + 1);
} }
std::string fmt::trim_front(const std::string& source, std::string_view values)
{
const usz begin = source.find_first_not_of(values);
if (begin == source.npos)
return {};
return source.substr(begin);
}
void fmt::trim_back(std::string& source, std::string_view values) void fmt::trim_back(std::string& source, std::string_view values)
{ {
const usz index = source.find_last_not_of(values); const usz index = source.find_last_not_of(values);

1
Utilities/StrUtil.h
View File

@ -125,6 +125,7 @@ namespace fmt
std::vector<std::string> split(std::string_view source, std::initializer_list<std::string_view> separators, bool is_skip_empty = true); std::vector<std::string> split(std::string_view source, std::initializer_list<std::string_view> separators, bool is_skip_empty = true);
std::string trim(const std::string& source, std::string_view values = " \t"); std::string trim(const std::string& source, std::string_view values = " \t");
std::string trim_front(const std::string& source, std::string_view values = " \t");
void trim_back(std::string& source, std::string_view values = " \t"); void trim_back(std::string& source, std::string_view values = " \t");
template <typename T> template <typename T>

17
rpcs3/Emu/System.cpp
View File

@ -1269,14 +1269,14 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
if (argv[0].starts_with(game0_path) && !fs::is_file(vfs::get(argv[0]))) if (argv[0].starts_with(game0_path) && !fs::is_file(vfs::get(argv[0])))
{ {
std::string title_id = argv[0].substr(game0_path.size()); std::string dirname = argv[0].substr(game0_path.size());
title_id = title_id.substr(0, title_id.find_first_of('/')); dirname = dirname.substr(0, dirname.find_first_of('/'));
// Try to load game directory from list if available // Try to load game directory from list if available
if (std::string game_path = m_games_config.get_path(m_title_id); !game_path.empty()) if (std::string game_path = m_games_config.get_path(m_title_id); !game_path.empty())
{ {
disc = std::move(game_path); disc = std::move(game_path);
m_path = disc + argv[0].substr(game0_path.size() + title_id.size()); m_path = disc + argv[0].substr(game0_path.size() + dirname.size());
} }
} }
} }
@ -1761,7 +1761,9 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
// PS1 Classic located in dev_hdd0/game // PS1 Classic located in dev_hdd0/game
sys_log.notice("PS1 Game: %s, %s", m_title_id, m_title); sys_log.notice("PS1 Game: %s, %s", m_title_id, m_title);
const std::string game_path = "/dev_hdd0/game/" + m_path.substr(hdd0_game.size(), 9); const std::string tail = m_path.substr(hdd0_game.size());
const std::string dirname = fmt::trim_front(tail, fs::delim).substr(0, tail.find_first_of(fs::delim));
const std::string game_path = "/dev_hdd0/game/" + dirname;
argv.resize(9); argv.resize(9);
argv[0] = "/dev_flash/ps1emu/ps1_newemu.self"; argv[0] = "/dev_flash/ps1emu/ps1_newemu.self";
@ -1787,7 +1789,9 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
// PSP Remaster located in dev_hdd0/game // PSP Remaster located in dev_hdd0/game
sys_log.notice("PSP Remaster Game: %s, %s", m_title_id, m_title); sys_log.notice("PSP Remaster Game: %s, %s", m_title_id, m_title);
const std::string game_path = "/dev_hdd0/game/" + m_path.substr(hdd0_game.size(), 9); const std::string tail = m_path.substr(hdd0_game.size());
const std::string dirname = fmt::trim_front(tail, fs::delim).substr(0, tail.find_first_of(fs::delim));
const std::string game_path = "/dev_hdd0/game/" + dirname;
argv.resize(2); argv.resize(2);
argv[0] = "/dev_flash/pspemu/psp_emulator.self"; argv[0] = "/dev_flash/pspemu/psp_emulator.self";
@ -1804,7 +1808,8 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
// Add HG games not in HDD0 to games.yml // Add HG games not in HDD0 to games.yml
[[maybe_unused]] const bool res = m_games_config.add_external_hdd_game(m_title_id, game_dir); [[maybe_unused]] const bool res = m_games_config.add_external_hdd_game(m_title_id, game_dir);
vfs::mount("/dev_hdd0/game/" + m_title_id, game_dir + '/'); const std::string dir = fmt::trim(game_dir.substr(fs::get_parent_dir_view(game_dir).size() + 1), fs::delim);
vfs::mount("/dev_hdd0/game/" + dir, game_dir + '/');
} }
} }
else if (!inherited_ps3_game_path.empty() || (from_hdd0_game && m_cat == "DG" && disc.empty())) else if (!inherited_ps3_game_path.empty() || (from_hdd0_game && m_cat == "DG" && disc.empty()))

2
rpcs3/Emu/games_config.cpp
View File

@ -97,7 +97,7 @@ bool games_config::save_nl()
fs::pending_file temp(fs::get_config_dir() + "/games.yml"); fs::pending_file temp(fs::get_config_dir() + "/games.yml");
if (temp.file && temp.file.write(out.c_str(), out.size()), temp.commit()) if (temp.file && temp.file.write(out.c_str(), out.size()) >= out.size() && temp.commit())
{ {
m_dirty = false; m_dirty = false;
return true; return true;