Rename ConvertMetadata methods to be easier to distinguish

This commit is contained in:
Matt Nadareski
2025-01-10 11:05:51 -05:00
parent 3595008ae4
commit 100c321e5d
8 changed files with 14 additions and 14 deletions

View File

@@ -16,7 +16,7 @@ namespace SabreTools.DatFiles
/// <param name="indexId">Index ID for the DAT</param> /// <param name="indexId">Index ID for the DAT</param>
/// <param name="keep">True if full pathnames are to be kept, false otherwise</param> /// <param name="keep">True if full pathnames are to be kept, false otherwise</param>
/// <param name="statsOnly">True to only add item statistics while parsing, false otherwise</param> /// <param name="statsOnly">True to only add item statistics while parsing, false otherwise</param>
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 the metadata file is invalid, we can't do anything
if (item == null || item.Count == 0) if (item == null || item.Count == 0)

View File

@@ -12,7 +12,7 @@ namespace SabreTools.DatFiles
/// <summary> /// <summary>
/// Convert metadata information /// Convert metadata information
/// </summary> /// </summary>
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 we don't have items, we can't do anything
if (Items == null || Items.Count == 0) if (Items == null || Items.Count == 0)
@@ -37,7 +37,7 @@ namespace SabreTools.DatFiles
/// <summary> /// <summary>
/// Convert metadata information /// Convert metadata information
/// </summary> /// </summary>
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 we don't have items, we can't do anything
if (ItemsDB == null) if (ItemsDB == null)

View File

