Removed dependency to Svg package

usercode · usercode · commit 548c7992310a · 2023-12-12T12:07:24.000+01:00
diff --git a/src/ImageWizard.AWS/AwsExtensions.cs b/src/ImageWizard.AWS/AwsExtensions.cs
@@ -4,7 +4,6 @@
 
 using ImageWizard.AWS;
 using Microsoft.Extensions.DependencyInjection;
-using System;
 
 namespace ImageWizard;
 
diff --git a/src/ImageWizard.AWS/AwsLoader.cs b/src/ImageWizard.AWS/AwsLoader.cs
@@ -6,7 +6,6 @@
 using Amazon.S3.Model;
 using ImageWizard.Loaders;
 using Microsoft.Extensions.Options;
-using System.Threading.Tasks;
 
 namespace ImageWizard.AWS;
 
diff --git a/src/ImageWizard.Analytics/AnalyticsData.cs b/src/ImageWizard.Analytics/AnalyticsData.cs
@@ -2,8 +2,6 @@
 // https://github.com/usercode/ImageWizard
 // MIT License
 
-using System.Collections.Generic;
-
 namespace ImageWizard.Analytics;
 
 /// <summary>
diff --git a/src/ImageWizard.Analytics/ImageRequestAnalytics.cs b/src/ImageWizard.Analytics/ImageRequestAnalytics.cs
@@ -2,8 +2,6 @@
 // https://github.com/usercode/ImageWizard
 // MIT License
 
-using System;
-
 namespace ImageWizard.Analytics;
 
 /// <summary>
diff --git a/src/ImageWizard.Azure/AzureBlobExtensions.cs b/src/ImageWizard.Azure/AzureBlobExtensions.cs
@@ -4,7 +4,6 @@
 
 using ImageWizard.Azure;
 using Microsoft.Extensions.DependencyInjection;
-using System;
 
 namespace ImageWizard;
 
diff --git a/src/ImageWizard.Azure/AzureBlobLoader.cs b/src/ImageWizard.Azure/AzureBlobLoader.cs
@@ -7,7 +7,6 @@
 using Azure.Storage.Blobs.Models;
 using ImageWizard.Loaders;
 using Microsoft.Extensions.Options;
-using System.Threading.Tasks;
 
 namespace ImageWizard.Azure;
 
diff --git a/src/ImageWizard.DocNET/DocNETPipeline.cs b/src/ImageWizard.DocNET/DocNETPipeline.cs
@@ -5,9 +5,6 @@
 using ImageWizard.DocNET.Filters.Base;
 using ImageWizard.Processing;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace ImageWizard.DocNET;
 
diff --git a/src/ImageWizard.DocNET/Filters/Base/DocNETFilterContext.cs b/src/ImageWizard.DocNET/Filters/Base/DocNETFilterContext.cs
@@ -4,8 +4,6 @@
 
 using ImageWizard.Processing;
 using ImageWizard.Processing.Results;
-using System.IO;
-using System.Threading.Tasks;
 
 namespace ImageWizard.DocNET.Filters.Base;
 
diff --git a/src/ImageWizard.DocNET/Filters/PageToImageFilter.cs b/src/ImageWizard.DocNET/Filters/PageToImageFilter.cs
@@ -10,7 +10,6 @@
 using ImageWizard.Processing.Results;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
-using System.IO;
 
 namespace ImageWizard.DocNET.Filters;
 
diff --git a/src/ImageWizard.DocNET/Filters/SubPagesFIlter.cs b/src/ImageWizard.DocNET/Filters/SubPagesFIlter.cs
@@ -6,7 +6,6 @@
 using ImageWizard.Attributes;
 using ImageWizard.DocNET.Filters.Base;
 using ImageWizard.Processing.Results;
-using System.IO;
 
 namespace ImageWizard.DocNET.Filters;
 
diff --git a/src/ImageWizard.DocNET/ImageWizardBuilderExtensions.cs b/src/ImageWizard.DocNET/ImageWizardBuilderExtensions.cs
@@ -5,7 +5,6 @@
 using ImageWizard.DocNET;
 using ImageWizard.DocNET.Builder;
 using ImageWizard.DocNET.Filters;
-using System;
 
 namespace ImageWizard;
 
diff --git a/src/ImageWizard.FFMpegCore/Builder/FFMpegBuilderExtensions.cs b/src/ImageWizard.FFMpegCore/Builder/FFMpegBuilderExtensions.cs
@@ -6,7 +6,6 @@
 using ImageWizard.FFMpegCore.Builder;
 using ImageWizard.FFMpegCore.Filters.Base;
 using Microsoft.Extensions.DependencyInjection;
