From a0680e4b94327d9537d84af0e12f7f4b4a9042c1 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 31 May 2020 10:28:02 -0500
Subject: [PATCH] do the todo of renaming BinaryStateSaver/Loader to
ZipStateSaver/Loader
---
src/BizHawk.Client.Common/SavestateManager.cs | 4 ++--
src/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs | 4 ++--
src/BizHawk.Client.Common/movie/tasproj/TasBranch.cs | 8 ++++----
.../movie/tasproj/TasMovie.IO.cs | 4 ++--
.../savestates/ZipStateLoader.cs | 11 ++++-------
src/BizHawk.Client.Common/savestates/ZipStateSaver.cs | 4 ++--
6 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/BizHawk.Client.Common/SavestateManager.cs b/src/BizHawk.Client.Common/SavestateManager.cs
index f085077347..5a63f841a0 100644
--- a/src/BizHawk.Client.Common/SavestateManager.cs
+++ b/src/BizHawk.Client.Common/SavestateManager.cs
@@ -15,7 +15,7 @@ namespace BizHawk.Client.Common
// the old method of text savestate save is now gone.
// a text savestate is just like a binary savestate, but with a different core lump
- using var bs = new BinaryStateSaver(filename, Global.Config.SaveStateCompressionLevelNormal);
+ using var bs = new ZipStateSaver(filename, Global.Config.SaveStateCompressionLevelNormal);
bs.PutVersionLumps();
if (Global.Config.SaveStateType == SaveStateTypeE.Text)
{
@@ -101,7 +101,7 @@ namespace BizHawk.Client.Common
var core = emulator.AsStatable();
// try to detect binary first
- var bl = BinaryStateLoader.LoadAndDetect(path);
+ var bl = ZipStateLoader.LoadAndDetect(path);
if (bl != null)
{
try
diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs
index 64e48f8804..4e32e2b8a6 100644
--- a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs
+++ b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs
@@ -42,7 +42,7 @@ namespace BizHawk.Client.Common
return false;
}
- using (var bl = BinaryStateLoader.LoadAndDetect(Filename, true))
+ using (var bl = ZipStateLoader.LoadAndDetect(Filename, true))
{
if (bl == null)
{
@@ -184,7 +184,7 @@ namespace BizHawk.Client.Common
Directory.CreateDirectory(file.Directory.ToString());
}
- using var bs = new BinaryStateSaver(fn, Global.Config.MovieCompressionLevel);
+ using var bs = new ZipStateSaver(fn, Global.Config.MovieCompressionLevel);
bs.PutLump(BinaryStateLump.Movieheader, tw => tw.WriteLine(Header.ToString()));
bs.PutLump(BinaryStateLump.Comments, tw => tw.WriteLine(CommentsString()));
bs.PutLump(BinaryStateLump.Subtitles, tw => tw.WriteLine(Subtitles.ToString()));
diff --git a/src/BizHawk.Client.Common/movie/tasproj/TasBranch.cs b/src/BizHawk.Client.Common/movie/tasproj/TasBranch.cs
index f2287fed02..0d05158424 100644
--- a/src/BizHawk.Client.Common/movie/tasproj/TasBranch.cs
+++ b/src/BizHawk.Client.Common/movie/tasproj/TasBranch.cs
@@ -31,8 +31,8 @@ namespace BizHawk.Client.Common
void Swap(int b1, int b2);
void Replace(TasBranch old, TasBranch newBranch);
- void Save(BinaryStateSaver bs);
- void Load(BinaryStateLoader bl, ITasMovie movie);
+ void Save(ZipStateSaver bs);
+ void Load(ZipStateLoader bl, ITasMovie movie);
}
public class TasBranchCollection : List<TasBranch>, ITasBranchCollection
@@ -108,7 +108,7 @@ namespace BizHawk.Client.Common
return result;
}
- public void Save(BinaryStateSaver bs)
+ public void Save(ZipStateSaver bs)
{
var nheader = new IndexedStateLump(BinaryStateLump.BranchHeader);
var ncore = new IndexedStateLump(BinaryStateLump.BranchCoreData);
@@ -176,7 +176,7 @@ namespace BizHawk.Client.Common
}
}
- public void Load(BinaryStateLoader bl, ITasMovie movie)
+ public void Load(ZipStateLoader bl, ITasMovie movie)
{
var nheader = new IndexedStateLump(BinaryStateLump.BranchHeader);
var ncore = new IndexedStateLump(BinaryStateLump.BranchCoreData);
diff --git a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
index 69275dc9da..0045b7b3fd 100644
--- a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
+++ b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
@@ -18,7 +18,7 @@ namespace BizHawk.Client.Common
Directory.CreateDirectory(file.Directory.ToString());
}
- using var bs = new BinaryStateSaver(fn, Global.Config.MovieCompressionLevel);
+ using var bs = new ZipStateSaver(fn, Global.Config.MovieCompressionLevel);
bs.PutLump(BinaryStateLump.Movieheader, tw => tw.WriteLine(Header.ToString()));
bs.PutLump(BinaryStateLump.Comments, tw => tw.WriteLine(CommentsString()));
bs.PutLump(BinaryStateLump.Subtitles, tw => tw.WriteLine(Subtitles.ToString()));
@@ -85,7 +85,7 @@ namespace BizHawk.Client.Common
return false;
}
- using (var bl = BinaryStateLoader.LoadAndDetect(Filename, true))
+ using (var bl = ZipStateLoader.LoadAndDetect(Filename, true))
{
if (bl == null)
{
diff --git a/src/BizHawk.Client.Common/savestates/ZipStateLoader.cs b/src/BizHawk.Client.Common/savestates/ZipStateLoader.cs
index ceb502030d..43a6bc0c7d 100644
--- a/src/BizHawk.Client.Common/savestates/ZipStateLoader.cs
+++ b/src/BizHawk.Client.Common/savestates/ZipStateLoader.cs
@@ -6,17 +6,14 @@ using ICSharpCode.SharpZipLib.Zip;
namespace BizHawk.Client.Common
{
- /// <summary>
- /// more accurately should be called ZipStateLoader, as it supports both text and binary core data
- /// </summary>
- public class BinaryStateLoader : IDisposable
+ public class ZipStateLoader : IDisposable
{
private ZipFile _zip;
private Version _ver;
private bool _isDisposed;
private Dictionary<string, ZipEntry> _entriesByName;
- private BinaryStateLoader()
+ private ZipStateLoader()
{
}
@@ -71,9 +68,9 @@ namespace BizHawk.Client.Common
}
private static readonly byte[] Zipheader = { 0x50, 0x4b, 0x03, 0x04 };
- public static BinaryStateLoader LoadAndDetect(string filename, bool isMovieLoad = false)
+ public static ZipStateLoader LoadAndDetect(string filename, bool isMovieLoad = false)
{
- var ret = new BinaryStateLoader();
+ var ret = new ZipStateLoader();
using (var fs = new FileStream(filename, FileMode.Open, FileAccess.Read))
{
diff --git a/src/BizHawk.Client.Common/savestates/ZipStateSaver.cs b/src/BizHawk.Client.Common/savestates/ZipStateSaver.cs
index 8b50dcbcb3..402168556b 100644
--- a/src/BizHawk.Client.Common/savestates/ZipStateSaver.cs
+++ b/src/BizHawk.Client.Common/savestates/ZipStateSaver.cs
@@ -3,7 +3,7 @@ using System.IO;
namespace BizHawk.Client.Common
{
- public class BinaryStateSaver : IDisposable
+ public class ZipStateSaver : IDisposable
{
private readonly IZipWriter _zip;
private bool _isDisposed;
@@ -22,7 +22,7 @@ namespace BizHawk.Client.Common
sw.Flush();
}
- public BinaryStateSaver(string path, int compressionLevel)
+ public ZipStateSaver(string path, int compressionLevel)
{
_zip = new FrameworkZipWriter(path, compressionLevel);
}