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 separate message for outdated incompat

Browse source
This commit is contained in:
Cvolton 2024-02-15 21:34:20 +01:00
parent f1ddc568e0
commit 98d572c0e5
No known key found for this signature in database
4 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
loader/include/Geode/loader/Loader.hpp
View file

@ -41,6 +41,7 @@ namespace geode {
NeedsNewerGeodeVersion,
DisabledDependency,
OutdatedDependency,
OutdatedIncompatibility,
};
Type type;
std::variant<ghc::filesystem::path, ModMetadata, Mod*> cause;

29
loader/include/Geode/utils/VersionInfo.hpp
View file

@ -16,6 +16,14 @@ namespace geode {
Any
};
enum class VersionCompareResult {
TooOld,
Match,
TooNew,
MajorMismatch,
GenericMismatch
};
/**
* A version label, like v1.0.0-alpha or v2.3.4-prerelease. Limited to these
* options; arbitary identifiers are not supported. Additional numbering
@ -198,30 +206,35 @@ namespace geode {
static Result<ComparableVersionInfo> parse(std::string const& string);
constexpr bool compare(VersionInfo const& version) const {
return compareWithReason(version) == VersionCompareResult::Match;
}
constexpr VersionCompareResult compareWithReason(VersionInfo const& version) const {
if (m_compare == VersionCompare::Any) {
return true;
return VersionCompareResult::Match;
}
// opposing major versions never match
if (m_version.getMajor() != version.getMajor()) {
return false;
return VersionCompareResult::MajorMismatch;
}
// the comparison works invertedly as a version like "v1.2.0"
// should return true for "<=v1.3.0"
switch (m_compare) {
case VersionCompare::LessEq:
return version <= m_version;
return version <= m_version ? VersionCompareResult::Match : VersionCompareResult::TooNew;
case VersionCompare::MoreEq:
return version >= m_version;
return version >= m_version ? VersionCompareResult::Match : VersionCompareResult::TooOld;
case VersionCompare::Less:
return version < m_version;
return version < m_version ? VersionCompareResult::Match : VersionCompareResult::TooNew;
case VersionCompare::More:
return version > m_version;
return version > m_version ? VersionCompareResult::Match : VersionCompareResult::TooOld;
case VersionCompare::Exact:
return version == m_version;
return version == m_version ? VersionCompareResult::Match :
(version > m_version) ? VersionCompareResult::TooOld : VersionCompareResult::TooNew;
default:
return false;
return VersionCompareResult::GenericMismatch;
}
}

14
loader/src/loader/LoaderImpl.cpp
View file

@ -558,8 +558,7 @@ void Loader::Impl::findProblems() {
});
log::error("{} requires {} {}", id, dep.id, dep.version);
break;
} else if(!dep.version.compare(installedDependency->getVersion())) {
// TODO: this also fires on major version mismatch
} else if(dep.version.compareWithReason(installedDependency->getVersion()) == VersionCompareResult::TooOld) {
this->addProblem({
LoadProblem::Type::OutdatedDependency,
mod,
@ -568,12 +567,11 @@ void Loader::Impl::findProblems() {
log::error("{} requires {} {}", id, dep.id, dep.version);
break;
} else {
// this should never happen i think?
// (major mismatch should eventually fall through here though once that's fixed)
// fires on major mismatch or too new version of dependency
this->addProblem({
LoadProblem::Type::MissingDependency,
mod,
fmt::format("{}", dep.id)
fmt::format("{} {}", dep.id, dep.version)
});
log::error("{} requires {} {}", id, dep.id, dep.version);
break;
@ -597,9 +595,9 @@ void Loader::Impl::findProblems() {
case ModMetadata::Incompatibility::Importance::Breaking: {
this->addProblem({
LoadProblem::Type::PresentIncompatibility,
dep.version.toString()[0] == '<' ? LoadProblem::Type::OutdatedIncompatibility : LoadProblem::Type::PresentIncompatibility,
mod,
fmt::format("{} {}", dep.id, dep.version.toString())
fmt::format("{}", dep.id)
});
log::error("{} breaks {} {}", id, dep.id, dep.version);
} break;
@ -608,7 +606,7 @@ void Loader::Impl::findProblems() {
this->addProblem({
LoadProblem::Type::PresentIncompatibility,
mod,
fmt::format("{} {}", dep.id, dep.version.toString())
fmt::format("{}", dep.id)
});
log::error("{} supersedes {} {}", id, dep.id, dep.version);
} break;

6
loader/src/ui/internal/list/ProblemsListCell.cpp
View file

@ -96,7 +96,11 @@ bool ProblemsListCell::init(LoadProblem problem, ProblemsListPopup* list, CCSize
break;
case LoadProblem::Type::PresentIncompatibility:
icon = "info-alert.png"_spr;
message = fmt::format("{} is incompatible with {}", cause, problem.message);
message = fmt::format("Uninstall {} to use {}", problem.message, cause);
break;
case LoadProblem::Type::OutdatedIncompatibility:
icon = "info-alert.png"_spr;
message = fmt::format("Update {} to use {}", problem.message, cause);
break;
case LoadProblem::Type::UnzipFailed:
icon = "info-alert.png"_spr;