Updated EllieHub to 1.0.1.0

EllieHub/Common/AppResources.cs

@@ -95,19 +95,16 @@ public static class AppResources
     /// </summary>
     public const string LightBackground = "LightBackground";
 
-
     /// <summary>
     /// Resource type: <see cref="ImmutableSolidColorBrush"/>
     /// </summary>
     public const string MediumBackground = "MediumBackground";
 
-
     /// <summary>
     /// Resource type: <see cref="ImmutableSolidColorBrush"/>
     /// </summary>
     public const string HeavyBackground = "HeavyBackground";
 
-
     /// <summary>
     /// Resource type: <see cref="ImmutableSolidColorBrush"/>
     /// </summary>

EllieHub/EllieHub.csproj

@@ -2,7 +2,7 @@
     <PropertyGroup>
         <!--Project Settings-->
         <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <AnalysisLevel>latest</AnalysisLevel>
         <LangVersion>latest</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
@@ -16,10 +16,11 @@
 
         <!--Publishing-->
         <PublishSingleFile>true</PublishSingleFile>
+        <SelfContained>true</SelfContained>
         <DebugType>embedded</DebugType>
 
         <!--Version-->
-    <VersionPrefix>1.0.0.0</VersionPrefix>
+        <VersionPrefix>1.0.1.0</VersionPrefix>
 
         <!--Avalonia Settings-->
         <ApplicationManifest>app.manifest</ApplicationManifest>

EllieHub/Services/EllieOrchestrator.cs

@@ -30,12 +30,10 @@ public sealed class EllieOrchestrator : IBotOrchestrator
     public EllieOrchestrator(ReadOnlyAppConfig appConfig)
         => _appConfig = appConfig;
 
-
     /// <inheritdoc/>
     public bool IsBotRunning(Guid botId)
         => _runningBots.ContainsKey(botId);
 
-
     /// <inheritdoc/>
     public bool Start(Guid botId)
     {

EllieHub/Services/EllieResolver.cs

@@ -162,52 +162,15 @@ public sealed partial class EllieResolver : IBotResolver
                 cToken
             );
 
-            // Move the bot root directory while renaming it
+            // Move the bot root directory
             if (Environment.OSVersion.Platform is not PlatformID.Unix)
-            {
+                await InstallToWindowsAsync(downloadStream, installationUri, zipTempLocation, botTempLocation, cToken);
-                // Save the zip file
-                using (var fileStream = new FileStream(zipTempLocation, FileMode.Create))
-                    await downloadStream.CopyToAsync(fileStream, cToken);
-
-                // Extract the zip file
-                await Task.Run(() => ZipFile.ExtractToDirectory(zipTempLocation, _tempDirectory), cToken);
-
-                // Move the bot root directory while renaming it
-                Directory.Move(botTempLocation, installationUri);
-            }
             else
-            {
+                await InstallToUnixAsync(downloadStream, installationUri, botTempLocation, cToken);
-                // Extract the tar ball
-                await TarFile.ExtractToDirectoryAsync(downloadStream, _tempDirectory, true, cToken);
-
-                // Move the bot root directory with "mv" to circumvent this issue on Unix systems: https://github.com/dotnet/runtime/issues/31149
-                using var moveProcess = Utilities.StartProcess("mv", $"\"{botTempLocation}\" \"{installationUri}\"");
-                await moveProcess.WaitForExitAsync(cToken);
-
-                // Set executable permission
-                using var chmod = Utilities.StartProcess("chmod", $"+x \"{Path.Combine(installationUri, FileName)}\"");
-                await chmod.WaitForExitAsync(cToken);
-            }
 
             // Reapply bot settings
             if (File.Exists(backupFileUri))
-            {
+                await ReaplyBotSettingsAsync(installationUri, backupFileUri, cToken);
-                using var zipFile = ZipFile.OpenRead(backupFileUri);
-                var zippedFiles = zipFile.Entries
-                    .Where(x =>
-                        x.Name is "creds.yml" or "creds_example.yml"
-                        || (!string.IsNullOrWhiteSpace(x.Name) && x.FullName.Contains("data/"))
-                    );
-
-                foreach (var zippedFile in zippedFiles)
-                {
-                    var fileDestinationPath = zippedFile.FullName.Split('/')
-                        .Prepend(Directory.GetParent(installationUri)?.FullName ?? string.Empty)
-                        .ToArray();
-
-                    await RestoreFileAsync(zippedFile, Path.Combine(fileDestinationPath), cToken);
-                }
-            }
 
             // Update settings
             await _appConfigManager.UpdateBotEntryAsync(Id, x => x with { Version = latestVersion }, cToken);
@@ -230,6 +193,73 @@ public sealed partial class EllieResolver : IBotResolver
         }
     }
 
