Add Tag validation case sensitivity option

t0815 · Oct 30, 2023 · c4d0941 · c4d0941
1 parent 95e6f49
commit c4d0941
Show file tree

Hide file tree

Showing 11 changed files with 112 additions and 41 deletions.
diff --git a/MyCBZ/App.config b/MyCBZ/App.config
@@ -37,6 +37,9 @@
             <setting name="CompatMode" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="TagValidationIgnoreCase" serializeAs="String">
+                <value>False</value>
+            </setting>
         </Win_CBZ.Win_CBZSettings>
         <Win_CBZ.CBZMageSettings>
             <setting name="TempFolderPath" serializeAs="String">
@@ -61,7 +64,7 @@
     <applicationSettings>
         <Win_CBZ.Win_CBZSettings>
             <setting name="Version" serializeAs="String">
-                <value>0.14.69b</value>
+                <value>0.14.70b</value>
             </setting>
             <setting name="RenamerPlaceholders" serializeAs="Xml">
                 <value>

diff --git a/MyCBZ/Data/DataValidation.cs b/MyCBZ/Data/DataValidation.cs
@@ -117,21 +117,46 @@ public static bool ValidateTags(ref ArrayList unknownTagsList, bool showError =
 
             MetaDataEntry tagEntry = Program.ProjectModel.MetaData.EntryByKey("Tags");
             System.Collections.Specialized.StringCollection validTags = Win_CBZSettings.Default.ValidKnownTags;
+            System.Collections.Specialized.StringCollection validTagsLcase = new System.Collections.Specialized.StringCollection();
             //ArrayList unknownTags = new ArrayList();
 
             if (unknownTagsList == null)
             {
                 unknownTagsList = new ArrayList();
             }
 
+            if (Win_CBZSettings.Default.TagValidationIgnoreCase) {
+                String[] bufferStrings = new string[validTags.Count];
+                validTags.CopyTo(bufferStrings, 0);
+                validTagsLcase.AddRange(bufferStrings.Select(s => s.ToLower()).ToArray());
+            }
+
             if (tagEntry != null && tagEntry.Value != null && tagEntry.Value.Length > 0 && validTags.Count > 0)
             {
-                String[] tags = tagEntry.Value.Split(',').Select(s => s.Trim()).ToArray();
+                String[] tags = new String[1];
+                if (Win_CBZSettings.Default.TagValidationIgnoreCase)
+                {
+                    tags = tagEntry.Value.Split(',').Select(s => s.Trim().ToLower()).ToArray();
+                } else
+                {
+                    tags = tagEntry.Value.Split(',').Select(s => s.Trim()).ToArray();
+                }
+
                 foreach (String tag in tags)
                 {
-                    if (!validTags.Contains(tag))
+                    if (Win_CBZSettings.Default.TagValidationIgnoreCase)
+                    {
+                        if (!validTagsLcase.Contains(tag.ToLower()))
+                        {
+                            unknownTagsList.Add(tag);
+                        }
+                    }
+                    else
                     {
-                        unknownTagsList.Add(tag);
+                        if (!validTags.Contains(tag))
+                        {
+                            unknownTagsList.Add(tag);
+                        }
                     }
                 }
             }

diff --git a/MyCBZ/Forms/MainForm.Designer.cs b/MyCBZ/Forms/MainForm.Designer.cs
diff --git a/MyCBZ/Forms/MainForm.cs b/MyCBZ/Forms/MainForm.cs
@@ -2691,6 +2691,7 @@ private void SettingsToolStripMenuItem_Click(object sender, EventArgs e)
                 }
 
                 Win_CBZSettings.Default.ValidateTags = settingsDialog.ValidateTagsSetting;
+                Win_CBZSettings.Default.TagValidationIgnoreCase = settingsDialog.TagValidationIgnoreCase;
             }
         }
 

diff --git a/MyCBZ/Forms/MainForm.resx b/MyCBZ/Forms/MainForm.resx
@@ -140,7 +140,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABu
-        CgAAAk1TRnQBSQFMAgEBAwEAAcgBDgHIAQ4BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CgAAAk1TRnQBSQFMAgEBAwEAAdABDgHQAQ4BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -198,7 +198,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABe
-        PgAAAk1TRnQBSQFMAgEBEQEAAcgBDgHIAQ4BGAEAARgBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFg
+        PgAAAk1TRnQBSQFMAgEBEQEAAdABDgHQAQ4BGAEAARgBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFg
         AwABeAMAAQEBAAEYBgABh/8A/wD/AHgAAtQB1QMnNiUDJwPV3gADvQMlNr0DJQO+3gADvQMlEgAD/wHl
         AfMB9gG8AeoB8wG8AeoB8wHlAfMB9gP/EgADJQO+3gADvQMlDwAB9AH4AfkBUAHaAfQBAAHSAfoBAAHS
         AfoBAAHSAfoBAAHSAfoBUAHaAvQB+AH5DwADJQO+3gADvQMlDAAB+gL7AS4B1wH3AQAB0gH6AcwB7QL0
@@ -490,7 +490,7 @@ The Page with Type 'FrontCover' should be at index 1.
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAK
-        AwAAAk1TRnQBSQFMAgEBAgEAATgBDgE4AQ4BEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwAAAk1TRnQBSQFMAgEBAgEAAUABDgFAAQ4BEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABEAMAAQEBAAEYBgABDCEAA/cD2QPEA78D0gPtA/6lAAP+A7kDLA8lA38D/RIAA+cBUgFUAVUD+g8A
         A7gBtgK4bwAD+wOGBiUDSQOrA60DfwYlA0QD4wwAA+YDUAMlA30D+gYAA/0DtAMrAyUDumkAA/4DYwkl
         A5sGAAPfCSUDRAP9BgAD5wwlA0YD+gMAA7QMJQG2ArhmAAPUDCUDmwYAA98MJQN/A/4DAAPoAzUMJQN9
@@ -514,7 +514,7 @@ The Page with Type 'FrontCover' should be at index 1.
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAQ
-        DAAAAk1TRnQBSQFMAgEBBAEAAdABDgHQAQ4BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        DAAAAk1TRnQBSQFMAgEBBAEAAdgBDgHYAQ4BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                     Win_CBZSettings.Default.ValidateTags = settingsDialog.ValidateTagsSetting;
+                    Win_CBZSettings.Default.TagValidationIgnoreCase = settingsDialog.TagValidationIgnoreCase;
                 }
             }
@@ Expand Down @@