dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-07-10 01:44:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix double path delimiter (#18923)

Browse Source 
A cosmetic fix. It removes a double delimiter at the end of a path in
`games.yml` when using `VFS games` path.
This commit is contained in:
Antonino Di Guardo 2026-06-21 19:38:03 +02:00 committed by GitHub
parent efc9a1a668
commit 2af7b58ce4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Utilities/StrFmt.cpp
View File

@ -921,6 +921,13 @@ std::string_view fmt::trim_front_sv(std::string_view source, std::string_view va
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);
if (index == source.npos)
{
source.clear();
return;
}
source.resize(index + 1); source.resize(index + 1);
} }

14
rpcs3/Emu/System.cpp
View File

@ -4276,10 +4276,12 @@ std::set<std::string> Emulator::GetGameDirs() const
return dirs; return dirs;
} }
u32 Emulator::AddGamesFromDir(const std::string& path) u32 Emulator::AddGamesFromDir(std::string path)
{ {
u32 games_added = 0; u32 games_added = 0;
fmt::trim_back(path, fs::delim);
m_games_config.set_save_on_dirty(false); m_games_config.set_save_on_dirty(false);
// search for a game on the provided path first (game on ISO file or on folder type) // search for a game on the provided path first (game on ISO file or on folder type)
@ -4313,7 +4315,7 @@ u32 Emulator::AddGamesFromDir(const std::string& path)
continue; continue;
} }
const std::string dir_path = path + '/' + dir_entry.name; const std::string dir_path = path + "/" + dir_entry.name;
if (!dir_entry.is_directory && !is_iso_file(dir_path)) if (!dir_entry.is_directory && !is_iso_file(dir_path))
{ {
@ -4349,8 +4351,10 @@ u32 Emulator::AddGamesFromDir(const std::string& path)
return games_added; return games_added;
} }
game_boot_result Emulator::AddGame(const std::string& path) game_boot_result Emulator::AddGame(std::string path)
{ {
fmt::trim_back(path, fs::delim);
// Handle files directly // Handle files directly
if (!fs::is_dir(path) || fs::get_optical_raw_device(path)) if (!fs::is_dir(path) || fs::get_optical_raw_device(path))
{ {
@ -4396,8 +4400,10 @@ game_boot_result Emulator::AddGame(const std::string& path)
return result; return result;
} }
game_boot_result Emulator::AddGameToYml(const std::string& path) game_boot_result Emulator::AddGameToYml(std::string path)
{ {
fmt::trim_back(path, fs::delim);
// Detect boot location // Detect boot location
const auto is_invalid_path = [this](std::string_view path, std::string_view dir) -> game_boot_result const auto is_invalid_path = [this](std::string_view path, std::string_view dir) -> game_boot_result
{ {

6
rpcs3/Emu/System.h
View File

@ -489,9 +489,9 @@ public:
void ConfigurePPUCache() const; void ConfigurePPUCache() const;
std::set<std::string> GetGameDirs() const; std::set<std::string> GetGameDirs() const;
u32 AddGamesFromDir(const std::string& path); u32 AddGamesFromDir(std::string path);
game_boot_result AddGame(const std::string& path); game_boot_result AddGame(std::string path);
game_boot_result AddGameToYml(const std::string& path); game_boot_result AddGameToYml(std::string path);
u32 RemoveGamesFromDir(const std::string& games_dir, const std::vector<std::string>& serials_to_remove_from_yml = {}, bool save_on_disk = true); u32 RemoveGamesFromDir(const std::string& games_dir, const std::vector<std::string>& serials_to_remove_from_yml = {}, bool save_on_disk = true);
u32 RemoveGames(const std::vector<std::string>& title_id_list, bool save_on_disk = true); u32 RemoveGames(const std::vector<std::string>& title_id_list, bool save_on_disk = true);
game_boot_result RemoveGameFromYml(const std::string& title_id); game_boot_result RemoveGameFromYml(const std::string& title_id);