Initial PupNet test

Author: MattEqualsCoder

.github/workflows/linux.yml

@@ -33,7 +33,7 @@ jobs:
         if: ${{ github.event_name != 'pull_request' }}
         with:
           path: "Deploy/OUT/MSUScripter*"
-          name: MSUScripterLinux
+          name: MSUScripter
 
       # - name: Restore dependencies
       #   run: dotnet restore

.github/workflows/windows.yml

@@ -2,7 +2,7 @@ name: .NET Build + Publish
 
 on:
   push:
-    branches: [main]
+    branches: [main, ui-rewrite]
   pull_request:
     branches: [main]
 
@@ -47,4 +47,4 @@ jobs:
         if: ${{ github.event_name != 'pull_request' }}
         with:
           path: "setup/Output/*"
-          name: MSUScripter_${{ steps.version.outputs.number }}
+          name: MSUScripter

MSUScripter/Assets/app.metainfo.xml

@@ -28,12 +28,12 @@
         <keyword>development</keyword>
         <keyword>programming</keyword>
     </keywords>
-
+<!-- 
     <screenshots>
         <screenshot type="default">
-            <image>https://private-user-images.githubusercontent.com/63823784/356325792-a31f393d-7b62-4550-b475-c754404332bd.png?jwt=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3NTg1NDgzMzMsIm5iZiI6MTc1ODU0ODAzMywicGF0aCI6Ii82MzgyMzc4NC8zNTYzMjU3OTItYTMxZjM5M2QtN2I2Mi00NTUwLWI0NzUtYzc1NDQwNDMzMmJkLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTA5MjIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwOTIyVDEzMzM1M1omWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTEzZjI5ZDc5ZThmMjExZDc3OTIwOGMwYTUyNDA3M2Y4MzUzYjU4YTUxMzliYzQzYjYzOWQyNzVkZDZjNTU2MzQmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.KO9do_00DMvZSFlkft31g9sVz25VfRG9e0pk_UcNrpU</image>
+            <image></image>
         </screenshot>
-    </screenshots>
+    </screenshots> -->
 
     <releases>
         ${APPSTREAM_CHANGELOG_XML}

MSUScripter/Assets/org.mattequalscoder.msuscripter.desktop

@@ -0,0 +1,23 @@
+[Desktop Entry]
+Type=Application
+Name=MSU Scripter
+Icon=org.mattequalscoder.msuscripter
+StartupWMClass=MSUScripter
+Comment=UI application for creating MSUs and PCM files
+Exec=%FileName%
+TryExec=%FileName%
+NoDisplay=false
+Terminal=false
+Categories=Utility;
+X-AppImage-Name=AppId
+X-AppImage-Version=AppVersion
+X-AppImage-Arch=PackageArch
+MimeType=
+Keywords=
+Icon=%IconPath%
+Path=%FolderPath%
+Actions=remove
+
+[Desktop Action remove]
+Name=Uninstall MSU Scripter
+Exec=%UninstallPath%

MSUScripter/Assets/uninstall.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+rm -f "%IconPath%"
+rm -f "%FolderPath%/%FileName%"
+rm -f "%DesktopFilePath%"
+rm -rf "%LocalDataPath%"

MSUScripter/MSUScripter.csproj

@@ -50,6 +50,9 @@
 
 	<ItemGroup>
 	  <AvaloniaResource Include="Assets\**" />
+	  <EmbeddedResource Include="Assets\icon.svg" />
+	  <EmbeddedResource Include="Assets\org.mattequalscoder.msuscripter.desktop" />
+	  <EmbeddedResource Include="Assets\uninstall.sh" />
 	  <EmbeddedResource Include="empty.pcm" />
 	</ItemGroup>
 

MSUScripter/Program.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Reflection;
 // ReSharper disable once RedundantUsingDirective
 using System.Linq;
 using System.Threading;
@@ -61,6 +62,11 @@ public static void Main(string[] args)
         {
             StartingProject = args[0];
         }
+
+        if (OperatingSystem.IsLinux())
+        {
+            _ = SetupLinuxDesktopFile();
+        }
 
         MainHost = Host.CreateDefaultBuilder(args)
             .UseSerilog()
@@ -161,6 +167,109 @@ await Dispatcher.UIThread.Invoke(async () =>
         });
     }
 
