diff --git a/.gitignore b/.gitignore
index 4e1bef9d..f4c3782b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,9 @@
/Deheader/obj
/Deheader/obj/Debug
/Deheader/obj/Release
+/Filter/obj
+/Filter/obj/Debug
+/Filter/obj/Release
/OfflineMerge/obj
/OfflineMerge/obj/Debug
/OfflineMerge/obj/Release
diff --git a/Filter/App.config b/Filter/App.config
new file mode 100644
index 00000000..88fa4027
--- /dev/null
+++ b/Filter/App.config
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Filter/Filter.cs b/Filter/Filter.cs
new file mode 100644
index 00000000..f32572f7
--- /dev/null
+++ b/Filter/Filter.cs
@@ -0,0 +1,375 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using SabreTools.Helper;
+
+namespace SabreTools
+{
+ /*
+ Create new tool: Filter, with the following filters available
+ Game name, Rom name, CRC, MD5, SHA-1 use asterisks as follows(case insensitive):
+ -crc=*00 (means ends with "00")
+ -crc=00* (means starts with "00")
+ -crc=*00* (means contains "00")
+ -crc=00 (means is "00")
+ */
+ public class Filter
+ {
+ // Private instance variables
+ private string _filename;
+ private string _gamename;
+ private string _romname;
+ private string _romtype;
+ private long _sgt;
+ private long _slt;
+ private long _seq;
+ private string _crc;
+ private string _md5;
+ private string _sha1;
+ private bool? _nodump;
+ private Logger _logger;
+
+ ///
+ /// Create a Filter object
+ ///
+ /// Name of the file to be parsed
+ /// Name of the game to match (can use asterisk-partials)
+ /// Name of the rom to match (can use asterisk-partials)
+ /// Type of the rom to match
+ /// Find roms greater than or equal to this size
+ /// Find roms less than or equal to this size
+ /// Find roms equal to this size
+ /// CRC of the rom to match (can use asterisk-partials)
+ /// MD5 of the rom to match (can use asterisk-partials)
+ /// SHA-1 of the rom to match (can use asterisk-partials)
+ /// Select roms with nodump status as follows: null (match all), true (match Nodump only), false (exclude Nodump)
+ /// Logging object for file and console output
+ public Filter(string filename, string gamename, string romname, string romtype, long sgt, long slt, long seq, string crc, string md5, string sha1, bool? nodump, Logger logger)
+ {
+ _filename = filename;
+ _gamename = gamename;
+ _romname = romname;
+ _romtype = romtype;
+ _sgt = sgt;
+ _slt = slt;
+ _seq = seq;
+ _crc = crc;
+ _md5 = md5;
+ _sha1 = sha1;
+ _nodump = nodump;
+ _logger = logger;
+ }
+
+ ///
+ /// Start help or use supplied parameters
+ ///
+ /// String array representing command line parameters
+ public static void Main(string[] args)
+ {
+ Console.Clear();
+
+ // Credits take precidence over all
+ if ((new List(args)).Contains("--credits"))
+ {
+ Build.Credits();
+ return;
+ }
+
+ Logger logger = new Logger(true, "filter.log");
+ logger.Start();
+
+ // First things first, take care of all of the arguments that this could have
+ bool? nodump = null;
+ string gamename = "", romname = "", romtype = "", crc = "", md5 = "", sha1= "";
+ long sgt = -1, slt = -1, seq = -1;
+ List inputs = new List();
+ foreach (string arg in args)
+ {
+ switch (arg)
+ {
+ case "-h":
+ case "-?":
+ case "--help":
+ Build.Help();
+ logger.Close();
+ return;
+ case "-nd":
+ case "--nodump":
+ nodump = true;
+ break;
+ case "-nnd":
+ case "--not-nodump":
+ nodump = false;
+ break;
+ default:
+ // Numerical inputs
+ if (arg.StartsWith("-seq=") || arg.StartsWith("--equal="))
+ {
+ if (!Int64.TryParse(arg.Split('=')[1], out seq))
+ {
+ seq = -1;
+ }
+ }
+ else if (arg.StartsWith("-sgt=") || arg.StartsWith("--greater="))
+ {
+ if (!Int64.TryParse(arg.Split('=')[1], out sgt))
+ {
+ sgt = -1;
+ }
+ }
+ else if (arg.StartsWith("-slt=") || arg.StartsWith("--less="))
+ {
+ if (!Int64.TryParse(arg.Split('=')[1], out slt))
+ {
+ slt = -1;
+ }
+ }
+
+ // String inputs
+ else if (arg.StartsWith("-crc=") || arg.StartsWith("--crc="))
+ {
+ crc = arg.Split('=')[1];
+ }
+ else if (arg.StartsWith("-gn=") || arg.StartsWith("--game-name="))
+ {
+ gamename = arg.Split('=')[1];
+ }
+ else if (arg.StartsWith("-md5=") || arg.StartsWith("--md5="))
+ {
+ md5 = arg.Split('=')[1];
+ }
+ else if (arg.StartsWith("-rn=") || arg.StartsWith("--rom-name="))
+ {
+ romname = arg.Split('=')[1];
+ }
+ else if (arg.StartsWith("-rt=") || arg.StartsWith("--rom-type="))
+ {
+ romtype = arg.Split('=')[1];
+ }
+ else if (arg.StartsWith("-sha1=") || arg.StartsWith("--sha1="))
+ {
+ sha1 = arg.Split('=')[1];
+ }
+ else
+ {
+ inputs.Add(arg);
+ }
+ break;
+ }
+ }
+
+ // If there's no inputs, show the help
+ if (inputs.Count == 0)
+ {
+ Build.Help();
+ logger.Close();
+ return;
+ }
+
+ // Output the title
+ Build.Start("Filter");
+
+ // If any of the inputs are not valid, show the help
+ foreach (string input in inputs)
+ {
+ if (!File.Exists(input) && !Directory.Exists(input))
+ {
+ logger.Error(input + " is not a valid input!");
+ Console.WriteLine();
+ Build.Help();
+ return;
+ }
+ }
+
+ // Create new Filter objects for each input
+ Filter filter;
+ bool success = true;
+ foreach (string input in inputs)
+ {
+ string newinput = Path.GetFullPath(input.Replace("\"", ""));
+
+ if (File.Exists(newinput))
+ {
+ filter = new Filter(newinput, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, logger);
+ success &= filter.Process();
+ }
+
+ if (Directory.Exists(newinput))
+ {
+ foreach (string file in Directory.EnumerateFiles(newinput, "*", SearchOption.AllDirectories))
+ {
+ filter = new Filter(file, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, logger);
+ success &= filter.Process();
+ }
+ }
+ }
+
+ // If we failed, show the help
+ if (!success)
+ {
+ Console.WriteLine();
+ Build.Help();
+ }
+
+ logger.Close();
+ }
+
+ ///
+ /// Process an individual DAT with the given information
+ ///
+ /// True if the DAT was output, false otherwise
+ public bool Process()
+ {
+ _logger.User("Processing file: '" + _filename + "'");
+
+ // Populated the DAT information
+ DatData datdata = new DatData();
+ datdata = RomManipulation.Parse(_filename, 0, 0, datdata, _logger);
+
+ // Now loop through and create a new Rom dictionary using filtered values
+ Dictionary> dict = new Dictionary>();
+ List keys = datdata.Roms.Keys.ToList();
+ foreach (string key in keys)
+ {
+ List roms = datdata.Roms[key];
+ foreach (RomData rom in roms)
+ {
+ // Filter on game name
+ if (_gamename != "")
+ {
+ if (!(_gamename.StartsWith("*") && _gamename.EndsWith("*") && rom.Game.Contains(_gamename.Replace("*", ""))))
+ {
+ continue;
+ }
+ else if (!(_gamename.StartsWith("*") && rom.Game.EndsWith(_gamename.Replace("*", ""))))
+ {
+ continue;
+ }
+ else if (!(_gamename.EndsWith("*") && rom.Game.StartsWith(_gamename.Replace("*", ""))))
+ {
+ continue;
+ }
+ }
+
+ // Filter on rom name
+ if (_romname != "")
+ {
+ if (!(_romname.StartsWith("*") && _romname.EndsWith("*") && rom.Game.Contains(_romname.Replace("*", ""))))
+ {
+ continue;
+ }
+ else if (!(_romname.StartsWith("*") && rom.Game.EndsWith(_romname.Replace("*", ""))))
+ {
+ continue;
+ }
+ else if (!(_romname.EndsWith("*") && rom.Game.StartsWith(_romname.Replace("*", ""))))
+ {
+ continue;
+ }
+ }
+
+ // Filter on rom type
+ if (_romtype != "" && rom.Type != _romtype)
+ {
+ continue;
+ }
+
+ // Filter on rom size
+ if (_seq != -1 && rom.Size != _seq)
+ {
+ continue;
+ }
+ else
+ {
+ if (_sgt != -1 && rom.Size < _sgt)
+ {
+ continue;
+ }
+ if (_slt != -1 && rom.Size > _slt)
+ {
+ continue;
+ }
+ }
+
+ // Filter on crc
+ if (_crc != "")
+ {
+ if (!(_crc.StartsWith("*") && _crc.EndsWith("*") && rom.Game.Contains(_crc.Replace("*", ""))))
+ {
+ continue;
+ }
+ else if (!(_crc.StartsWith("*") && rom.Game.EndsWith(_crc.Replace("*", ""))))
+ {
+ continue;
+ }
+ else if (!(_crc.EndsWith("*") && rom.Game.StartsWith(_crc.Replace("*", ""))))
+ {
+ continue;
+ }
+ }
+
+ // Filter on md5
+ if (_md5 != "")
+ {
+ if (!(_md5.StartsWith("*") && _md5.EndsWith("*") && rom.Game.Contains(_md5.Replace("*", ""))))
+ {
+ continue;
+ }
+ else if (!(_md5.StartsWith("*") && rom.Game.EndsWith(_md5.Replace("*", ""))))
+ {
+ continue;
+ }
+ else if (!(_md5.EndsWith("*") && rom.Game.StartsWith(_md5.Replace("*", ""))))
+ {
+ continue;
+ }
+ }
+
+ // Filter on sha1
+ if (_sha1 != "")
+ {
+ if (!(_sha1.StartsWith("*") && _sha1.EndsWith("*") && rom.Game.Contains(_sha1.Replace("*", ""))))
+ {
+ continue;
+ }
+ else if (!(_sha1.StartsWith("*") && rom.Game.EndsWith(_sha1.Replace("*", ""))))
+ {
+ continue;
+ }
+ else if (!(_sha1.EndsWith("*") && rom.Game.StartsWith(_sha1.Replace("*", ""))))
+ {
+ continue;
+ }
+ }
+
+ // If it made it this far, add the rom to the output dictionary
+ if (dict.ContainsKey(key))
+ {
+ dict[key].Add(rom);
+ }
+ else
+ {
+ List temp = new List();
+ temp.Add(rom);
+ dict.Add(key, temp);
+ }
+ }
+
+ // Now clean up by removing the old list
+ datdata.Roms[key] = null;
+ }
+
+ // Get the correct output values
+ datdata.Name += " (Filtered)";
+ datdata.Description += " (Filtered)";
+ datdata.Roms = dict;
+
+ // Now write the file out and return
+ return Output.WriteDatfile(datdata, Path.GetDirectoryName(_filename), _logger);
+ }
+ }
+}
diff --git a/Filter/Filter.csproj b/Filter/Filter.csproj
new file mode 100644
index 00000000..97cbbed3
--- /dev/null
+++ b/Filter/Filter.csproj
@@ -0,0 +1,86 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {136AA0D0-9234-4680-B593-A32C0762972E}
+ Exe
+ Properties
+ SabreTools
+ Filter
+ v4.5.2
+ 512
+ true
+
+
+ AnyCPU
+ true
+ full
+ false
+ ..\..\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ AnyCPU
+ pdbonly
+ true
+ ..\..\Release\
+ TRACE
+ prompt
+ 4
+
+
+ true
+ ..\..\Debug-x64\
+ DEBUG;TRACE
+ full
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+ true
+
+
+ ..\..\Release-x64\
+ TRACE
+ true
+ pdbonly
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {225a1afd-0890-44e8-b779-7502665c23a5}
+ SabreHelper
+
+
+
+
+
\ No newline at end of file
diff --git a/Filter/Properties/AssemblyInfo.cs b/Filter/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..587dba49
--- /dev/null
+++ b/Filter/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Filter")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Filter")]
+[assembly: AssemblyCopyright("Copyright © 2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("136aa0d0-9234-4680-b593-a32c0762972e")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/SabreHelper/Build.cs b/SabreHelper/Build.cs
index 3959ff45..422d8a29 100644
--- a/SabreHelper/Build.cs
+++ b/SabreHelper/Build.cs
@@ -208,6 +208,32 @@ Options:
-sys=, --system= System ID to generate from
");
break;
+ case "Filter":
+ Console.WriteLine(@"Filter - Filter DATs by inputted criteria
+-----------------------------------------
+Usage: Filter [options] [inputs]
+
+Options:
+ -h, -?, --help Show this help dialog
+ -gn=, --game-name= Game name to be filtered on
+ -rn=, --rom-name= Rom name to be filtered on
+ -rt=, --rom-type= Rom type to be filtered on
+ -sgt=, --greater= Size greater than or equal to
+ -slt=, --less= Size less than or equal to
+ -seq=, --equal= Size equal to
+ -crc=, --crc= CRC to be filtered on
+ -md5=, --md5= MD5 to be filtered on
+ -sha1=, --sha1= SHA-1 to be filtered on
+ -nd, --nodump Only match nodump roms
+ -nnd, --not-nodump Exclude all nodump roms
+
+Game name, Rom name, CRC, MD5, SHA-1 can do partial matches
+using asterisks as follows (case insensitive):
+ *00 means ends with '00'
+ 00* means starts with '00'
+ *00* means contains '00'
+ 00 means exactly equals '00'");
+ break;
default:
Console.Write("This is the default help output");
break;
diff --git a/SabreTools.sln b/SabreTools.sln
index c8c8d42b..4690845a 100644
--- a/SabreTools.sln
+++ b/SabreTools.sln
@@ -19,6 +19,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UncompressedSize", "Uncompr
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DATabaseTwo", "DATabaseTwo\DATabaseTwo.csproj", "{C7732A05-1F96-43ED-AC8C-0E388F37EBC1}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filter", "Filter\Filter.csproj", "{136AA0D0-9234-4680-B593-A32C0762972E}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -92,6 +94,14 @@ Global
{C7732A05-1F96-43ED-AC8C-0E388F37EBC1}.Release|Any CPU.Build.0 = Release|Any CPU
{C7732A05-1F96-43ED-AC8C-0E388F37EBC1}.Release|x64.ActiveCfg = Release|x64
{C7732A05-1F96-43ED-AC8C-0E388F37EBC1}.Release|x64.Build.0 = Release|x64
+ {136AA0D0-9234-4680-B593-A32C0762972E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {136AA0D0-9234-4680-B593-A32C0762972E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {136AA0D0-9234-4680-B593-A32C0762972E}.Debug|x64.ActiveCfg = Debug|x64
+ {136AA0D0-9234-4680-B593-A32C0762972E}.Debug|x64.Build.0 = Debug|x64
+ {136AA0D0-9234-4680-B593-A32C0762972E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {136AA0D0-9234-4680-B593-A32C0762972E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {136AA0D0-9234-4680-B593-A32C0762972E}.Release|x64.ActiveCfg = Release|Any CPU
+ {136AA0D0-9234-4680-B593-A32C0762972E}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE