From 9be621693d3b16988b40f5c83f40273d4e8cd5bc Mon Sep 17 00:00:00 2001 From: saturneric Date: Thu, 19 Jun 2025 02:28:38 +0200 Subject: fix(version-check): correct git commit hash url and improve version check - fix incorrect git commit hash url in BKTUSVersionCheckTask - add cache saving for upgrade versions in both check tasks - improve commit hash parsing in GitHubVersionCheckTask - remove debug logging from SoftwareVersion::NeedUpgrade --- src/m_ver_check/GitHubVersionCheckTask.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/m_ver_check/GitHubVersionCheckTask.cpp') diff --git a/src/m_ver_check/GitHubVersionCheckTask.cpp b/src/m_ver_check/GitHubVersionCheckTask.cpp index 72e47e7..35c6ca0 100644 --- a/src/m_ver_check/GitHubVersionCheckTask.cpp +++ b/src/m_ver_check/GitHubVersionCheckTask.cpp @@ -47,6 +47,12 @@ GitHubVersionCheckTask::GitHubVersionCheckTask() meta_.api = "GitHub"; meta_.current_version = current_version_; meta_.local_commit_hash = GFProjectGitCommitHash(); + + connect(this, &GitHubVersionCheckTask::SignalUpgradeVersion, this, + [](const SoftwareVersion& sv) { + GFDurableCacheSave(DUP("update_checking_cache"), + DUP(QJsonDocument(sv.ToJson()).toJson())); + }); } auto GitHubVersionCheckTask::Run() -> int { @@ -176,7 +182,8 @@ void GitHubVersionCheckTask::slot_parse_current_tag_info(QNetworkReply* reply) { } auto object = current_reply_json["object"].toObject(); - if (object["type"].toString() != "commit") { + if (object["type"].toString() != "tag" && + object["type"].toString() != "commit") { FLOG_WARN("remote tag: %1 is not a ref: %2", meta_.current_version, object["type"].toString()); return; @@ -203,14 +210,7 @@ void GitHubVersionCheckTask::slot_parse_current_commit_info( return; } - auto object = current_reply_json["object"].toObject(); - if (object["type"].toString() != "commit") { - FLOG_WARN("remote tag: %1 is not a ref: %2", meta_.current_version, - object["type"].toString()); - return; - } - - auto sha = object["sha"].toString(); + auto sha = current_reply_json["sha"].toString(); FLOG_DEBUG("got remote commit hash from github: %1", meta_.remote_commit_hash_by_tag); -- cgit