Simplified configurator version checking (#3346)

betaflight · Feb 18, 2023 · 6618378 · 6618378
1 parent ad5b94c
commit 6618378
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 90 deletions.
diff --git a/src/js/BuildApi.js b/src/js/BuildApi.js
@@ -160,4 +160,9 @@ export default class BuildApi {
         const url = `${this._url}/api/releases/${release}/commits`;
         this.load(url, onSuccess, onFailure);
     }
+
+    loadConfiguratorRelease(type, onSuccess, onFailure) {
+        const url = `${this._url}/api/configurator/releases/${type}`;
+        this.load(url, onSuccess, onFailure);
+    }
 }
diff --git a/src/js/release_checker.js b/src/js/release_checker.js
diff --git a/src/js/utils/checkForConfiguratorUpdates.js b/src/js/utils/checkForConfiguratorUpdates.js
@@ -1,43 +1,21 @@
-import semver from "semver";
-import ReleaseChecker from "../release_checker";
+import BuildApi from "../BuildApi";
 import { get as getConfig } from "../ConfigStorage";
 import CONFIGURATOR from "../data_storage";
 import { i18n } from "../localization";
 import { gui_log } from "../gui_log";
 
-function notifyOutdatedVersion(releaseData) {
-    const result = getConfig('checkForConfiguratorUnstableVersions');
-    let showUnstableReleases = false;
-    if (result.checkForConfiguratorUnstableVersions) {
-        showUnstableReleases = true;
-    }
+function notifyOutdatedVersion(data) {
 
-    if (releaseData === undefined) {
+    if (data === undefined) {
         console.log('No releaseData');
         return false;
     }
 
-    const versions = releaseData.filter(function (version) {
-        const semVerVersion = semver.parse(version.tag_name);
-        if (semVerVersion && (showUnstableReleases || semVerVersion.prerelease.length === 0)) {
-            return version;
-        } else {
-            return null;
-        }
-        }).sort(function (v1, v2) {
-        try {
-            return semver.compare(v2.tag_name, v1.tag_name);
-        } catch (e) {
-            return false;
-        }
-    });
+    if (data.isCurrent === false && data.updatedVersion !== undefined) {
 
-    if (versions.length > 0) {
-        CONFIGURATOR.latestVersion = versions[0].tag_name;
-        CONFIGURATOR.latestVersionReleaseUrl = versions[0].html_url;
-    }
+        CONFIGURATOR.latestVersion = data.UpdatedVersion.Version;
+        CONFIGURATOR.latestVersionReleaseUrl = data.UpdatedVersion.Url;
 
-    if (semver.lt(CONFIGURATOR.version, CONFIGURATOR.latestVersion)) {
         const message = i18n.getMessage('configuratorUpdateNotice', [CONFIGURATOR.latestVersion, CONFIGURATOR.latestVersionReleaseUrl]);
         gui_log(message);
 
@@ -60,7 +38,13 @@ function notifyOutdatedVersion(releaseData) {
 }
 
 export function checkForConfiguratorUpdates() {
-    const releaseChecker = new ReleaseChecker('configurator', 'https://api.github.com/repos/betaflight/betaflight-configurator/releases');
 
-    releaseChecker.loadReleaseData(notifyOutdatedVersion);
+    const result = getConfig('checkForConfiguratorUnstableVersions');
+    let type = "Stable";
+    if (result.checkForConfiguratorUnstableVersions) {
+        type = "Unstable";
+    }
+
+    const buildApi = new BuildApi();
+    buildApi.loadConfiguratorRelease(type, notifyOutdatedVersion);
 }