andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

workaround version update check #2190

Browse Source
This commit is contained in:
MichaelDvP
2024-11-09 09:53:36 +01:00
parent df92e9253f
commit 38efb0de67
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
interface/src/app/settings/Version.tsx
View File

@@ -42,7 +42,9 @@ const Version = () => {
} }
).onSuccess((event) => { ).onSuccess((event) => {
const data = event.data as { emsesp_version: string; upgradeable: boolean }; const data = event.data as { emsesp_version: string; upgradeable: boolean };
if (data.upgradeable != undefined) {
setUpgradeAvailable(data.upgradeable); setUpgradeAvailable(data.upgradeable);
}
}); });
const { data, send: loadData, error } = useRequest(SystemApi.readSystemStatus); const { data, send: loadData, error } = useRequest(SystemApi.readSystemStatus);
@@ -60,9 +62,7 @@ const Version = () => {
// immediate: false, // immediate: false,
// initialData: '3.6.5' // initialData: '3.6.5'
}).onSuccess((event) => { }).onSuccess((event) => {
if (!useDev) {
void sendCheckUpgrade(event.data); void sendCheckUpgrade(event.data);
}
}); });
// called immediately to get the latest version, on page load, then check for upgrade (works for both dev and stable) // called immediately to get the latest version, on page load, then check for upgrade (works for both dev and stable)
@@ -71,9 +71,7 @@ const Version = () => {
// immediate: false, // immediate: false,
// initialData: '3.7.0-dev.32' // initialData: '3.7.0-dev.32'
}).onSuccess((event) => { }).onSuccess((event) => {
if (useDev) {
void sendCheckUpgrade(event.data); void sendCheckUpgrade(event.data);
}
}); });
const STABLE_URL = 'https://github.com/emsesp/EMS-ESP32/releases/download/'; const STABLE_URL = 'https://github.com/emsesp/EMS-ESP32/releases/download/';

3
src/web/WebStatusService.cpp
View File

@@ -214,8 +214,11 @@ bool WebStatusService::checkUpgrade(JsonObject root, std::string & latest_versio
version::Semver200_version settings_version(EMSESP_APP_VERSION); version::Semver200_version settings_version(EMSESP_APP_VERSION);
version::Semver200_version this_version(latest_version); version::Semver200_version this_version(latest_version);
if ((this_version.prerelease().empty() && settings_version.prerelease().empty())
|| (!this_version.prerelease().empty() && !settings_version.prerelease().empty())) {
root["upgradeable"] = (this_version > settings_version); root["upgradeable"] = (this_version > settings_version);
} }
}
return true; // always ok return true; // always ok
} }