+    private static async Task SetupLinuxDesktopFile()
+    {
+        await Task.Run(() =>
+        {
+            var desktopPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                "applications");
+            if (!Directory.Exists(desktopPath))
+            {
+                return;
+            }
+
+            var iconFolderPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                "icons");
+            if (!Directory.Exists(iconFolderPath))
+            {
+                Directory.CreateDirectory(iconFolderPath);
+            }
+
+            var iconPath = Path.Combine(Path.Combine(iconFolderPath, "MSUScripter.svg"));
+
+            var appImagePath = Directory.EnumerateFiles(Environment.CurrentDirectory, "MSUScripter*.AppImage")
+                .FirstOrDefault();
+            Log.Logger.Information("appImagePath: {Path}", appImagePath);
+            if (string.IsNullOrEmpty(appImagePath) || !File.Exists(appImagePath))
+            {
+                return;
+            }
+
+            var desktopFilePath = Path.Combine(desktopPath, "MSUScripter.desktop");
+            var uninstallFilePath = Path.Combine(Directories.BaseFolder, "uninstall.sh");
+
+            var assembly = Assembly.GetExecutingAssembly();
+            CopyIconFile(assembly, iconPath);
+            CopyUninstallFile(assembly, appImagePath, iconPath, desktopFilePath, uninstallFilePath);
+            CopyDesktopFile(assembly, appImagePath, iconPath, uninstallFilePath, desktopFilePath);
+        });
+    }
+
+    private static void CopyDesktopFile(Assembly assembly, string appImagePath, string iconPath, string uninstallPath, string targetPath)
+    {
+        const string resourceName = "MSUScripter.Assets.org.mattequalscoder.msuscripter.desktop";
+        using var stream = assembly.GetManifestResourceStream(resourceName);
+        if (stream == null)
+        {
+            return;
+        }
+        using var reader = new StreamReader(stream);
+        var desktopText = reader.ReadToEnd();
+
+        var workingDirectory = Path.GetDirectoryName(appImagePath);
+        var fileName = Path.GetFileName(appImagePath);
+        desktopText = desktopText.Replace("%FolderPath%", workingDirectory);
+        desktopText = desktopText.Replace("%FileName%", fileName);
+        desktopText = desktopText.Replace("%IconPath%", iconPath);
+        desktopText = desktopText.Replace("%DesktopFilePath%", targetPath);
+        desktopText = desktopText.Replace("%UninstallPath%", uninstallPath);
+        File.WriteAllText(targetPath, desktopText);
+    }
+    
+    private static void CopyUninstallFile(Assembly assembly, string appImagePath, string iconPath, string desktopFilePath, string targetPath)
+    {
+        if (!OperatingSystem.IsLinux())
+        {
+            return;
+        }
+        
+        const string resourceName = "MSUScripter.Assets.uninstall.sh";
+        using var stream = assembly.GetManifestResourceStream(resourceName);
+        if (stream == null)
+        {
+            return;
+        }
+        using var reader = new StreamReader(stream);
+        var fileText = reader.ReadToEnd();
+
+        var workingDirectory = Path.GetDirectoryName(appImagePath);
+        var fileName = Path.GetFileName(appImagePath);
+        fileText = fileText.Replace("%FolderPath%", workingDirectory);
+        fileText = fileText.Replace("%FileName%", fileName);
+        fileText = fileText.Replace("%IconPath%", iconPath);
+        fileText = fileText.Replace("%DesktopFilePath%", desktopFilePath);
+        fileText = fileText.Replace("%LocalDataPath%", Directories.BaseFolder);
+        File.WriteAllText(targetPath, fileText);
+        File.SetUnixFileMode(targetPath, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute | UnixFileMode.GroupExecute);
+    }
+
+    private static void CopyIconFile(Assembly assembly, string targetPath)
+    {
+        const string resourceName = "MSUScripter.Assets.icon.svg";
+        using var stream = assembly.GetManifestResourceStream(resourceName);
+        if (stream == null)
+        {
+            return;
+        }
+
+        using var fileStream = new FileStream(Path.Combine(targetPath), FileMode.Create);
+        for (var i = 0; i < stream.Length; i++)
+        {
+            fileStream.WriteByte((byte)stream.ReadByte());
+        }
+        fileStream.Close();
+    }
+
 #if DEBUG
     private static string LogPath => Path.Combine(Directories.LogFolder, "msu-scripter-debug_.log");
 #else