From 065d915d464c048b0cbe8b26835492e7d4279264 Mon Sep 17 00:00:00 2001
From: Pilzinsel64 <pilzinsel64@gmx.de>
Date: Sat, 8 Nov 2025 15:46:56 +0100
Subject: [PATCH] improvements & deployment

---
 Directory.Build.props                         | 16 ++++
 ModpackUpdater.Apps.Client.Gui/AppUpdater.cs  | 83 -----------------
 ModpackUpdater.Apps.Client.Gui/MainForm.axaml | 22 ++---
 .../MainForm.axaml.cs                         | 48 +++++++---
 .../ModpackUpdater.Apps.Client.Gui.csproj     | 14 ++-
 ModpackUpdater.Apps.Client.Gui/Program.cs     |  2 +-
 .../{Windows.pubxml => Release.pubxml}        |  0
 .../app.pupnet.conf                           | 89 +++++++++++++++++++
 Version.cs                                    |  2 +-
 publish.sh                                    |  9 ++
 10 files changed, 173 insertions(+), 112 deletions(-)
 create mode 100644 Directory.Build.props
 delete mode 100644 ModpackUpdater.Apps.Client.Gui/AppUpdater.cs
 rename ModpackUpdater.Apps.Client.Gui/Properties/PublishProfiles/{Windows.pubxml => Release.pubxml} (100%)
 create mode 100644 ModpackUpdater.Apps.Client.Gui/app.pupnet.conf
 create mode 100755 publish.sh

diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..d8283d3
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,16 @@
+<Project>
+  
+  <PropertyGroup>
+    <PackageProjectUrl>https://git.pilzinsel64.de/litw-refined/minecraft-modpack-updater</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <GenerateSerializationAssemblies>False</GenerateSerializationAssemblies>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <NoWarn>1591</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <DebugSymbols>False</DebugSymbols>
+    <DebugType>None</DebugType>
+  </PropertyGroup>
+  
+</Project>
\ No newline at end of file
diff --git a/ModpackUpdater.Apps.Client.Gui/AppUpdater.cs b/ModpackUpdater.Apps.Client.Gui/AppUpdater.cs
deleted file mode 100644
index ba988aa..0000000
--- a/ModpackUpdater.Apps.Client.Gui/AppUpdater.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Pilz.Extensions;
-using System.Reflection;
-
-namespace ModpackUpdater.Apps.Client.Gui;
-
-public class AppUpdater(string updateUrl)
-{
-    private class UpdateInfo
-    {
-        [JsonConverter(typeof(VersionConverter))]
-        public Version? Version { get; set; }
-        public string? DownloadUrl { get; set; }
-    }
-
-    private readonly HttpClient httpClient = new();
-    private UpdateInfo? info;
-
-    public async Task<bool> Check()
-    {
-        var hasUpdate = false;
-
-        try
-        {
-            var appVersion = Assembly.GetExecutingAssembly().GetAppVersion().Version;
-            var result = await httpClient.GetStringAsync(updateUrl);
-            info = JsonConvert.DeserializeObject<UpdateInfo>(result);
-
-            if (info is not null && info.Version > appVersion)
-                hasUpdate = true;
-        }
-        catch
-        {
-        }
-
-        return hasUpdate;
-    }
-
-    public async Task Install()
-    {
-        var client = new HttpClient();
-        var tempFileName = Path.GetTempFileName();
-        var appFileName = Environment.ProcessPath;
-        var oldFileName = appFileName + ".old";
-
-        // Delete old file
-        try
-        {
-            File.Delete(oldFileName);
-        }
-        catch
-        {
-        }
-
-        // Download the new file
-        await using (var tempFileStream = new FileStream(tempFileName, FileMode.Create, FileAccess.ReadWrite))
-        {
-            Stream? downloadStream = null;
-            try
-            {
-                var url = info?.DownloadUrl;
-                downloadStream = await client.GetStreamAsync(url);
-                await downloadStream.CopyToAsync(tempFileStream);
-            }
-            catch
-            {
-            }
-            finally
-            {
-                if (downloadStream != null)
-                    await downloadStream.DisposeAsync();
-            }
-        }
-
-        // Replace current application file with new file
-        if (!string.IsNullOrWhiteSpace(appFileName))
-        {
-            File.Move(appFileName, oldFileName, true);
-            File.Move(tempFileName, appFileName);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ModpackUpdater.Apps.Client.Gui/MainForm.axaml b/ModpackUpdater.Apps.Client.Gui/MainForm.axaml
index 9967507..64b4ea8 100644
--- a/ModpackUpdater.Apps.Client.Gui/MainForm.axaml
+++ b/ModpackUpdater.Apps.Client.Gui/MainForm.axaml
@@ -6,7 +6,9 @@
     xmlns:pilz="https://git.pilzinsel64.de/pilz-framework/pilz"
     mc:Ignorable="d"
     x:Class="ModpackUpdater.Apps.Client.Gui.MainForm"
-    SizeToContent="WidthAndHeight"
+    Width="520"
+    SizeToContent="Height"
+    WindowStartupLocation="CenterScreen"
     Title="Minecraft Modpack Updater"
     Icon="/Assets/app.ico"
     >
@@ -21,9 +23,9 @@
         >
         
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="*" MinWidth="300"/>
-            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="*" MinWidth="250"/>
+            <ColumnDefinition Width="Auto"/>
         </Grid.ColumnDefinitions>
         
         <!-- Labels -->
@@ -31,10 +33,10 @@
         <Label Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Content="{x:Static lang:GeneralLangRes.ModpackConfigUrl}" />
         <Label Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" IsVisible="false" x:Name="LabelInstallKey" Content="{x:Static lang:GeneralLangRes.InstallationKey}" />
         <Label Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Content="{x:Static lang:GeneralLangRes.Status}" />
-        <Label Grid.Row="3" Grid.Column="1" VerticalAlignment="Center">
-            <StackPanel Orientation="Horizontal">
+        <Label Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" VerticalAlignment="Center">
+            <StackPanel Orientation="Horizontal" Spacing="6">
                 <Image Width="16" Height="16" x:Name="ImageStatus" />
-                <TextBlock Margin="3, 0, 0, 0" x:Name="TextStatus" />
+                <TextBlock x:Name="TextStatus" />
             </StackPanel>
         </Label>
         
@@ -45,7 +47,7 @@
             Grid.Column="1"
             VerticalAlignment="Center"
             Watermark="C:\..."
-            TextInput="TextBoxMinecraftProfileFolder_TextInserted"
+            TextChanged="TextBoxMinecraftProfileFolder_TextChanged"
             />
         
         <!-- TextBoxes: ModpackConfig -->
@@ -56,7 +58,7 @@
             Grid.ColumnSpan="2"
             VerticalAlignment="Center"
             Watermark="https://..."
-            TextInput="TextBoxModpackConfig_TextInserted"
+            TextChanged="TextBoxModpackConfig_TextChanged"
             />
       
         <!-- TextBoxes: InstallKey -->
@@ -67,7 +69,7 @@
             Grid.ColumnSpan="2"
             VerticalAlignment="Center"
             Watermark="XXXXX-YYYYY-ZZZZZ-AAAAA-BBBBB"
-            TextInput="TextBoxInstallKey_TextInserted"
+            TextChanged="TextBoxInstallKey_TextChanged"
             IsVisible="false"
             />
         
diff --git a/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs b/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs
index d7ccf6e..5599e0f 100644
--- a/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs
+++ b/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs
@@ -1,17 +1,21 @@
-using Avalonia.Controls;
+using System.Diagnostics;
+using System.Reflection;
+using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 using ModpackUpdater.Apps.Client.Gui.LangRes;
 using ModpackUpdater.Manager;
 using MsBox.Avalonia;
 using MsBox.Avalonia.Enums;
+using Pilz;
 using Pilz.Extensions;
+using Pilz.Runtime;
 using Pilz.SymbolPacks.Sets;
 using Pilz.UI.AvaloniaUI.Symbols;
-using System.Diagnostics;
-using System.Reflection;
 using Pilz.UI.Symbols;
+using Pilz.Updating.Client;
 
 namespace ModpackUpdater.Apps.Client.Gui;
 
@@ -66,7 +70,7 @@ public partial class MainForm : Window
         TextBoxModpackConfig.Text = modpackInfo.ConfigUrl ?? TextBoxModpackConfig.Text;
         TextBoxInstallKey.Text = modpackInfo.ExtrasKey ?? TextBoxInstallKey.Text;
 
-        loadingData = false;
+        Dispatcher.UIThread.Post(() => loadingData = false, DispatcherPriority.Background);
     }
 
     private void LoadOptionsToUi()
@@ -91,6 +95,7 @@ public partial class MainForm : Window
         }
         catch
         {
+            // Ignore
         }
 
         if (loadProfileToUi)
@@ -100,8 +105,9 @@ public partial class MainForm : Window
         {
             updateConfig = ModpackConfig.LoadFromUrl(TextBoxModpackConfig.Text);
         }
-        catch (Exception)
+        catch
         {
+            // Ignore
         }
 
         if (modpackInfo != null)
@@ -260,31 +266,45 @@ public partial class MainForm : Window
 
     private async void MainForm_Loaded(object? sender, RoutedEventArgs e)
     {
-        var updater = new AppUpdater(Program.UpdateUrl);
-        if (await updater.Check() && await MessageBoxManager.GetMessageBoxStandard(MsgBoxLangRes.UpdateAvailable_Title, MsgBoxLangRes.UpdateAvailable, ButtonEnum.YesNo).ShowWindowDialogAsync(this) == ButtonResult.Ok)
+#if !DISABLE_UPDATE
+        var myAppPath = EnvironmentEx.ProcessPath;
+        var updater = new UpdateClient(Program.UpdateUrl, Assembly.GetEntryAssembly()!.GetAppVersion(), AppChannel.Stable)
+        {
+            Distro = RuntimeInformationsEx.GetRuntimeIdentifier(),
+        };
+        
+        if (await updater.CheckForUpdate() is {} packageToInstall
+            && await MessageBoxManager.GetMessageBoxStandard(MsgBoxLangRes.UpdateAvailable_Title, MsgBoxLangRes.UpdateAvailable, ButtonEnum.YesNo).ShowWindowDialogAsync(this) == ButtonResult.Ok)
         {
             SetStatus(GeneralLangRes.DownloadProgramUpdate, Symbols.Fluent.GetImageSource(SymbolsFluent.software_installer));
             IsEnabled = false;
-            await updater.Install();
-            //Application.Restart(); // FIXME
-            return;
+            if (await updater.DownloadPackageAsync(packageToInstall)
+                && await updater.InstallPackageAsync(packageToInstall, myAppPath))
+            {
+                Process.Start(myAppPath);
+                Environment.Exit(0);
+                return;
+            }
+            IsEnabled = true;
         }
+#endif
+        
         CheckStatusAndUpdate(true);
     }
 
-    private void TextBoxMinecraftProfileFolder_TextInserted(object? o, Avalonia.Input.TextInputEventArgs args)
+    private void TextBoxMinecraftProfileFolder_TextChanged(object? o, TextChangedEventArgs args)
     {
         if (!loadingData)
             CheckStatusAndUpdate(true);
     }
 
-    private void TextBoxModpackConfig_TextInserted(object? o, Avalonia.Input.TextInputEventArgs args)
+    private void TextBoxModpackConfig_TextChanged(object? o, RoutedEventArgs args)
     {
         if (!loadingData)
             CheckStatusAndUpdate(false);
     }
 
-    private void TextBoxInstallKey_TextInserted(object? o, Avalonia.Input.TextInputEventArgs args)
+    private void TextBoxInstallKey_TextChanged(object? o, RoutedEventArgs args)
     {
         if (!loadingData)
             CheckStatusAndUpdate(false);
@@ -300,7 +320,7 @@ public partial class MainForm : Window
         });
 
         if (filePaths.Count >= 1)