-using System;
 
 namespace ImageWizard;
 
diff --git a/src/ImageWizard.FFMpegCore/FFMpegExtensions.cs b/src/ImageWizard.FFMpegCore/FFMpegExtensions.cs
@@ -5,7 +5,6 @@
 using ImageWizard.FFMpegCore;
 using ImageWizard.FFMpegCore.Builder;
 using ImageWizard.FFMpegCore.Filters;
-using System;
 
 namespace ImageWizard;
 
diff --git a/src/ImageWizard.FFMpegCore/FFMpegPipeline.cs b/src/ImageWizard.FFMpegCore/FFMpegPipeline.cs
@@ -5,9 +5,6 @@
 using ImageWizard.FFMpegCore.Filters.Base;
 using ImageWizard.Processing;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace ImageWizard.FFMpegCore;
 
diff --git a/src/ImageWizard.FFMpegCore/Filters/Base/FFMpegContext.cs b/src/ImageWizard.FFMpegCore/Filters/Base/FFMpegContext.cs
@@ -4,8 +4,6 @@
 
 using ImageWizard.Processing;
 using ImageWizard.Processing.Results;
-using System;
-using System.Threading.Tasks;
 
 namespace ImageWizard.FFMpegCore.Filters.Base;
 
diff --git a/src/ImageWizard.FFMpegCore/Filters/FrameFilter.cs b/src/ImageWizard.FFMpegCore/Filters/FrameFilter.cs
@@ -8,7 +8,6 @@
 using ImageWizard.Attributes;
 using ImageWizard.FFMpegCore.Filters.Base;
 using ImageWizard.Processing.Results;
-using System.IO;
 
 namespace ImageWizard.FFMpegCore.Filters;
 
