FSUI: Use locale sensitive sort for game list

Author: TellowKrinkle

pcsx2-qt/Translations.cpp

@@ -71,6 +71,7 @@ namespace QtHost
 
 	static QLocale s_current_locale;
 	static QCollator s_current_collator;
+	static std::mutex s_collator_mtx;
 
 	static std::vector<QTranslator*> s_translators;
 } // namespace QtHost
@@ -122,7 +123,10 @@ void QtHost::InstallTranslator(QWidget* dialog_parent)
 	QString qlanguage = language;
 	qlanguage.replace('-', '_');
 	s_current_locale = QLocale(qlanguage);
-	s_current_collator = QCollator(s_current_locale);
+	{
+		std::lock_guard<std::mutex> guard(s_collator_mtx);
+		s_current_collator = QCollator(s_current_locale);
+	}
 
 	// Install the base qt translation first.
 #if defined(__APPLE__)
@@ -694,3 +698,11 @@ int QtHost::LocaleSensitiveCompare(QStringView lhs, QStringView rhs)
 {
 	return s_current_collator.compare(lhs, rhs);
 }
+
+int Host::LocaleSensitiveCompare(std::string_view lhs, std::string_view rhs)
+{
+	QString qlhs = QString::fromUtf8(lhs.data(), lhs.size());
+	QString qrhs = QString::fromUtf8(rhs.data(), rhs.size());
+	std::lock_guard<std::mutex> guard(QtHost::s_collator_mtx);
+	return QtHost::s_current_collator.compare(qlhs, qrhs);
+}

pcsx2/Host.h

@@ -147,6 +147,9 @@ namespace Host
 	/// Creates a progress callback that displays in the host.
 	std::unique_ptr<ProgressCallback> CreateHostProgressCallback();
 
+	/// Compare strings in the locale of the current UI language from any thread.  Prefer the QtHost version if you can use it.
+	int LocaleSensitiveCompare(std::string_view lhs, std::string_view rhs);
+
 	namespace Internal
 	{
 		/// Retrieves the base settings layer. Must call with lock held.

pcsx2/ImGui/FullscreenUI.cpp

@@ -7787,11 +7787,41 @@ void FullscreenUI::PopulateGameListEntryList()
 {
 	const int sort = Host::GetBaseIntSettingValue("UI", "FullscreenUIGameSort", 0);
 	const bool reverse = Host::GetBaseBoolSettingValue("UI", "FullscreenUIGameSortReverse", false);
+	static int s_last_sort = -1;
+	static bool s_last_reverse = false;
+	static bool s_last_prefer_eng = false;
+	static std::vector<const GameList::Entry*> s_last_unsorted_entries;
 
+	// Sort can be expensive, try to avoid when possible
 	const u32 count = GameList::GetEntryCount();
+	bool needs_update = sort != s_last_sort || reverse != s_last_reverse || s_last_prefer_eng != s_prefer_english_titles;
+	needs_update |= count != s_last_unsorted_entries.size();
+	if (!needs_update)
+	{
+		for (u32 i = 0; i < count; i++)
+		{
+			if (GameList::GetEntryByIndex(i) != s_last_unsorted_entries[i])
+			{
+				needs_update = true;
+				break;
+			}
+		}
+	}
+
+	if (!needs_update)
+		return;
+
+	s_last_sort = sort;
+	s_last_reverse = reverse;
+	s_last_prefer_eng = s_prefer_english_titles;
+
 	s_game_list_sorted_entries.resize(count);
+	s_last_unsorted_entries.resize(count);
 	for (u32 i = 0; i < count; i++)
+	{
 		s_game_list_sorted_entries[i] = GameList::GetEntryByIndex(i);
+		s_last_unsorted_entries[i] = s_game_list_sorted_entries[i];
+	}
 
 	std::sort(s_game_list_sorted_entries.begin(), s_game_list_sorted_entries.end(),
 		[sort, reverse](const GameList::Entry* lhs, const GameList::Entry* rhs) {
@@ -7862,7 +7892,7 @@ void FullscreenUI::PopulateGameListEntryList()
 			}
 
 			// fallback to title when all else is equal
-			const int res = StringUtil::Strcasecmp(lhs->GetTitleSort(s_prefer_english_titles).c_str(), rhs->GetTitleSort(s_prefer_english_titles).c_str());
+			const int res = Host::LocaleSensitiveCompare(lhs->GetTitleSort(s_prefer_english_titles), rhs->GetTitleSort(s_prefer_english_titles));
 			return reverse ? (res > 0) : (res < 0);
 		});
 }

tests/ctest/core/StubHost.cpp

@@ -266,6 +266,14 @@ void Host::OpenHostFileSelectorAsync(std::string_view title, bool select_directo
 	callback(std::string());
 }
 
+int Host::LocaleSensitiveCompare(std::string_view lhs, std::string_view rhs)
+{
+	int res = std::strncmp(lhs.data(), rhs.data(), std::min(lhs.size(), rhs.size()));
+	if (res != 0)
+		return res;
+	return lhs.size() > rhs.size() ? 1 : lhs.size() < rhs.size() ? -1 : 0;
+}
+
 std::optional<u32> InputManager::ConvertHostKeyboardStringToCode(const std::string_view str)
 {
 	return std::nullopt;