Feat | Check plugin.json In Zip && Unzip DllName Folder

kitUIN · Dec 26, 2024 · 92e111e · 92e111e
1 parent fd22766
commit 92e111e
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 20 deletions.
diff --git a/ShadowPluginLoader.WinUI/AbstractPluginLoader.Assignable.cs b/ShadowPluginLoader.WinUI/AbstractPluginLoader.Assignable.cs
@@ -31,9 +31,10 @@ public void Import(Type type)
         }
         catch (PluginImportException e)
         {
-            Logger?.Warning("{Pre}{Message}", LoggerPrefix, e.Message);
+            Logger.Warning("{Pre}{Message}", LoggerPrefix, e.Message);
         }
     }
+
     /// <summary>
     /// <inheritdoc />
     /// </summary>
@@ -60,12 +61,14 @@ public async Task ImportFromZipAsync(string zipPath)
     {
         try
         {
-            CheckPluginInZip(zipPath);
-            await ImportFromDirAsync(UnZip(PluginFolder, zipPath));
+            var meta = await CheckPluginInZip(zipPath);
+            var outPath = Path.Combine(PluginFolder, meta!.DllName);
+            Logger.Information("{t}",outPath);
+            await ImportFromDirAsync(await UnZip(zipPath, outPath));
         }
         catch (PluginImportException e)
         {
-            Logger?.Warning("{Pre}{Message}", LoggerPrefix, e.Message);
+            Logger.Warning("{Pre}{Message}", LoggerPrefix, e.Message);
         }
     }
 
@@ -195,6 +198,4 @@ public void UpgradePlugin(string id)
     {
         // TODO
     }
-
-
 }
diff --git a/ShadowPluginLoader.WinUI/AbstractPluginLoader.cs b/ShadowPluginLoader.WinUI/AbstractPluginLoader.cs
@@ -14,6 +14,8 @@
 using System.Threading.Tasks;
 using ShadowPluginLoader.WinUI.Args;
 using ShadowPluginLoader.WinUI.Enums;
+using SharpCompress.Archives;
+using SharpCompress.IO;
 using Path = System.IO.Path;
 
 namespace ShadowPluginLoader.WinUI;
@@ -249,20 +251,28 @@ protected virtual void LoadPluginDi(Type tPlugin, TAPlugin aPlugin, TMeta meta)
     /// </summary>
     /// <param name="zipPath">plugin zip path</param>
     /// <exception cref="PluginImportException">Not Found plugin.json in zip</exception>
-    protected virtual void CheckPluginInZip(string zipPath)
+    protected virtual async Task<TMeta?> CheckPluginInZip(string zipPath)
     {
-        using FileStream zipToOpen = new(zipPath, FileMode.Open);
+        await using FileStream zipToOpen = new(zipPath, FileMode.Open);
         using ZipArchive archive = new(zipToOpen, ZipArchiveMode.Update);
         var jsonEntry = archive.GetEntry(PluginJson) ??
                         throw new PluginImportException($"Not Found {PluginJson} in zip {zipPath}");
+        using var reader = new StreamReader(jsonEntry.Open());
+        var jsonContent = await reader.ReadToEndAsync();
+        Logger.Information("{Pre} plugin.json content: {Content}",
+            LoggerPrefix, jsonContent);
+        return JsonSerializer.Deserialize<TMeta>(jsonContent);
     }
 
     /// <summary>
     /// UnZip
     /// </summary>
-    protected virtual string UnZip(string zipPath, string outputPath)
+    protected virtual async Task<string> UnZip(string zipPath, string outputPath)
     {
-        ZipFile.ExtractToDirectory(zipPath, outputPath, true);
+        await using var fStream = File.OpenRead(zipPath);
+        await using var stream = NonDisposingStream.Create(fStream);
+        using var archive = ArchiveFactory.Open(stream);
+        archive.ExtractToDirectory(outputPath);
         return outputPath;
     }
 }
diff --git a/ShadowPluginLoader.WinUI/DIFactory.cs b/ShadowPluginLoader.WinUI/DIFactory.cs
@@ -3,7 +3,6 @@
 
 namespace ShadowPluginLoader.WinUI;
 
-
 /// <summary>
 /// 依赖注入-工厂
 /// </summary>
@@ -13,13 +12,14 @@ public static class DiFactory
     /// 依赖注入-容器
     /// </summary>
     public static Container Services { get; }
+
     static DiFactory()
     {
         Services = new Container(rules => rules.With(FactoryMethod.ConstructorWithResolvableArguments));
         Services.Register(
-            Made.Of(() => Serilog.Log.ForContext(Arg.Index<Type>(0)), r => r.Parent.ImplementationType),
-            setup: Setup.With(condition: r => r.Parent.ImplementationType != null));
-        Services.Register<PluginEventService>(reuse:Reuse.Singleton);
+            Made.Of(() => Serilog.Log.ForContext(Arg.Index<Type>(0)),
+                r => r.ImplementationType ?? r.Parent.ImplementationType ?? typeof(object)),
+            setup: Setup.With(condition: r => r.Parent.ImplementationType != null || r.ImplementationType != null));
+        Services.Register<PluginEventService>(reuse: Reuse.Singleton);
     }
-
-}
+}
diff --git a/ShadowPluginLoader.WinUI/Helpers/SettingsHelper.cs b/ShadowPluginLoader.WinUI/Helpers/SettingsHelper.cs
@@ -55,7 +55,6 @@ public static void Set(string container, string key, object value)
             ApplicationData.Current.LocalSettings.CreateContainer(container,
                 ApplicationDataCreateDisposition.Always);
         coreSettings.Values[key] = value;
-        DiFactory.Services.Resolve<ILogger>().Debug("Container: {container} | [{key}] {value}",
-            container, key, value);
+        Log.Debug("Container: {container} | [{key}] {value}", container, key, value);
     }
 }
diff --git a/ShadowPluginLoader.WinUI/ShadowPluginLoader.WinUI.csproj b/ShadowPluginLoader.WinUI/ShadowPluginLoader.WinUI.csproj
@@ -11,7 +11,7 @@
 		<EnableMsixTooling>true</EnableMsixTooling>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <!-- Nuget -->
-        <Version>1.4.2</Version>
+        <Version>1.4.3</Version>
 		<PackageId>ShadowPluginLoader.WinUI</PackageId>
 		<Owner>kitUIN</Owner>
 		<Authors>kitUIN</Authors>
@@ -28,12 +28,13 @@
 
     <ItemGroup>
         <PackageReference Include="DryIoc.dll" Version="5.4.3" />
-        <PackageReference Include="Serilog" Version="4.1.0" />
+        <PackageReference Include="Serilog" Version="4.2.0" />
 		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.241107002" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
         <PackageReference Include="ShadowPluginLoader.SourceGenerator" Version="1.4.10" />
         <PackageReference Include="kitUIN.CustomExtensions.WinUI" Version="0.6.3" />
         <PackageReference Include="ShadowPluginLoader.Tool" Version="1.3.0" />
+        <PackageReference Include="SharpCompress" Version="0.38.0" />
     </ItemGroup>
     <ItemGroup>
         <None Include="..\README.md" Pack="true" PackagePath="\" />