redone update function, logo decorations

Error504TimeOut · Error504TimeOut · commit ef439d7f5527 · 2024-10-21T18:25:52.000+02:00
diff --git a/AdvancedSettings.axaml b/AdvancedSettings.axaml
@@ -12,6 +12,6 @@
         <TextBox x:Name="AdvBox" Margin="0,8,0,0" Watermark="{x:Static lang:Resources.AdvWatermark}"/>
         <Button Margin="0,8,0,0" Content="{x:Static lang:Resources.Apply}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Click="Button_OnClick"/>
         <Button Margin="0,8,0,0" Content="{x:Static lang:Resources.OpenParameterWiki}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Click="WikiBtn_OnClick"/>
-        <Button Margin="0,4,0,0" Content="{x:Static lang:Resources.RestartSetup}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Click="UpdateBtn_OnClick"/>
+        <Button x:Name="UpdateBtn" Margin="0,4,0,0" Content="{x:Static lang:Resources.UpdateBtn}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Click="UpdateBtn_OnClick"/>
     </StackPanel>
 </Window>
diff --git a/AdvancedSettings.axaml.cs b/AdvancedSettings.axaml.cs
@@ -1,7 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
+using System.IO.Compression;
+using System.Net.Http;
 using System.Runtime.InteropServices.JavaScript;
+using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using MsBox.Avalonia;
@@ -42,21 +46,71 @@ private void WikiBtn_OnClick(object? sender, RoutedEventArgs e)
 
     private async void UpdateBtn_OnClick(object? sender, RoutedEventArgs e)
     {
-        var box = MessageBoxManager.GetMessageBoxCustom(new MessageBoxCustomParams
+        UpdateBtn.IsEnabled = false;
+        string tmpDir = Path.Join(Path.GetTempPath(), Path.GetRandomFileName());
+        string basePath = MainWindow.AppConfiguration.MoSpeedPath.Replace("\\dist", "\\").Replace("/dist", "/");
+        Directory.CreateDirectory(tmpDir);
+        string outputPath = Path.Join(tmpDir, "mospeed.zip");
+        try
         {
-            ContentMessage = String.Format(Lang.Resources.ConfirmReset, MainWindow.ConfigFolder),
+            using var client = new HttpClient();
+            using var response =
+                await client.GetAsync("https://github.com/EgonOlsen71/basicv2/archive/refs/heads/master.zip",
+                    HttpCompletionOption.ResponseHeadersRead);
+            response.EnsureSuccessStatusCode();
+            await using var contentStream = await response.Content.ReadAsStreamAsync();
+            await using var fileStream =
+                new FileStream(outputPath, FileMode.Create, FileAccess.Write, FileShare.None, 8192, true);
+            var buffer = new byte[8192];
+            long totalBytesRead = 0;
+            int bytesRead;
+            while ((bytesRead = await contentStream.ReadAsync(buffer, 0, buffer.Length)) > 0)
+            {
+                await fileStream.WriteAsync(buffer.AsMemory(0, bytesRead));
+                totalBytesRead += bytesRead;
+            }
+            fileStream.Close();
+            await Task.Run(() =>
+            {
+                ZipFile.ExtractToDirectory(Path.Join(tmpDir, "mospeed.zip"),
+                    tmpDir, true);
+            });
+            try
+            {
+                Directory.Delete(basePath, true);   
+            }
+            catch{}
+            Shared.CopyFilesRecursively(Path.Join(tmpDir, "basicv2-master"),
+                basePath);
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine(ex + "//" + ex.Message);
+            var box = MessageBoxManager.GetMessageBoxCustom(new MessageBoxCustomParams
+            {
+                ContentMessage = Lang.Resources.MSDownloadError + $" {ex.Message}",
+                ButtonDefinitions = new List<ButtonDefinition>
+                {
+                    new ButtonDefinition { Name = "Ok" }
+                },
+                Icon = MsBox.Avalonia.Enums.Icon.Error
+            });
+            await box.ShowAsPopupAsync(this);
+            return;
+        }
+        finally
+        {
+            UpdateBtn.IsEnabled = true;
+        }
+        var sBox = MessageBoxManager.GetMessageBoxCustom(new MessageBoxCustomParams
+        {
+            ContentMessage = Lang.Resources.MSDownloadSuccess + $" {MainWindow.AppConfiguration.MoSpeedPath}",
             ButtonDefinitions = new List<ButtonDefinition>
             {
-                new ButtonDefinition {Name = Lang.Resources.Abort, IsCancel = true},
-                new ButtonDefinition { Name = Lang.Resources.Yes }
+                new ButtonDefinition { Name = "Ok" }
             },
-            Icon = MsBox.Avalonia.Enums.Icon.Question
+            Icon = MsBox.Avalonia.Enums.Icon.Success
         });
-        var res = await box.ShowAsPopupAsync(this);
-        if (res == Lang.Resources.Yes)
-        {
-            SetupWindow sw = new SetupWindow(true);
-            sw.ShowDialog(this);
-        }
+        await sBox.ShowAsPopupAsync(this);
     }
 }
