WIP - cleanup

imazen · Jan 27, 2024 · 31fc0dc · 31fc0dc
1 parent dfda9ff
commit 31fc0dc
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 202 deletions.
diff --git a/src/Imageflow.Server/Internal/MiddlewareOptionsServerBuilder.cs b/src/Imageflow.Server/Internal/MiddlewareOptionsServerBuilder.cs
@@ -7,19 +7,17 @@
 using Imazen.Abstractions.DependencyInjection;
 using Imazen.Abstractions.Logging;
 using Imazen.Common.Storage;
-using Imazen.Routing.Compatibility.ImageflowServer;
 using Imazen.Routing.Engine;
 using Imazen.Routing.Health;
 using Imazen.Routing.HttpAbstractions;
 using Imazen.Routing.Layers;
-using Imazen.Routing.Promises;
 using Imazen.Routing.Promises.Pipelines;
+using Imazen.Routing.Promises.Pipelines.Watermarking;
 using Imazen.Routing.Requests;
 using Imazen.Routing.Serving;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Primitives;
 
 namespace Imageflow.Server.LegacyOptions;
 
@@ -74,7 +72,7 @@ public void PopulateServices()
                 var match = options.NamedWatermarks.FirstOrDefault(a =>
                     name.Equals(a.Name, StringComparison.OrdinalIgnoreCase));
                 if (match == null) return null;
