From e5d667f424d1385624b834cdc508bd883801f6f5 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sat, 27 May 2017 15:42:00 +0100 Subject: [PATCH] Refactor: Move IBGLog to Core. --- DiscImageChef.Core/ChangeLog | 5 +++++ DiscImageChef.Core/DiscImageChef.Core.csproj | 4 ++++ .../Core => DiscImageChef.Core/Logging}/IBGLog.cs | 2 +- DiscImageChef/ChangeLog | 7 +++++++ DiscImageChef/Commands/DumpMedia.cs | 15 ++++++++------- DiscImageChef/Commands/MediaScan.cs | 11 ++++++----- DiscImageChef/DiscImageChef.csproj | 1 - 7 files changed, 31 insertions(+), 14 deletions(-) rename {DiscImageChef/Core => DiscImageChef.Core/Logging}/IBGLog.cs (99%) diff --git a/DiscImageChef.Core/ChangeLog b/DiscImageChef.Core/ChangeLog index c2dab9d3..c5123a3d 100644 --- a/DiscImageChef.Core/ChangeLog +++ b/DiscImageChef.Core/ChangeLog @@ -1,3 +1,8 @@ +2017-05-27 Natalia Portillo + + * IBGLog.cs: + * DiscImageChef.Core.csproj: Refactor: Move IBGLog to Core. + 2017-05-27 Natalia Portillo * Checksum.cs: diff --git a/DiscImageChef.Core/DiscImageChef.Core.csproj b/DiscImageChef.Core/DiscImageChef.Core.csproj index f7b94a03..3c084235 100644 --- a/DiscImageChef.Core/DiscImageChef.Core.csproj +++ b/DiscImageChef.Core/DiscImageChef.Core.csproj @@ -39,6 +39,7 @@ + @@ -82,5 +83,8 @@ DiscImageChef.Metadata + + + \ No newline at end of file diff --git a/DiscImageChef/Core/IBGLog.cs b/DiscImageChef.Core/Logging/IBGLog.cs similarity index 99% rename from DiscImageChef/Core/IBGLog.cs rename to DiscImageChef.Core/Logging/IBGLog.cs index fe0170bd..0d01ad89 100644 --- a/DiscImageChef/Core/IBGLog.cs +++ b/DiscImageChef.Core/Logging/IBGLog.cs @@ -36,7 +36,7 @@ using System.IO; using System.Text; using DiscImageChef.Devices; -namespace DiscImageChef.Core +namespace DiscImageChef.Core.Logging { public class IBGLog { diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog index 4f413aa2..9d2224e5 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 IBGLog to Core. + 2017-05-27 Natalia Portillo * DiscImageChef.csproj: diff --git a/DiscImageChef/Commands/DumpMedia.cs b/DiscImageChef/Commands/DumpMedia.cs index 3d993119..a810b415 100644 --- a/DiscImageChef/Commands/DumpMedia.cs +++ b/DiscImageChef/Commands/DumpMedia.cs @@ -36,6 +36,7 @@ using System.IO; using DiscImageChef.CommonTypes; using DiscImageChef.Console; using DiscImageChef.Core; +using DiscImageChef.Core.Logging; using DiscImageChef.Decoders.PCMCIA; using DiscImageChef.Devices; using DiscImageChef.Filesystems; @@ -51,7 +52,7 @@ namespace DiscImageChef.Commands static bool aborted; static FileStream dataFs; static Core.MHDDLog mhddLog; - static Core.IBGLog ibgLog; + static IBGLog ibgLog; // TODO: Implement dump map public static void doDumpMedia(DumpMediaOptions options) @@ -426,7 +427,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); - ibgLog = new Core.IBGLog(options.OutputPrefix + ".ibg", currentProfile); + ibgLog = new IBGLog(options.OutputPrefix + ".ibg", currentProfile); initDataFile(options.OutputPrefix + ".bin"); start = DateTime.UtcNow; @@ -640,7 +641,7 @@ namespace DiscImageChef.Commands else { mhddLog = new Core.MHDDLog(options.OutputPrefix + ".mhddlog.bin", dev, blocks, blockSize, blocksToRead); - ibgLog = new Core.IBGLog(options.OutputPrefix + ".ibg", currentProfile); + ibgLog = new IBGLog(options.OutputPrefix + ".ibg", currentProfile); initDataFile(options.OutputPrefix + ".bin"); ulong currentBlock = 0; @@ -1334,7 +1335,7 @@ namespace DiscImageChef.Commands dataChk = new Core.Checksum(); start = DateTime.UtcNow; mhddLog = new Core.MHDDLog(options.OutputPrefix + ".mhddlog.bin", dev, blocks, blockSize, 1); - ibgLog = new Core.IBGLog(options.OutputPrefix + ".ibg", 0x0008); + ibgLog = new IBGLog(options.OutputPrefix + ".ibg", 0x0008); currentTapeFile = new TapeFileType(); currentTapeFile.Image = new ImageType(); @@ -2547,7 +2548,7 @@ namespace DiscImageChef.Commands initDataFile(options.OutputPrefix + ".bin"); mhddLog = new Core.MHDDLog(options.OutputPrefix + ".mhddlog.bin", dev, blocks, blockSize, blocksToRead); - ibgLog = new Core.IBGLog(options.OutputPrefix + ".ibg", 0x0008); + ibgLog = new IBGLog(options.OutputPrefix + ".ibg", 0x0008); start = DateTime.UtcNow; for(ulong i = 0; i < blocks; i += blocksToRead) @@ -2950,7 +2951,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); - ibgLog = new Core.IBGLog(options.OutputPrefix + ".ibg", currentProfile); + ibgLog = new IBGLog(options.OutputPrefix + ".ibg", currentProfile); initDataFile(options.OutputPrefix + ".bin"); start = DateTime.UtcNow; @@ -3897,7 +3898,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); - ibgLog = new Core.IBGLog(options.OutputPrefix + ".ibg", currentProfile); + ibgLog = new IBGLog(options.OutputPrefix + ".ibg", currentProfile); initDataFile(options.OutputPrefix + ".bin"); start = DateTime.UtcNow; diff --git a/DiscImageChef/Commands/MediaScan.cs b/DiscImageChef/Commands/MediaScan.cs index dee04695..56186697 100644 --- a/DiscImageChef/Commands/MediaScan.cs +++ b/DiscImageChef/Commands/MediaScan.cs @@ -34,6 +34,7 @@ using System; using DiscImageChef.Console; using DiscImageChef.Devices; using System.Collections.Generic; +using DiscImageChef.Core.Logging; namespace DiscImageChef.Commands { @@ -41,7 +42,7 @@ namespace DiscImageChef.Commands { static bool aborted; static Core.MHDDLog mhddLog; - static Core.IBGLog ibgLog; + static IBGLog ibgLog; public static void doMediaScan(MediaScanOptions options) { @@ -338,7 +339,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); mhddLog = new Core.MHDDLog(MHDDLogPath, dev, blocks, blockSize, blocksToRead); - ibgLog = new Core.IBGLog(IBGLogPath, currentProfile); + ibgLog = new IBGLog(IBGLogPath, currentProfile); start = DateTime.UtcNow; for(ulong i = 0; i < blocks; i += blocksToRead) @@ -490,7 +491,7 @@ namespace DiscImageChef.Commands else { mhddLog = new Core.MHDDLog(MHDDLogPath, dev, blocks, blockSize, blocksToRead); - ibgLog = new Core.IBGLog(IBGLogPath, currentProfile); + ibgLog = new IBGLog(IBGLogPath, currentProfile); ulong currentBlock = 0; blocks = (ulong)(cylinders * heads * sectors); @@ -920,7 +921,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); mhddLog = new Core.MHDDLog(MHDDLogPath, dev, blocks, blockSize, blocksToRead); - ibgLog = new Core.IBGLog(IBGLogPath, currentProfile); + ibgLog = new IBGLog(IBGLogPath, currentProfile); for(ulong i = 0; i < blocks; i += blocksToRead) { @@ -1106,7 +1107,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); mhddLog = new Core.MHDDLog(MHDDLogPath, dev, blocks, blockSize, blocksToRead); - ibgLog = new Core.IBGLog(IBGLogPath, currentProfile); + ibgLog = new IBGLog(IBGLogPath, currentProfile); for(ulong i = 0; i < blocks; i += blocksToRead) { diff --git a/DiscImageChef/DiscImageChef.csproj b/DiscImageChef/DiscImageChef.csproj index 4cf5c460..f180df90 100644 --- a/DiscImageChef/DiscImageChef.csproj +++ b/DiscImageChef/DiscImageChef.csproj @@ -65,7 +65,6 @@ -