diff --git a/DiscImageChef.Core/ChangeLog b/DiscImageChef.Core/ChangeLog index c5123a3d..ef0c641d 100644 --- a/DiscImageChef.Core/ChangeLog +++ b/DiscImageChef.Core/ChangeLog @@ -1,3 +1,8 @@ +2017-05-27 Natalia Portillo + + * MHDDLog.cs: + * DiscImageChef.Core.csproj: Refactor: Move MHDDLog to Core. + 2017-05-27 Natalia Portillo * IBGLog.cs: diff --git a/DiscImageChef.Core/DiscImageChef.Core.csproj b/DiscImageChef.Core/DiscImageChef.Core.csproj index 3c084235..0bb7ce3f 100644 --- a/DiscImageChef.Core/DiscImageChef.Core.csproj +++ b/DiscImageChef.Core/DiscImageChef.Core.csproj @@ -40,6 +40,7 @@ + diff --git a/DiscImageChef/Core/MHDDLog.cs b/DiscImageChef.Core/Logging/MHDDLog.cs similarity index 99% rename from DiscImageChef/Core/MHDDLog.cs rename to DiscImageChef.Core/Logging/MHDDLog.cs index 2abf4e2f..742e7892 100644 --- a/DiscImageChef/Core/MHDDLog.cs +++ b/DiscImageChef.Core/Logging/MHDDLog.cs @@ -35,7 +35,7 @@ using System.IO; using System.Text; using DiscImageChef.Devices; -namespace DiscImageChef.Core +namespace DiscImageChef.Core.Logging { public class MHDDLog { diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog index 9d2224e5..75b7e873 100644 --- a/DiscImageChef/ChangeLog +++ b/DiscImageChef/ChangeLog @@ -1,3 +1,10 @@ +2017-05-27 Natalia Portillo + + * DiscImageChef.csproj: + * Commands/DumpMedia.cs: + * Commands/MediaScan.cs: + Refactor: Move MHDDLog to Core. + 2017-05-27 Natalia Portillo * DiscImageChef.csproj: diff --git a/DiscImageChef/Commands/DumpMedia.cs b/DiscImageChef/Commands/DumpMedia.cs index a810b415..f09ca8e8 100644 --- a/DiscImageChef/Commands/DumpMedia.cs +++ b/DiscImageChef/Commands/DumpMedia.cs @@ -51,7 +51,7 @@ namespace DiscImageChef.Commands { static bool aborted; static FileStream dataFs; - static Core.MHDDLog mhddLog; + static MHDDLog mhddLog; static IBGLog ibgLog; // TODO: Implement dump map @@ -426,7 +426,7 @@ namespace DiscImageChef.Commands { DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); - mhddLog = new Core.MHDDLog(options.OutputPrefix + ".mhddlog.bin", dev, blocks, blockSize, blocksToRead); + mhddLog = new MHDDLog(options.OutputPrefix + ".mhddlog.bin", dev, blocks, blockSize, blocksToRead); ibgLog = new IBGLog(options.OutputPrefix + ".ibg", currentProfile); initDataFile(options.OutputPrefix + ".bin"); @@ -640,7 +640,7 @@ namespace DiscImageChef.Commands } else { - mhddLog = new Core.MHDDLog(options.OutputPrefix + ".mhddlog.bin", dev, blocks, blockSize, blocksToRead); + mhddLog = new MHDDLog(options.OutputPrefix + ".mhddlog.bin", dev, blocks, blockSize, blocksToRead); ibgLog = new IBGLog(options.OutputPrefix + ".ibg", currentProfile); initDataFile(options.OutputPrefix + ".bin"); @@ -1334,7 +1334,7 @@ namespace DiscImageChef.Commands initDataFile(options.OutputPrefix + ".bin"); dataChk = new Core.Checksum(); start = DateTime.UtcNow; - mhddLog = new Core.MHDDLog(options.OutputPrefix + ".mhddlog.bin", dev, blocks, blockSize, 1); + mhddLog = new MHDDLog(options.OutputPrefix + ".mhddlog.bin", dev, blocks, blockSize, 1); ibgLog = new IBGLog(options.OutputPrefix + ".ibg", 0x0008); currentTapeFile = new TapeFileType(); @@ -2547,7 +2547,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); initDataFile(options.OutputPrefix + ".bin"); - mhddLog = new Core.MHDDLog(options.OutputPrefix + ".mhddlog.bin", dev, blocks, blockSize, blocksToRead); + mhddLog = new MHDDLog(options.OutputPrefix + ".mhddlog.bin", dev, blocks, blockSize, blocksToRead); ibgLog = new IBGLog(options.OutputPrefix + ".ibg", 0x0008); start = DateTime.UtcNow; @@ -2950,7 +2950,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); - mhddLog = new Core.MHDDLog(options.OutputPrefix + ".mhddlog.bin", dev, blocks, blockSize, blocksToRead); + mhddLog = new MHDDLog(options.OutputPrefix + ".mhddlog.bin", dev, blocks, blockSize, blocksToRead); ibgLog = new IBGLog(options.OutputPrefix + ".ibg", currentProfile); initDataFile(options.OutputPrefix + ".bin"); @@ -3897,7 +3897,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); - mhddLog = new Core.MHDDLog(options.OutputPrefix + ".mhddlog.bin", dev, blocks, blockSize, blocksToRead); + mhddLog = new MHDDLog(options.OutputPrefix + ".mhddlog.bin", dev, blocks, blockSize, blocksToRead); ibgLog = new IBGLog(options.OutputPrefix + ".ibg", currentProfile); initDataFile(options.OutputPrefix + ".bin"); diff --git a/DiscImageChef/Commands/MediaScan.cs b/DiscImageChef/Commands/MediaScan.cs index 56186697..682cac7b 100644 --- a/DiscImageChef/Commands/MediaScan.cs +++ b/DiscImageChef/Commands/MediaScan.cs @@ -41,7 +41,7 @@ namespace DiscImageChef.Commands public static class MediaScan { static bool aborted; - static Core.MHDDLog mhddLog; + static MHDDLog mhddLog; static IBGLog ibgLog; public static void doMediaScan(MediaScanOptions options) @@ -338,7 +338,7 @@ namespace DiscImageChef.Commands { DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); - mhddLog = new Core.MHDDLog(MHDDLogPath, dev, blocks, blockSize, blocksToRead); + mhddLog = new MHDDLog(MHDDLogPath, dev, blocks, blockSize, blocksToRead); ibgLog = new IBGLog(IBGLogPath, currentProfile); start = DateTime.UtcNow; @@ -490,7 +490,7 @@ namespace DiscImageChef.Commands } else { - mhddLog = new Core.MHDDLog(MHDDLogPath, dev, blocks, blockSize, blocksToRead); + mhddLog = new MHDDLog(MHDDLogPath, dev, blocks, blockSize, blocksToRead); ibgLog = new IBGLog(IBGLogPath, currentProfile); ulong currentBlock = 0; @@ -920,7 +920,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); - mhddLog = new Core.MHDDLog(MHDDLogPath, dev, blocks, blockSize, blocksToRead); + mhddLog = new MHDDLog(MHDDLogPath, dev, blocks, blockSize, blocksToRead); ibgLog = new IBGLog(IBGLogPath, currentProfile); for(ulong i = 0; i < blocks; i += blocksToRead) @@ -1106,7 +1106,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); - mhddLog = new Core.MHDDLog(MHDDLogPath, dev, blocks, blockSize, blocksToRead); + mhddLog = new MHDDLog(MHDDLogPath, dev, blocks, blockSize, blocksToRead); ibgLog = new IBGLog(IBGLogPath, currentProfile); for(ulong i = 0; i < blocks; i += blocksToRead) diff --git a/DiscImageChef/DiscImageChef.csproj b/DiscImageChef/DiscImageChef.csproj index f180df90..52192a6d 100644 --- a/DiscImageChef/DiscImageChef.csproj +++ b/DiscImageChef/DiscImageChef.csproj @@ -65,14 +65,12 @@ - -