From d39cf5d13fad33a3c49307c82407ffa28174f4c9 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Fri, 2 Apr 2021 18:57:25 -0700 Subject: [PATCH] Make JSON optional (fixes #268) --- MPF.Library/Data/DumpEnvironment.cs | 17 ++++++++++------- MPF.Library/Data/Options.cs | 9 +++++++++ MPF/Windows/OptionsWindow.xaml | 7 ++++++- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/MPF.Library/Data/DumpEnvironment.cs b/MPF.Library/Data/DumpEnvironment.cs index 4ea4408c..8408c479 100644 --- a/MPF.Library/Data/DumpEnvironment.cs +++ b/MPF.Library/Data/DumpEnvironment.cs @@ -467,13 +467,16 @@ namespace MPF.Data else resultProgress?.Report(Result.Failure("Writing could not complete!")); - // Write the JSON output - resultProgress?.Report(Result.Success("Writing information to !submissionInfo.json.gz...")); - success = WriteOutputData(submissionInfo); - if (success) - resultProgress?.Report(Result.Success("Writing complete!")); - else - resultProgress?.Report(Result.Failure("Writing could not complete!")); + // Write the JSON output, if required + if (Options.OutputSubmissionJSON) + { + resultProgress?.Report(Result.Success("Writing information to !submissionInfo.json.gz...")); + success = WriteOutputData(submissionInfo); + if (success) + resultProgress?.Report(Result.Success("Writing complete!")); + else + resultProgress?.Report(Result.Failure("Writing could not complete!")); + } resultProgress?.Report(Result.Success("Submission information process complete!")); return Result.Success(); diff --git a/MPF.Library/Data/Options.cs b/MPF.Library/Data/Options.cs index 885468e2..d4387de5 100644 --- a/MPF.Library/Data/Options.cs +++ b/MPF.Library/Data/Options.cs @@ -277,6 +277,15 @@ namespace MPF.Data set { _settings["ToolsInSeparateWindow"] = value.ToString(); } } + /// + /// Output the compressed JSON version of the submission info + /// + public bool OutputSubmissionJSON + { + get { return GetBooleanSetting(_settings, "OutputSubmissionJSON", false); } + set { _settings["OutputSubmissionJSON"] = value.ToString(); } + } + #endregion #region Skip Options diff --git a/MPF/Windows/OptionsWindow.xaml b/MPF/Windows/OptionsWindow.xaml index fce6543f..8e62e5e6 100644 --- a/MPF/Windows/OptionsWindow.xaml +++ b/MPF/Windows/OptionsWindow.xaml @@ -51,7 +51,7 @@ - + + +