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

cleanup StringLog.cs, removes a warning

This commit is contained in:
adelikat 2020-03-19 10:28:34 -05:00
parent a40e37eda6
commit 8ea04c3ed5
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
BizHawk.Client.Common/movie/bk2/StringLogs.cs
View File

@ -1,7 +1,8 @@
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Security.AccessControl;
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Client.Common namespace BizHawk.Client.Common
@ -67,29 +68,27 @@ namespace BizHawk.Client.Common
/// </summary> /// </summary>
internal class StreamStringLog : IStringLog internal class StreamStringLog : IStringLog
{ {
private readonly Stream stream; private readonly Stream _stream;
private readonly List<long> _offsets = new List<long>(); private readonly List<long> _offsets = new List<long>();
private readonly BinaryWriter _bw; private readonly BinaryWriter _bw;
private readonly BinaryReader _br; private readonly BinaryReader _br;
private readonly bool _mDisk; private readonly bool _mDisk;
private long _cursor;
public StreamStringLog(bool disk) public StreamStringLog(bool disk)
{ {
_mDisk = disk; _mDisk = disk;
if (disk) if (disk)
{ {
var path = TempFileManager.GetTempFilename("movieOnDisk"); var path = TempFileManager.GetTempFilename("movieOnDisk");
stream = new FileStream(path, FileMode.Create, System.Security.AccessControl.FileSystemRights.FullControl, FileShare.None, 4 * 1024, FileOptions.DeleteOnClose); _stream = new FileStream(path, FileMode.Create, FileSystemRights.FullControl, FileShare.None, 4 * 1024, FileOptions.DeleteOnClose);
} }
else else
{ {
stream = new AWEMemoryStream(); _stream = new AWEMemoryStream();
} }
_bw = new BinaryWriter(stream); _bw = new BinaryWriter(_stream);
_br = new BinaryReader(stream); _br = new BinaryReader(_stream);
} }
public IStringLog Clone() public IStringLog Clone()
@ -105,22 +104,21 @@ namespace BizHawk.Client.Common
public void Dispose() public void Dispose()
{ {
stream.Dispose(); _stream.Dispose();
} }
public int Count => _offsets.Count; public int Count => _offsets.Count;
public void Clear() public void Clear()
{ {
stream.SetLength(0); _stream.SetLength(0);
_offsets.Clear(); _offsets.Clear();
_cursor = 0;
} }
public void Add(string str) public void Add(string str)
{ {
stream.Position = stream.Length; _stream.Position = _stream.Length;
_offsets.Add(stream.Position); _offsets.Add(_stream.Position);
_bw.Write(str); _bw.Write(str);
_bw.Flush(); _bw.Flush();
} }
@ -135,14 +133,14 @@ namespace BizHawk.Client.Common
{ {
get get
{ {
stream.Position = _offsets[index]; _stream.Position = _offsets[index];
return _br.ReadString(); return _br.ReadString();
} }
set set
{ {
stream.Position = stream.Length; _stream.Position = _stream.Length;
_offsets[index] = stream.Position; _offsets[index] = _stream.Position;
_bw.Write(value); _bw.Write(value);
_bw.Flush(); _bw.Flush();
} }
@ -150,8 +148,8 @@ namespace BizHawk.Client.Common
public void Insert(int index, string val) public void Insert(int index, string val)
{ {
stream.Position = stream.Length; _stream.Position = _stream.Length;
_offsets.Insert(index, stream.Position); _offsets.Insert(index, _stream.Position);
_bw.Write(val); _bw.Write(val);
_bw.Flush(); _bw.Flush();
} }
@ -178,9 +176,9 @@ namespace BizHawk.Client.Common
private int _index = -1; private int _index = -1;
public string Current => Log[_index]; public string Current => Log[_index];
object System.Collections.IEnumerator.Current => Log[_index]; object IEnumerator.Current => Log[_index];
bool System.Collections.IEnumerator.MoveNext() bool IEnumerator.MoveNext()
{ {
_index++; _index++;
if (_index >= Log.Count) if (_index >= Log.Count)
@ -192,7 +190,7 @@ namespace BizHawk.Client.Common
return true; return true;
} }
void System.Collections.IEnumerator.Reset() { _index = -1; } void IEnumerator.Reset() { _index = -1; }
public void Dispose() { } public void Dispose() { }
} }
@ -202,7 +200,7 @@ namespace BizHawk.Client.Common
return new Enumerator { Log = this }; return new Enumerator { Log = this };
} }
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() IEnumerator IEnumerable.GetEnumerator()
{ {
return new Enumerator { Log = this }; return new Enumerator { Log = this };
} }