Skip to content

Commit 76f0a2a

Browse files
Merge pull request #30 from georgidhristov/refactor/split-compare-engine
Refactor/split compare engine
2 parents a009ebe + 247ae5b commit 76f0a2a

8 files changed

Lines changed: 1142 additions & 622 deletions

File tree

DebugProbe.AspNetCore/DebugProbe.AspNetCore.csproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,21 @@
3636
<ItemGroup>
3737
<EmbeddedResource Include="Resources\**\*.html" />
3838
<EmbeddedResource Include="Resources\**\*.css" />
39-
<EmbeddedResource Include="Resources\js\debugprobe-compare.js" />
40-
<EmbeddedResource Include="Resources\js\debugprobe-ui.js" />
39+
<EmbeddedResource Include="Resources\js\debugprobe_compare_engine.js" />
40+
<EmbeddedResource Include="Resources\js\debugprobe_compare_renderer.js" />
41+
<EmbeddedResource Include="Resources\js\debugprobe_ui.js" />
4142
<EmbeddedResource Include="Assets\logo-full.PNG" />
4243
<EmbeddedResource Include="Assets\favicon.ico" />
4344
</ItemGroup>
4445

4546
<ItemGroup>
4647
<None Remove="Resources\**\*.html" />
4748
<None Remove="Resources\**\*.css" />
48-
<None Remove="Resources\js\debugprobe-compare.js" />
49-
<None Remove="Resources\js\debugprobe-ui.js" />
49+
</ItemGroup>
50+
51+
<ItemGroup>
52+
<None Remove="Resources\js\debugprobe_compare_engine.js" />
53+
<None Remove="Resources\js\debugprobe_compare_renderer.js" />
5054
</ItemGroup>
5155

5256
<ItemGroup>

DebugProbe.AspNetCore/Extensions/DebugProbeExtensions.cs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,16 @@ public static IApplicationBuilder UseDebugProbe(this IApplicationBuilder app)
143143
return item is null ? Results.NotFound() : Results.Json(item);
144144
}).ExcludeFromDescription();
145145

146-
webApp.MapGet("/debug/compare.js", () =>
147-
Results.Text(EmbeddedResources.CompareJs, "application/javascript")
148-
).ExcludeFromDescription();
149146

150-
webApp.MapGet("/debug/ui.js", () =>
151-
Results.Text(EmbeddedResources.UiJs, "application/javascript")
152-
).ExcludeFromDescription();
147+
webApp.MapGet("/debug/js/{file}", (string file) =>
148+
{
149+
if (!EmbeddedResources.JavaScript.TryGetValue(file, out var content))
150+
{
151+
return Results.NotFound();
152+
}
153+
154+
return Results.Text(content, "application/javascript");
155+
}).ExcludeFromDescription();
153156

154157
webApp.MapPost("/debug/clear", (DebugEntryStore store) =>
155158
{

DebugProbe.AspNetCore/Internal/EmbeddedResources.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,20 @@
77
internal static class EmbeddedResources
88
{
99
public static readonly string Css = ResourceLoader.LoadCss("debugprobe.css");
10+
1011
public static readonly string Layout = ResourceLoader.LoadHtml("_shared.layout.html");
12+
1113
public static readonly string Index = ResourceLoader.LoadHtml("index.html");
14+
1215
public static readonly string Details = ResourceLoader.LoadHtml("details.html");
13-
public static readonly string CompareJs = ResourceLoader.LoadJs("debugprobe-compare.js");
14-
public static readonly string UiJs = ResourceLoader.LoadJs("debugprobe-ui.js");
16+
17+
public static readonly Dictionary<string, string> JavaScript = new()
18+
{
19+
["debugprobe-compare-renderer.js"] = ResourceLoader.LoadJs("debugprobe_compare_renderer.js"),
20+
21+
["debugprobe-compare-engine.js"] = ResourceLoader.LoadJs("debugprobe_compare_engine.js"),
22+
23+
["debugprobe-ui.js"] = ResourceLoader.LoadJs("debugprobe_ui.js")
24+
};
1525
}
1626

DebugProbe.AspNetCore/Resources/html/_shared/layout.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
{{content}}
1515

16-
<script src="/debug/ui.js"></script>
17-
<script src="/debug/compare.js"></script>
16+
<script src="/debug/js/debugprobe-ui.js"></script>
17+
<script src="/debug/js/debugprobe-compare-engine.js"></script>
18+
<script src="/debug/js/debugprobe-compare-renderer.js"></script>
1819
</body>

0 commit comments

Comments
 (0)