YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2026-06-30 19:05:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ci] standardize hotfix package version ordering across platforms

Browse Source
This commit is contained in:
kunkundi
2026-05-29 00:52:07 +08:00
parent eea107db66
commit 65d8284fb8
10 changed files with 234 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/version_checker/version_checker.cpp
+24 -39
View File
@@ -137,27 +137,6 @@ bool ExtractDateFromText(const std::string& value,
return false;
}
bool ExtractPatchAfterDate(const std::string& value,
size_t start,
int* patch) {
size_t pos = start;
while (pos < value.size() && !IsAlphaNumeric(value[pos])) {
pos++;
}
const size_t token_start = pos;
while (pos < value.size() && IsAlphaNumeric(value[pos])) {
pos++;
}
if (token_start == pos) {
return false;
}
return TryParseInlinePatch(value.substr(token_start, pos - token_start),
patch);
}
ParsedVersion ParseVersion(const std::string& version) {
const size_t numeric_start = FindNumericStart(version);
const size_t numeric_end = FindNumericEnd(version, numeric_start);
@@ -167,10 +146,29 @@ ParsedVersion ParseVersion(const std::string& version) {
numeric_end - numeric_start));
const std::string suffix = version.substr(numeric_end);
size_t date_end = 0;
if (ExtractDateFromText(suffix, &parsed.date, &date_end)) {
size_t pos = 0;
while (pos < suffix.size()) {
while (pos < suffix.size() && !IsAlphaNumeric(suffix[pos])) {
pos++;
}
const size_t token_start = pos;
while (pos < suffix.size() && IsAlphaNumeric(suffix[pos])) {
pos++;
}
if (token_start == pos) {
continue;
}
const std::string token = suffix.substr(token_start, pos - token_start);
if (parsed.date.empty() && IsCompactDateAt(token, 0)) {
parsed.date = CompactDateToIso(token);
continue;
}
int patch = 0;
if (ExtractPatchAfterDate(suffix, date_end, &patch)) {
if (!parsed.has_patch && TryParseInlinePatch(token, &patch)) {
parsed.has_patch = true;
parsed.patch = patch;
}
@@ -280,6 +278,8 @@ bool IsNewerVersionWithMetadata(const std::string& current,
const std::string& latest,
const std::string& latest_date,
int latest_patch) {
(void)latest_date;
const ParsedVersion current_version = ParseVersion(current);
const ParsedVersion latest_version = ParseVersion(latest);
@@ -292,21 +292,6 @@ bool IsNewerVersionWithMetadata(const std::string& current,
return false;
}
const std::string resolved_latest_date =
!latest_date.empty() ? latest_date : latest_version.date;
if (!resolved_latest_date.empty() && !current_version.date.empty()) {
if (resolved_latest_date > current_version.date) {
return true;
}
if (resolved_latest_date < current_version.date) {
return false;
}
} else if (!resolved_latest_date.empty() && current_version.date.empty()) {
return true;
} else if (resolved_latest_date.empty() && !current_version.date.empty()) {
return false;
}
const bool metadata_has_patch = latest_patch >= 0;
const bool latest_has_patch = metadata_has_patch || latest_version.has_patch;
if (latest_has_patch || current_version.has_patch) {