aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Move MHDDLog to Core.

Browse Source
This commit is contained in:
Natalia Portillo
2017-05-27 15:54:03 +01:00
parent e5d667f424
commit 03b5381658
7 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DiscImageChef.Core/ChangeLog
View File

@@ -1,3 +1,8 @@
2017-05-27 Natalia Portillo <claunia@claunia.com>
* MHDDLog.cs:
* DiscImageChef.Core.csproj: Refactor: Move MHDDLog to Core.
2017-05-27 Natalia Portillo <claunia@claunia.com> 2017-05-27 Natalia Portillo <claunia@claunia.com>
* IBGLog.cs: * IBGLog.cs:

1
DiscImageChef.Core/DiscImageChef.Core.csproj
View File

@@ -40,6 +40,7 @@
<Compile Include="Statistics.cs" /> <Compile Include="Statistics.cs" />
<Compile Include="Checksum.cs" /> <Compile Include="Checksum.cs" />
<Compile Include="Logging\IBGLog.cs" /> <Compile Include="Logging\IBGLog.cs" />
<Compile Include="Logging\MHDDLog.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj"> <ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj">

2
DiscImageChef/Core/MHDDLog.cs → DiscImageChef.Core/Logging/MHDDLog.cs
View File

@@ -35,7 +35,7 @@ using System.IO;
using System.Text; using System.Text;
using DiscImageChef.Devices; using DiscImageChef.Devices;
namespace DiscImageChef.Core namespace DiscImageChef.Core.Logging
{ {
public class MHDDLog public class MHDDLog
{ {

7
DiscImageChef/ChangeLog
View File

@@ -1,3 +1,10 @@
2017-05-27 Natalia Portillo <claunia@claunia.com>
* DiscImageChef.csproj:
* Commands/DumpMedia.cs:
* Commands/MediaScan.cs:
Refactor: Move MHDDLog to Core.
2017-05-27 Natalia Portillo <claunia@claunia.com> 2017-05-27 Natalia Portillo <claunia@claunia.com>
* DiscImageChef.csproj: * DiscImageChef.csproj:

14
DiscImageChef/Commands/DumpMedia.cs
View File

@@ -51,7 +51,7 @@ namespace DiscImageChef.Commands
{ {
static bool aborted; static bool aborted;
static FileStream dataFs; static FileStream dataFs;
static Core.MHDDLog mhddLog; static MHDDLog mhddLog;
static IBGLog ibgLog; static IBGLog ibgLog;
// TODO: Implement dump map // TODO: Implement dump map
@@ -426,7 +426,7 @@ namespace DiscImageChef.Commands
{ {
DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); 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); ibgLog = new IBGLog(options.OutputPrefix + ".ibg", currentProfile);
initDataFile(options.OutputPrefix + ".bin"); initDataFile(options.OutputPrefix + ".bin");
@@ -640,7 +640,7 @@ namespace DiscImageChef.Commands
} }
else 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); ibgLog = new IBGLog(options.OutputPrefix + ".ibg", currentProfile);
initDataFile(options.OutputPrefix + ".bin"); initDataFile(options.OutputPrefix + ".bin");
@@ -1334,7 +1334,7 @@ namespace DiscImageChef.Commands
initDataFile(options.OutputPrefix + ".bin"); initDataFile(options.OutputPrefix + ".bin");
dataChk = new Core.Checksum(); dataChk = new Core.Checksum();
start = DateTime.UtcNow; 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); ibgLog = new IBGLog(options.OutputPrefix + ".ibg", 0x0008);
currentTapeFile = new TapeFileType(); currentTapeFile = new TapeFileType();
@@ -2547,7 +2547,7 @@ namespace DiscImageChef.Commands
DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead);
initDataFile(options.OutputPrefix + ".bin"); 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); ibgLog = new IBGLog(options.OutputPrefix + ".ibg", 0x0008);
start = DateTime.UtcNow; start = DateTime.UtcNow;
@@ -2950,7 +2950,7 @@ namespace DiscImageChef.Commands
DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); 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); ibgLog = new IBGLog(options.OutputPrefix + ".ibg", currentProfile);
initDataFile(options.OutputPrefix + ".bin"); initDataFile(options.OutputPrefix + ".bin");
@@ -3897,7 +3897,7 @@ namespace DiscImageChef.Commands
DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); 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); ibgLog = new IBGLog(options.OutputPrefix + ".ibg", currentProfile);
initDataFile(options.OutputPrefix + ".bin"); initDataFile(options.OutputPrefix + ".bin");

10
DiscImageChef/Commands/MediaScan.cs
View File

@@ -41,7 +41,7 @@ namespace DiscImageChef.Commands
public static class MediaScan public static class MediaScan
{ {
static bool aborted; static bool aborted;
static Core.MHDDLog mhddLog; static MHDDLog mhddLog;
static IBGLog ibgLog; static IBGLog ibgLog;
public static void doMediaScan(MediaScanOptions options) public static void doMediaScan(MediaScanOptions options)
@@ -338,7 +338,7 @@ namespace DiscImageChef.Commands
{ {
DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); 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); ibgLog = new IBGLog(IBGLogPath, currentProfile);
start = DateTime.UtcNow; start = DateTime.UtcNow;
@@ -490,7 +490,7 @@ namespace DiscImageChef.Commands
} }
else else
{ {
mhddLog = new Core.MHDDLog(MHDDLogPath, dev, blocks, blockSize, blocksToRead); mhddLog = new MHDDLog(MHDDLogPath, dev, blocks, blockSize, blocksToRead);
ibgLog = new IBGLog(IBGLogPath, currentProfile); ibgLog = new IBGLog(IBGLogPath, currentProfile);
ulong currentBlock = 0; ulong currentBlock = 0;
@@ -920,7 +920,7 @@ namespace DiscImageChef.Commands
DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); 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); ibgLog = new IBGLog(IBGLogPath, currentProfile);
for(ulong i = 0; i < blocks; i += blocksToRead) for(ulong i = 0; i < blocks; i += blocksToRead)
@@ -1106,7 +1106,7 @@ namespace DiscImageChef.Commands
DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); 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); ibgLog = new IBGLog(IBGLogPath, currentProfile);
for(ulong i = 0; i < blocks; i += blocksToRead) for(ulong i = 0; i < blocks; i += blocksToRead)

2
DiscImageChef/DiscImageChef.csproj
View File

@@ -65,14 +65,12 @@
<Compile Include="Commands\DeviceReport.cs" /> <Compile Include="Commands\DeviceReport.cs" />
<Compile Include="Commands\Configure.cs" /> <Compile Include="Commands\Configure.cs" />
<Compile Include="Commands\Statistics.cs" /> <Compile Include="Commands\Statistics.cs" />
<Compile Include="Core\MHDDLog.cs" />
<Compile Include="Commands\Ls.cs" /> <Compile Include="Commands\Ls.cs" />
<Compile Include="Commands\ExtractFiles.cs" /> <Compile Include="Commands\ExtractFiles.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup> <ItemGroup>
<Folder Include="Commands\" /> <Folder Include="Commands\" />
<Folder Include="Core\" />
</ItemGroup> </ItemGroup>
<ProjectExtensions> <ProjectExtensions>
<MonoDevelop> <MonoDevelop>