-            TextBoxMinecraftProfileFolder.Text = filePaths[0].Path.ToString();
+            TextBoxMinecraftProfileFolder.Text = filePaths[0].Path.AbsolutePath;
     }
 
     private async void ButtonCheckForUpdates_Click(object? sender, RoutedEventArgs e)
diff --git a/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj b/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj
index 265a2d7..eb7d9f6 100644
--- a/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj
+++ b/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  
+
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
-    <ApplicationIcon>Assets/app.ico</ApplicationIcon>
-    <AssemblyName>Minecraft Modpack Updater</AssemblyName>
+    <ApplicationIcon>Assets\app.ico</ApplicationIcon>
+    <AssemblyName>MinecraftModpackUpdater</AssemblyName>
     <ImplicitUsings>true</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
@@ -13,6 +13,11 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
+  <ItemGroup>
+    <TrimmerRootAssembly Include="Newtonsoft.Json" />
+    <TrimmerRootAssembly Include="Pilz.SymbolPacks.Fluent" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\Version.cs" />
   </ItemGroup>
@@ -58,6 +63,7 @@
     <PackageReference Include="MessageBox.Avalonia" Version="3.3.0" />
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+    <PackageReference Include="Pilz" Version="2.6.0" />
     <PackageReference Include="Pilz.Configuration" Version="3.2.7" />
     <PackageReference Include="Pilz.Cryptography" Version="2.1.2" />
     <PackageReference Include="Pilz.IO" Version="2.1.0" />
