claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor formatting cleanup in DatFileTool

Browse Source
This commit is contained in:
Matt Nadareski
2024-10-24 05:26:05 -04:00
parent 3f353c745f
commit e992f0d013
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
SabreTools.DatTools/DatFileTool.cs
View File

@@ -55,16 +55,17 @@ namespace SabreTools.DatTools
foreach (DatItem item in items) foreach (DatItem item in items)
{ {
DatItem newItem = item; DatItem newItem = item;
if (newItem.GetFieldValue<Source?>(DatItem.SourceKey) == null) var source = newItem.GetFieldValue<Source?>(DatItem.SourceKey);
if (source == null)
continue; continue;
string filename = inputs[newItem.GetFieldValue<Source?>(DatItem.SourceKey)!.Index].CurrentPath; string filename = inputs[source.Index].CurrentPath;
string? rootpath = inputs[newItem.GetFieldValue<Source?>(DatItem.SourceKey)!.Index].ParentPath; string rootpath = inputs[source.Index].ParentPath ?? string.Empty;
if (!string.IsNullOrEmpty(rootpath) if (rootpath.Length > 0
#if NETFRAMEWORK #if NETFRAMEWORK
&& !rootpath!.EndsWith(Path.DirectorySeparatorChar.ToString()) && !rootpath.EndsWith(Path.DirectorySeparatorChar.ToString())
&& !rootpath!.EndsWith(Path.AltDirectorySeparatorChar.ToString())) && !rootpath.EndsWith(Path.AltDirectorySeparatorChar.ToString()))
#else #else
&& !rootpath.EndsWith(Path.DirectorySeparatorChar) && !rootpath.EndsWith(Path.DirectorySeparatorChar)
&& !rootpath.EndsWith(Path.AltDirectorySeparatorChar)) && !rootpath.EndsWith(Path.AltDirectorySeparatorChar))
@@ -73,10 +74,17 @@ namespace SabreTools.DatTools
rootpath += Path.DirectorySeparatorChar.ToString(); rootpath += Path.DirectorySeparatorChar.ToString();
} }
filename = filename.Remove(0, rootpath?.Length ?? 0); filename = filename.Remove(0, rootpath.Length);
newItem.GetFieldValue<Machine>(DatItem.MachineKey)!.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, Path.GetDirectoryName(filename) + Path.DirectorySeparatorChar
+ Path.GetFileNameWithoutExtension(filename) + Path.DirectorySeparatorChar var machine = newItem.GetFieldValue<Machine>(DatItem.MachineKey);
+ newItem.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey)); if (machine == null)
continue;
machine.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, Path.GetDirectoryName(filename)
+ Path.DirectorySeparatorChar
+ Path.GetFileNameWithoutExtension(filename)
+ Path.DirectorySeparatorChar
+ machine.GetStringFieldValue(Models.Metadata.Machine.NameKey));
newItems.Add(newItem); newItems.Add(newItem);
} }
@@ -125,9 +133,9 @@ namespace SabreTools.DatTools
continue; continue;
string filename = inputs[source.Item2.Index].CurrentPath; string filename = inputs[source.Item2.Index].CurrentPath;
string? rootpath = inputs[source.Item2.Index].ParentPath; string rootpath = inputs[source.Item2.Index].ParentPath ?? string.Empty;
if (!string.IsNullOrEmpty(rootpath) if (rootpath.Length > 0
#if NETFRAMEWORK #if NETFRAMEWORK
&& !rootpath!.EndsWith(Path.DirectorySeparatorChar.ToString()) && !rootpath!.EndsWith(Path.DirectorySeparatorChar.ToString())
&& !rootpath!.EndsWith(Path.AltDirectorySeparatorChar.ToString())) && !rootpath!.EndsWith(Path.AltDirectorySeparatorChar.ToString()))
@@ -139,7 +147,8 @@ namespace SabreTools.DatTools
rootpath += Path.DirectorySeparatorChar.ToString(); rootpath += Path.DirectorySeparatorChar.ToString();
} }
filename = filename.Remove(0, rootpath?.Length ?? 0); filename = filename.Remove(0, rootpath.Length);
machine.Item2.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, Path.GetDirectoryName(filename) + Path.DirectorySeparatorChar machine.Item2.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, Path.GetDirectoryName(filename) + Path.DirectorySeparatorChar
+ Path.GetFileNameWithoutExtension(filename) + Path.DirectorySeparatorChar + Path.GetFileNameWithoutExtension(filename) + Path.DirectorySeparatorChar
+ machine.Item2.GetStringFieldValue(Models.Metadata.Machine.NameKey)); + machine.Item2.GetStringFieldValue(Models.Metadata.Machine.NameKey));
@@ -1330,7 +1339,8 @@ namespace SabreTools.DatTools
foreach (DatItem item in items) foreach (DatItem item in items)
{ {
if (item.GetFieldValue<Source?>(DatItem.SourceKey) != null && item.GetFieldValue<Source?>(DatItem.SourceKey)!.Index == index) var source = item.GetFieldValue<Source?>(DatItem.SourceKey);
if (source != null && source.Index == index)
indexDat.Items.Add(key, item); indexDat.Items.Add(key, item);
} }
#if NET40_OR_GREATER || NETCOREAPP #if NET40_OR_GREATER || NETCOREAPP