* DiscImageChef.Metadata/DiskType.cs:

* DiscImageChef.Metadata/DiscImageChef.Metadata.csproj:
	  Added method to convert DiskType to disk type and subtype
	  strings.

	* DiscImageChef.DiscImages/CDRWin.cs:
	  Added extra track information.
	Corrected ReadLong for CD+G, subchannel should never come
	  along main channel on reading.

	* DiscImageChef.DiscImages/ImagePlugin.cs:
	  Added extra track information.
	Added audio media type.

	* DiscImageChef.DiscImages/Nero.cs:
	  Added extra track information.

	* DiscImageChef.DiscImages/ZZZRawImage.cs:
	  Added support for ReadLong and a single track and session
	  for optical discs.

	* DiscImageChef.Filesystems/FFS.cs:
	* DiscImageChef.Filesystems/BFS.cs:
	* DiscImageChef.Filesystems/ODS.cs:
	* DiscImageChef.Filesystems/SysV.cs:
	* DiscImageChef.Filesystems/extFS.cs:
	* DiscImageChef.Filesystems/ProDOS.cs:
	* DiscImageChef.Filesystems/ext2FS.cs:
	* DiscImageChef.Filesystems/LisaFS.cs:
	* DiscImageChef.Filesystems/MinixFS.cs:
	* DiscImageChef.Filesystems/UNIXBFS.cs:
	* DiscImageChef.Filesystems/AppleMFS.cs:
	* DiscImageChef.Filesystems/PCEngine.cs:
	* DiscImageChef.Filesystems/AppleHFS.cs:
	* DiscImageChef.Filesystems/AmigaDOS.cs:
	* DiscImageChef.Filesystems/AppleHFSPlus.cs:
	  Completed XML information.

	* DiscImageChef.Filesystems/ISO9660.cs:
	  Corrected fail in Sega CD IP.BIN decoding.
	Corrected IP.BIN date decoding.
	Trim spaces at end of Volume Descriptor string fields.
	Completed XML information.

	* DiscImageChef/Commands/Checksum.cs:
	  Checking memory usage on each step makes checksum
	  calculation abismally slower. Removed.

	* DiscImageChef/Main.cs:
	* DiscImageChef/Options.cs:
	* DiscImageChef/DiscImageChef.csproj:
	* DiscImageChef/Commands/CreateSidecar.cs:
	  Added method for creating CICM Metadata XML sidecar.
This commit is contained in:
2015-12-06 05:09:31 +00:00
parent 564775d3f7
commit 36e12eb1a7
31 changed files with 2354 additions and 125 deletions

View File

@@ -77,8 +77,6 @@ namespace DiscImageChef.Commands
}
inputFormat.OpenImage(options.InputFile);
long maxMemory = GC.GetTotalMemory(false);
long snapMemory;
if (inputFormat.ImageInfo.imageHasPartitions)
{
@@ -303,10 +301,6 @@ namespace DiscImageChef.Commands
spamsumThread.Start(spamsumPkt);
}
snapMemory = GC.GetTotalMemory(false);
if (snapMemory > maxMemory)
maxMemory = snapMemory;
while (adlerThread.IsAlive || crc16Thread.IsAlive ||
crc32Thread.IsAlive || crc64Thread.IsAlive ||
//fletcher16Thread.IsAlive || fletcher32Thread.IsAlive ||
@@ -330,10 +324,6 @@ namespace DiscImageChef.Commands
sha384Thread = new Thread(updateSHA384);
sha512Thread = new Thread(updateSHA512);
spamsumThread = new Thread(updateSpamSum);
snapMemory = GC.GetTotalMemory(false);
if (snapMemory > maxMemory)
maxMemory = snapMemory;
}
}
@@ -511,10 +501,6 @@ namespace DiscImageChef.Commands
spamsumThread.Start(spamsumPkt);
}
snapMemory = GC.GetTotalMemory(false);
if (snapMemory > maxMemory)
maxMemory = snapMemory;
while (adlerThread.IsAlive || crc16Thread.IsAlive ||
crc32Thread.IsAlive || crc64Thread.IsAlive ||
//fletcher16Thread.IsAlive || fletcher32Thread.IsAlive ||
@@ -538,10 +524,6 @@ namespace DiscImageChef.Commands
sha384Thread = new Thread(updateSHA384);
sha512Thread = new Thread(updateSHA512);
spamsumThread = new Thread(updateSpamSum);
snapMemory = GC.GetTotalMemory(false);
if (snapMemory > maxMemory)
maxMemory = snapMemory;
}
if (options.SeparatedTracks)
@@ -612,10 +594,6 @@ namespace DiscImageChef.Commands
spamsumThread.Start(spamsumPktTrack);
}
snapMemory = GC.GetTotalMemory(false);
if (snapMemory > maxMemory)
maxMemory = snapMemory;
while (adlerThread.IsAlive || crc16Thread.IsAlive ||
crc32Thread.IsAlive || crc64Thread.IsAlive ||
//fletcher16Thread.IsAlive || fletcher32Thread.IsAlive ||
@@ -639,10 +617,6 @@ namespace DiscImageChef.Commands
sha384Thread = new Thread(updateSHA384);
sha512Thread = new Thread(updateSHA512);
spamsumThread = new Thread(updateSpamSum);
snapMemory = GC.GetTotalMemory(false);
if (snapMemory > maxMemory)
maxMemory = snapMemory;
}
}
@@ -756,10 +730,6 @@ namespace DiscImageChef.Commands
spamsumThread.Start(spamsumPkt);
}
snapMemory = GC.GetTotalMemory(false);
if (snapMemory > maxMemory)
maxMemory = snapMemory;
while (adlerThread.IsAlive || crc16Thread.IsAlive ||
crc32Thread.IsAlive || crc64Thread.IsAlive ||
//fletcher16Thread.IsAlive || fletcher32Thread.IsAlive ||
@@ -783,10 +753,6 @@ namespace DiscImageChef.Commands
sha384Thread = new Thread(updateSHA384);
sha512Thread = new Thread(updateSHA512);
spamsumThread = new Thread(updateSpamSum);
snapMemory = GC.GetTotalMemory(false);
if (snapMemory > maxMemory)
maxMemory = snapMemory;
}
}
@@ -1025,10 +991,6 @@ namespace DiscImageChef.Commands
spamsumThread.Start(spamsumPkt);
}
snapMemory = GC.GetTotalMemory(false);
if (snapMemory > maxMemory)
maxMemory = snapMemory;
while (adlerThread.IsAlive || crc16Thread.IsAlive ||
crc32Thread.IsAlive || crc64Thread.IsAlive ||
//fletcher16Thread.IsAlive || fletcher32Thread.IsAlive ||
@@ -1052,10 +1014,6 @@ namespace DiscImageChef.Commands
sha384Thread = new Thread(updateSHA384);
sha512Thread = new Thread(updateSHA512);
spamsumThread = new Thread(updateSpamSum);
snapMemory = GC.GetTotalMemory(false);
if (snapMemory > maxMemory)
maxMemory = snapMemory;
}
DicConsole.WriteLine();
@@ -1087,8 +1045,6 @@ namespace DiscImageChef.Commands
if (options.DoSpamSum)
DicConsole.WriteLine("Disk's SpamSum: {0}", ssctx.End());
}
DicConsole.DebugWriteLine("Checksum command", "Maximum memory used has been {0} bytes", maxMemory);
}
#region Threading helpers