Merge pull request #523 from memstechtips/dev

Release v26.03.11

Author: memstechtips

extras/Winhance.Installer.iss

@@ -46,8 +46,8 @@ SetupIconFile=C:\Winhance\src\Winhance.UI\Assets\AppIcons\winhance-rocket.ico
 VersionInfoCopyright=Copyright © Marco du Plessis
 SolidCompression=yes
 WizardStyle=modern
-; Allow user to select installation type
-DisableDirPage=no
+; Dir page is replaced by a custom page that appears after task selection
+DisableDirPage=yes
 ; Only create uninstaller for regular installations
 Uninstallable=WizardIsTaskSelected('regularinstall')
 ; Close applications before installation/uninstallation
@@ -132,14 +132,21 @@ begin
 end;
 
 var
-  UserSelectedDir: String;
-  IsFirstRun: Boolean;
+  CustomDirPage: TInputDirWizardPage;
+  HasSetDefaultDir: Boolean;
 
 procedure InitializeWizard;
 begin
-  // Initialize variables
-  IsFirstRun := True;
-  UserSelectedDir := '';
+  HasSetDefaultDir := False;
+
+  // Create a custom directory page that appears AFTER the tasks page
+  CustomDirPage := CreateInputDirPage(wpSelectTasks,
+    SetupMessage(msgWizardSelectDir),
+    '',
+    'To continue, click Next. If you would like to select a different folder, click Browse.',
+    False, '');
+  CustomDirPage.Add('');
+  CustomDirPage.Values[0] := ExpandConstant('{autopf}\{#MyAppName}');
 end;
 
 // This function runs right before the actual installation starts
@@ -154,30 +161,24 @@ end;
 function NextButtonClick(CurPageID: Integer): Boolean;
 begin
   Result := True;
-  
-  // Save user-selected directory when leaving the directory selection page
-  if CurPageID = wpSelectDir then
-  begin
-    UserSelectedDir := WizardForm.DirEdit.Text;
-  end;
-  
-  // Set default directory based on installation type when tasks page is shown for the first time
+
+  // After task selection, set the default directory based on installation type
   if CurPageID = wpSelectTasks then
   begin
-    if IsFirstRun then
+    if not HasSetDefaultDir then
     begin
-      IsFirstRun := False;
-      if WizardIsTaskSelected('portableinstall') and (UserSelectedDir = '') then
-        WizardForm.DirEdit.Text := ExpandConstant('{userdesktop}\{#MyAppName}')
-      else if WizardIsTaskSelected('regularinstall') and (UserSelectedDir = '') then
-        WizardForm.DirEdit.Text := ExpandConstant('{autopf}\{#MyAppName}');
+      HasSetDefaultDir := True;
+      if WizardIsTaskSelected('portableinstall') then
+        CustomDirPage.Values[0] := ExpandConstant('{userdesktop}\{#MyAppName}')
+      else
+        CustomDirPage.Values[0] := ExpandConstant('{autopf}\{#MyAppName}');
     end;
   end;
-  
-  // Restore user's custom directory selection after task selection
-  if (CurPageID = wpSelectTasks) and (UserSelectedDir <> '') then
+
+  // Sync the custom dir page value to the actual install directory
+  if CurPageID = CustomDirPage.ID then
   begin
-    WizardForm.DirEdit.Text := UserSelectedDir;
+    WizardForm.DirEdit.Text := CustomDirPage.Values[0];
   end;
 end;
 

src/Winhance.Core/Features/Common/Interfaces/IVersionService.cs

@@ -18,8 +18,13 @@ public interface IVersionService
     Task<VersionInfo> CheckForUpdateAsync(CancellationToken cancellationToken = default);
 
     /// <summary>
-    /// Downloads and launches the installer for the latest version
+    /// Downloads the installer for the latest version to a temp location.
     /// </summary>
-    /// <returns>A task that completes when the download is initiated</returns>
     Task DownloadAndInstallUpdateAsync(CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Launches the downloaded installer and schedules the app to relaunch after installation.
+    /// The caller should exit the application immediately after calling this.
+    /// </summary>
+    void LaunchInstallerAndRestart();
 }

src/Winhance.Infrastructure/Features/Common/Services/VersionService.cs

@@ -20,6 +20,7 @@ public class VersionService : IVersionService
     private readonly string _latestReleaseApiUrl = "https://api.github.com/repos/memstechtips/Winhance/releases/latest";
     private readonly string _latestReleaseDownloadUrl = "https://github.com/memstechtips/Winhance/releases/latest/download/Winhance.Installer.exe";
     private readonly string _userAgent = "Winhance-Update-Checker";