+    /// <summary>
+    /// Installs the Nadeko instance on a Unix system.
+    /// </summary>
+    /// <param name="downloadStream">The stream of data downloaded from the source.</param>
+    /// <param name="installationUri">The absolute path to the directory the bot got installed to.</param>
+    /// <param name="botTempLocation">The absolute path to the temporary directory the bot is extracted to.</param>
+    /// <param name="cToken">The cancellation token.</param>
+    private async ValueTask InstallToUnixAsync(Stream downloadStream, string installationUri, string botTempLocation, CancellationToken cToken = default)
+    {
+        // Extract the tar ball
+        await TarFile.ExtractToDirectoryAsync(downloadStream, _tempDirectory, true, cToken);
+
+        // Move the bot root directory with "mv" to circumvent this issue on Unix systems: https://github.com/dotnet/runtime/issues/31149
+        using var moveProcess = Utilities.StartProcess("mv", $"\"{botTempLocation}\" \"{installationUri}\"");
+        await moveProcess.WaitForExitAsync(cToken);
+
+        // Set executable permission
+        using var chmod = Utilities.StartProcess("chmod", $"+x \"{Path.Combine(installationUri, FileName)}\"");
+        await chmod.WaitForExitAsync(cToken);
+    }
+
+    /// <summary>
+    /// Installs the Nadeko instance on a non-Unix system.
+    /// </summary>
+    /// <param name="downloadStream">The stream of data downloaded from the source.</param>
+    /// <param name="installationUri">The absolute path to the directory the bot got installed to.</param>
+    /// <param name="zipTempLocation">The absolute path to the zip file the bot is initially on.</param>
+    /// <param name="botTempLocation">The absolute path to the temporary directory the bot is extracted to.</param>
+    /// <param name="cToken">The cancellation token.</param>
+    private async static ValueTask InstallToWindowsAsync(Stream downloadStream, string installationUri, string zipTempLocation, string botTempLocation, CancellationToken cToken = default)
+    {
+        // Save the zip file
+        using (var fileStream = new FileStream(zipTempLocation, FileMode.Create))
+            await downloadStream.CopyToAsync(fileStream, cToken);
+
+        // Extract the zip file
+        await Task.Run(() => ZipFile.ExtractToDirectory(zipTempLocation, _tempDirectory), cToken);
+
+        // Move the bot root directory while renaming it
+        Directory.Move(botTempLocation, installationUri);
+    }
+
+    /// <summary>
+    /// Reaplies the bot settings and user-defined data from the specified backup.
+    /// </summary>
+    /// <param name="installationUri">The absolute path to the directory the bot got installed to.</param>
+    /// <param name="backupFileUri">The absolute path to the backup zip file.</param>
+    /// <param name="cToken">The cancellation token.</param>
+    private async static ValueTask ReaplyBotSettingsAsync(string installationUri, string backupFileUri, CancellationToken cToken = default)
+    {
+        using var zipFile = ZipFile.OpenRead(backupFileUri);
+        var zippedFiles = zipFile.Entries
+            .Where(x =>
+                x.Name is "creds.yml" or "creds_example.yml"
+                || (!string.IsNullOrWhiteSpace(x.Name) && x.FullName.Contains("data/"))
+            );
+
+        foreach (var zippedFile in zippedFiles)
+        {
+            var fileDestinationPath = zippedFile.FullName.Split('/')
+                .Prepend(Directory.GetParent(installationUri)?.FullName ?? string.Empty)
+                .ToArray();
+
+            await RestoreFileAsync(zippedFile, Path.Combine(fileDestinationPath), cToken);
+        }
+    }
+
     /// <summary>
     /// Extracts the specified <paramref name="zippedFile"/> to the <paramref name="destinationPath"/>.
     /// </summary>

EllieHub/Services/LogWriter.cs

@@ -48,7 +48,7 @@ public sealed class LogWriter : ILogWriter
         var botEntry = _appConfig.BotEntries[botId];
         var now = DateTimeOffset.Now;
         var date = new DateOnly(now.Year, now.Month, now.Day).ToShortDateString().Replace('/', '-');
-        var fileUri = Path.Combine(_appConfig.LogsDirectoryUri, $"{botEntry.Name}_{date}-{now.ToUnixTimeSeconds()}.txt");
+        var fileUri = Path.Combine(_appConfig.LogsDirectoryUri, $"{botEntry.Name}_v{botEntry.Version}_{date}-{now.ToUnixTimeSeconds()}.txt");
 
         await File.WriteAllTextAsync(fileUri, logStringBuilder.ToString(), cToken);
 

EllieHub/ViewModels/Controls/BotConfigViewModel.cs

@@ -10,7 +10,6 @@ using ReactiveUI;
 using SkiaSharp;
 using System.Diagnostics;
 using System.Reactive.Disposables;
-using System.Runtime.InteropServices;
 
 namespace EllieHub.ViewModels.Controls;
 

EllieHub/ViewModels/Controls/ConfigViewModel.cs

@@ -1,4 +1,3 @@
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Styling;
 using MsBox.Avalonia.Enums;