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 odd output naming for conversion dats

Browse Source
This commit is contained in:
Matt Nadareski
2016-05-18 15:34:49 -07:00
parent ce1f895a9b
commit 3ee1753b21
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DATabase/DATabase.cs
View File

@@ -1303,9 +1303,8 @@ Make a selection:
outdir = outdir.Replace("\"", ""); outdir = outdir.Replace("\"", "");
if (outdir != "") if (outdir != "")
{ {
outdir = Path.GetFullPath(outdir); outdir = Path.GetFullPath(outdir) + Path.DirectorySeparatorChar;
} }
Console.WriteLine(outdir);
filename = filename.Replace("\"", ""); filename = filename.Replace("\"", "");
if (File.Exists(filename)) if (File.Exists(filename))
@@ -1380,7 +1379,7 @@ Make a selection:
datdata.Description += ".new"; datdata.Description += ".new";
} }
Output.WriteDatfile(datdata, (outdir == "" ? Path.GetDirectoryName(file) : outdir + Path.DirectorySeparatorChar + Path.GetDirectoryName(file).Remove(0, filename.Length)), logger); Output.WriteDatfile(datdata, (outdir == "" ? Path.GetDirectoryName(file) : outdir + Path.GetDirectoryName(file).Remove(0, filename.Length + 1)), logger);
} }
} }
else else

2
SabreHelper/Output.cs
View File

@@ -256,7 +256,7 @@ namespace SabreTools.Helper
} }
sw.Write(footer); sw.Write(footer);
logger.User("File written!" + Environment.NewLine); logger.Log("File written!" + Environment.NewLine);
sw.Close(); sw.Close();
fs.Close(); fs.Close();
} }

2
SabreHelper/RomManipulation.cs
View File

@@ -332,7 +332,7 @@ namespace SabreTools.Helper
sha1 = (sha1 == "" ? "" : sha1.PadLeft(40, '0')); sha1 = (sha1 == "" ? "" : sha1.PadLeft(40, '0'));
// If we have a rom and it's missing size AND the hashes match a 0-byte file, fill in the rest of the info // If we have a rom and it's missing size AND the hashes match a 0-byte file, fill in the rest of the info
if (subreader.Name == "rom" && (size == 0 || size == -1) && (crc == CRCZero || md5 == MD5Zero || sha1 == SHA1Zero)) if (subreader.Name == "rom" && (size == 0 || size == -1) && ((crc == CRCZero || crc == "") || md5 == MD5Zero || sha1 == SHA1Zero))
{ {
size = SizeZero; size = SizeZero;
crc = CRCZero; crc = CRCZero;