7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-22 23:48:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

add caseInsensitiveCompare util, use it for local mod ordering

Browse source
This commit is contained in:
matcool 2024-10-02 16:18:32 -03:00
parent 6d2557b22a
commit f3d38a795b
3 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
loader/include/Geode/utils/string.hpp
View file

@ -4,6 +4,7 @@
#include <functional> #include <functional>
#include <string> #include <string>
#include <vector> #include <vector>
#include <compare>
namespace geode::utils::string { namespace geode::utils::string {
/** /**
@ -64,4 +65,10 @@ namespace geode::utils::string {
GEODE_DLL bool startsWith(std::string const& str, std::string const& prefix); GEODE_DLL bool startsWith(std::string const& str, std::string const& prefix);
GEODE_DLL bool endsWith(std::string const& str, std::string const& suffix); GEODE_DLL bool endsWith(std::string const& str, std::string const& suffix);
/**
* Similar to strcmp, but case insensitive.
* Uses std::tolower, but could change in the future for better locale support
*/
GEODE_DLL std::strong_ordering caseInsensitiveCompare(std::string_view a, std::string_view b);
} }

6
loader/src/ui/mods/sources/ModListSource.hpp
View file

@ -194,6 +194,7 @@ void filterModsWithLocalQuery(ModListSource::ProvidedMods& mods, Query const& qu
std::vector<std::pair<ModSource, double>> filtered; std::vector<std::pair<ModSource, double>> filtered;
// Filter installed mods based on query // Filter installed mods based on query
// TODO: maybe skip fuzzy matching altogether if query is empty?
for (auto& src : mods.mods) { for (auto& src : mods.mods) {
double weighted = 0; double weighted = 0;
bool addToList = true; bool addToList = true;
@ -226,7 +227,10 @@ void filterModsWithLocalQuery(ModListSource::ProvidedMods& mods, Query const& qu
return a.second > b.second; return a.second > b.second;
} }
// Sort secondarily alphabetically // Sort secondarily alphabetically
return a.first.getMetadata().getName() < b.first.getMetadata().getName(); return utils::string::caseInsensitiveCompare(
a.first.getMetadata().getName(),
b.first.getMetadata().getName()
) == std::strong_ordering::less;
}); });
mods.mods.clear(); mods.mods.clear();

17
loader/src/utils/string.cpp
View file

@ -192,3 +192,20 @@ std::string utils::string::normalize(std::string const& str) {
auto ret = str; auto ret = str;
return utils::string::normalizeIP(ret); return utils::string::normalizeIP(ret);
} }
std::strong_ordering utils::string::caseInsensitiveCompare(std::string_view str1, std::string_view str2) {
for (size_t i = 0; i < str1.size() && i < str2.size(); i++) {
auto const a = std::tolower(str1[i]);
auto const b = std::tolower(str2[i]);
if (a < b) {
return std::strong_ordering::less;
} else if (a > b) {
return std::strong_ordering::greater;
}
}
if (str1.size() < str2.size())
return std::strong_ordering::less;
else if (str1.size() > str2.size())
return std::strong_ordering::greater;
return std::strong_ordering::equal;
}