izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update version check logic

Browse Source
This commit is contained in:
Yukino Song
2024-08-28 02:59:16 +08:00
parent b8d3ebb248
commit f999f3364b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src_assets/common/assets/web/apollo_version.js
View File

@@ -17,6 +17,7 @@ class ApolloVersion {
this.versionMajor = this.versionParts ? this.versionParts[0] : null;
this.versionMinor = this.versionParts ? this.versionParts[1] : null;
this.versionPatch = this.versionParts ? this.versionParts[2] : null;
this.versionIncremental = this.versionParts ? this.versionParts[3] : null;
}
parseVersion(version) {
@@ -27,10 +28,10 @@ class ApolloVersion {
if (v.indexOf("v") === 0) {
v = v.substring(1);
}
return v.split('.').map(Number);
return v.split('.').map(i => parseInt(i, 10));
}
isGreater(otherVersion) {
isGreater(otherVersion, checkIncremental) {
let otherVersionParts;
if (otherVersion instanceof ApolloVersion) {
otherVersionParts = otherVersion.versionParts;
@@ -43,7 +44,7 @@ class ApolloVersion {
if (!this.versionParts || !otherVersionParts) {
return false;
}
for (let i = 0; i < Math.min(3, this.versionParts.length, otherVersionParts.length); i++) {
for (let i = 0; i < Math.min(checkIncremental && 4 || 3, this.versionParts.length, otherVersionParts.length); i++) {
if (this.versionParts[i] > otherVersionParts[i]) {
return true;
}

2
src_assets/common/assets/web/index.html
View File

@@ -135,7 +135,7 @@
if (!this.preReleaseVersion || !this.githubVersion || !this.version) {
return false;
}
return this.preReleaseVersion.isGreater(this.version) && this.preReleaseVersion.isGreater(this.githubVersion);
return this.preReleaseVersion.isGreater(this.version, true) && this.preReleaseVersion.isGreater(this.githubVersion, true);
},
buildVersionIsDirty() {
return this.version.version?.split(".").length === 5 &&