updater

Author: phphackerr

backend/updater/component_updater.go

@@ -178,20 +178,14 @@ func (u *Updater) UpdateComponent(update ComponentUpdate) error {
 	}
 	exeDir := filepath.Dir(ex)
 
-	if update.Type == "theme" {
-		url = fmt.Sprintf("%s/themes/%s.css", BaseRepoURL, update.Name)
-		filename = filepath.Join(exeDir, "themes", update.Name+".json") // Note: User changed extension to .json in previous step, assuming themes are JSON now?
-		// Wait, themes are JSON in this project (theming.go loads .json).
-		// But in component_updater.go line 178 it says .css in URL.
-		// Let's check theming.go again. It loads .json.
-		// So URL should probably be .json too?
-		// The user manually changed .css to .json in step 2423.
-		// So I should respect that.
+	switch update.Type {
+	case "theme":
+		filename = filepath.Join(exeDir, "themes", update.Name+".json")
 		url = fmt.Sprintf("%s/themes/%s.json", BaseRepoURL, update.Name)
-	} else if update.Type == "locale" {
+	case "locale":
 		url = fmt.Sprintf("%s/locales/%s.json", BaseRepoURL, update.Name)
 		filename = filepath.Join(exeDir, "locales", update.Name+".json")
-	} else {
+	default:
 		return fmt.Errorf("unknown component type: %s", update.Type)
 	}
 

backend/updater/updater.go

@@ -11,7 +11,6 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
-	"sync"
 
 	"github.com/wailsapp/wails/v3/pkg/application"
 )
@@ -22,8 +21,8 @@ const (
 )
 
 type Updater struct {
-	app  *application.App
-	lock sync.Mutex
+	app        *application.App
+	newExePath string
 }
 
 type ReleaseInfo struct {
@@ -85,6 +84,9 @@ func (u *Updater) CheckForUpdates() UpdateCheckResult {
 // DoUpdate downloads the new version side-by-side and launches it
 func (u *Updater) DoUpdate(version string) error {
 	// 1. Fetch release info
+	// url := fmt.Sprintf("https://api.github.com/repos/%s/%s/releases/tags/%s", RepoOwner, RepoName, version)
+	// Actually we need to fetch the release info to get the assets.
+	// The previous code was:
 	url := fmt.Sprintf("https://api.github.com/repos/%s/%s/releases/tags/%s", RepoOwner, RepoName, version)
 	resp, err := http.Get(url)
 	if err != nil {
@@ -160,14 +162,24 @@ func (u *Updater) DoUpdate(version string) error {
 	}
 
 	// 5. Launch new executable and quit
-	u.app.Event.Emit("update:progress", map[string]interface{}{"status": "installing", "percent": 100})
+	u.app.Event.Emit("update:progress", map[string]interface{}{"status": "ready", "percent": 100})
 
-	cmd := exec.Command(newExePath)
+	// Store path for restart
+	u.newExePath = newExePath
+	return nil
+}
+
+// RestartApp launches the new executable and quits the current one
+func (u *Updater) RestartApp() error {
+	if u.newExePath == "" {
+		return fmt.Errorf("no update ready to install")
+	}
+
+	cmd := exec.Command(u.newExePath)
 	if err := cmd.Start(); err != nil {
 		return fmt.Errorf("failed to start new version: %w", err)
 	}
 
-	// Quit current app
 	u.app.Quit()
 	return nil
 }

frontend/bindings/lce/backend/updater/updater.js

@@ -49,6 +49,14 @@ export function LoadLocalVersions() {
     }));
 }
 
+/**
+ * RestartApp launches the new executable and quits the current one
+ * @returns {$CancellablePromise<void>}
+ */
+export function RestartApp() {
+    return $Call.ByID(4288405115);
+}
+
 /**
  * SaveLocalVersions saves versions to versions.json
  * @param {$models.ComponentVersions} versions

frontend/src/App/footer/UpdaterNotification.svelte

@@ -1,7 +1,13 @@
 <script>
   import { onMount } from 'svelte';
   import { slide } from 'svelte/transition';
-  import { updaterStore, checkForUpdates, doUpdate, updateComponent } from '../lib/store/updater';
+  import {
+    updaterStore,
+    checkForUpdates,
+    doUpdate,
+    updateComponent,
+    restartApp
+  } from '../lib/store/updater';
   import { t } from 'svelte-i18n';
 
   onMount(() => {
@@ -14,6 +20,10 @@
     }
   }
 
+  function handleRestart() {
+    restartApp();
+  }
+
   function handleComponentUpdate(component) {
     updateComponent(component);
   }
@@ -32,6 +42,11 @@
               <div class="fill" style="width: {$updaterStore.progress}%"></div>
             </div>
             <span class="status">Downloading... {Math.round($updaterStore.progress)}%</span>
+          {:else if $updaterStore.readyToRestart}
+            <div class="success-msg">{$t('update_ready', { default: 'Download Complete!' })}</div>
+            <button class="update-btn restart-btn" on:click={handleRestart}>
+              {$t('restart_now', { default: 'Restart Now' })}
+            </button>
           {:else}
             <button class="update-btn" on:click={handleUpdate}>
               {$t('update_now', { default: 'Update Now' })}
@@ -111,6 +126,22 @@
     transform: translateY(-1px);
   }
 
+  .restart-btn {
+    background: #4caf50;
+    color: white;
+  }
+
+  .restart-btn:hover {
+    background: #45a049;
+  }
+
+  .success-msg {
+    color: #4caf50;
+    font-size: 12px;
+    font-weight: bold;
+    margin-bottom: 5px;
+  }
+
   .progress-bar {
     height: 6px;
     background: rgba(255, 255, 255, 0.1);

frontend/src/App/lib/store/updater.js

@@ -15,7 +15,8 @@ export const updaterStore = writable({
   downloading: false,
   progress: 0,
   error: null,
-  componentUpdates: [] // Array of {type, name, version, changelog}
+  componentUpdates: [], // Array of {type, name, version, changelog}
+  readyToRestart: false
 });
 
 export async function checkForUpdates() {
@@ -47,14 +48,24 @@ export async function doUpdate(version) {
 
   try {
     await DoUpdate(version);
-    // Success - usually the app restarts or closes, but we can show a message
-    updaterStore.update((s) => ({ ...s, downloading: false, progress: 100 }));
-    alert('Update downloaded! Please restart the application.');
+    // Update downloaded, ready to restart
+    updaterStore.update((s) => ({ ...s, downloading: false, progress: 100, readyToRestart: true }));
   } catch (err) {
     updaterStore.update((s) => ({ ...s, downloading: false, error: err.message }));
   }
 }
 
+export async function restartApp() {
+  try {
+    // We need to import RestartApp from bindings, but it might not be generated yet.
+    // Assuming wails generates it.
+    const { RestartApp } = await import('/bindings/lce/backend/updater/updater');
+    await RestartApp();
+  } catch (err) {
+    updaterStore.update((s) => ({ ...s, error: err.message }));
+  }
+}
+
 export async function updateComponent(component) {
   updaterStore.update((s) => ({ ...s, downloading: true, error: null }));