diff --git a/Assets/Images/mospeed_christmas.png b/Assets/Images/mospeed_christmas.png
diff --git a/Assets/Images/mospeed_halloween.png b/Assets/Images/mospeed_halloween.png
diff --git a/Assets/Images/mospeed_pride.png b/Assets/Images/mospeed_pride.png
diff --git a/Configuration.cs b/Configuration.cs
@@ -6,9 +6,8 @@ public class Configuration
 {
     [XmlElement("mospeed")]
     public string MoSpeedPath { get; set; }
-   
-    /*[XmlElement("javaskip")]
-    public bool SkipJavaCheck { get; set; }*/
     [XmlElement("javapath")]
     public string JavaPath { get; set; }
+    [XmlElement("logodec")]
+    public bool LogoDecoration { get; set; } = true;
 }
diff --git a/Lang/Resources.Designer.cs b/Lang/Resources.Designer.cs
diff --git a/Lang/Resources.de.resx b/Lang/Resources.de.resx
@@ -263,8 +263,8 @@
     <data name="CompileCancel" xml:space="preserve">
         <value>Kompilieren abgebrochen</value>
     </data>
-    <data name="RestartSetup" xml:space="preserve">
-        <value>Setup neustarten (MoSpeed updaten)</value>
+    <data name="UpdateBtn" xml:space="preserve">
+        <value>Update MoSpeed (überschreibt aktuell ausgewähltes MoSpeed)</value>
     </data>
     <data name="ConfirmReset" xml:space="preserve">
         <value>Wenn du updatest, wird der Inhalt von '{0}' gelöscht. Danach wird der Setup-Dialog erscheinen und du kannst eine neue Setup-Option auswählen. Möchtest du fortfahren?</value>
@@ -273,7 +273,7 @@
         <value>Ja</value>
     </data>
     <data name="ConfigReadError" xml:space="preserve">
-        <value>Es gab einen Fehler beim lesen der Konfigurationsdatei. SObald du dieses Pop-Up schließt, wird alles in {0} gelöscht und der Einrichtungsdialog wird erscheinen.</value>
+        <value>Es gab einen Fehler beim lesen der Konfigurationsdatei. Sobald du dieses Pop-Up schließt, wird alles in {0} gelöscht und der Einrichtungsdialog wird erscheinen. ({1})</value>
     </data>
     <data name="Ignore" xml:space="preserve">
         <value>Ignorieren</value>
diff --git a/Lang/Resources.resx b/Lang/Resources.resx
@@ -270,8 +270,8 @@
     <data name="CompileCancel" xml:space="preserve">
         <value>Compilation canceled</value>
     </data>
-    <data name="RestartSetup" xml:space="preserve">
-        <value>Restart Setup (Update MoSpeed)</value>
+    <data name="UpdateBtn" xml:space="preserve">
+        <value>Update MoSpeed (overrides currently selected MoSpeed)</value>
     </data>
     <data name="ConfirmReset" xml:space="preserve">
         <value>By updating, everything in '{0}' will be deleted if you choose to continue. The setup dialog will appear and you can choose a setup option again. Do you want to continue?</value>
@@ -280,7 +280,7 @@
         <value>Yes</value>
     </data>
     <data name="ConfigReadError" xml:space="preserve">
-        <value>There has been an error reading the config file. Once you close this pop-up, everything in {0} will be deleted and the Setup will reappear.</value>
+        <value>There has been an error reading the config file. Once you close this pop-up, everything in {0} will be deleted and the Setup will reappear. ({1})</value>
     </data>
     <data name="Ignore" xml:space="preserve">
         <value>Ignore</value>
diff --git a/MainWindow.axaml.cs b/MainWindow.axaml.cs
@@ -16,11 +16,13 @@
 using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Media.Imaging;
+using Avalonia.Platform;
 using Avalonia.Platform.Storage;
 using Avalonia.VisualTree;
 using MsBox.Avalonia;
 using MsBox.Avalonia.Dto;
 using MsBox.Avalonia.Models;
+using SkiaSharp;
 
 namespace MoSpeedUI;
 
@@ -55,17 +57,18 @@ public MainWindow()
             ControlPanel.MaxWidth = (int)(e.ClientSize.Width * 0.75);
             ControlPanel.Width = ControlPanel.MaxWidth;
         };
-        this.Opened += (sender, args) =>
+        this.Opened += async (sender, args) =>
         {
             if (!Directory.Exists(ConfigFolder))
             {
                 Directory.CreateDirectory(ConfigFolder);
-                SetupRoutine(true);
+                await SetupRoutine();
                 ReadConfig();
+                return;
             }
-            else if (!File.Exists(ConfigFile))
+            if (!File.Exists(ConfigFile))
             {
-                SetupRoutine(true);
+                await SetupRoutine(true);
                 ReadConfig();
             }
             else
@@ -131,29 +134,60 @@ public MainWindow()
             }
         };
         AboutLink.Cursor = new Cursor(StandardCursorType.Hand);