@@ -58,7 +58,7 @@ namespace SabreTools.DatFiles.Formats
var metadata = new Serialization.CrossModel.ClrMamePro().Serialize(metadataFile); var metadata = new Serialization.CrossModel.ClrMamePro().Serialize(metadataFile);
// Convert to the internal format // Convert to the internal format
ConvertMetadata(metadata, filename, indexId, keep, statsOnly); ConvertFromMetadata(metadata, filename, indexId, keep, statsOnly);
} }
catch (Exception ex) when (!throwOnError) catch (Exception ex) when (!throwOnError)
{ {
@@ -174,7 +174,7 @@ namespace SabreTools.DatFiles.Formats
_logger.User($"Writing to '{outfile}'..."); _logger.User($"Writing to '{outfile}'...");
// Serialize the input file // Serialize the input file
var metadata = ConvertMetadata(ignoreblanks); var metadata = ConvertToMetadata(ignoreblanks);
var metadataFile = new Serialization.CrossModel.ClrMamePro().Deserialize(metadata); var metadataFile = new Serialization.CrossModel.ClrMamePro().Deserialize(metadata);
if (!Serialization.Serializers.ClrMamePro.SerializeFile(metadataFile, outfile, _quotes)) if (!Serialization.Serializers.ClrMamePro.SerializeFile(metadataFile, outfile, _quotes))
{ {

View File

@@ -44,7 +44,7 @@ namespace SabreTools.DatFiles.Formats
var metadata = new Serialization.CrossModel.Hashfile().Serialize(hashfile); var metadata = new Serialization.CrossModel.Hashfile().Serialize(hashfile);
// Convert to the internal format // Convert to the internal format
ConvertMetadata(metadata, filename, indexId, keep, statsOnly); ConvertFromMetadata(metadata, filename, indexId, keep, statsOnly);
} }
catch (Exception ex) when (!throwOnError) catch (Exception ex) when (!throwOnError)
{ {
@@ -222,7 +222,7 @@ namespace SabreTools.DatFiles.Formats
_logger.User($"Writing to '{outfile}'..."); _logger.User($"Writing to '{outfile}'...");
// Serialize the input file // Serialize the input file
var metadata = ConvertMetadata(ignoreblanks); var metadata = ConvertToMetadata(ignoreblanks);
var hashfile = new Serialization.CrossModel.Hashfile().Deserialize(metadata, _hash); var hashfile = new Serialization.CrossModel.Hashfile().Deserialize(metadata, _hash);
if (!(Serialization.Serializers.Hashfile.SerializeFile(hashfile, outfile, _hash))) if (!(Serialization.Serializers.Hashfile.SerializeFile(hashfile, outfile, _hash)))
{ {

View File

@@ -237,7 +237,7 @@ namespace SabreTools.DatFiles.Formats
} }
// Convert to the internal format // Convert to the internal format
ConvertMetadata(metadata, filename, indexId, keep, statsOnly); ConvertFromMetadata(metadata, filename, indexId, keep, statsOnly);
} }
catch (Exception ex) when (!throwOnError) catch (Exception ex) when (!throwOnError)
{ {

View File

@@ -358,7 +358,7 @@ namespace SabreTools.DatFiles.Formats
_logger.User($"Writing to '{outfile}'..."); _logger.User($"Writing to '{outfile}'...");
// Serialize the input file // Serialize the input file
var metadata = ConvertMetadata(ignoreblanks); var metadata = ConvertToMetadata(ignoreblanks);
var datafile = new Serialization.CrossModel.Logiqx().Deserialize(metadata, _deprecated); var datafile = new Serialization.CrossModel.Logiqx().Deserialize(metadata, _deprecated);
// TODO: Reenable doctype writing // TODO: Reenable doctype writing

View File

@@ -45,7 +45,7 @@ namespace SabreTools.DatFiles.Formats
var metadata = new Serialization.CrossModel.SeparatedValue().Serialize(metadataFile); var metadata = new Serialization.CrossModel.SeparatedValue().Serialize(metadataFile);
// Convert to the internal format // Convert to the internal format
ConvertMetadata(metadata, filename, indexId, keep, statsOnly); ConvertFromMetadata(metadata, filename, indexId, keep, statsOnly);
} }
catch (Exception ex) when (!throwOnError) catch (Exception ex) when (!throwOnError)
{ {
@@ -100,7 +100,7 @@ namespace SabreTools.DatFiles.Formats
_logger.User($"Writing to '{outfile}'..."); _logger.User($"Writing to '{outfile}'...");
// Serialize the input file // Serialize the input file
var metadata = ConvertMetadata(ignoreblanks); var metadata = ConvertToMetadata(ignoreblanks);
var metadataFile = new Serialization.CrossModel.SeparatedValue().Deserialize(metadata); var metadataFile = new Serialization.CrossModel.SeparatedValue().Deserialize(metadata);
if (!(Serialization.Serializers.SeparatedValue.SerializeFile(metadataFile, outfile, _delim))) if (!(Serialization.Serializers.SeparatedValue.SerializeFile(metadataFile, outfile, _delim)))
{ {

View File

@@ -29,7 +29,7 @@ namespace SabreTools.DatFiles
var internalFormat = Activator.CreateInstance<TModelSerializer>().Serialize(specificFormat); var internalFormat = Activator.CreateInstance<TModelSerializer>().Serialize(specificFormat);
// Convert to the internal format // Convert to the internal format
ConvertMetadata(internalFormat, filename, indexId, keep, statsOnly); ConvertFromMetadata(internalFormat, filename, indexId, keep, statsOnly);
} }
catch (Exception ex) when (!throwOnError) catch (Exception ex) when (!throwOnError)
{ {
@@ -46,7 +46,7 @@ namespace SabreTools.DatFiles
_logger.User($"Writing to '{outfile}'..."); _logger.User($"Writing to '{outfile}'...");
// Serialize the input file in two steps // Serialize the input file in two steps
var internalFormat = ConvertMetadata(ignoreblanks); var internalFormat = ConvertToMetadata(ignoreblanks);
var specificFormat = Activator.CreateInstance<TModelSerializer>().Deserialize(internalFormat); var specificFormat = Activator.CreateInstance<TModelSerializer>().Deserialize(internalFormat);
if (!Activator.CreateInstance<TFileSerializer>().Serialize(specificFormat, outfile)) if (!Activator.CreateInstance<TFileSerializer>().Serialize(specificFormat, outfile))
{ {
@@ -72,7 +72,7 @@ namespace SabreTools.DatFiles
_logger.User($"Writing to '{outfile}'..."); _logger.User($"Writing to '{outfile}'...");
// Serialize the input file in two steps // Serialize the input file in two steps
var internalFormat = ConvertMetadataDB(ignoreblanks); var internalFormat = ConvertToMetadataDB(ignoreblanks);
var specificFormat = Activator.CreateInstance<TModelSerializer>().Deserialize(internalFormat); var specificFormat = Activator.CreateInstance<TModelSerializer>().Deserialize(internalFormat);
if (!Activator.CreateInstance<TFileSerializer>().Serialize(specificFormat, outfile)) if (!Activator.CreateInstance<TFileSerializer>().Serialize(specificFormat, outfile))
{ {