-                return new Imazen.Routing.Compatibility.ImageflowServer.WatermarkWithPath(
+                return new Imazen.Routing.Promises.Pipelines.Watermarking.WatermarkWithPath(
                     match.Name,
                     match.VirtualPath,
                     match.Watermark);

diff --git a/src/Imageflow.Server/LegacyOptions/NamedWatermark.cs b/src/Imageflow.Server/LegacyOptions/NamedWatermark.cs
@@ -1,5 +1,5 @@
 using Imageflow.Fluent;
-using Imazen.Routing.Compatibility.ImageflowServer;
+using Imazen.Routing.Promises.Pipelines.Watermarking;
 using Newtonsoft.Json;
 
 namespace Imageflow.Server

diff --git a/src/Imageflow.Server/UpdatedUrlEventArgs.cs b/src/Imageflow.Server/UpdatedUrlEventArgs.cs
diff --git a/src/Imazen.Routing/Compatibility/ImageflowServer/ContextUrlEventArgs.cs b/src/Imazen.Routing/Compatibility/ImageflowServer/ContextUrlEventArgs.cs
diff --git a/src/Imazen.Routing/Compatibility/ImageflowServer/EnforceLicenseWith.cs b/src/Imazen.Routing/Compatibility/ImageflowServer/EnforceLicenseWith.cs
diff --git a/src/Imazen.Routing/Compatibility/ImageflowServer/ImageflowMiddlewareOptions.cs.txt b/src/Imazen.Routing/Compatibility/ImageflowServer/ImageflowMiddlewareOptions.cs.txt
diff --git a/src/Imazen.Routing/Compatibility/ImageflowServer/Internal/PathPrefixHandler.cs b/src/Imazen.Routing/Compatibility/ImageflowServer/Internal/PathPrefixHandler.cs
diff --git a/src/Imazen.Routing/Compatibility/ImageflowServer/WatermarkingContextEventArgs.cs b/src/Imazen.Routing/Compatibility/ImageflowServer/WatermarkingContextEventArgs.cs
diff --git a/src/Imazen.Routing/Imazen.Routing.csproj b/src/Imazen.Routing/Imazen.Routing.csproj
@@ -22,4 +22,8 @@
 
         <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.*" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
     </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Compatibility\ImageflowServer\Internal\" />
+    </ItemGroup>
 </Project>
diff --git a/src/Imazen.Routing/Layers/LicensingLayer.cs b/src/Imazen.Routing/Layers/LicensingLayer.cs
@@ -1,12 +1,18 @@
 using Imazen.Abstractions.Resulting;
-using Imazen.Routing.Compatibility.ImageflowServer;
+using Imazen.Routing.Promises.Pipelines.Watermarking;
 using Imazen.Routing.Helpers;
 using Imazen.Routing.HttpAbstractions;
 using Imazen.Routing.Requests;
 using Imazen.Routing.Serving;
 
 namespace Imazen.Routing.Layers;
 
+internal enum EnforceLicenseWith
+{
+    RedDotWatermark = 0,
+    Http422Error = 1,
+    Http402Error = 2
+}
 internal class LicensingLayer(ILicenseChecker licenseChecker, EnforceLicenseWith enforcementMethod) : IRoutingLayer
 {
     public string Name => "Licensing";

diff --git a/src/Imazen.Routing/Layers/MutableRequestEventLayer.cs b/src/Imazen.Routing/Layers/MutableRequestEventLayer.cs
@@ -1,7 +1,8 @@
 using Imazen.Abstractions.Resulting;
-using Imazen.Routing.Compatibility.ImageflowServer;
+using Imazen.Routing.Promises.Pipelines.Watermarking;
 using Imazen.Routing.Helpers;
 using Imazen.Routing.Requests;
+using Microsoft.Extensions.Primitives;
 
 namespace Imazen.Routing.Layers;
 internal class PathPrefixHandler<T>
@@ -15,6 +16,24 @@ internal PathPrefixHandler(string prefix, T handler)
 
     public T Handler { get; }
 }
+
+internal readonly struct MutableRequestEventArgs
+{
+    internal MutableRequestEventArgs(MutableRequest request)
+    {
+        Request = request;
+    }
+    public string VirtualPath {
+        get => Request.MutablePath;
+        set => Request.MutablePath = value;
+    }
+    public MutableRequest Request { get; }
+
+    public IDictionary<string,StringValues> Query {
+        get => Request.MutableQueryString;
+        set => Request.MutableQueryString = value;
+    }
+}
 internal class MutableRequestEventLayer: IRoutingLayer
 {
     public MutableRequestEventLayer(string name, List<PathPrefixHandler<Func<MutableRequestEventArgs, bool>>> handlers)

diff --git a/src/Imazen.Routing/Promises/Pipelines/ImagingMiddleware.cs b/src/Imazen.Routing/Promises/Pipelines/ImagingMiddleware.cs
@@ -6,7 +6,7 @@
 using Imazen.Abstractions.HttpStrings;
 using Imazen.Abstractions.Logging;
 using Imazen.Abstractions.Resulting;
-using Imazen.Routing.Compatibility.ImageflowServer;
+using Imazen.Routing.Promises.Pipelines.Watermarking;
 using Imazen.Routing.Helpers;
 using Imazen.Routing.HttpAbstractions;
 using Imazen.Routing.Requests;

diff --git a/...lity/ImageflowServer/WatermarkWithPath.cs → ...pelines/Watermarking/WatermarkWithPath.cs b/...lity/ImageflowServer/WatermarkWithPath.cs → ...pelines/Watermarking/WatermarkWithPath.cs
@@ -1,6 +1,6 @@
 using Imageflow.Fluent;
 
-namespace Imazen.Routing.Compatibility.ImageflowServer;
+namespace Imazen.Routing.Promises.Pipelines.Watermarking;
 
 public interface IWatermark
 {
@@ -9,11 +9,11 @@ public interface IWatermark
     WatermarkOptions Watermark { get; }
 }
 
-public record class WatermarkWithPath(string? Name, string VirtualPath, WatermarkOptions Watermark)
+public record WatermarkWithPath(string? Name, string VirtualPath, WatermarkOptions Watermark)
     : IWatermark
 {
     public static WatermarkWithPath FromIWatermark(IWatermark watermark)
     {
         return new WatermarkWithPath(watermark.Name, watermark.VirtualPath, watermark.Watermark);
     }
-}
+} 
diff --git a/...ses/Pipelines/WatermarkingLogicOptions.cs → .../Watermarking/WatermarkingLogicOptions.cs b/...ses/Pipelines/WatermarkingLogicOptions.cs → .../Watermarking/WatermarkingLogicOptions.cs
@@ -1,10 +1,12 @@
 using System.Buffers;
 using Imageflow.Fluent;
-using Imazen.Routing.Compatibility.ImageflowServer;
 using Imazen.Routing.HttpAbstractions;
 using Imazen.Routing.Requests;
 
-namespace Imazen.Routing.Promises.Pipelines;
+namespace Imazen.Routing.Promises.Pipelines.Watermarking;
+
+
+
 
 public record WatermarkingLogicOptions(Func<string, WatermarkWithPath?>? LookupWatermark, Func<IRequestSnapshot, IList<WatermarkWithPath>?, IList<WatermarkWithPath>?>? MutateWatermarks)
 {

diff --git a/src/Imazen.Routing/Promises/hash_design.md b/src/Imazen.Routing/Promises/hash_design.md
diff --git a/src/Imazen.Routing/Serving/ImageServer.cs b/src/Imazen.Routing/Serving/ImageServer.cs
@@ -12,6 +12,7 @@
 using Imazen.Routing.HttpAbstractions;
 using Imazen.Routing.Promises;
 using Imazen.Routing.Promises.Pipelines;
+using Imazen.Routing.Promises.Pipelines.Watermarking;
 using Imazen.Routing.Requests;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;

diff --git a/tests/ImazenShared.Tests/Routing/Serving/ImageServerTests.cs b/tests/ImazenShared.Tests/Routing/Serving/ImageServerTests.cs
@@ -1,6 +1,6 @@
 using Imazen.Abstractions.DependencyInjection;
 using Imazen.Abstractions.Logging;
-using Imazen.Routing.Compatibility.ImageflowServer;
+using Imazen.Routing.Promises.Pipelines.Watermarking;
 using Imazen.Routing.Engine;
 using Imazen.Routing.HttpAbstractions;
 using Imazen.Routing.Layers;