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

issue 252 is fix

This commit is contained in:
goyuken 2014-08-19 00:59:02 +00:00
parent d04d32d647
commit e94d1f7345
1 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
BizHawk.Client.Common/BinarySaveStates.cs
View File

@ -38,33 +38,44 @@ namespace BizHawk.Client.Common
public const string Movieheader = "Header"; public const string Movieheader = "Header";
*/ */
private static readonly Dictionary<BinaryStateLump, string> LumpNames; private static readonly Dictionary<BinaryStateLump, string> ReadNames;
private static readonly Dictionary<BinaryStateLump, string> WriteNames;
static void AddLumpName(BinaryStateLump token, string name)
{
ReadNames[token] = Path.GetFileNameWithoutExtension(name);
WriteNames[token] = name;
}
static BinaryStateFileNames() static BinaryStateFileNames()
{ {
LumpNames = new Dictionary<BinaryStateLump, string>(); ReadNames = new Dictionary<BinaryStateLump, string>();
LumpNames[BinaryStateLump.Versiontag] = "BizState 1.0"; WriteNames = new Dictionary<BinaryStateLump, string>();
LumpNames[BinaryStateLump.Corestate] = "Core"; AddLumpName(BinaryStateLump.Versiontag, "BizState 1.0");
LumpNames[BinaryStateLump.Framebuffer] = "Framebuffer"; AddLumpName(BinaryStateLump.Corestate, "Core");
LumpNames[BinaryStateLump.Input] = "Input Log"; AddLumpName(BinaryStateLump.Framebuffer, "Framebuffer");
LumpNames[BinaryStateLump.CorestateText] = "CoreText"; AddLumpName(BinaryStateLump.Input, "Input Log.txt");
LumpNames[BinaryStateLump.Movieheader] = "Header"; AddLumpName(BinaryStateLump.CorestateText, "CoreText.txt");
AddLumpName(BinaryStateLump.Movieheader, "Header.txt");
// Only for movies they probably shoudln't be leaching this stuff // Only for movies they probably shoudln't be leaching this stuff
LumpNames[BinaryStateLump.Comments] = "Comments"; AddLumpName(BinaryStateLump.Comments, "Comments.txt");
LumpNames[BinaryStateLump.Subtitles] = "Subtitles"; AddLumpName(BinaryStateLump.Subtitles, "Subtitles.txt");
LumpNames[BinaryStateLump.SyncSettings] = "SyncSettings"; AddLumpName(BinaryStateLump.SyncSettings, "SyncSettings.json");
// TasMovie // TasMovie
LumpNames[BinaryStateLump.LagLog] = "LagLog"; AddLumpName(BinaryStateLump.LagLog, "LagLog");
LumpNames[BinaryStateLump.Greenzone] = "GreenZone"; AddLumpName(BinaryStateLump.Greenzone, "GreenZone");
LumpNames[BinaryStateLump.GreenzoneSettings] = "GreenZoneSettings"; AddLumpName(BinaryStateLump.GreenzoneSettings, "GreenZoneSettings.txt");
LumpNames[BinaryStateLump.Markers] = "Markers"; AddLumpName(BinaryStateLump.Markers, "Markers.txt");
} }
public static string Get(BinaryStateLump lump) public static string GetReadName(BinaryStateLump lump)
{ {
return LumpNames[lump]; return ReadNames[lump];
}
public static string GetWriteName(BinaryStateLump lump)
{
return WriteNames[lump];
} }
} }
@ -76,6 +87,7 @@ namespace BizHawk.Client.Common
private ZipFile _zip; private ZipFile _zip;
private Version _ver; private Version _ver;
private bool _isDisposed; private bool _isDisposed;
private Dictionary<string, ZipEntry> _entriesbyname;
private BinaryStateLoader() private BinaryStateLoader()
{ {
@ -116,6 +128,15 @@ namespace BizHawk.Client.Common
Console.WriteLine("Read a zipstate of version {0}", _ver); Console.WriteLine("Read a zipstate of version {0}", _ver);
} }
private void PopulateEntries()
{
_entriesbyname = new Dictionary<string, ZipEntry>();
foreach (ZipEntry z in _zip)
{
_entriesbyname.Add(Path.GetFileNameWithoutExtension(z.Name), z);
}
}
public static BinaryStateLoader LoadAndDetect(string filename, bool isMovieLoad = false) public static BinaryStateLoader LoadAndDetect(string filename, bool isMovieLoad = false)
{ {
var ret = new BinaryStateLoader(); var ret = new BinaryStateLoader();
@ -138,7 +159,7 @@ namespace BizHawk.Client.Common
try try
{ {
ret._zip = new ZipFile(filename); ret._zip = new ZipFile(filename);
ret.PopulateEntries();
if (!isMovieLoad && !ret.GetLump(BinaryStateLump.Versiontag, false, ret.ReadVersion)) if (!isMovieLoad && !ret.GetLump(BinaryStateLump.Versiontag, false, ret.ReadVersion))
{ {
ret._zip.Close(); ret._zip.Close();
@ -162,9 +183,9 @@ namespace BizHawk.Client.Common
/// <returns>true if callback was called and stream was loaded</returns> /// <returns>true if callback was called and stream was loaded</returns>
public bool GetLump(BinaryStateLump lump, bool abort, Action<Stream, long> callback) public bool GetLump(BinaryStateLump lump, bool abort, Action<Stream, long> callback)
{ {
var name = BinaryStateFileNames.Get(lump); string name = BinaryStateFileNames.GetReadName(lump);
var e = _zip.GetEntry(name); ZipEntry e;
if (e != null) if (_entriesbyname.TryGetValue(name, out e))
{ {
using (var zs = _zip.GetInputStream(e)) using (var zs = _zip.GetInputStream(e))
{ {
@ -209,19 +230,6 @@ namespace BizHawk.Client.Common
}); });
} }
/*
/// <summary>
/// load binary state, or text state if binary state lump doesn't exist
/// </summary>
public void GetCoreState(Action<Stream> callbackBinary, Action<Stream> callbackText)
{
if (!GetLump(BinaryStateLump.Corestate, false, callbackBinary)
&& !GetLump(BinaryStateLump.CorestateText, false, callbackText))
{
throw new Exception("Couldn't find Binary or Text savestate");
}
}*/
public void GetCoreState(Action<BinaryReader, long> callbackBinary, Action<TextReader> callbackText) public void GetCoreState(Action<BinaryReader, long> callbackBinary, Action<TextReader> callbackText)
{ {
if (!GetLump(BinaryStateLump.Corestate, false, callbackBinary) if (!GetLump(BinaryStateLump.Corestate, false, callbackBinary)
@ -274,7 +282,7 @@ namespace BizHawk.Client.Common
public void PutLump(BinaryStateLump lump, Action<Stream> callback) public void PutLump(BinaryStateLump lump, Action<Stream> callback)
{ {
var name = BinaryStateFileNames.Get(lump); var name = BinaryStateFileNames.GetWriteName(lump);
var e = new ZipEntry(name); var e = new ZipEntry(name);
if (Global.Config.SaveStateCompressionLevelNormal == 0) if (Global.Config.SaveStateCompressionLevelNormal == 0)
e.CompressionMethod = CompressionMethod.Stored; e.CompressionMethod = CompressionMethod.Stored;