improved updater

alex9849 · Nov 18, 2023 · bd0df94 · bd0df94
1 parent 9e5be32
commit bd0df94
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/backend/src/main/java/net/alex9849/cocktailpi/service/SystemService.java b/backend/src/main/java/net/alex9849/cocktailpi/service/SystemService.java
@@ -396,6 +396,9 @@ public void performUpdate() {
         if(!cuResult.isUpdateAvailable()) {
             throw new IllegalStateException("No update available!");
         }
+        if(isDemoMode) {
+            throw new IllegalArgumentException("Can't update in demomode!");
+        }
         String stringPath = SystemService.class.getProtectionDomain().getCodeSource().getLocation().getPath();
         stringPath = URLDecoder.decode(stringPath, StandardCharsets.UTF_8);
         stringPath = stringPath.substring(0, stringPath.lastIndexOf(".jar") + 4);

diff --git a/frontend/src/components/CSettingsUpdater.vue b/frontend/src/components/CSettingsUpdater.vue
@@ -16,7 +16,7 @@
             color="info"
             :icon="mdiUpdate()"
             label="Check for update"
-            @click="checkUpdate"
+            @click="onCheckUpdate"
             :loading="searchUpdate"
           />
         </div>
@@ -143,7 +143,7 @@ export default {
     mdiUpdate () {
       return mdiUpdate
     },
-    checkUpdate () {
+    onCheckUpdate () {
       this.searchUpdate = true
       this.errorMsg = ''
       this.updateCandidate = ''

diff --git a/frontend/src/store/modules/updater/actions.js b/frontend/src/store/modules/updater/actions.js
@@ -1,9 +1,8 @@
 import SystemService from 'src/services/system.service'
 
 export const performUpdate = async ({ commit }) => {
-  await SystemService.getCheckUpdate(true)
   try {
-    SystemService.performUpdate()
+    await SystemService.performUpdate()
   } catch (e) {
     if (e.response.status !== 504) {
       throw e