diff --git a/SabreTools.DatFiles/DatFile.FromMetadata.cs b/SabreTools.DatFiles/DatFile.FromMetadata.cs
index 9c13d998..4d315d5f 100644
--- a/SabreTools.DatFiles/DatFile.FromMetadata.cs
+++ b/SabreTools.DatFiles/DatFile.FromMetadata.cs
@@ -16,7 +16,7 @@ namespace SabreTools.DatFiles
/// Index ID for the DAT
/// True if full pathnames are to be kept, false otherwise
/// True to only add item statistics while parsing, false otherwise
- public void ConvertMetadata(Models.Metadata.MetadataFile? item, string filename, int indexId, bool keep, bool statsOnly)
+ public void ConvertFromMetadata(Models.Metadata.MetadataFile? item, string filename, int indexId, bool keep, bool statsOnly)
{
// If the metadata file is invalid, we can't do anything
if (item == null || item.Count == 0)
diff --git a/SabreTools.DatFiles/DatFile.ToMetadata.cs b/SabreTools.DatFiles/DatFile.ToMetadata.cs
index 4537b27f..7f6cfc37 100644
--- a/SabreTools.DatFiles/DatFile.ToMetadata.cs
+++ b/SabreTools.DatFiles/DatFile.ToMetadata.cs
@@ -12,7 +12,7 @@ namespace SabreTools.DatFiles
///
/// Convert metadata information
///
- public Models.Metadata.MetadataFile? ConvertMetadata(bool ignoreblanks = false)
+ public Models.Metadata.MetadataFile? ConvertToMetadata(bool ignoreblanks = false)
{
// If we don't have items, we can't do anything
if (Items == null || Items.Count == 0)
@@ -37,7 +37,7 @@ namespace SabreTools.DatFiles
///
/// Convert metadata information
///
- public Models.Metadata.MetadataFile? ConvertMetadataDB(bool ignoreblanks = false)
+ public Models.Metadata.MetadataFile? ConvertToMetadataDB(bool ignoreblanks = false)
{
// If we don't have items, we can't do anything
if (ItemsDB == null)
diff --git a/SabreTools.DatFiles/Formats/ClrMamePro.cs b/SabreTools.DatFiles/Formats/ClrMamePro.cs
index 23b836fe..2b6d207b 100644
--- a/SabreTools.DatFiles/Formats/ClrMamePro.cs
+++ b/SabreTools.DatFiles/Formats/ClrMamePro.cs
@@ -58,7 +58,7 @@ namespace SabreTools.DatFiles.Formats
var metadata = new Serialization.CrossModel.ClrMamePro().Serialize(metadataFile);
// Convert to the internal format
- ConvertMetadata(metadata, filename, indexId, keep, statsOnly);
+ ConvertFromMetadata(metadata, filename, indexId, keep, statsOnly);
}
catch (Exception ex) when (!throwOnError)
{
@@ -174,7 +174,7 @@ namespace SabreTools.DatFiles.Formats
_logger.User($"Writing to '{outfile}'...");
// Serialize the input file
- var metadata = ConvertMetadata(ignoreblanks);
+ var metadata = ConvertToMetadata(ignoreblanks);
var metadataFile = new Serialization.CrossModel.ClrMamePro().Deserialize(metadata);
if (!Serialization.Serializers.ClrMamePro.SerializeFile(metadataFile, outfile, _quotes))
{
diff --git a/SabreTools.DatFiles/Formats/Hashfile.cs b/SabreTools.DatFiles/Formats/Hashfile.cs
index 4fccc79f..a10a1371 100644
--- a/SabreTools.DatFiles/Formats/Hashfile.cs
+++ b/SabreTools.DatFiles/Formats/Hashfile.cs
@@ -44,7 +44,7 @@ namespace SabreTools.DatFiles.Formats
var metadata = new Serialization.CrossModel.Hashfile().Serialize(hashfile);
// Convert to the internal format
- ConvertMetadata(metadata, filename, indexId, keep, statsOnly);
+ ConvertFromMetadata(metadata, filename, indexId, keep, statsOnly);
}
catch (Exception ex) when (!throwOnError)
{
@@ -222,7 +222,7 @@ namespace SabreTools.DatFiles.Formats
_logger.User($"Writing to '{outfile}'...");
// Serialize the input file
- var metadata = ConvertMetadata(ignoreblanks);
+ var metadata = ConvertToMetadata(ignoreblanks);
var hashfile = new Serialization.CrossModel.Hashfile().Deserialize(metadata, _hash);
if (!(Serialization.Serializers.Hashfile.SerializeFile(hashfile, outfile, _hash)))
{
diff --git a/SabreTools.DatFiles/Formats/Listxml.cs b/SabreTools.DatFiles/Formats/Listxml.cs
index b5f8a421..bcf3be0b 100644
--- a/SabreTools.DatFiles/Formats/Listxml.cs
+++ b/SabreTools.DatFiles/Formats/Listxml.cs
@@ -237,7 +237,7 @@ namespace SabreTools.DatFiles.Formats
}
// Convert to the internal format
- ConvertMetadata(metadata, filename, indexId, keep, statsOnly);
+ ConvertFromMetadata(metadata, filename, indexId, keep, statsOnly);
}
catch (Exception ex) when (!throwOnError)
{
diff --git a/SabreTools.DatFiles/Formats/Logiqx.cs b/SabreTools.DatFiles/Formats/Logiqx.cs
index 01661c07..36a40b94 100644
--- a/SabreTools.DatFiles/Formats/Logiqx.cs
+++ b/SabreTools.DatFiles/Formats/Logiqx.cs
@@ -358,7 +358,7 @@ namespace SabreTools.DatFiles.Formats
_logger.User($"Writing to '{outfile}'...");
// Serialize the input file
- var metadata = ConvertMetadata(ignoreblanks);
+ var metadata = ConvertToMetadata(ignoreblanks);
var datafile = new Serialization.CrossModel.Logiqx().Deserialize(metadata, _deprecated);
// TODO: Reenable doctype writing
diff --git a/SabreTools.DatFiles/Formats/SeparatedValue.cs b/SabreTools.DatFiles/Formats/SeparatedValue.cs
index 6c8f1b52..ce3876a8 100644
--- a/SabreTools.DatFiles/Formats/SeparatedValue.cs
+++ b/SabreTools.DatFiles/Formats/SeparatedValue.cs
@@ -45,7 +45,7 @@ namespace SabreTools.DatFiles.Formats
var metadata = new Serialization.CrossModel.SeparatedValue().Serialize(metadataFile);
// Convert to the internal format
- ConvertMetadata(metadata, filename, indexId, keep, statsOnly);
+ ConvertFromMetadata(metadata, filename, indexId, keep, statsOnly);
}
catch (Exception ex) when (!throwOnError)
{
@@ -100,7 +100,7 @@ namespace SabreTools.DatFiles.Formats
_logger.User($"Writing to '{outfile}'...");
// Serialize the input file
- var metadata = ConvertMetadata(ignoreblanks);
+ var metadata = ConvertToMetadata(ignoreblanks);
var metadataFile = new Serialization.CrossModel.SeparatedValue().Deserialize(metadata);
if (!(Serialization.Serializers.SeparatedValue.SerializeFile(metadataFile, outfile, _delim)))
{
diff --git a/SabreTools.DatFiles/SerializableDatFile.cs b/SabreTools.DatFiles/SerializableDatFile.cs
index 576e5525..94ea4004 100644
--- a/SabreTools.DatFiles/SerializableDatFile.cs
+++ b/SabreTools.DatFiles/SerializableDatFile.cs
@@ -29,7 +29,7 @@ namespace SabreTools.DatFiles
var internalFormat = Activator.CreateInstance().Serialize(specificFormat);
// Convert to the internal format
- ConvertMetadata(internalFormat, filename, indexId, keep, statsOnly);
+ ConvertFromMetadata(internalFormat, filename, indexId, keep, statsOnly);
}
catch (Exception ex) when (!throwOnError)
{
@@ -46,7 +46,7 @@ namespace SabreTools.DatFiles
_logger.User($"Writing to '{outfile}'...");
// Serialize the input file in two steps
- var internalFormat = ConvertMetadata(ignoreblanks);
+ var internalFormat = ConvertToMetadata(ignoreblanks);
var specificFormat = Activator.CreateInstance().Deserialize(internalFormat);
if (!Activator.CreateInstance().Serialize(specificFormat, outfile))
{
@@ -72,7 +72,7 @@ namespace SabreTools.DatFiles
_logger.User($"Writing to '{outfile}'...");
// Serialize the input file in two steps
- var internalFormat = ConvertMetadataDB(ignoreblanks);
+ var internalFormat = ConvertToMetadataDB(ignoreblanks);
var specificFormat = Activator.CreateInstance().Deserialize(internalFormat);
if (!Activator.CreateInstance().Serialize(specificFormat, outfile))
{