@@ -74,6 +80,8 @@
         <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
         <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="Pilz.Updating" Version="4.3.4" />
+    <PackageReference Include="Pilz.Updating.Client" Version="4.4.1" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/ModpackUpdater.Apps.Client.Gui/Program.cs b/ModpackUpdater.Apps.Client.Gui/Program.cs
index 6a01a31..34fa069 100644
--- a/ModpackUpdater.Apps.Client.Gui/Program.cs
+++ b/ModpackUpdater.Apps.Client.Gui/Program.cs
@@ -7,7 +7,7 @@ namespace ModpackUpdater.Apps.Client.Gui;
 
 public static class Program
 {
-    public const string UpdateUrl = "https://git.pilzinsel64.de/litw-refined/minecraft-modpack-updater/-/snippets/3/raw/main/updates.json";
+    public const string UpdateUrl = "https://git.pilzinsel64.de/litw-refined/minecraft-modpack-updater/-/snippets/3/raw/main/updates-new.json";
 
     private static readonly SettingsManager settingsManager;
 
diff --git a/ModpackUpdater.Apps.Client.Gui/Properties/PublishProfiles/Windows.pubxml b/ModpackUpdater.Apps.Client.Gui/Properties/PublishProfiles/Release.pubxml
similarity index 100%
rename from ModpackUpdater.Apps.Client.Gui/Properties/PublishProfiles/Windows.pubxml
rename to ModpackUpdater.Apps.Client.Gui/Properties/PublishProfiles/Release.pubxml
diff --git a/ModpackUpdater.Apps.Client.Gui/app.pupnet.conf b/ModpackUpdater.Apps.Client.Gui/app.pupnet.conf
new file mode 100644
index 0000000..11de094
--- /dev/null
+++ b/ModpackUpdater.Apps.Client.Gui/app.pupnet.conf
@@ -0,0 +1,89 @@
+# PUPNET DEPLOY: 1.9.1
+# Use: 'pupnet --help conf' for information.
+
+# APP PREAMBLE
+AppBaseName = MinecraftModpackUpdater
+AppFriendlyName = Minecraft Modpack Updater
+AppId = de.pilzinsel64.minecraft-modpack-updater
+AppVersionRelease = 1.10.0[1]
+AppShortSummary = Install and Update Minecraft Modpacks easliy.
+AppDescription = """
+    Minecraft Modpack Updater is a simple tool to install and update a modpack to a selected minecraft profile by a selected modpack configuration file. It downloads a config file via https and checks the version there and what files has been changed and download the updateded files via a given link from the config.
+"""
+AppLicenseId = MIT
+AppLicenseFile = ../LICENSE
+AppChangeFile = 
+
+# PUBLISHER
+PublisherName = Pilzinsel64
+PublisherId = de.pilzinsel64
+PublisherCopyright = Copyright (C) Pilzinsel64 2025
+PublisherLinkName = Pilzinsel64 Homepage
+PublisherLinkUrl = https://pilzinsel64.de
+PublisherEmail = 
+
+# DESKTOP INTEGRATION
+DesktopNoDisplay = false
+DesktopTerminal = false
+DesktopFile = 
+StartCommand = 
+PrimeCategory = 
+MetaFile = 
+IconFiles = """
+    Assets/app.ico
+    Assets/app.svg
+"""
+
+# DOTNET PUBLISH
+DotnetProjectPath = ModpackUpdater.Apps.Client.Gui.csproj
+DotnetPublishArgs = -p:Version=${APP_VERSION} --self-contained true -p:DebugType=None -p:DebugSymbols=false -p:PublishSingleFile=true -p:PublishTrimmed=false
+DotnetPostPublish = 
+DotnetPostPublishOnWindows = 
+
+# PACKAGE OUTPUT
+PackageName = minecraft-modpack-updater
+OutputDirectory = ../publish/client-ui
+
+# APPIMAGE OPTIONS
+AppImageArgs = 
+AppImageRuntimePath = 
+AppImageVersionOutput = false
+
+# FLATPAK OPTIONS
+FlatpakPlatformRuntime = org.freedesktop.Platform
+FlatpakPlatformSdk = org.freedesktop.Sdk
+FlatpakPlatformVersion = 25.08
+FlatpakFinishArgs = """
+    --socket=x11
+"""
+FlatpakBuilderArgs = 
+
+# RPM OPTIONS
+RpmAutoReq = false
+RpmAutoProv = true
+RpmRequires = """
+    krb5-libs
+    libicu
+    openssl-libs
+"""
+
+# DEBIAN OPTIONS
+DebianRecommends = """
+    libc6
+    libgcc1
+    libgssapi-krb5-2
+    libicu70
+    libssl3
+    libstdc++6
+    zlib1g
+"""
+
+# WINDOWS SETUP OPTIONS
+SetupGroupName = 
+SetupAdminInstall = false
+SetupCommandPrompt = 
+SetupMinWindowsVersion = 10
+SetupSignTool = 
+SetupSuffixOutput = 
+SetupVersionOutput = false
+SetupUninstallScript =
\ No newline at end of file
diff --git a/Version.cs b/Version.cs
index 02153ba..705d991 100644
--- a/Version.cs
+++ b/Version.cs
@@ -1,3 +1,3 @@
 using Pilz;
 
-[assembly: AssemblyAppVersion("1.9.5.0")]
\ No newline at end of file
+[assembly: AssemblyAppVersion("1.10.0")]
\ No newline at end of file
diff --git a/publish.sh b/publish.sh
new file mode 100755
index 0000000..0ee086e
--- /dev/null
+++ b/publish.sh
@@ -0,0 +1,9 @@
+pupnet -y -r linux-x64 -k appimage
+pupnet -y -r linux-x64 -k flatpak -p DefineConstants=DISABLE_UPDATE
+#pupnet -y -r linux-x64 -k deb -p DefineConstants=DISABLE_UPDATE
+#pupnet -y -r linux-x64 -k rpm -p DefineConstants=DISABLE_UPDATE
+pupnet -y -r linux-arm64 -k appimage
+pupnet -y -r linux-arm64 -k flatpak -p DefineConstants=DISABLE_UPDATE
+#pupnet -y -r linux-arm64 -k deb -p DefineConstants=DISABLE_UPDATE
+#pupnet -y -r linux-arm64 -k rpm -p DefineConstants=DISABLE_UPDATE
+pupnet -y -r win-x64 -k zip
\ No newline at end of file