fix double add for same assembly

in GetAssembliesForRouting #21
StardustDL · Mar 14, 2021 · a0e9eee · a0e9eee
1 parent 4f26ce4
commit a0e9eee
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,7 +50,7 @@ jobs:
         NUGET_AUTH_TOKEN: ${{ secrets.NUGET_TOKEN }}
       run: ./build.ps1 -e -t Deploy-Packages
     - name: Deploy documents
-      uses: JamesIves/github-pages-deploy-action@4.0.0
+      uses: JamesIves/github-pages-deploy-action@4.1.0
       with:
         token: ${{ secrets.PA_TOKEN }}
         branch: gh-pages

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -41,7 +41,7 @@ jobs:
         name: artifacts
         path: ./dist
     - name: Deploy documents
-      uses: JamesIves/github-pages-deploy-action@4.0.0
+      uses: JamesIves/github-pages-deploy-action@4.1.0
       with:
         token: ${{ secrets.PA_TOKEN }}
         branch: gh-pages

diff --git a/build/BuildContext.cs b/build/BuildContext.cs
@@ -63,6 +63,12 @@ public BuildContext(ICakeContext context)
             }
 
             Solution = SolutionType.All;
+
+            if (CommitMessage.Contains("[ui]"))
+            {
+                Solution = SolutionType.UI;
+            }
+
             Solution = context.Argument("solution", "").ToLowerInvariant() switch
             {
                 "all" => SolutionType.All,

diff --git a/src/Modulight.Modules.Client.RazorComponents/RazorComponentClientModuleCollection.cs b/src/Modulight.Modules.Client.RazorComponents/RazorComponentClientModuleCollection.cs
@@ -136,6 +136,8 @@ public async Task<List<Assembly>> GetAssembliesForRouting(string path, bool recu
 
             var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies();
 
+            HashSet<string> processed = new HashSet<string>();
+
             List<Assembly> results = new List<Assembly>();
 
             Queue<string> toLoad = new Queue<string>();
@@ -144,7 +146,12 @@ public async Task<List<Assembly>> GetAssembliesForRouting(string path, bool recu
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                toLoad.Enqueue(module.GetType().GetAssemblyName());
+                var name = module.GetType().GetAssemblyName();
+
+                if (processed.Add(name))
+                {
+                    toLoad.Enqueue(name);
+                }
 
                 var pages = module.GetPageProvider(Host);
 
@@ -154,7 +161,10 @@ public async Task<List<Assembly>> GetAssembliesForRouting(string path, bool recu
                     {
                         cancellationToken.ThrowIfCancellationRequested();
 
-                        toLoad.Enqueue(resource.Path);
+                        if (processed.Add(resource.Path))
+                        {
+                            toLoad.Enqueue(resource.Path);
+                        }
                     }
                 }
             }
@@ -209,7 +219,12 @@ public async Task<List<Assembly>> GetAssembliesForRouting(string path, bool recu
                     {
                         cancellationToken.ThrowIfCancellationRequested();
                         if (refe.Name is not null)
-                            toLoad.Enqueue(refe.Name);
+                        {
+                            if (processed.Add(refe.Name))
+                            {
+                                toLoad.Enqueue(refe.Name);
+                            }
+                        }
                     }
                 }
             }

diff --git a/src/Modulight.UI.Blazor/App.razor b/src/Modulight.UI.Blazor/App.razor
@@ -24,6 +24,7 @@
         AdditionalAssemblies.Clear();
 
         var results = await ClientModuleHost.GetAssembliesForRouting(context.Path, cancellationToken: context.CancellationToken);
-        AdditionalAssemblies.AddRange(results.Where(x => x != UIProvider.AppAssembly));
+        var filterdResults = new HashSet<Assembly>(results);
+        AdditionalAssemblies.AddRange(filterdResults.Where(x => x != UIProvider.AppAssembly));
     }
 }