+    private string? _downloadedInstallerPath;
 
     public VersionService(ILogService logService, IProcessExecutor processExecutor, IFileSystemService fileSystemService, HttpClient httpClient)
     {
@@ -154,16 +155,48 @@ public async Task DownloadAndInstallUpdateAsync(CancellationToken cancellationTo
         using var response = await _httpClient.SendAsync(downloadRequest, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
         response.EnsureSuccessStatusCode();
 
-        await using var contentStream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
-        await using var fileStream = new FileStream(tempPath, FileMode.Create, FileAccess.Write, FileShare.None, 81920, true);
-        await contentStream.CopyToAsync(fileStream, cancellationToken).ConfigureAwait(false);
+        // Use explicit block so streams are disposed before returning
+        {
+            await using var contentStream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
+            await using var fileStream = new FileStream(tempPath, FileMode.Create, FileAccess.Write, FileShare.None, 81920, true);
+            await contentStream.CopyToAsync(fileStream, cancellationToken).ConfigureAwait(false);
+        }
+
+        _downloadedInstallerPath = tempPath;
+        _logService.Log(LogLevel.Info, $"Update downloaded to {tempPath}");
+    }
+
+    public void LaunchInstallerAndRestart()
+    {
+        if (string.IsNullOrEmpty(_downloadedInstallerPath))
+            throw new InvalidOperationException("No update has been downloaded.");
 
-        _logService.Log(LogLevel.Info, $"Update downloaded to {tempPath}, launching installer...");
+        string appDir = AppContext.BaseDirectory;
+        bool isPortable = _fileSystemService.FileExists(_fileSystemService.CombinePath(appDir, "portable.marker"));
+        string appExePath = _fileSystemService.CombinePath(appDir, "Winhance.exe");
 
-        // Launch the installer
-        await _processExecutor.ShellExecuteAsync(tempPath).ConfigureAwait(false);
+        string installerArgs;
+        if (isPortable)
+        {
+            installerArgs = $"/SILENT /SUPPRESSMSGBOXES /DIR=\"{appDir.TrimEnd(Path.DirectorySeparatorChar)}\" /MERGETASKS=\"portableinstall\"";
+        }
+        else
+        {
+            installerArgs = "/SILENT /SUPPRESSMSGBOXES /MERGETASKS=\"regularinstall\\desktopicon,regularinstall\\startmenuicon\"";
+        }
+
+        _logService.Log(LogLevel.Info, $"Launching installer (portable: {isPortable}), app will restart after install...");
 
-        _logService.Log(LogLevel.Info, "Installer launched successfully");
+        // Use cmd /c to: run installer (wait for it to finish) then relaunch the app.
+        // The caller should exit the application immediately after this call.
+        var cmdArgs = $"/c start /wait \"\" \"{_downloadedInstallerPath}\" {installerArgs} && start \"\" \"{appExePath}\"";
+        Process.Start(new ProcessStartInfo
+        {
+            FileName = "cmd.exe",
+            Arguments = cmdArgs,
+            UseShellExecute = false,
+            CreateNoWindow = true
+        });
     }
 
     private VersionInfo CreateDefaultVersion()

src/Winhance.UI/Features/Common/Localization/af.json

@@ -69,6 +69,9 @@
   "Dialog_Update_NoUpdates_Message": "Jy het die nuutste weergawe van Winhance.",
   "Dialog_Update_CheckError_Title": "Opdateringkontrolefout",
   "Dialog_Update_CheckError_Message": "Daar het 'n fout voorgekom terwyl daar vir opdaterings gekontroleer is: {0}",
+  "Dialog_Update_Installed_Title": "Opdatering Gereed",
+  "Dialog_Update_Installed_Message": "Die opdatering is afgelaai. Klik Herbegin om te installeer en Winhance te herbegin.",
+  "Dialog_Update_Button_Relaunch": "Herbegin",
   "Dialog_ImportConfig_Title": "Voer Konfigurasie In",
   "Dialog_ImportConfig_Option_Own_Title": "Voer my eie konfigurasie in",
   "Dialog_ImportConfig_Option_Own_Description": "Kies 'n konfigurasielêer vanaf jou rekenaar",

src/Winhance.UI/Features/Common/Localization/ar.json

@@ -1380,6 +1380,9 @@
     "Dialog_Update_NoUpdates_Message": "لديك أحدث إصدار من Winhance.",
     "Dialog_Update_CheckError_Title": "خطأ في التحقق من التحديثات",
     "Dialog_Update_CheckError_Message": "حدث خطأ أثناء التحقق من التحديثات: {0}",
+    "Dialog_Update_Installed_Title": "التحديث جاهز",
+    "Dialog_Update_Installed_Message": "تم تنزيل التحديث. انقر فوق إعادة التشغيل للتثبيت وإعادة تشغيل Winhance.",
+    "Dialog_Update_Button_Relaunch": "إعادة التشغيل",
     "Dialog_ImportOptions_Message": "اختر كيف تريد استيراد التكوين:",
     "Button_Delete": "حذف",
     "Category_AdvancedTools_StatusText": "أدوات متقدمة لتخصيص Windows",

src/Winhance.UI/Features/Common/Localization/cs.json

@@ -69,6 +69,9 @@
   "Dialog_Update_NoUpdates_Message": "Máte nejnovější verzi Winhance.",
   "Dialog_Update_CheckError_Title": "Chyba kontroly aktualizací",
   "Dialog_Update_CheckError_Message": "Při kontrole aktualizací došlo k chybě: {0}",
+  "Dialog_Update_Installed_Title": "Aktualizace připravena",
+  "Dialog_Update_Installed_Message": "Aktualizace byla stažena. Klikněte na Restartovat pro instalaci a restartování Winhance.",
+  "Dialog_Update_Button_Relaunch": "Restartovat",
   "Dialog_ImportConfig_Title": "Importovat konfiguraci",
   "Dialog_ImportConfig_Option_Own_Title": "Importovat vlastní konfiguraci",
   "Dialog_ImportConfig_Option_Own_Description": "Vyberte konfigurační soubor z vašeho počítače",

src/Winhance.UI/Features/Common/Localization/de.json

@@ -69,6 +69,9 @@
   "Dialog_Update_NoUpdates_Message": "Sie haben die neueste Version von Winhance.",
   "Dialog_Update_CheckError_Title": "Fehler bei der Update-Prüfung",
   "Dialog_Update_CheckError_Message": "Beim Prüfen auf Updates ist ein Fehler aufgetreten: {0}",
+  "Dialog_Update_Installed_Title": "Update bereit",
+  "Dialog_Update_Installed_Message": "Das Update wurde heruntergeladen. Klicken Sie auf Neu starten, um das Update zu installieren und Winhance neu zu starten.",
+  "Dialog_Update_Button_Relaunch": "Neu starten",
   "Dialog_ImportConfig_Title": "Konfiguration importieren",
   "Dialog_ImportConfig_Option_Own_Title": "Eigene Konfiguration importieren",
   "Dialog_ImportConfig_Option_Own_Description": "Wählen Sie eine Konfigurationsdatei von Ihrem Computer aus",

src/Winhance.UI/Features/Common/Localization/el.json

@@ -69,6 +69,9 @@
   "Dialog_Update_NoUpdates_Message": "Έχετε την τελευταία έκδοση του Winhance.",
   "Dialog_Update_CheckError_Title": "Σφάλμα ελέγχου ενημερώσεων",
   "Dialog_Update_CheckError_Message": "Παρουσιάστηκε σφάλμα κατά τον έλεγχο για ενημερώσεις: {0}",
+  "Dialog_Update_Installed_Title": "Η ενημέρωση είναι έτοιμη",
+  "Dialog_Update_Installed_Message": "Η ενημέρωση έχει ληφθεί. Κάντε κλικ στο Επανεκκίνηση για εγκατάσταση και επανεκκίνηση του Winhance.",
+  "Dialog_Update_Button_Relaunch": "Επανεκκίνηση",
   "Dialog_ImportConfig_Title": "Εισαγωγή Ρυθμίσεων",
   "Dialog_ImportConfig_Option_Own_Title": "Εισαγωγή δικών μου ρυθμίσεων",
   "Dialog_ImportConfig_Option_Own_Description": "Επιλέξτε ένα αρχείο ρυθμίσεων από τον υπολογιστή σας",

src/Winhance.UI/Features/Common/Localization/en.json

@@ -71,6 +71,9 @@
   "Dialog_Update_NoUpdates_Message": "You have the latest version of Winhance.",
   "Dialog_Update_CheckError_Title": "Update Check Error",
   "Dialog_Update_CheckError_Message": "An error occurred while checking for updates: {0}",
+  "Dialog_Update_Installed_Title": "Update Ready",
+  "Dialog_Update_Installed_Message": "The update has been downloaded. Click Relaunch to install and restart Winhance.",
+  "Dialog_Update_Button_Relaunch": "Relaunch",
   "Dialog_ImportConfig_Title": "Import Config",
   "Dialog_ImportConfig_Option_Own_Title": "Import my own config",
   "Dialog_ImportConfig_Option_Own_Description": "Select a configuration file from your computer",

src/Winhance.UI/Features/Common/Localization/es.json

@@ -69,6 +69,9 @@
   "Dialog_Update_NoUpdates_Message": "Tienes la última versión de Winhance.",
   "Dialog_Update_CheckError_Title": "Error al buscar actualizaciones",
   "Dialog_Update_CheckError_Message": "Se produjo un error al buscar actualizaciones: {0}",
+  "Dialog_Update_Installed_Title": "Actualización lista",
+  "Dialog_Update_Installed_Message": "La actualización se ha descargado. Haz clic en Relanzar para instalar y reiniciar Winhance.",
+  "Dialog_Update_Button_Relaunch": "Reiniciar",
   "Dialog_ImportConfig_Title": "Importar Configuración",
   "Dialog_ImportConfig_Option_Own_Title": "Importar mi propia configuración",
   "Dialog_ImportConfig_Option_Own_Description": "Selecciona un archivo de configuración de tu equipo",