From 2dc2f2e04888fcc7391ee544ee8ae3e3d042a297 Mon Sep 17 00:00:00 2001 From: saturneric Date: Sun, 1 Dec 2024 22:13:50 +0100 Subject: feat: check commit hash by current version --- src/m_ver_check/SoftwareVersion.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/m_ver_check/SoftwareVersion.cpp') diff --git a/src/m_ver_check/SoftwareVersion.cpp b/src/m_ver_check/SoftwareVersion.cpp index becc396..6c4ccf1 100644 --- a/src/m_ver_check/SoftwareVersion.cpp +++ b/src/m_ver_check/SoftwareVersion.cpp @@ -44,21 +44,24 @@ auto SoftwareVersion::NeedUpgrade() const -> bool { GFModuleStrDup(current_version.toUtf8()), GFModuleStrDup(latest_version.toUtf8())))); - MLogDebug(QString("load done: %1, pre-release: %2, draft: %3") - .arg(static_cast(loading_done)) - .arg(static_cast(latest_prerelease_version_from_remote)) - .arg(static_cast(latest_draft_from_remote))); - return loading_done && !latest_prerelease_version_from_remote && + FLOG_DEBUG("load done: %1, pre-release: %2, draft: %3", latest_version, + latest_prerelease_version_from_remote, latest_draft_from_remote); + return !latest_version.isEmpty() && !latest_prerelease_version_from_remote && !latest_draft_from_remote && GFCompareSoftwareVersion(GFModuleStrDup(current_version.toUtf8()), GFModuleStrDup(latest_version.toUtf8())) < 0; } auto SoftwareVersion::VersionWithdrawn() const -> bool { - return loading_done && !current_version_publish_in_remote && + return !latest_version.isEmpty() && !current_version_publish_in_remote && current_version_is_a_prerelease && !current_version_is_drafted; } auto SoftwareVersion::CurrentVersionReleased() const -> bool { - return loading_done && current_version_publish_in_remote; -} \ No newline at end of file + return !latest_version.isEmpty() && current_version_publish_in_remote; +} + +auto SoftwareVersion::GitCommitHashMismatch() const -> bool { + if (remote_commit_hash_by_tag.isEmpty()) return false; + return remote_commit_hash_by_tag.trimmed() != local_commit_hash.trimmed(); +} -- cgit v1.2.3