Unpackaged support

Author: KimihikoAkayasaki

KinectHandler/KinectHandler.vcxproj

@@ -95,7 +95,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Amethyst.Plugins.Contract">
-      <Version>0.3.33</Version>
+      <Version>0.3.35</Version>
     </PackageReference>
     <PackageReference Include="System.ComponentModel">
       <Version>4.3.0</Version>

plugin_KinectOne/PackageUtils.cs

@@ -2,13 +2,27 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Reflection;
+using System.Threading.Tasks;
 using Windows.ApplicationModel;
 using Windows.Storage;
 
 namespace plugin_KinectOne;
 
-public static class PackageUtils
+public static class PathsHandler
 {
+    public static async Task Setup()
+    {
+        if (IsAmethystPackaged) return;
+
+        var root = await StorageFolder.GetFolderFromPathAsync(
+            Path.Join(ProgramLocation.DirectoryName!));
+
+        TemporaryFolderUnpackaged = await (await root
+                .CreateFolderAsync("AppData", CreationCollisionOption.OpenIfExists))
+            .CreateFolderAsync("TempState", CreationCollisionOption.OpenIfExists);
+    }
+
     public static bool IsAmethystPackaged
     {
         get
@@ -24,15 +38,11 @@ public static bool IsAmethystPackaged
         }
     }
 
-    public static string GetAmethystAppDataPath()
-    {
-        return ApplicationData.Current.LocalFolder.Path;
-    }
+    public static FileInfo ProgramLocation => new(Assembly.GetExecutingAssembly().Location);
 
-    public static string GetAmethystTempPath()
-    {
-        return ApplicationData.Current.TemporaryFolder.Path;
-    }
+    public static StorageFolder TemporaryFolder => IsAmethystPackaged ? ApplicationData.Current.TemporaryFolder : TemporaryFolderUnpackaged;
+
+    public static StorageFolder TemporaryFolderUnpackaged { get; set; } // Assigned on Setup()
 }
 
 public static class StorageExtensions

plugin_KinectOne/RuntimeInstaller.cs

@@ -115,25 +115,24 @@ public async Task<bool> Install(IProgress<InstallationProgress> progress, Cancel
                 "Assets", "Resources", "Dependencies", "KinectRuntime-x64.msi")
         };
 
+        await PathsHandler.Setup();
+
         // Copy to temp if amethyst is packaged
         // ReSharper disable once InvertIf
-        if (PackageUtils.IsAmethystPackaged)
-        {
-            // Create a shared folder with the dependencies
-            var dependenciesFolder = await ApplicationData.Current.TemporaryFolder.CreateFolderAsync(
-                Guid.NewGuid().ToString().ToUpper(), CreationCollisionOption.OpenIfExists);
-
-            // Copy all driver files to Amethyst's local data folder
-            new DirectoryInfo(Path.Join(Directory.GetParent(Assembly.GetExecutingAssembly().Location)!.FullName,
-                    "Assets", "Resources", "Dependencies"))
-                .CopyToFolder(dependenciesFolder.Path);
-
-            // Update the installation paths
-            paths =
-            [
-                Path.Join(dependenciesFolder.Path, "KinectRuntime-x64.msi")
-            ];
-        }
+        // Create a shared folder with the dependencies
+        var dependenciesFolder = await PathsHandler.TemporaryFolder.CreateFolderAsync(
+            Guid.NewGuid().ToString().ToUpper(), CreationCollisionOption.OpenIfExists);
+
+        // Copy all driver files to Amethyst's local data folder
+        new DirectoryInfo(Path.Join(Directory.GetParent(Assembly.GetExecutingAssembly().Location)!.FullName,
+                "Assets", "Resources", "Dependencies"))
+            .CopyToFolder(dependenciesFolder.Path);
+
+        // Update the installation paths
+        paths =
+        [
+            Path.Join(dependenciesFolder.Path, "KinectRuntime-x64.msi")
+        ];
 
         // Finally install the packages
         return InstallFiles(paths, progress, cancellationToken);

plugin_KinectOne/plugin_KinectOne.csproj

@@ -16,7 +16,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Amethyst.Plugins.Contract" Version="0.3.33" />
+		<PackageReference Include="Amethyst.Plugins.Contract" Version="0.3.35" />
 		<PackageReference Include="NAudio.Sdl2" Version="2.2.6" />
 		<PackageReference Include="RestSharp" Version="108.0.3" />
 		<PackageReference Include="System.ComponentModel.Composition" Version="8.0.0" />