YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2026-08-25 12:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] restore latest_version update metadata

Browse Source
This commit is contained in:
kunkundi
2026-05-29 02:11:46 +08:00
parent 9d3a422916
commit 04100584ce
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+1 -1
View File
@@ -501,7 +501,7 @@ jobs:
run: | run: |
cat > version.json << EOF cat > version.json << EOF
{ {
"version": "${{ steps.version.outputs.VERSION_NUM }}", "latest_version": "${{ steps.version.outputs.VERSION_NUM }}",
"releaseDate": "${{ steps.version.outputs.BUILD_DATE_ISO }}", "releaseDate": "${{ steps.version.outputs.BUILD_DATE_ISO }}",
"patch": ${{ steps.version.outputs.PATCH_NUMBER }}, "patch": ${{ steps.version.outputs.PATCH_NUMBER }},
"releaseName": "", "releaseName": "",
.github/workflows/update-version-json.yml
+1 -1
View File
@@ -140,7 +140,7 @@ jobs:
# Generate version.json using cat and heredoc # Generate version.json using cat and heredoc
cat > version.json << EOF cat > version.json << EOF
{ {
"version": "${{ steps.version.outputs.VERSION_FULL }}", "latest_version": "${{ steps.version.outputs.VERSION_FULL }}",
"releaseDate": "${{ steps.version.outputs.BUILD_DATE_ISO }}", "releaseDate": "${{ steps.version.outputs.BUILD_DATE_ISO }}",
"patch": ${{ steps.version.outputs.PATCH_NUMBER }}, "patch": ${{ steps.version.outputs.PATCH_NUMBER }},
"releaseName": ${{ steps.release_info.outputs.RELEASE_NAME }}, "releaseName": ${{ steps.release_info.outputs.RELEASE_NAME }},
src/gui/render.cpp
+18 -6
View File
@@ -1748,17 +1748,29 @@ int Render::Run() {
LOG_INFO("CrossDesk version: {}", CROSSDESK_VERSION); LOG_INFO("CrossDesk version: {}", CROSSDESK_VERSION);
latest_version_info_ = CheckUpdate(); latest_version_info_ = CheckUpdate();
if (!latest_version_info_.empty() && if (!latest_version_info_.empty()) {
latest_version_info_.contains("version") && std::string version;
latest_version_info_["version"].is_string()) { if (latest_version_info_.contains("latest_version") &&
latest_version_ = 'v' + latest_version_info_["version"].get<std::string>(); latest_version_info_["latest_version"].is_string()) {
version = latest_version_info_["latest_version"].get<std::string>();
} else if (latest_version_info_.contains("version") &&
latest_version_info_["version"].is_string()) {
version = latest_version_info_["version"].get<std::string>();
}
if (!version.empty()) {
latest_version_ = 'v' + version;
} else {
latest_version_ = "";
}
if (latest_version_info_.contains("releaseNotes") && if (latest_version_info_.contains("releaseNotes") &&
latest_version_info_["releaseNotes"].is_string()) { latest_version_info_["releaseNotes"].is_string()) {
release_notes_ = latest_version_info_["releaseNotes"].get<std::string>(); release_notes_ = latest_version_info_["releaseNotes"].get<std::string>();
} else { } else {
release_notes_ = ""; release_notes_ = "";
} }
update_available_ = IsNewerVersion(CROSSDESK_VERSION, latest_version_); update_available_ =
!version.empty() && IsNewerVersion(CROSSDESK_VERSION, latest_version_);
LOG_INFO("Update check: current={}, latest={}, available={}", LOG_INFO("Update check: current={}, latest={}, available={}",
CROSSDESK_VERSION, latest_version_, update_available_); CROSSDESK_VERSION, latest_version_, update_available_);
if (update_available_) { if (update_available_) {
@@ -1767,7 +1779,7 @@ int Render::Run() {
} else { } else {
latest_version_ = ""; latest_version_ = "";
update_available_ = false; update_available_ = false;
LOG_WARN("Update check skipped: version.json is empty or missing version"); LOG_WARN("Update check skipped: version.json is empty or missing latest_version");
} }
InitializeSettings(); InitializeSettings();
src/version_checker/version_checker.cpp
+3 -2
View File
@@ -337,8 +337,9 @@ nlohmann::json CheckUpdate() {
} }
latest_patch_ = 0; latest_patch_ = 0;
latest_patch_available_ = ReadPatchField(j, &latest_patch_); latest_patch_available_ = ReadPatchField(j, &latest_patch_);
LOG_INFO("Fetched version.json: version={}, releaseDate={}, patch={}", LOG_INFO("Fetched version.json: latest_version={}, releaseDate={}, patch={}",
j.value("version", ""), j.value("releaseDate", ""), j.value("latest_version", j.value("version", "")),
j.value("releaseDate", ""),
latest_patch_available_ ? latest_patch_ : -1); latest_patch_available_ ? latest_patch_ : -1);
return j; return j;
} catch (const std::exception& e) { } catch (const std::exception& e) {