MergeCommand: when handling --input-file-(nul-)list, avoid adding dup…

…licates and empty lines, if any Signed-off-by: Jim Klimov <jimklimov@gmail.com>
CycloneDX · Jul 19, 2023 · 2cd9f5e · 2cd9f5e
1 parent 89499f5
commit 2cd9f5e
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/src/cyclonedx/Commands/MergeCommand.cs b/src/cyclonedx/Commands/MergeCommand.cs
@@ -86,8 +86,14 @@ public static async Task<int> Merge(MergeCommandOptions options)
                 {
                     Console.WriteLine($"Adding to input file list from " + OneInputFileList);
                     string[] lines = File.ReadAllLines(OneInputFileList);
-                    InputFiles.AddRange(lines);
-                    Console.WriteLine($"Got " + lines.Length + " entries from " + OneInputFileList);
+                    int count = 0;
+                    foreach (string line in lines) {
+                        if (string.IsNullOrEmpty(line)) continue;
+                        if (InputFiles.Contains(line)) continue;
+                        InputFiles.Add(line);
+                        count++;
+                    }
+                    Console.WriteLine($"Got " + count + " new entries from " + OneInputFileList);
                 }
             }
 
@@ -99,8 +105,14 @@ public static async Task<int> Merge(MergeCommandOptions options)
                 {
                     Console.WriteLine($"Adding to input file list from " + OneInputFileList);
                     string[] lines = File.ReadAllText(OneInputFileList).Split('\0');
-                    InputFiles.AddRange(lines);
-                    Console.WriteLine($"Got " + lines.Length + " entries from " + OneInputFileList);
+                    int count = 0;
+                    foreach (string line in lines) {
+                        if (string.IsNullOrEmpty(line)) continue;
+                        if (InputFiles.Contains(line)) continue;
+                        InputFiles.Add(line);
+                        count++;
+                    }
+                    Console.WriteLine($"Got " + count + " new entries from " + OneInputFileList);
                 }
             }