Rename negate to remove

This commit is contained in:
Matt Nadareski
2020-09-04 21:40:22 -07:00
parent 5b8519bbc3
commit 5e47d511bc

View File

@@ -30,7 +30,7 @@ The following commands are currently implemented:
Set a header field (if default): set(header.field, value); Set a header field (if default): set(header.field, value);
Parse new file(s): input(datpath, ...); Parse new file(s): input(datpath, ...);
Perform a dir2dat: d2d(path, ...); Perform a dir2dat: d2d(path, ...);
Filter on a field and value: filter(machine.field|item.field, value, [negate = false]); Filter on a field and value: filter(machine.field|item.field, value, [remove = false, [perMachine = false]]);
Apply a MAME Extra INI for a field: extra(field, inipath); Apply a MAME Extra INI for a field: extra(field, inipath);
Perform a split/merge: merge(split|merged|nonmerged|full|device); Perform a split/merge: merge(split|merged|nonmerged|full|device);
Set game names from description: descname(); Set game names from description: descname();
@@ -163,16 +163,16 @@ Reset the internal state: reset();";
if (command.Arguments.Count < 2 || command.Arguments.Count > 4) if (command.Arguments.Count < 2 || command.Arguments.Count > 4)
{ {
Globals.Logger.User($"Invoked {command.Name} and expected between 2-4 arguments, but {command.Arguments.Count} arguments were provided"); Globals.Logger.User($"Invoked {command.Name} and expected between 2-4 arguments, but {command.Arguments.Count} arguments were provided");
Globals.Logger.User("Usage: filter(field, value, [negate = false, [perMachine = false]]);"); Globals.Logger.User("Usage: filter(field, value, [remove = false, [perMachine = false]]);");
continue; continue;
} }
// Read in the individual arguments // Read in the individual arguments
Field filterField = command.Arguments[0].AsField(); Field filterField = command.Arguments[0].AsField();
string filterValue = command.Arguments[1]; string filterValue = command.Arguments[1];
bool? filterNegate = false; bool? filterRemove = false;
if (command.Arguments.Count == 3) if (command.Arguments.Count == 3)
filterNegate = command.Arguments[2].AsYesNo(); filterRemove = command.Arguments[2].AsYesNo();
bool? filterPerMachine = false; bool? filterPerMachine = false;
if (command.Arguments.Count == 4) if (command.Arguments.Count == 4)
filterPerMachine = command.Arguments[3].AsYesNo(); filterPerMachine = command.Arguments[3].AsYesNo();
@@ -183,7 +183,7 @@ Reset the internal state: reset();";
Globals.Logger.User($"{command.Arguments[0]} was an invalid field name"); Globals.Logger.User($"{command.Arguments[0]} was an invalid field name");
continue; continue;
} }
if (filterNegate == null) if (filterRemove == null)
{ {
Globals.Logger.User($"{command.Arguments[2]} was an invalid true/false value"); Globals.Logger.User($"{command.Arguments[2]} was an invalid true/false value");
continue; continue;
@@ -196,7 +196,7 @@ Reset the internal state: reset();";
// Create a filter with this new set of fields // Create a filter with this new set of fields
Filter filter = new Filter(); Filter filter = new Filter();
filter.SetFilter(filterField, filterValue, filterNegate.Value); filter.SetFilter(filterField, filterValue, filterRemove.Value);
// Apply the filter blindly // Apply the filter blindly
datFile.ApplyFilter(filter, filterPerMachine.Value); datFile.ApplyFilter(filter, filterPerMachine.Value);