Skip to content

GameList: Replace [ and ] with '{{' and '}}' to fix custom attributes #14227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
F0bes wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −9
Open

GameList: Replace [ and ] with '{{' and '}}' to fix custom attributes #14227

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 29 additions & 9 deletions pcsx2/GameList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ namespace GameList
const std::string& path, const std::string& serial, std::time_t last_time, std::time_t add_time);

static std::string GetCustomPropertiesFile();

static std::string EncodeIniKey(const std::string_view& input);
} // namespace GameList

static std::vector<GameList::Entry> s_entries;
Expand Down Expand Up @@ -784,12 +786,12 @@ bool GameList::ScanFile(std::string path, std::time_t timestamp, std::unique_loc
entry.total_played_time = iter->second.total_played_time;
}

auto custom_title = custom_attributes_ini.GetOptionalStringValue(entry.path.c_str(), "Title");
auto custom_title = custom_attributes_ini.GetOptionalStringValue(EncodeIniKey(entry.path).c_str(), "Title");
if (custom_title)
{
entry.title = std::move(custom_title.value());
}
const auto custom_region = custom_attributes_ini.GetOptionalIntValue(entry.path.c_str(), "Region");
const auto custom_region = custom_attributes_ini.GetOptionalIntValue(EncodeIniKey(entry.path).c_str(), "Region");
if (custom_region)
{
const int custom_region_value = custom_region.value();
Expand Down Expand Up @@ -1464,8 +1466,8 @@ void GameList::CheckCustomAttributesForPath(const std::string& path, bool& has_c
INISettingsInterface names(GetCustomPropertiesFile());
if (names.Load())
{
has_custom_title = names.ContainsValue(path.c_str(), "Title");
has_custom_region = names.ContainsValue(path.c_str(), "Region");
has_custom_title = names.ContainsValue(EncodeIniKey(path).c_str(), "Title");
has_custom_region = names.ContainsValue(EncodeIniKey(path).c_str(), "Region");
}
}

Expand All @@ -1476,11 +1478,11 @@ void GameList::SaveCustomTitleForPath(const std::string& path, const std::string

if (!custom_title.empty())
{
names.SetStringValue(path.c_str(), "Title", custom_title.c_str());
names.SetStringValue(EncodeIniKey(path).c_str(), "Title", custom_title.c_str());
}
else
{
names.DeleteValue(path.c_str(), "Title");
names.DeleteValue(EncodeIniKey(path).c_str(), "Title");
}

if (names.Save())
Expand All @@ -1497,11 +1499,11 @@ void GameList::SaveCustomRegionForPath(const std::string& path, int custom_regio

if (custom_region >= 0)
{
names.SetIntValue(path.c_str(), "Region", custom_region);
names.SetIntValue(EncodeIniKey(path).c_str(), "Region", custom_region);
}
else
{
names.DeleteValue(path.c_str(), "Region");
names.DeleteValue(EncodeIniKey(path).c_str(), "Region");
}

if (names.Save())
Expand All @@ -1516,11 +1518,29 @@ std::string GameList::GetCustomTitleForPath(const std::string& path)
std::string ret;

std::unique_lock lock(s_mutex);
const GameList::Entry* entry = GetEntryForPath(path.c_str());
const GameList::Entry* entry = GetEntryForPath(EncodeIniKey(path).c_str());
if (entry)
{
ret = entry->title;
}

return ret;
}

static std::string GameList::EncodeIniKey(const std::string_view& input)
{
std::string out;
out.reserve(input.size());

for (char c : input)
{
if (c == '[')
out += "{{";
else if (c == ']')
out += "}}";
else
out += c;
}

return out;
}
Loading
⚡