+        if (AppConfiguration.LogoDecoration)
+        {
+            DateTime dt = DateTime.Today;
+            if (dt.Month == 6)
+            {
+                MoSpeedLogo.Source =
+                    new Bitmap(AssetLoader.Open(new Uri("avares://MoSpeedUI/Assets/Images/mospeed_pride.png")));
+            }
+            else if (dt.Month == 12)
+            {
+                MoSpeedLogo.Source =
+                    new Bitmap(AssetLoader.Open(new Uri("avares://MoSpeedUI/Assets/Images/mospeed_christmas.png")));
+            }
+            else if (dt.Month == 10 && Enumerable.Range(20, 31).Contains(dt.Day))
+            {
+                MoSpeedLogo.Source =
+                    new Bitmap(AssetLoader.Open(new Uri("avares://MoSpeedUI/Assets/Images/mospeed_halloween.png")));
+            }
+        }
         PlatformSelect.SelectedIndex = 0;
     }
 
     private void ReadConfig()
     {
         try
         {
+            Configuration propConfig = new();
+            bool redoConfig = false;
             XmlSerializer ser = new XmlSerializer(typeof(Configuration));
             StreamReader r = new StreamReader(ConfigFile);
             AppConfiguration = (Configuration)ser.Deserialize(r)!;
             r.Close();
             foreach(PropertyDescriptor descriptor in TypeDescriptor.GetProperties(AppConfiguration))
             {
                 string name = descriptor.Name;
-                object value = descriptor.GetValue(AppConfiguration);
+                object? value = descriptor.GetValue(AppConfiguration);
                 Console.WriteLine("{0}={1}", name, value);
+                if (Equals(value, descriptor.GetValue(propConfig)))
+                {
+                    Console.WriteLine("{0} not configured, will be saved with default value {1}", name, value);
+                    redoConfig = true;
+                }
             }
+            if (redoConfig)
+            {
+                SetupWindow.RegenerateConfig(AppConfiguration);
+            } 
         }
-        catch
+        catch (Exception e)
         {
+            Console.WriteLine(e + "//"+e.Message);
             var box = MessageBoxManager.GetMessageBoxCustom(new MessageBoxCustomParams
             {
-                ContentMessage = Lang.Resources.ConfigReadError,
+                ContentMessage = String.Format(Lang.Resources.ConfigReadError, ConfigFolder, e.Message),
                 ButtonDefinitions = new List<ButtonDefinition>
                 {
                     new ButtonDefinition { Name = "Ok" }
@@ -500,10 +534,10 @@ private string GenerateMemHolesString()
         }
         return String.Join(",",memholes);
     }
-    private void SetupRoutine(bool restart = false)
+    private async Task SetupRoutine(bool restart = false)
     {
         SetupWindow setupWindow = new(restart);
-        setupWindow.ShowDialog(this);
+        await setupWindow.ShowDialog(this);
     }
 
     private void AdvSettings_OnClick(object? sender, RoutedEventArgs e)
diff --git a/MoSpeedUI.csproj b/MoSpeedUI.csproj
@@ -58,5 +58,11 @@
       <AvaloniaResource Include="Assets\Fonts\SUSE-SemiBold.ttf" />
       <None Remove="Assets\Fonts\SUSE-Thin.ttf" />
       <AvaloniaResource Include="Assets\Fonts\SUSE-Thin.ttf" />
+      <None Remove="Assets\Images\mospeed_christmas.png" />
+      <AvaloniaResource Include="Assets\Images\mospeed_christmas.png" />
+      <None Remove="Assets\Images\mospeed_halloween.png" />
+      <AvaloniaResource Include="Assets\Images\mospeed_halloween.png" />
+      <None Remove="Assets\Images\mospeed_pride.png" />
+      <AvaloniaResource Include="Assets\Images\mospeed_pride.png" />
     </ItemGroup>
 </Project>
diff --git a/Shared.cs b/Shared.cs
@@ -0,0 +1,21 @@
+using System.IO;
+
+namespace MoSpeedUI;
+
+public class Shared
+{
+    public static void CopyFilesRecursively(string sourcePath, string targetPath)
+    {
+        //Now Create all of the directories
+        foreach (string dirPath in Directory.GetDirectories(sourcePath, "*", SearchOption.AllDirectories))
+        {
+            Directory.CreateDirectory(dirPath.Replace(sourcePath, targetPath));
+        }
+
+        //Copy all the files & Replaces any files with the same name
+        foreach (string newPath in Directory.GetFiles(sourcePath, "*.*",SearchOption.AllDirectories))
+        {
+            File.Copy(newPath, newPath.Replace(sourcePath, targetPath), true);
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,8 @@ public class Configuration`
`6`	`6`	`{`
`7`	`7`	`[XmlElement("mospeed")]`
`8`	`8`	`public string MoSpeedPath { get; set; }`
`9`		`-`
`10`		`- /*[XmlElement("javaskip")]`
`11`		`- public bool SkipJavaCheck { get; set; }*/`
`12`	`9`	`[XmlElement("javapath")]`
`13`	`10`	`public string JavaPath { get; set; }`
	`11`	`+ [XmlElement("logodec")]`
	`12`	`+ public bool LogoDecoration { get; set; } = true;`
`14`	`13`	`}`