From a07fca6a7bc720cda0c91a24c6a3ec97a8152830 Mon Sep 17 00:00:00 2001 From: Markus Persson Date: Mon, 18 Sep 2023 21:36:29 +0200 Subject: [PATCH] Fix timestamp (#551) Timestamp used 12-hour clock. Fixed to 24-hour. --- MPF.Modules/Aaru/Parameters.cs | 2 +- MPF.Modules/CleanRIp/Parameters.cs | 2 +- MPF.Modules/DiscImageCreator/Parameters.cs | 2 +- MPF.Modules/Redumper/Parameters.cs | 2 +- MPF.Modules/UmdImageCreator/Parameters.cs | 2 +- MPF.Test/RedumpLib/SubmissionInfoTests.cs | 2 +- MPF/ViewModels/MainViewModel.cs | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MPF.Modules/Aaru/Parameters.cs b/MPF.Modules/Aaru/Parameters.cs index 2293a871..3fb1a0e1 100644 --- a/MPF.Modules/Aaru/Parameters.cs +++ b/MPF.Modules/Aaru/Parameters.cs @@ -199,7 +199,7 @@ namespace MPF.Modules.Aaru // TODO: Determine if there's an Aaru version anywhere info.DumpingInfo.DumpingProgram = EnumConverter.LongName(this.InternalProgram); - info.DumpingInfo.DumpingDate = GetFileModifiedDate(basePath + ".cicm.xml")?.ToString("yyyy-MM-dd hh:mm:ss"); + info.DumpingInfo.DumpingDate = GetFileModifiedDate(basePath + ".cicm.xml")?.ToString("yyyy-MM-dd HH:mm:ss"); // Deserialize the sidecar, if possible var sidecar = GenerateSidecar(basePath + ".cicm.xml"); diff --git a/MPF.Modules/CleanRIp/Parameters.cs b/MPF.Modules/CleanRIp/Parameters.cs index c1678176..23b50175 100644 --- a/MPF.Modules/CleanRIp/Parameters.cs +++ b/MPF.Modules/CleanRIp/Parameters.cs @@ -64,7 +64,7 @@ namespace MPF.Modules.CleanRip { // TODO: Determine if there's a CleanRip version anywhere info.DumpingInfo.DumpingProgram = EnumConverter.LongName(this.InternalProgram); - info.DumpingInfo.DumpingDate = GetFileModifiedDate(basePath + "-dumpinfo.txt")?.ToString("yyyy-MM-dd hh:mm:ss"); + info.DumpingInfo.DumpingDate = GetFileModifiedDate(basePath + "-dumpinfo.txt")?.ToString("yyyy-MM-dd HH:mm:ss"); Datafile datafile = GenerateCleanripDatafile(basePath + ".iso", basePath + "-dumpinfo.txt"); diff --git a/MPF.Modules/DiscImageCreator/Parameters.cs b/MPF.Modules/DiscImageCreator/Parameters.cs index de27b320..60f86000 100644 --- a/MPF.Modules/DiscImageCreator/Parameters.cs +++ b/MPF.Modules/DiscImageCreator/Parameters.cs @@ -390,7 +390,7 @@ namespace MPF.Modules.DiscImageCreator // Get the dumping program and version (string dicCmd, string dicVersion) = GetCommandFilePathAndVersion(basePath); info.DumpingInfo.DumpingProgram = $"{EnumConverter.LongName(this.InternalProgram)} {dicVersion ?? "Unknown Version"}"; - info.DumpingInfo.DumpingDate = GetFileModifiedDate(dicCmd)?.ToString("yyyy-MM-dd hh:mm:ss"); + info.DumpingInfo.DumpingDate = GetFileModifiedDate(dicCmd)?.ToString("yyyy-MM-dd HH:mm:ss"); // Fill in the hardware data if (GetHardwareInfo($"{basePath}_drive.txt", out string manufacturer, out string model, out string firmware)) diff --git a/MPF.Modules/Redumper/Parameters.cs b/MPF.Modules/Redumper/Parameters.cs index 5a121ff8..ae9f53e9 100644 --- a/MPF.Modules/Redumper/Parameters.cs +++ b/MPF.Modules/Redumper/Parameters.cs @@ -247,7 +247,7 @@ namespace MPF.Modules.Redumper { // Get the dumping program and version info.DumpingInfo.DumpingProgram = $"{EnumConverter.LongName(this.InternalProgram)} {GetVersion($"{basePath}.log") ?? "Unknown Version"}"; - info.DumpingInfo.DumpingDate = GetFileModifiedDate($"{basePath}.log")?.ToString("yyyy-MM-dd hh:mm:ss"); + info.DumpingInfo.DumpingDate = GetFileModifiedDate($"{basePath}.log")?.ToString("yyyy-MM-dd HH:mm:ss"); // Fill in the hardware data if (GetHardwareInfo($"{basePath}.log", out string manufacturer, out string model, out string firmware)) diff --git a/MPF.Modules/UmdImageCreator/Parameters.cs b/MPF.Modules/UmdImageCreator/Parameters.cs index d0c4b962..d141a8d8 100644 --- a/MPF.Modules/UmdImageCreator/Parameters.cs +++ b/MPF.Modules/UmdImageCreator/Parameters.cs @@ -65,7 +65,7 @@ namespace MPF.Modules.UmdImageCreator { // TODO: Determine if there's a UMDImageCreator version anywhere info.DumpingInfo.DumpingProgram = EnumConverter.LongName(this.InternalProgram); - info.DumpingInfo.DumpingDate = GetFileModifiedDate(basePath + "_disc.txt")?.ToString("yyyy-MM-dd hh:mm:ss"); + info.DumpingInfo.DumpingDate = GetFileModifiedDate(basePath + "_disc.txt")?.ToString("yyyy-MM-dd HH:mm:ss"); // Extract info based generically on MediaType switch (this.Type) diff --git a/MPF.Test/RedumpLib/SubmissionInfoTests.cs b/MPF.Test/RedumpLib/SubmissionInfoTests.cs index c143be06..4f5e09df 100644 --- a/MPF.Test/RedumpLib/SubmissionInfoTests.cs +++ b/MPF.Test/RedumpLib/SubmissionInfoTests.cs @@ -169,7 +169,7 @@ namespace MPF.Test.RedumpLib DumpingInfo = new DumpingInfoSection() { DumpingProgram = "DiscImageCreator 20500101", - DumpingDate = DateTime.UtcNow.ToString("yyyy-MM-dd hh:mm:ss"), + DumpingDate = DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss"), Manufacturer = "ATAPI", Model = "Optical Drive", Firmware = "1.23", diff --git a/MPF/ViewModels/MainViewModel.cs b/MPF/ViewModels/MainViewModel.cs index 4c1918ba..d1269876 100644 --- a/MPF/ViewModels/MainViewModel.cs +++ b/MPF/ViewModels/MainViewModel.cs @@ -442,7 +442,7 @@ namespace MPF.UI.ViewModels DumpingInfo = new DumpingInfoSection() { DumpingProgram = "DiscImageCreator 20500101", - DumpingDate = DateTime.UtcNow.ToString("yyyy-MM-dd hh:mm:ss"), + DumpingDate = DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss"), Manufacturer = "ATAPI", Model = "Optical Drive", Firmware = "1.23",