Skip to content

Commit 87988a3

Browse files
committed
Refactor expression flag management to be more sane
1 parent dbe0eec commit 87988a3

18 files changed

+494
-253
lines changed

.vscode/launch.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22
"version": "0.2.0",
33
"configurations": [
44

5+
// Build solution in repo root, Imageflow.Server.sln
6+
{
7+
"name": "build",
8+
"type": "coreclr",
9+
"request": "launch",
10+
"preLaunchTask": "build",
11+
"program": "${workspaceFolder}/src/Imageflow.Server/bin/Debug/net8.0/Imageflow.Server.dll",
12+
"args": [],
13+
"cwd": "${workspaceFolder}/src/Imageflow.Server",
14+
"console": "internalConsole",
15+
"stopAtEntry": false
16+
},
17+
18+
519
{
620
"name": "netcoredbg ImazenShared.Tests",
721
"type": "coreclr",

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"azureFunctions.projectSubpath": "src\\Imageflow.Server.AzureFunctions",
2020
"csharp.lsp.enable": true,
2121

22-
"dotnet.testExplorer.testProjectPath": "tests\\**\\**\\*Tests.csproj"
22+
"dotnet.testExplorer.testProjectPath": "tests\\**\\**\\*Tests.csproj",
23+
"eslint.enable": false
2324

2425
}

src/Imazen.Routing/Layers/RoutingExpressions/RoutingExpressionLayer.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public RoutingExpressionLayer(IOptionsMonitor<UriRoutingOptions> options, IReLog
5454
{
5555
group.OnProvidersChanged += () => ReloadRoutes(options.CurrentValue,_providers, _providerGroups);
5656
}
57-
ReloadRoutes(options.CurrentValue,_providers, _providerGroups);
57+
_providerSet =ReloadRoutes(options.CurrentValue,_providers, _providerGroups);
5858
}
5959

6060
// Any schema allowed, but a scheme: is required.
@@ -68,7 +68,7 @@ public RoutingExpressionLayer(IOptionsMonitor<UriRoutingOptions> options, IReLog
6868
AllowedFlagRegexes: null);
6969

7070

71-
private void ReloadRoutes(UriRoutingOptions options, List<IRoutedBlobProvider> providers, List<IRoutedBlobProviderGroup> providerGroups)
71+
private RoutingExpressionProviderSet ReloadRoutes(UriRoutingOptions options, List<IRoutedBlobProvider> providers, List<IRoutedBlobProviderGroup> providerGroups)
7272
{
7373

7474
configIssues.ClearIssues();
@@ -90,6 +90,7 @@ private void ReloadRoutes(UriRoutingOptions options, List<IRoutedBlobProvider> p
9090
throw new Exception("Failed to create routing expression provider set: " + criticalError);
9191
}
9292
_providerSet = set;
93+
return set;
9394

9495
}
9596

0 commit comments

Comments
 (0)