Temporary workaround for IfPartPattern in reviewer and other fixes

.github/workflows/dotnet-core.yml

@@ -87,13 +87,22 @@ jobs:
           mv target/nerd-0.0.1-SNAPSHOT.jar ../../release/smi-nerd-$(fgrep AssemblyVersion ../../SharedAssemblyInfo.cs | cut -d'"' -f2).jar
       - name: Package ii binary
         run: |
+          tag="$(fgrep AssemblyVersion SharedAssemblyInfo.cs | cut -d'"' -f2)"
           cd ii
           dotnet publish --runtime win-x64 -c Release --self-contained true -o ../ii-win-x64
-          dotnet publish --runtime linux-x64 -c Release --self-contained true -o ../ii-$(fgrep AssemblyVersion ../SharedAssemblyInfo.cs|cut -d'"' -f2)-cli-linux-x64
+          dotnet publish --runtime linux-x64 -c Release --self-contained true -o ../ii-"$tag"-cli-linux-x64
           cd ../ii-win-x64
-          zip -q9r ../release/ii-$(fgrep AssemblyVersion ../SharedAssemblyInfo.cs|cut -d'"' -f2)-cli-win-x64.zip .
+          zip -q9r ../release/ii-"$tag"-cli-win-x64.zip .
           cd ..
-          tar -zcvf ./release/ii-$(fgrep AssemblyVersion SharedAssemblyInfo.cs|cut -d'"' -f2)-cli-linux-x64.tar.gz ii-$(fgrep AssemblyVersion SharedAssemblyInfo.cs|cut -d'"' -f2)-cli-linux-x64
+          tar -zcvf ./release/ii-"$tag"-cli-linux-x64.tar.gz ii-"$tag"-cli-linux-x64
+          git_tag="$(git rev-parse --short HEAD)"
+          cp ./release/ii-"$tag"-cli-linux-x64.tar.gz ./ii-"$git_tag"-cli-linux-x64.tar.gz
+      - name: Store created ii binary
+        uses: actions/upload-artifact@v3
+        with:
+          name: ii
+          path: "*.tar.gz"
+          retention-days: 1
       - name: Test ii binary
         run: |
           set -e
@@ -122,6 +131,7 @@ jobs:
       - name: Store created nupkg files
         uses: actions/upload-artifact@v3
         with:
+          name: IsIdentifiablePlugin
           path: release/IsIdentifiablePlugin.*.nupkg
           retention-days: 1
       - name: Upload binaries to release

IsIdentifiable/Failures/FailurePart.cs

@@ -1,4 +1,4 @@
-using Equ;
+using Equ;
 
 namespace IsIdentifiable.Failures;
 
@@ -71,4 +71,7 @@ public bool Includes(int start, int length)
 
         return false;
     }
+
+    /// <inheritdoc/>
+    public override string ToString() => $"{nameof(FailurePart)}({Word},{Offset},{Classification})";
 }

IsIdentifiable/Options/IsIdentifiableReportValidatorOptions.cs

@@ -0,0 +1,53 @@
+using CommandLine;
+using IsIdentifiable.Reporting.Reports;
+using System;
+
+namespace IsIdentifiable.Options;
+
+/// <summary>
+/// CLI options for the validator
+/// </summary>
+[Verb("validate", HelpText = "Validate a FailureStoreReport")]
+public class IsIdentifiableReportValidatorOptions
+{
+    /// <summary>
+    /// The CSV list of failures to process.  Must be in the format of a <see cref="FailureStoreReport"/>
+    /// </summary>
+    [Option('f', "file",
+        Required = true,
+        HelpText = "Pre load an existing failures file"
+    )]
+    public string FailuresCsv { get; set; }
+
+    /// <summary>
+    /// Sets UseSystemConsole to true for Terminal.gui (i.e. uses the NetDriver which is based on System.Console)
+    /// </summary>
+    [Option("usc", HelpText = "Sets UseSystemConsole to true for Terminal.gui (i.e. uses the NetDriver which is based on System.Console)")]
+    public bool UseSystemConsole { get; internal set; }
+
+    /// <summary>
+    /// Sets the user interface to use a specific color palette yaml file
+    /// </summary>
+    [Option("theme", HelpText = "Sets the user interface to use a specific color palette yaml file")]
+    public string Theme { get; set; }
+
+    /// <summary>
+    /// Stop after the first error encountered
+    /// </summary>
+    [Option("stop-at-first-error", Required = false, Default = false, HelpText = "Stop after the first error encountered")]
+    public bool StopAtFirstError { get; set; }
+
+
+    /// <summary>
+    /// Populates values in this instance where no value yet exists and there is a value in <paramref name="globalOpts"/>
+    /// to inherit.
+    /// </summary>
+    /// <param name="globalOpts"></param>
+    public virtual void InheritValuesFrom(IsIdentifiableReviewerOptions globalOpts)
+    {
+        ArgumentNullException.ThrowIfNull(globalOpts);
+
+        if (Theme == null && !string.IsNullOrWhiteSpace(globalOpts.Theme))
+            Theme = globalOpts.Theme;
+    }
+}

