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

Fix oversights in hashfiles

Browse Source 
- Allows for multiple spaces between filename and hash
- Allows for paths in names to be counted as machine names
This commit is contained in:
Matt Nadareski
2023-03-29 22:58:06 -04:00
parent dc79249d61
commit 6ee9edfe89
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
SabreTools.DatFiles/Formats/Hashfile.cs
View File

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Text.RegularExpressions;
using SabreTools.Core;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
@@ -43,7 +44,7 @@ namespace SabreTools.DatFiles.Formats
string line = sr.ReadLine();
// Split the line and get the name and hash
string[] split = line.Split(' ');
string[] split = Regex.Replace(line, @"\s+", " ").Split(' ');
string name = string.Empty;
string hash = string.Empty;
@@ -60,6 +61,21 @@ namespace SabreTools.DatFiles.Formats
hash = split[0];
}
// If the name contains a path, use that path as the machine
string machine = Path.GetFileNameWithoutExtension(filename);
if (name.Contains('/'))
{
split = name.Split('/');
machine = split[0];
name = name.Substring(machine.Length + 1);
}
else if (name.Contains('\\'))
{
split = name.Split('\\');
machine = split[0];
name = name.Substring(machine.Length + 1);
}
Rom rom = new Rom
{
Name = name,
@@ -75,7 +91,7 @@ namespace SabreTools.DatFiles.Formats
Machine = new Machine
{
Name = Path.GetFileNameWithoutExtension(filename),
Name = machine,
},
Source = new Source