From cbaf20ed6c950ca141b1f991796db092c789b124 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 30 Oct 2024 14:01:13 -0400 Subject: [PATCH] Move OfflineListInfo to new file --- SabreTools.DatFiles/DatFile.FromMetadata.cs | 32 +++++++++---------- SabreTools.DatFiles/DatFile.ToMetadata.cs | 2 +- .../Auxiliary.cs => OfflineListInfo.cs} | 13 +------- 3 files changed, 18 insertions(+), 29 deletions(-) rename SabreTools.DatFiles/{Formats/Auxiliary.cs => OfflineListInfo.cs} (59%) diff --git a/SabreTools.DatFiles/DatFile.FromMetadata.cs b/SabreTools.DatFiles/DatFile.FromMetadata.cs index e687ccd1..1764d80a 100644 --- a/SabreTools.DatFiles/DatFile.FromMetadata.cs +++ b/SabreTools.DatFiles/DatFile.FromMetadata.cs @@ -70,11 +70,11 @@ namespace SabreTools.DatFiles var infos = item.Read(Models.Metadata.Header.InfosKey); if (infos != null) { - var offlineListInfos = new List(); + var offlineListInfos = new List(); if (infos.Title != null) { - offlineListInfos.Add(new Formats.OfflineListInfo + offlineListInfos.Add(new OfflineListInfo { Name = "title", Visible = infos.Title.Visible.AsYesNo(), @@ -84,7 +84,7 @@ namespace SabreTools.DatFiles } if (infos.Location != null) { - offlineListInfos.Add(new Formats.OfflineListInfo + offlineListInfos.Add(new OfflineListInfo { Name = "location", Visible = infos.Location.Visible.AsYesNo(), @@ -94,7 +94,7 @@ namespace SabreTools.DatFiles } if (infos.Publisher != null) { - offlineListInfos.Add(new Formats.OfflineListInfo + offlineListInfos.Add(new OfflineListInfo { Name = "publisher", Visible = infos.Publisher.Visible.AsYesNo(), @@ -104,7 +104,7 @@ namespace SabreTools.DatFiles } if (infos.SourceRom != null) { - offlineListInfos.Add(new Formats.OfflineListInfo + offlineListInfos.Add(new OfflineListInfo { Name = "sourceRom", Visible = infos.SourceRom.Visible.AsYesNo(), @@ -114,7 +114,7 @@ namespace SabreTools.DatFiles } if (infos.SaveType != null) { - offlineListInfos.Add(new Formats.OfflineListInfo + offlineListInfos.Add(new OfflineListInfo { Name = "saveType", Visible = infos.SaveType.Visible.AsYesNo(), @@ -124,7 +124,7 @@ namespace SabreTools.DatFiles } if (infos.RomSize != null) { - offlineListInfos.Add(new Formats.OfflineListInfo + offlineListInfos.Add(new OfflineListInfo { Name = "romSize", Visible = infos.RomSize.Visible.AsYesNo(), @@ -134,7 +134,7 @@ namespace SabreTools.DatFiles } if (infos.ReleaseNumber != null) { - offlineListInfos.Add(new Formats.OfflineListInfo + offlineListInfos.Add(new OfflineListInfo { Name = "releaseNumber", Visible = infos.ReleaseNumber.Visible.AsYesNo(), @@ -144,7 +144,7 @@ namespace SabreTools.DatFiles } if (infos.ImageNumber != null) { - offlineListInfos.Add(new Formats.OfflineListInfo + offlineListInfos.Add(new OfflineListInfo { Name = "imageNumber", Visible = infos.ImageNumber.Visible.AsYesNo(), @@ -154,7 +154,7 @@ namespace SabreTools.DatFiles } if (infos.LanguageNumber != null) { - offlineListInfos.Add(new Formats.OfflineListInfo + offlineListInfos.Add(new OfflineListInfo { Name = "languageNumber", Visible = infos.LanguageNumber.Visible.AsYesNo(), @@ -164,7 +164,7 @@ namespace SabreTools.DatFiles } if (infos.Comment != null) { - offlineListInfos.Add(new Formats.OfflineListInfo + offlineListInfos.Add(new OfflineListInfo { Name = "comment", Visible = infos.Comment.Visible.AsYesNo(), @@ -174,7 +174,7 @@ namespace SabreTools.DatFiles } if (infos.RomCRC != null) { - offlineListInfos.Add(new Formats.OfflineListInfo + offlineListInfos.Add(new OfflineListInfo { Name = "romCRC", Visible = infos.RomCRC.Visible.AsYesNo(), @@ -184,7 +184,7 @@ namespace SabreTools.DatFiles } if (infos.Im1CRC != null) { - offlineListInfos.Add(new Formats.OfflineListInfo + offlineListInfos.Add(new OfflineListInfo { Name = "im1CRC", Visible = infos.Im1CRC.Visible.AsYesNo(), @@ -194,7 +194,7 @@ namespace SabreTools.DatFiles } if (infos.Im2CRC != null) { - offlineListInfos.Add(new Formats.OfflineListInfo + offlineListInfos.Add(new OfflineListInfo { Name = "im2CRC", Visible = infos.Im2CRC.Visible.AsYesNo(), @@ -204,7 +204,7 @@ namespace SabreTools.DatFiles } if (infos.Languages != null) { - offlineListInfos.Add(new Formats.OfflineListInfo + offlineListInfos.Add(new OfflineListInfo { Name = "languages", Visible = infos.Languages.Visible.AsYesNo(), @@ -213,7 +213,7 @@ namespace SabreTools.DatFiles }); } - Header.SetFieldValue(Models.Metadata.Header.InfosKey, [.. offlineListInfos]); + Header.SetFieldValue(Models.Metadata.Header.InfosKey, [.. offlineListInfos]); } } if (item.ContainsKey(Models.Metadata.Header.NewDatKey)) diff --git a/SabreTools.DatFiles/DatFile.ToMetadata.cs b/SabreTools.DatFiles/DatFile.ToMetadata.cs index 6013fa3b..54947129 100644 --- a/SabreTools.DatFiles/DatFile.ToMetadata.cs +++ b/SabreTools.DatFiles/DatFile.ToMetadata.cs @@ -87,7 +87,7 @@ namespace SabreTools.DatFiles if (Header.InfosSpecified) { var infoItem = new Models.OfflineList.Infos(); - var infos = Header.GetFieldValue(Models.Metadata.Header.InfosKey)!; + var infos = Header.GetFieldValue(Models.Metadata.Header.InfosKey)!; foreach (var info in infos) { switch (info.Name) diff --git a/SabreTools.DatFiles/Formats/Auxiliary.cs b/SabreTools.DatFiles/OfflineListInfo.cs similarity index 59% rename from SabreTools.DatFiles/Formats/Auxiliary.cs rename to SabreTools.DatFiles/OfflineListInfo.cs index 6db0559c..2191c3b9 100644 --- a/SabreTools.DatFiles/Formats/Auxiliary.cs +++ b/SabreTools.DatFiles/OfflineListInfo.cs @@ -1,12 +1,5 @@ -/// -/// This holds all of the auxiliary types needed for proper parsing -/// -namespace SabreTools.DatFiles.Formats +namespace SabreTools.DatFiles { - #region DatHeader - - #region OfflineList - /// /// Represents one OfflineList infos object /// @@ -18,8 +11,4 @@ namespace SabreTools.DatFiles.Formats public bool? InNamingOption { get; set; } public bool? Default { get; set; } } - - #endregion - - #endregion // DatHeader }