Skip to content

Commit 2850b77

Browse files
committed
Use source generator for calling filters
1 parent 79946af commit 2850b77

File tree

81 files changed

+1177
-493
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1177
-493
lines changed

src/ImageWizard.Client/Builder/Types/Abstracts/IFilter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// https://github.com/usercode/ImageWizard
33
// MIT License
44

5+
using ImageWizard.Utils;
6+
57
namespace ImageWizard.Client;
68

79
/// <summary>
@@ -12,7 +14,5 @@ public interface IFilter : IBuildUrl, IUrlBuilder
1214
/// <summary>
1315
/// Filter
1416
/// </summary>
15-
/// <param name="filter"></param>
16-
/// <returns></returns>
17-
IFilter Filter(string filter);
17+
IFilter Filter(FilterSegment filter);
1818
}

src/ImageWizard.Client/Builder/Types/File.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// https://github.com/usercode/ImageWizard
33
// MIT License
44

5+
using ImageWizard.Utils;
6+
57
namespace ImageWizard.Client;
68

79
public abstract class File : IFilter
@@ -19,5 +21,5 @@ public File(IFilter filter)
1921

2022
public string BuildUrl() => CurrentFilter.BuildUrl();
2123

22-
public IFilter Filter(string filter) => CurrentFilter.Filter(filter);
24+
public IFilter Filter(FilterSegment filter) => CurrentFilter.Filter(filter);
2325
}

src/ImageWizard.Client/Builder/UrlBuilderContext.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public UrlBuilderContext(UrlBuilder imageUrlBuilder)
1919
}
2020

2121
public UrlBuilder ImageUrlBuilder { get; }
22-
private List<string> Filters { get; } = new List<string>();
22+
private List<FilterSegment> Filters { get; } = new List<FilterSegment>();
2323
private string? LoaderSource { get; set; }
2424
private string? LoaderType { get; set; }
2525

@@ -34,7 +34,7 @@ public IFilter LoadData(string loaderType, string loaderSource)
3434
return this;
3535
}
3636

37-
public IFilter Filter(string filter)
37+
public IFilter Filter(FilterSegment filter)
3838
{
3939
Filters.Add(filter);
4040

src/ImageWizard.Core/Filters/Filter.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44

55
namespace ImageWizard;
66

7-
public abstract class Filter<TContext> : IFilter<TContext>
7+
public abstract class Filter<TContext> : IFilter
88
where TContext : FilterContext
99
{
1010
public abstract string Namespace { get; }
1111

1212
public TContext Context { get; set; }
13+
14+
FilterContext IFilter.Context { get => Context; set => Context = (TContext)value; }
1315
}

src/ImageWizard.Core/Filters/FilterAction.cs

Lines changed: 0 additions & 241 deletions
This file was deleted.

src/ImageWizard.Core/Filters/IFilter.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ namespace ImageWizard;
66

77
public interface IFilter
88
{
9+
FilterContext Context { get; set; }
910
}

src/ImageWizard.Core/Filters/IFilterAction.cs

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/ImageWizard.Core/Filters/IFilterAction~.cs

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/ImageWizard.Core/Filters/IFilter~.cs

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/ImageWizard.Core/Middlewares/ImageWizardApi.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ public static async Task ExecuteAsync(
289289
LastAccess = now,
290290
Key = key,
291291
Hash = hash,
292-
Filters = url.Filters,
292+
Filters = url.Filters.Select(x=> x.Fullname).ToArray(),
293293
LoaderSource = url.LoaderSource,
294294
LoaderType = url.LoaderType,
295295
MimeType = processingContext.Result.MimeType,

0 commit comments

Comments
 (0)