diff --git a/RombaSharp/Features/Diffdat.cs b/RombaSharp/Features/Diffdat.cs
index 8eaa80c0..010df094 100644
--- a/RombaSharp/Features/Diffdat.cs
+++ b/RombaSharp/Features/Diffdat.cs
@@ -45,7 +45,7 @@ in -old DAT file. Ignores those entries in -old that are not in -new.";
string? outdat = GetString(features, OutStringValue);
// Ensure the output directory
- outdat = (outdat ?? string.Empty).Ensure(create: true);
+ outdat = outdat.Ensure(create: true);
// Check that all required files exist
if (!File.Exists(olddat))
diff --git a/RombaSharp/Features/Dir2Dat.cs b/RombaSharp/Features/Dir2Dat.cs
index 8b581e57..ce97b89c 100644
--- a/RombaSharp/Features/Dir2Dat.cs
+++ b/RombaSharp/Features/Dir2Dat.cs
@@ -44,7 +44,7 @@ namespace RombaSharp.Features
string? outdat = GetString(features, OutStringValue);
// Ensure the output directory
- outdat = (outdat ?? string.Empty).Ensure(create: true);
+ outdat = outdat.Ensure(create: true);
// Check that all required directories exist
if (!Directory.Exists(source))
diff --git a/RombaSharp/Features/EDiffdat.cs b/RombaSharp/Features/EDiffdat.cs
index 9fdd9618..12797d15 100644
--- a/RombaSharp/Features/EDiffdat.cs
+++ b/RombaSharp/Features/EDiffdat.cs
@@ -40,7 +40,7 @@ namespace RombaSharp.Features
string? newdat = GetString(features, NewStringValue);
// Ensure the output directory
- outdat = (outdat ?? string.Empty).Ensure(create: true);
+ outdat = outdat.Ensure(create: true);
// Check that all required files exist
if (!File.Exists(olddat))
diff --git a/RombaSharp/RombaSharp.csproj b/RombaSharp/RombaSharp.csproj
index e98ca676..064a7abe 100644
--- a/RombaSharp/RombaSharp.csproj
+++ b/RombaSharp/RombaSharp.csproj
@@ -23,7 +23,7 @@
-
+
diff --git a/SabreTools.Core/SabreTools.Core.csproj b/SabreTools.Core/SabreTools.Core.csproj
index c2ff7b45..5260736a 100644
--- a/SabreTools.Core/SabreTools.Core.csproj
+++ b/SabreTools.Core/SabreTools.Core.csproj
@@ -37,7 +37,7 @@
-
+
diff --git a/SabreTools.DatFiles/DatFile.FromMetadata.cs b/SabreTools.DatFiles/DatFile.FromMetadata.cs
index 45be397c..f8823777 100644
--- a/SabreTools.DatFiles/DatFile.FromMetadata.cs
+++ b/SabreTools.DatFiles/DatFile.FromMetadata.cs
@@ -138,17 +138,16 @@ namespace SabreTools.DatFiles
Default = infos.ReleaseNumber.Default.AsYesNo(),
});
}
- // TODO: Uncomment this when the change to both Models and Serialization is done
- //if (infos.ImageNumber != null)
- //{
- // offlineListInfos.Add(new Formats.OfflineListInfo
- // {
- // Name = "imageNumber",
- // Visible = infos.ImageNumber.Visible.AsYesNo(),
- // InNamingOption = infos.ImageNumber.InNamingOption.AsYesNo(),
- // Default = infos.ImageNumber.Default.AsYesNo(),
- // });
- //}
+ if (infos.ImageNumber != null)
+ {
+ offlineListInfos.Add(new Formats.OfflineListInfo
+ {
+ Name = "imageNumber",
+ Visible = infos.ImageNumber.Visible.AsYesNo(),
+ InNamingOption = infos.ImageNumber.InNamingOption.AsYesNo(),
+ Default = infos.ImageNumber.Default.AsYesNo(),
+ });
+ }
if (infos.LanguageNumber != null)
{
offlineListInfos.Add(new Formats.OfflineListInfo
diff --git a/SabreTools.DatFiles/DatFile.ToMetadata.cs b/SabreTools.DatFiles/DatFile.ToMetadata.cs
index e61edbcf..e81c1c2f 100644
--- a/SabreTools.DatFiles/DatFile.ToMetadata.cs
+++ b/SabreTools.DatFiles/DatFile.ToMetadata.cs
@@ -123,6 +123,14 @@ namespace SabreTools.DatFiles
Default = info.Default.FromYesNo(),
};
break;
+ case "imageNumber":
+ infoItem.ImageNumber = new Models.OfflineList.ImageNumber
+ {
+ Visible = info.Visible.FromYesNo(),
+ InNamingOption = info.InNamingOption.FromYesNo(),
+ Default = info.Default.FromYesNo(),
+ };
+ break;
case "languageNumber":
infoItem.LanguageNumber = new Models.OfflineList.LanguageNumber
{
diff --git a/SabreTools.DatFiles/SabreTools.DatFiles.csproj b/SabreTools.DatFiles/SabreTools.DatFiles.csproj
index 36b435b7..13803880 100644
--- a/SabreTools.DatFiles/SabreTools.DatFiles.csproj
+++ b/SabreTools.DatFiles/SabreTools.DatFiles.csproj
@@ -28,16 +28,16 @@
-
+
-
+
-
-
+
+
diff --git a/SabreTools.DatItems/SabreTools.DatItems.csproj b/SabreTools.DatItems/SabreTools.DatItems.csproj
index 3b6a9df3..8526cfeb 100644
--- a/SabreTools.DatItems/SabreTools.DatItems.csproj
+++ b/SabreTools.DatItems/SabreTools.DatItems.csproj
@@ -30,7 +30,7 @@
-
+
diff --git a/SabreTools.DatTools/SabreTools.DatTools.csproj b/SabreTools.DatTools/SabreTools.DatTools.csproj
index 1e966026..b5728809 100644
--- a/SabreTools.DatTools/SabreTools.DatTools.csproj
+++ b/SabreTools.DatTools/SabreTools.DatTools.csproj
@@ -31,7 +31,7 @@
-
+
diff --git a/SabreTools.DatTools/Statistics.cs b/SabreTools.DatTools/Statistics.cs
index 07dcf407..2a1e6d1d 100644
--- a/SabreTools.DatTools/Statistics.cs
+++ b/SabreTools.DatTools/Statistics.cs
@@ -171,7 +171,7 @@ namespace SabreTools.DatTools
reportName = "report";
// Get the proper output directory name
- outDir = (outDir ?? string.Empty).Ensure();
+ outDir = outDir.Ensure();
InternalStopwatch watch = new($"Writing out report data to '{outDir}'");
diff --git a/SabreTools.DatTools/Writer.cs b/SabreTools.DatTools/Writer.cs
index 77c2214a..d8631d14 100644
--- a/SabreTools.DatTools/Writer.cs
+++ b/SabreTools.DatTools/Writer.cs
@@ -53,7 +53,7 @@ namespace SabreTools.DatTools
}
// Ensure the output directory is set and created
- outDir = (outDir ?? string.Empty).Ensure(create: true);
+ outDir = outDir.Ensure(create: true);
InternalStopwatch watch = new($"Writing out internal dat to '{outDir}'");
diff --git a/SabreTools.FileTypes/SabreTools.FileTypes.csproj b/SabreTools.FileTypes/SabreTools.FileTypes.csproj
index a4530189..49e34f07 100644
--- a/SabreTools.FileTypes/SabreTools.FileTypes.csproj
+++ b/SabreTools.FileTypes/SabreTools.FileTypes.csproj
@@ -27,14 +27,14 @@
-
+
-
+
-
+
diff --git a/SabreTools.Filter/SabreTools.Filter.csproj b/SabreTools.Filter/SabreTools.Filter.csproj
index e583eafd..48c4f9ae 100644
--- a/SabreTools.Filter/SabreTools.Filter.csproj
+++ b/SabreTools.Filter/SabreTools.Filter.csproj
@@ -25,7 +25,7 @@
-
+
diff --git a/SabreTools.Filtering/SabreTools.Filtering.csproj b/SabreTools.Filtering/SabreTools.Filtering.csproj
index 43bd8c4d..913d1214 100644
--- a/SabreTools.Filtering/SabreTools.Filtering.csproj
+++ b/SabreTools.Filtering/SabreTools.Filtering.csproj
@@ -29,7 +29,7 @@
-
+
diff --git a/SabreTools.Logging/SabreTools.Logging.csproj b/SabreTools.Logging/SabreTools.Logging.csproj
index 7d0666d6..34ea8ee2 100644
--- a/SabreTools.Logging/SabreTools.Logging.csproj
+++ b/SabreTools.Logging/SabreTools.Logging.csproj
@@ -25,7 +25,7 @@
-
+
diff --git a/SabreTools.Test/SabreTools.Test.csproj b/SabreTools.Test/SabreTools.Test.csproj
index e201e24b..feda252b 100644
--- a/SabreTools.Test/SabreTools.Test.csproj
+++ b/SabreTools.Test/SabreTools.Test.csproj
@@ -27,15 +27,15 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
-
-
-
-
+
+
+
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/SabreTools/Features/Split.cs b/SabreTools/Features/Split.cs
index 386807b4..4b4ae37d 100644
--- a/SabreTools/Features/Split.cs
+++ b/SabreTools/Features/Split.cs
@@ -68,7 +68,7 @@ namespace SabreTools.Features
Parser.ParseInto(internalDat, file);
// Get the output directory
- OutputDir = (OutputDir ?? string.Empty).Ensure();
+ OutputDir = OutputDir.Ensure();
OutputDir = file.GetOutputPath(OutputDir, GetBoolean(features, InplaceValue));
// Extension splitting
diff --git a/SabreTools/Features/Update.cs b/SabreTools/Features/Update.cs
index eaaba488..03112913 100644
--- a/SabreTools/Features/Update.cs
+++ b/SabreTools/Features/Update.cs
@@ -149,7 +149,7 @@ namespace SabreTools.Features
List basePaths = PathTool.GetFilesOnly(GetList(features, BaseDatListValue));
// Ensure the output directory
- OutputDir = (OutputDir ?? string.Empty).Ensure();
+ OutputDir = OutputDir.Ensure();
// If we're in standard update mode, run through all of the inputs
if (updateMode == UpdateMode.None)
diff --git a/SabreTools/SabreTools.csproj b/SabreTools/SabreTools.csproj
index ce9925e7..460a2ce7 100644
--- a/SabreTools/SabreTools.csproj
+++ b/SabreTools/SabreTools.csproj
@@ -23,7 +23,7 @@
-
+