IsIdentifiable/Redacting/OutBase.cs

@@ -23,6 +23,11 @@
     /// </summary>
     public List<RegexRule> Rules { get; }
 
+    /// <summary>
+    /// Temp -- do not use.
+    /// </summary>
+    public readonly List<PartPatternFilterRule> PartRules_Temp = new();
+
     /// <summary>
     /// Persistence of <see cref="RulesFile"/>
     /// </summary>
@@ -68,8 +73,11 @@
             else
             {
                 //populated rules file already existed
-                var deserializer = new Deserializer();
-                Rules = deserializer.Deserialize<List<RegexRule>>(existingRules) ?? new List<RegexRule>();
+                 var builder = new DeserializerBuilder();
+                builder.WithTagMapping("!IgnorePartRegexRule", typeof(PartPatternFilterRule));
+                var allRules = builder.Build().Deserialize<List<RegexRule>>(existingRules) ?? new List<RegexRule>();
+                Rules = allRules.OfType<RegexRule>().ToList();
+                PartRules_Temp = allRules.OfType<PartPatternFilterRule>().ToList();
             }
         }
     }
@@ -81,7 +89,7 @@
     /// <param name="action"></param>
     /// <param name="overrideRuleFactory">Overrides the current <see cref="RulesFactory"/> and uses this instead</param>
     /// <returns>The new / existing rule that covers failure</returns>
     protected RegexRule Add(Failure f, RuleAction action, IRulePatternFactory overrideRuleFactory = null)
     {
         var factory = overrideRuleFactory ?? RulesFactory;
 
@@ -175,7 +183,7 @@
     /// Serializes the current <see cref="Rules"/> to the provided file
     /// </summary>
     /// <param name="toFile"></param>
     public void Save(IFileInfo toFile = null)
     {
         toFile ??= RulesFile;
 

IsIdentifiable/Redacting/ReportReader.cs

@@ -1,6 +1,8 @@
 using IsIdentifiable.Failures;
 using IsIdentifiable.Reporting.Reports;
+using IsIdentifiable.Rules;
 using System;
+using System.Collections.Generic;
 using System.IO.Abstractions;
 using System.Linq;
 using System.Threading;
@@ -52,10 +54,10 @@ public ReportReader(IFileInfo csvFile)
     /// <param name="loadedRows"></param>
     /// <param name="token"></param>
     /// <param name="fileSystem"></param>
-    public ReportReader(IFileInfo csvFile, Action<int> loadedRows, IFileSystem fileSystem, CancellationToken token)
+    public ReportReader(IFileInfo csvFile, Action<int> loadedRows, IFileSystem fileSystem, CancellationToken token, List<PartPatternFilterRule>? partRules = null)
     {
         var report = new FailureStoreReport("", 0, fileSystem);
-        Failures = FailureStoreReport.Deserialize(csvFile, loadedRows, token).ToArray();
+        Failures = FailureStoreReport.Deserialize(csvFile, loadedRows, token, partRules).ToArray();
     }
 
     /// <summary>
@@ -77,18 +79,17 @@ public bool Next()
     /// by the total number of <see cref="Failures"/>
     /// </summary>
     /// <param name="index"></param>
-    public void GoTo(int index)
+    public bool GoTo(int index)
     {
+        var original = _current;
         _current = Math.Min(Math.Max(0, index), Failures.Length);
+        return _current != original && (_current != Failures.Length);
     }
 
     /// <summary>
     /// Provides a human readable count of how far through the <see cref="Failures"/>
     /// the <see cref="CurrentIndex"/> is.
     /// </summary>
     /// <returns></returns>
-    public string DescribeProgress()
-    {
-        return $"{_current}/{Failures.Length}";
-    }
+    public string DescribeProgress() => $"{_current + 1}/{Failures.Length}";
 }