ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve rom status report for PSX, and generate one for the M3U scenario

This commit is contained in:
zeromus 2015-07-12 20:23:27 -05:00
parent 7bec7b806b
commit 56e3416de2
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
BizHawk.Client.Common/RomLoader.cs
View File

@ -251,6 +251,7 @@ namespace BizHawk.Client.Common
m3u.Rebase(Path.GetDirectoryName(path));
List<Disc> discs = new List<Disc>();
List<string> discNames = new List<string>();
StringWriter sw = new StringWriter();
foreach (var e in m3u.Entries)
{
Disc disc = null;
@ -259,11 +260,37 @@ namespace BizHawk.Client.Common
disc = Disc.LoadAutomagic(discPath);
if(disc == null)
throw new InvalidOperationException("Can't load one of the files specified in the M3U");
discNames.Add(Path.GetFileNameWithoutExtension(discPath));
var discName = Path.GetFileNameWithoutExtension(discPath);
discNames.Add(discName);
discs.Add(disc);
var discType = new DiscIdentifier(disc).DetectDiscType();
sw.WriteLine("{0}", Path.GetFileName(discPath));
if (discType == DiscType.SonyPSX)
{
string discHash = new DiscHasher(disc).Calculate_PSX_BizIDHash().ToString("X8");
game = Database.CheckDatabase(discHash);
if (game.IsRomStatusBad())
sw.WriteLine("Disc could not be identified as known-good. Look for a better rip.");
else
{
sw.WriteLine("Disc was identified (99.99% confidently) as known good.");
sw.WriteLine("Nonetheless it could be an unrecognized romhack or patched version.");
sw.WriteLine("According to redump.org, the ideal hash for entire disc is: CRC32:{0:X8}", game.GetStringValue("dh"));
sw.WriteLine("The file you loaded hasn't been hashed entirely (it would take too long)");
sw.WriteLine("Compare it with the full hash calculated by the PSX menu's disc hasher tool");
}
}
else
{
sw.WriteLine("Not a PSX disc");
}
sw.WriteLine("-------------------------");
}
nextEmulator = new Octoshock(nextComm, discs, discNames, null, GetCoreSettings<Octoshock>(), GetCoreSyncSettings<Octoshock>());
nextEmulator.CoreComm.RomStatusDetails = "PSX etc.";
nextEmulator.CoreComm.RomStatusDetails = sw.ToString();
game = new GameInfo { Name = Path.GetFileNameWithoutExtension(file.Name) };
game.System = "PSX";
}
@ -346,9 +373,9 @@ namespace BizHawk.Client.Common
StringWriter sw = new StringWriter();
sw.WriteLine("Disc was identified (99.99% confidently) as known good.");
sw.WriteLine("Nonetheless it could be an unrecognized romhack or patched version.");
sw.WriteLine("Ideal hash for entire disc is: CRC32:{0:X8}", game.GetStringValue("dh"));
sw.WriteLine("According to redump.org, the ideal hash for entire disc is: CRC32:{0:X8}", game.GetStringValue("dh"));
sw.WriteLine("The file you loaded hasn't been hashed entirely (it would take too long)");
sw.WriteLine("Check it in the PSX menu (eventually) and compare to this or check each .bin file individually against redump.org");
sw.WriteLine("Compare it with the full hash calculated by the PSX menu's disc hasher tool");
nextEmulator.CoreComm.RomStatusDetails = sw.ToString();
}
break;

10
BizHawk.Emulation.DiscSystem/DiscIdentifier.cs
View File

@ -8,7 +8,12 @@ namespace BizHawk.Emulation.DiscSystem
public enum DiscType
{
/// <summary>
/// Nothing is known about this disc type
/// Disc contains audio in track 1. Nothing more can readily be determined
/// </summary>
AudioDisc,
/// <summary>
/// Nothing is known about this data disc type
/// </summary>
UnknownFormat,
@ -61,6 +66,9 @@ namespace BizHawk.Emulation.DiscSystem
/// </summary>
public DiscType DetectDiscType()
{
//check track 0. if it's an audio track, further data-track testing is useless
if (dsr.ReadLBA_Mode(0) == 0) return DiscType.AudioDisc;
//sega doesnt put anything identifying in the cdfs volume info. but its consistent about putting its own header here in sector 0
if (DetectSegaSaturn()) return DiscType.SegaSaturn;