Refactoring generator

usercode · Jul 26, 2024 · 798efad · 798efad
1 parent d87f1e7
commit 798efad
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 26 deletions.
diff --git a/src/ImageWizard.Core/Middlewares/ImageWizardExtensions.cs b/src/ImageWizard.Core/Middlewares/ImageWizardExtensions.cs
@@ -17,9 +17,6 @@ public static class ImageWizardExtensions
     /// <summary>
     /// Maps ImageWizard endpoint with specified base path.
     /// </summary>
-    /// <param name="endpoints"></param>
-    /// <param name="path"></param>
-    /// <returns></returns>
     public static IEndpointConventionBuilder MapImageWizard(this IEndpointRouteBuilder endpoints, string path = ImageWizardDefaults.BasePath)
     {
         return endpoints
@@ -30,9 +27,6 @@ public static IEndpointConventionBuilder MapImageWizard(this IEndpointRouteBuild
     /// <summary>
     /// Use ImageWizard middleware with default base path. ("/image")
     /// </summary>
-    /// <param name="builder"></param>
-    /// <param name="endpointsHandler"></param>
-    /// <returns></returns>
     public static IApplicationBuilder UseImageWizard(this IApplicationBuilder builder, Action<IImageWizardEndpointBuilder>? endpointsHandler = null)
     {
         return UseImageWizard(builder, ImageWizardDefaults.BasePath, endpointsHandler);
@@ -41,10 +35,6 @@ public static IApplicationBuilder UseImageWizard(this IApplicationBuilder builde
     /// <summary>
     /// Use ImageWizard middleware with specified base path.
     /// </summary>
-    /// <param name="builder"></param>
-    /// <param name="path"></param>
-    /// <param name="endpointsHandler"></param>
-    /// <returns></returns>
     public static IApplicationBuilder UseImageWizard(this IApplicationBuilder builder, string path, Action<IImageWizardEndpointBuilder>? endpointsHandler = null)
     {
         builder.Map(path, x =>
@@ -72,9 +62,6 @@ public static IApplicationBuilder UseImageWizard(this IApplicationBuilder builde
     /// <see cref="IUrlSignature"/> -> <see cref="HMACSHA256UrlSignature"/><br/>
     /// <see cref="IStreamPool"/> -> <see cref="RecyclableMemoryStreamPool"/><br/>
     /// </summary>
-    /// <param name="services"></param>
-    /// <param name="options"></param>
-    /// <returns></returns>
     public static IImageWizardBuilder AddImageWizard(this IServiceCollection services, Action<ImageWizardOptions>? options = null)
     {
         if (options != null)

diff --git a/src/ImageWizard.Core/Pipelines/Factory/FilterAction.cs b/src/ImageWizard.Core/Pipelines/Factory/FilterAction.cs
@@ -3,20 +3,19 @@
 // MIT License
 
 using Microsoft.Extensions.DependencyInjection;
-using System.Diagnostics.CodeAnalysis;
 using System.Text.RegularExpressions;
 
 namespace ImageWizard.Processing;
 
 public class FilterAction<TFilter> : IFilterAction
     where TFilter : IFilter
 {
-    public delegate void FilterItemHandler(TFilter filer, GroupCollection groups);
+    public delegate void FilterActionHandler(TFilter filer, GroupCollection groups);
 
-    public FilterAction(string name, [StringSyntax(StringSyntaxAttribute.Regex)]string pattern, FilterItemHandler handler)
+    public FilterAction(string name, Regex pattern, FilterActionHandler handler)
     {
         Name = name;
-        Regex = new Regex(pattern);
+        Regex = pattern;
         Handler = handler;
     }
 
@@ -33,7 +32,7 @@ public FilterAction(string name, [StringSyntax(StringSyntaxAttribute.Regex)]stri
     /// <summary>
     /// Handler
     /// </summary>
-    public FilterItemHandler Handler { get; }
+    public FilterActionHandler Handler { get; }
 
     public bool TryExecute(IServiceProvider serviceProvider, string input, FilterContext filterContext)
     {

diff --git a/src/ImageWizard.Core/Pipelines/Pipeline.cs b/src/ImageWizard.Core/Pipelines/Pipeline.cs
@@ -166,10 +166,8 @@ public async Task<DataResult> StartAsync(PipelineContext context)
         preProcessing?.Invoke(filterContext);
 
         //execute filters
-        while (context.UrlFilters.Count > 0)
+        while (context.UrlFilters.TryPeek(out FilterSegment segment))
         {
-            FilterSegment segment = context.UrlFilters.Peek();
-
             if (FilterFactories.TryGetValue(segment.Name, out var filters))
             {
                 //find and execute filter

diff --git a/src/ImageWizard.Generators/FilterGenerator.cs b/src/ImageWizard.Generators/FilterGenerator.cs
@@ -47,7 +47,7 @@ private void Generate(SourceProductionContext context, ImmutableArray<GeneratorA
                             string pattern = CreateParameterRegex(methodSymbol);
                             string parser = CreateParameterParser(methodSymbol);
 
-                            x.AppendLine($"new FilterAction<{group.Key.Identifier.Text}>(\"{method.TargetSymbol.Name.ToLower()}\", \"{pattern}\", (filter, group) => {{ {parser} }}),");
+                            x.AppendLine($"new FilterAction<{group.Key.Identifier.Text}>(\"{method.TargetSymbol.Name.ToLower()}\", new Regex(@\"{pattern}\"), (filter, group) => {{ {parser} }}),");
                         }
                         x.AppendLine("];");
                     });
@@ -99,15 +99,15 @@ private string CreateParameterRegex(IMethodSymbol methodSymbol)
                     or SpecialType.System_Int16
                     or SpecialType.System_Int32
                     or SpecialType.System_Int64
-                    => @"-?\\d+",
+                    => @"-?\d+",
 
                     SpecialType.System_Single
                     or SpecialType.System_Double
                     or SpecialType.System_Decimal
-                    => @"-?\\d+\\.\\d+",
+                    => @"-?\d+\.\d+",
 
                     SpecialType.System_Boolean => "True|False",
-                    SpecialType.System_String => @"(('[^']*')|([A-Za-z0-9-_\\s]+))",
+                    SpecialType.System_String => @"(('[^']*')|([A-Za-z0-9-_\s]+))",
 
                     _ => throw new Exception()
                 };
@@ -120,7 +120,7 @@ or SpecialType.System_Decimal
             });
         }
 
-        return $@"^\\({string.Join(",", parameterItems.Select(x => x.Pattern).ToArray())}\\)$";
+        return $@"^\({string.Join(",", parameterItems.Select(x => x.Pattern).ToArray())}\)$";
     }
 
     private string CreateParameterParser(IMethodSymbol methodSymbol)