diff --git a/DevConsole/Program.cs b/DevConsole/Program.cs index 811510a..e3a8d54 100644 --- a/DevConsole/Program.cs +++ b/DevConsole/Program.cs @@ -214,7 +214,8 @@ namespace DevConsole Console.WriteLine($"Full: {fullPath}"); Console.WriteLine($"Relative Path: {relPath}"); - PrintListValues(Helpers.Filters.FilterDirectory(fullPath, @"*ManualSave|*AutoSave", @"BioWare\Mass Effect Andromeda\Save\*")); + Console.WriteLine("Please enter the pattern for the inclusion filter and then\nthe exclusion filter:"); + PrintListValues(Helpers.Filters.FilterDirectory(fullPath, Console.ReadLine(), Console.ReadLine())); //FSManipulation.CopyDirectory( // fullPath, diff --git a/FireLance/Helpers.cs b/FireLance/Helpers.cs index 38a2318..256332f 100644 --- a/FireLance/Helpers.cs +++ b/FireLance/Helpers.cs @@ -74,8 +74,7 @@ namespace FirelanceMgr var inclusionList = ManifestBuilder(incBuilder, fullPath); var exclusionList = ManifestBuilder(excBuilder, fullPath); - - return inclusionList; + return inclusionList.Where(x => exclusionList.All(y => !x.Contains(y))).ToList(); ; } private static List PatternBuilder(string filterStr)