diff --git a/CHANGELIST.md b/CHANGELIST.md index 6fcd5d68..0d8e1923 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -137,6 +137,7 @@ - Update Aaru submodules - Fix missing info reference change - Enable separated protection info output by default +- Try adding MPF logs to zip ### 2.3 (2022-02-05) - Start overhauling Redump information pulling, again diff --git a/MPF.Library/InfoTool.cs b/MPF.Library/InfoTool.cs index 9a6ee319..d050b20e 100644 --- a/MPF.Library/InfoTool.cs +++ b/MPF.Library/InfoTool.cs @@ -586,6 +586,17 @@ namespace MPF.Library // Get the list of log files from the parameters object var files = parameters.GetLogFilePaths(combinedBase); + + // Add on generated log files if they exist + if (File.Exists(Path.Combine(outputDirectory, "!submissionInfo.txt"))) + files.Add(Path.Combine(outputDirectory, "!submissionInfo.txt")); + if (File.Exists(Path.Combine(outputDirectory, "!submissionInfo.json"))) + files.Add(Path.Combine(outputDirectory, "!submissionInfo.json")); + if (File.Exists(Path.Combine(outputDirectory, "!submissionInfo.json.gz"))) + files.Add(Path.Combine(outputDirectory, "!submissionInfo.json.gz")); + if (File.Exists(Path.Combine(outputDirectory, "!protectionInfo.txt"))) + files.Add(Path.Combine(outputDirectory, "!protectionInfo.txt")); + if (!files.Any()) return true;