icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-14 20:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Tidying

Browse Source
This commit is contained in:
Chris Cameron
2018-06-06 10:54:39 -04:00
parent 1ae6a55c7d
commit da58379dfa
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ICD.Common.Utils/IO/Compression/IcdZip.cs
View File

@@ -90,7 +90,7 @@ namespace ICD.Common.Utils.IO.Compression
if (stream.Length < 22) if (stream.Length < 22)
yield break; yield break;
stream.Seek(-22, eSeekOrigin.End.ToSeekOrigin()); stream.Seek(-22, eSeekOrigin.End);
// find directory signature // find directory signature
while (reader.ReadInt32() != DIRECTORY_SIGNATURE) while (reader.ReadInt32() != DIRECTORY_SIGNATURE)
@@ -99,15 +99,15 @@ namespace ICD.Common.Utils.IO.Compression
yield break; yield break;
// move 1 byte back // move 1 byte back
stream.Seek(-5, eSeekOrigin.Current.ToSeekOrigin()); stream.Seek(-5, eSeekOrigin.Current);
} }
// read directory properties // read directory properties
stream.Seek(6, eSeekOrigin.Current.ToSeekOrigin()); stream.Seek(6, eSeekOrigin.Current);
ushort entries = reader.ReadUInt16(); ushort entries = reader.ReadUInt16();
int difSize = reader.ReadInt32(); int difSize = reader.ReadInt32();
uint dirOffset = reader.ReadUInt32(); uint dirOffset = reader.ReadUInt32();
stream.Seek(dirOffset, eSeekOrigin.Begin.ToSeekOrigin()); stream.Seek(dirOffset, eSeekOrigin.Begin);
// read directory entries // read directory entries
for (int i = 0; i < entries; i++) for (int i = 0; i < entries; i++)
@@ -130,7 +130,7 @@ namespace ICD.Common.Utils.IO.Compression
reader.ReadInt32(); reader.ReadInt32();
int fileHeaderOffset = reader.ReadInt32(); int fileHeaderOffset = reader.ReadInt32();
byte[] fileNameBytes = reader.ReadBytes(fileNameSize); byte[] fileNameBytes = reader.ReadBytes(fileNameSize);
stream.Seek(extraSize, eSeekOrigin.Current.ToSeekOrigin()); stream.Seek(extraSize, eSeekOrigin.Current);
byte[] fileCommentBytes = reader.ReadBytes(commentSize); byte[] fileCommentBytes = reader.ReadBytes(commentSize);
int fileDataOffset = CalculateFileDataOffset(stream, reader, fileHeaderOffset); int fileDataOffset = CalculateFileDataOffset(stream, reader, fileHeaderOffset);
@@ -157,12 +157,12 @@ namespace ICD.Common.Utils.IO.Compression
private static int CalculateFileDataOffset(IcdStream stream, IcdBinaryReader reader, int fileHeaderOffset) private static int CalculateFileDataOffset(IcdStream stream, IcdBinaryReader reader, int fileHeaderOffset)
{ {
long position = stream.Position; long position = stream.Position;
stream.Seek(fileHeaderOffset + 26, eSeekOrigin.Begin.ToSeekOrigin()); stream.Seek(fileHeaderOffset + 26, eSeekOrigin.Begin);
short fileNameSize = reader.ReadInt16(); short fileNameSize = reader.ReadInt16();
short extraSize = reader.ReadInt16(); short extraSize = reader.ReadInt16();
int fileOffset = (int)stream.Position + fileNameSize + extraSize; int fileOffset = (int)stream.Position + fileNameSize + extraSize;
stream.Seek(position, eSeekOrigin.Begin.ToSeekOrigin()); stream.Seek(position, eSeekOrigin.Begin);
return fileOffset; return fileOffset;
} }

4
ICD.Common.Utils/IO/IcdStream.cs
View File

@@ -34,9 +34,9 @@ namespace ICD.Common.Utils.IO
m_Stream.Dispose(); m_Stream.Dispose();
} }
public void Seek(long offset, SeekOrigin end) public void Seek(long offset, eSeekOrigin seekOrigin)
{ {
m_Stream.Seek(offset, end); m_Stream.Seek(offset, seekOrigin.ToSeekOrigin());
} }
} }
} }