diff --git a/src/ImageWizard.ImageSharp/Builder/ImageSharpBuilderExtensions.cs b/src/ImageWizard.ImageSharp/Builder/ImageSharpBuilderExtensions.cs
@@ -11,11 +11,8 @@ namespace ImageWizard;
 public static class ImageSharpBuilderExtensions
 {
     /// <summary>
-    /// Registers an ImageSharp filter.
+    /// Registers the <typeparamref name="TFilter"/> filter.
     /// </summary>
-    /// <typeparam name="TFilter"></typeparam>
-    /// <param name="builder"></param>
-    /// <returns></returns>
     public static IImageSharpBuilder WithFilter<TFilter>(this IImageSharpBuilder builder) 
         where TFilter : ImageSharpFilter
     {
diff --git a/src/ImageWizard.MongoDB/ImageWizard.MongoDB.csproj b/src/ImageWizard.MongoDB/ImageWizard.MongoDB.csproj
@@ -21,8 +21,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="MongoDB.Driver" Version="2.22.0" />
-		<PackageReference Include="MongoDB.Driver.GridFS" Version="2.22.0" />
+		<PackageReference Include="MongoDB.Driver" Version="2.23.0" />
+		<PackageReference Include="MongoDB.Driver.GridFS" Version="2.23.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/ImageWizard.OpenCvSharp/Filters/Base/OpenCvSharpFilterContext.cs b/src/ImageWizard.OpenCvSharp/Filters/Base/OpenCvSharpFilterContext.cs
@@ -4,8 +4,6 @@
 
 using ImageWizard.Processing;
 using ImageWizard.Processing.Results;
-using System;
-using System.Threading.Tasks;
 
 namespace ImageWizard.OpenCvSharp.Filters;
 
diff --git a/src/ImageWizard.OpenCvSharp/OpenCvSharpPipeline.cs b/src/ImageWizard.OpenCvSharp/OpenCvSharpPipeline.cs
@@ -5,9 +5,6 @@
 using ImageWizard.OpenCvSharp.Filters;
 using ImageWizard.Processing;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace ImageWizard.ImageSharp.Filters;
 
diff --git a/src/ImageWizard.OpenGraph/Loaders/OpenGraphExtensions.cs b/src/ImageWizard.OpenGraph/Loaders/OpenGraphExtensions.cs
@@ -4,7 +4,6 @@
 
 using ImageWizard.Loaders;
 using Microsoft.Extensions.DependencyInjection;
-using System;
 
 namespace ImageWizard;
 
diff --git a/src/ImageWizard.OpenGraph/Loaders/OpenGraphLoader.cs b/src/ImageWizard.OpenGraph/Loaders/OpenGraphLoader.cs
@@ -5,9 +5,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using OpenGraphNet;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
 
 namespace ImageWizard.Loaders;
 
diff --git a/src/ImageWizard.OpenGraph/Loaders/OpenGraphOptions.cs b/src/ImageWizard.OpenGraph/Loaders/OpenGraphOptions.cs
@@ -2,8 +2,6 @@
 // https://github.com/usercode/ImageWizard
 // MIT License
 
-using System;
-
 namespace ImageWizard.Loaders;
 
 public class OpenGraphOptions : LoaderOptions
diff --git a/src/ImageWizard.OpenStreetMap/Loaders/OpenStreetMapExtensions.cs b/src/ImageWizard.OpenStreetMap/Loaders/OpenStreetMapExtensions.cs
@@ -7,8 +7,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using System;
-using System.Net.Http;
 using System.Net.Http.Headers;
 
 namespace ImageWizard;
diff --git a/src/ImageWizard.OpenStreetMap/Loaders/OpenStreetMapLoader.cs b/src/ImageWizard.OpenStreetMap/Loaders/OpenStreetMapLoader.cs
@@ -5,9 +5,6 @@
 using ImageWizard.Loaders;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
 
 namespace ImageWizard.OpenStreetMap;
 
diff --git a/src/ImageWizard.OpenStreetMap/Loaders/OpenStreetMapOptions.cs b/src/ImageWizard.OpenStreetMap/Loaders/OpenStreetMapOptions.cs
@@ -3,7 +3,6 @@
 // MIT License
 
 using ImageWizard.Loaders;
-using System;
 
 namespace ImageWizard.OpenStreetMap;
 
diff --git a/src/ImageWizard.Playwright/Extensions.cs b/src/ImageWizard.Playwright/Extensions.cs
@@ -4,7 +4,6 @@
 
 using ImageWizard.Playwright;
 using Microsoft.Extensions.DependencyInjection;
-using System;
 
 namespace ImageWizard;
 
diff --git a/src/ImageWizard.Playwright/Loaders/PlaywrightOptions.cs b/src/ImageWizard.Playwright/Loaders/PlaywrightOptions.cs
@@ -3,7 +3,6 @@
 // MIT License
 
 using ImageWizard.Loaders;
-using System;
 
 namespace ImageWizard.Playwright;
 
diff --git a/src/ImageWizard.Playwright/Loaders/ScreenshotLoader.cs b/src/ImageWizard.Playwright/Loaders/ScreenshotLoader.cs
@@ -5,7 +5,6 @@
 using ImageWizard.Loaders;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Microsoft.Playwright;
 
 namespace ImageWizard.Playwright;
 
diff --git a/src/ImageWizard.PuppeteerSharp/Extensions.cs b/src/ImageWizard.PuppeteerSharp/Extensions.cs
@@ -4,7 +4,6 @@
 
 using ImageWizard.PuppeteerSharp;
 using Microsoft.Extensions.DependencyInjection;
-using System;
 
 namespace ImageWizard;
 
diff --git a/src/ImageWizard.PuppeteerSharp/Loaders/PuppeteerOptions.cs b/src/ImageWizard.PuppeteerSharp/Loaders/PuppeteerOptions.cs
@@ -3,7 +3,6 @@
 // MIT License
 
 using ImageWizard.Loaders;
-using System;
 
 namespace ImageWizard.PuppeteerSharp;
 
diff --git a/src/ImageWizard.SvgNet/Builder/SvgNetBuilderExtensions.cs b/src/ImageWizard.SvgNet/Builder/SvgNetBuilderExtensions.cs
@@ -7,7 +7,6 @@
 using ImageWizard.SvgNet.Builder;
 using ImageWizard.SvgNet.Filters;
 using Microsoft.Extensions.DependencyInjection;
-using System;
 
 namespace ImageWizard;
 
diff --git a/src/ImageWizard.SvgNet/Filters/Base/SvgFilterContext.cs b/src/ImageWizard.SvgNet/Filters/Base/SvgFilterContext.cs
@@ -4,12 +4,8 @@
 
 using ImageWizard.Processing;
 using ImageWizard.Processing.Results;
-using Svg;
-using Svg.FilterEffects;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
+using ImageWizard.SvgNet;
+using System.Xml.Linq;
 
 namespace ImageWizard.Filters;
 
@@ -19,53 +15,68 @@ namespace ImageWizard.Filters;
 public class SvgFilterContext : FilterContext
 {
     public SvgFilterContext(
-        PipelineContext processingContext, 
-        SvgDocument image)
+        PipelineContext processingContext,
+        XDocument image)
         : base(processingContext)
     {
-        Image = image;
-        Filters = new List<SvgFilterPrimitive>();
+        Document = image;
+
+        Root = Document.Root ?? throw new ArgumentNullException();
     }
 
     /// <summary>
     /// Image
     /// </summary>
-    public SvgDocument Image { get; }
+    public XDocument Document { get; }
+
+    /// <summary>
+    /// Image
+    /// </summary>
+    public XElement Root { get; }
 
     /// <summary>
     /// Filters
     /// </summary>
-    public IList<SvgFilterPrimitive> Filters { get; set; }
+    public IList<XElement> Filters { get; set; } = new List<XElement>();
 
     public override async Task<DataResult> BuildResultAsync()
     {
         //apply filters
         if (Filters.Any())
         {
-            var defs = Image.Children.GetSvgElementOf<SvgDefinitionList>();
-
-            if (defs == null)
+            if (Root.Attribute("filter") == null)
             {
-                defs = new SvgDefinitionList();
-                Image.Children.Add(defs);
+                Root.Add(new XAttribute("filter", $"url(#filter01)"));
             }
 
-            var filterElement = new Svg.FilterEffects.SvgFilter();
-            filterElement.ID = "filter01";
+            XName defName = SvgConstants.SvgNs + "defs";
+            XName filterName = SvgConstants.SvgNs + "filter";
 
-            defs.Children.Add(filterElement);
+            XElement? def = Root.Element(defName);
 
-            foreach (var f in Filters)
+            if (def == null)
             {
-                filterElement.Children.Add(f);
+                def = new XElement(defName);
+                Root.Add(def);
             }
 
-            Image.CustomAttributes.Add("filter", $"url(#{filterElement.ID})");
+            XElement? filter = def.Element(filterName);
+
+            if (filter == null)
+            {
+                filter = new XElement(filterName, new XAttribute("id", "filter01"));
+                def.Add(filter);
+            }
+
+            foreach (XElement f in Filters)
+            {
+                filter.Add(f);
+            }
         }
 
         Stream mem = ProcessingContext.StreamPool.GetStream();
 
-        Image.Write(mem);
+        Document.Save(mem);
 
         mem.Seek(0, SeekOrigin.Begin);
 
diff --git a/src/ImageWizard.SvgNet/Filters/BlurFilter.cs b/src/ImageWizard.SvgNet/Filters/BlurFilter.cs
diff --git a/src/ImageWizard.SvgNet/Filters/GrayscaleFilter.cs b/src/ImageWizard.SvgNet/Filters/GrayscaleFilter.cs
diff --git a/src/ImageWizard.SvgNet/Filters/ImageFormatFilter.cs b/src/ImageWizard.SvgNet/Filters/ImageFormatFilter.cs
diff --git a/src/ImageWizard.SvgNet/Filters/InvertFilter.cs b/src/ImageWizard.SvgNet/Filters/InvertFilter.cs
diff --git a/src/ImageWizard.SvgNet/Filters/RemoveSizeFilter.cs b/src/ImageWizard.SvgNet/Filters/RemoveSizeFilter.cs
diff --git a/src/ImageWizard.SvgNet/Filters/RotateFilter.cs b/src/ImageWizard.SvgNet/Filters/RotateFilter.cs
diff --git a/src/ImageWizard.SvgNet/Filters/SaturateFilter.cs b/src/ImageWizard.SvgNet/Filters/SaturateFilter.cs
diff --git a/src/ImageWizard.SvgNet/ImageWizard.SvgNet.csproj b/src/ImageWizard.SvgNet/ImageWizard.SvgNet.csproj
diff --git a/src/ImageWizard.SvgNet/ImageWizardBuilderExtensions.cs b/src/ImageWizard.SvgNet/ImageWizardBuilderExtensions.cs
diff --git a/src/ImageWizard.SvgNet/SvgConstants.cs b/src/ImageWizard.SvgNet/SvgConstants.cs
diff --git a/src/ImageWizard.SvgNet/SvgPipeline.cs b/src/ImageWizard.SvgNet/SvgPipeline.cs
diff --git a/src/ImageWizard.TestApp/Pages/Index.cshtml b/src/ImageWizard.TestApp/Pages/Index.cshtml
diff --git a/src/ImageWizard/Dockerfile b/src/ImageWizard/Dockerfile
diff --git a/src/ImageWizard/Program.cs b/src/ImageWizard/Program.cs
diff --git a/src/ImageWizard/Startup.cs b/src/ImageWizard/Startup.cs
diff --git a/src/ImageWizard/appsettings.json b/src/ImageWizard/appsettings.json
