From 9f76dcc5fd6e0aa9d22269ca800abaa144dab844 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Fri, 19 Jul 2024 10:20:45 -0400
Subject: [PATCH] Add include artifacts flag for check, sanitize options (fixes
 #726)

---
 CHANGELIST.md        |  1 +
 MPF.Check/Program.cs | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index 4e379937..27b38f23 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -43,6 +43,7 @@
 - Fix broken test logic
 - Remove RedumpLib tests
 - Change to generic wording in report (JohnVeness)
+- Add include artifacts flag for check, sanitize options
 
 ### 3.2.0 (2024-06-20)
 
diff --git a/MPF.Check/Program.cs b/MPF.Check/Program.cs
index a12e3903..81f09d43 100644
--- a/MPF.Check/Program.cs
+++ b/MPF.Check/Program.cs
@@ -21,6 +21,7 @@ namespace MPF.Check
                 InternalProgram = InternalProgram.NONE,
                 AddFilenameSuffix = false,
                 OutputSubmissionJSON = false,
+                IncludeArtifacts = false,
                 CompressLogFiles = false,
                 DeleteUnnecessaryFiles = false,
             };
@@ -120,13 +121,14 @@ namespace MPF.Check
             Console.WriteLine("Check Options:");
             Console.WriteLine("-u, --use <program>            Dumping program output type [REQUIRED]");
             Console.WriteLine("-c, --credentials <user> <pw>  Redump username and password");
-            Console.WriteLine("-a, --pull-all                 Pull all information from Redump (requires --credentials)");
+            Console.WriteLine("    --pull-all                 Pull all information from Redump (requires --credentials)");
             Console.WriteLine("-p, --path <drivepath>         Physical drive path for additional checks");
             Console.WriteLine("-s, --scan                     Enable copy protection scan (requires --path)");
-            Console.WriteLine("-g, --hide-drive-letters       Hide drive letters from scan output (requires --protect-file)");
+            Console.WriteLine("    --hide-drive-letters       Hide drive letters from scan output (requires --protect-file)");
             Console.WriteLine("-l, --load-seed <path>         Load a seed submission JSON for user information");
             Console.WriteLine("-x, --suffix                   Enable adding filename suffix");
             Console.WriteLine("-j, --json                     Enable submission JSON output");
+            Console.WriteLine("    --include-artifacts        Include artifacts in JSON (requires --json)");
             Console.WriteLine("-z, --zip                      Enable log file compression");
             Console.WriteLine("-d, --delete                   Enable unnecessary file deletion");
             Console.WriteLine();
@@ -182,7 +184,7 @@ namespace MPF.Check
                 }
 
                 // Pull all information (requires Redump login)
-                else if (args[startIndex].Equals("-a") || args[startIndex].Equals("--pull-all"))
+                else if (args[startIndex].Equals("--pull-all"))
                 {
                     options.PullAllInformation = true;
                 }
@@ -205,7 +207,7 @@ namespace MPF.Check
                 }
 
                 // Hide drive letters from scan output (requires --protect-file)
-                else if (args[startIndex].Equals("-g") || args[startIndex].Equals("--hide-drive-letters"))
+                else if (args[startIndex].Equals("--hide-drive-letters"))
                 {
                     hideDriveLetters = true;
                 }
@@ -235,6 +237,12 @@ namespace MPF.Check
                     options.OutputSubmissionJSON = true;
                 }
 
+                // Output submission JSON
+                else if (args[startIndex].Equals("--include-artifacts"))
+                {
+                    options.IncludeArtifacts = true;
+                }
+
                 // Compress log and extraneous files
                 else if (args[startIndex].Equals("-z") || args[startIndex].Equals("--zip"))
                 {