Code cleanup.

This commit is contained in:
2018-06-22 08:08:38 +01:00
parent 82f474c7e3
commit 88da8fc019
581 changed files with 22423 additions and 20839 deletions

View File

@@ -41,23 +41,23 @@ namespace DiscImageChef.Filters
/// </summary>
public class XZ : IFilter
{
string basePath;
string basePath;
DateTime creationTime;
Stream dataStream;
long decompressedSize;
Stream innerStream;
Stream dataStream;
long decompressedSize;
Stream innerStream;
DateTime lastWriteTime;
bool opened;
bool opened;
public string Name => "XZ";
public Guid Id => new Guid("666A8617-0444-4C05-9F4F-DF0FD758D0D2");
public Guid Id => new Guid("666A8617-0444-4C05-9F4F-DF0FD758D0D2");
public void Close()
{
dataStream?.Close();
dataStream = null;
basePath = null;
opened = false;
basePath = null;
opened = false;
}
public string GetBasePath()
@@ -87,9 +87,9 @@ namespace DiscImageChef.Filters
public bool Identify(byte[] buffer)
{
return buffer[0] == 0xFD && buffer[1] == 0x37 && buffer[2] == 0x7A && buffer[3] == 0x58 &&
return buffer[0] == 0xFD && buffer[1] == 0x37 && buffer[2] == 0x7A && buffer[3] == 0x58 &&
buffer[4] == 0x5A && buffer[5] == 0x00 && buffer[buffer.Length - 2] == 0x59 &&
buffer[buffer.Length - 1] == 0x5A;
buffer[buffer.Length - 1] == 0x5A;
}
public bool Identify(Stream stream)
@@ -112,12 +112,12 @@ namespace DiscImageChef.Filters
if(!File.Exists(path)) return false;
FileStream stream = new FileStream(path, FileMode.Open, FileAccess.Read);
byte[] buffer = new byte[6];
byte[] footer = new byte[2];
byte[] buffer = new byte[6];
byte[] footer = new byte[2];
stream.Seek(0, SeekOrigin.Begin);
stream.Read(buffer, 0, 6);
stream.Seek(0, SeekOrigin.Begin);
stream.Seek(0, SeekOrigin.Begin);
stream.Seek(-2, SeekOrigin.End);
stream.Read(footer, 0, 2);
stream.Seek(0, SeekOrigin.Begin);
@@ -126,85 +126,39 @@ namespace DiscImageChef.Filters
buffer[4] == 0x5A && buffer[5] == 0x00 && footer[0] == 0x59 && footer[1] == 0x5A;
}
void GuessSize()
{
decompressedSize = 0;
// Seek to footer backwards size field
dataStream.Seek(-8, SeekOrigin.End);
byte[] tmp = new byte[4];
dataStream.Read(tmp, 0, 4);
uint backwardSize = (BitConverter.ToUInt32(tmp, 0) + 1) * 4;
// Seek to first indexed record
dataStream.Seek(-12 - (backwardSize - 2), SeekOrigin.End);
// Skip compressed size
tmp = new byte[backwardSize - 2];
dataStream.Read(tmp, 0, tmp.Length);
ulong number = 0;
int ignore = Decode(tmp, tmp.Length, ref number);
// Get compressed size
dataStream.Seek(-12 - (backwardSize - 2 - ignore), SeekOrigin.End);
tmp = new byte[backwardSize - 2 - ignore];
dataStream.Read(tmp, 0, tmp.Length);
Decode(tmp, tmp.Length, ref number);
decompressedSize = (long)number;
dataStream.Seek(0, SeekOrigin.Begin);
}
int Decode(byte[] buf, int sizeMax, ref ulong num)
{
if(sizeMax == 0) return 0;
if(sizeMax > 9) sizeMax = 9;
num = (ulong)(buf[0] & 0x7F);
int i = 0;
while((buf[i++] & 0x80) == 0x80)
{
if(i >= sizeMax || buf[i] == 0x00) return 0;
num |= (ulong)(buf[i] & 0x7F) << (i * 7);
}
return i;
}
public void Open(byte[] buffer)
{
dataStream = new MemoryStream(buffer);
basePath = null;
creationTime = DateTime.UtcNow;
dataStream = new MemoryStream(buffer);
basePath = null;
creationTime = DateTime.UtcNow;
lastWriteTime = creationTime;
GuessSize();
innerStream = new ForcedSeekStream<XZStream>(decompressedSize, dataStream);
opened = true;
opened = true;
}
public void Open(Stream stream)
{
dataStream = stream;
basePath = null;
creationTime = DateTime.UtcNow;
dataStream = stream;
basePath = null;
creationTime = DateTime.UtcNow;
lastWriteTime = creationTime;
GuessSize();
innerStream = new ForcedSeekStream<XZStream>(decompressedSize, dataStream);
opened = true;
opened = true;
}
public void Open(string path)
{
dataStream = new FileStream(path, FileMode.Open, FileAccess.Read);
basePath = Path.GetFullPath(path);
basePath = Path.GetFullPath(path);
FileInfo fi = new FileInfo(path);
creationTime = fi.CreationTimeUtc;
creationTime = fi.CreationTimeUtc;
lastWriteTime = fi.LastWriteTimeUtc;
GuessSize();
innerStream = new ForcedSeekStream<XZStream>(decompressedSize, dataStream);
opened = true;
opened = true;
}
public DateTime GetCreationTime()
@@ -251,5 +205,51 @@ namespace DiscImageChef.Filters
{
return opened;
}
void GuessSize()
{
decompressedSize = 0;
// Seek to footer backwards size field
dataStream.Seek(-8, SeekOrigin.End);
byte[] tmp = new byte[4];
dataStream.Read(tmp, 0, 4);
uint backwardSize = (BitConverter.ToUInt32(tmp, 0) + 1) * 4;
// Seek to first indexed record
dataStream.Seek(-12 - (backwardSize - 2), SeekOrigin.End);
// Skip compressed size
tmp = new byte[backwardSize - 2];
dataStream.Read(tmp, 0, tmp.Length);
ulong number = 0;
int ignore = Decode(tmp, tmp.Length, ref number);
// Get compressed size
dataStream.Seek(-12 - (backwardSize - 2 - ignore), SeekOrigin.End);
tmp = new byte[backwardSize - 2 - ignore];
dataStream.Read(tmp, 0, tmp.Length);
Decode(tmp, tmp.Length, ref number);
decompressedSize = (long)number;
dataStream.Seek(0, SeekOrigin.Begin);
}
int Decode(byte[] buf, int sizeMax, ref ulong num)
{
if(sizeMax == 0) return 0;
if(sizeMax > 9) sizeMax = 9;
num = (ulong)(buf[0] & 0x7F);
int i = 0;
while((buf[i++] & 0x80) == 0x80)
{
if(i >= sizeMax || buf[i] == 0x00) return 0;
num |= (ulong)(buf[i] & 0x7F) << (i * 7);
}
return i;
}
}
}