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 IBGLog to Core.

Browse Source
This commit is contained in:
Natalia Portillo
2017-05-27 15:42:00 +01:00
parent 9a87466b25
commit e5d667f424
7 changed files with 31 additions and 14 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>
* IBGLog.cs:
* DiscImageChef.Core.csproj: Refactor: Move IBGLog to Core.
2017-05-27 Natalia Portillo <claunia@claunia.com> 2017-05-27 Natalia Portillo <claunia@claunia.com>
* Checksum.cs: * Checksum.cs:

4
DiscImageChef.Core/DiscImageChef.Core.csproj
View File

@@ -39,6 +39,7 @@
<Compile Include="ImageFormat.cs" /> <Compile Include="ImageFormat.cs" />
<Compile Include="Statistics.cs" /> <Compile Include="Statistics.cs" />
<Compile Include="Checksum.cs" /> <Compile Include="Checksum.cs" />
<Compile Include="Logging\IBGLog.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj"> <ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj">
@@ -82,5 +83,8 @@
<Name>DiscImageChef.Metadata</Name> <Name>DiscImageChef.Metadata</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Logging\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project> </Project>

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

@@ -36,7 +36,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 IBGLog public class IBGLog
{ {

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 IBGLog to Core.
2017-05-27 Natalia Portillo <claunia@claunia.com> 2017-05-27 Natalia Portillo <claunia@claunia.com>
* DiscImageChef.csproj: * DiscImageChef.csproj:

15
DiscImageChef/Commands/DumpMedia.cs
View File

@@ -36,6 +36,7 @@ using System.IO;
using DiscImageChef.CommonTypes; using DiscImageChef.CommonTypes;
using DiscImageChef.Console; using DiscImageChef.Console;
using DiscImageChef.Core; using DiscImageChef.Core;
using DiscImageChef.Core.Logging;
using DiscImageChef.Decoders.PCMCIA; using DiscImageChef.Decoders.PCMCIA;
using DiscImageChef.Devices; using DiscImageChef.Devices;
using DiscImageChef.Filesystems; using DiscImageChef.Filesystems;
@@ -51,7 +52,7 @@ namespace DiscImageChef.Commands
static bool aborted; static bool aborted;
static FileStream dataFs; static FileStream dataFs;
static Core.MHDDLog mhddLog; static Core.MHDDLog mhddLog;
static Core.IBGLog ibgLog; static IBGLog ibgLog;
// TODO: Implement dump map // TODO: Implement dump map
public static void doDumpMedia(DumpMediaOptions options) public static void doDumpMedia(DumpMediaOptions options)
@@ -426,7 +427,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 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"); initDataFile(options.OutputPrefix + ".bin");
start = DateTime.UtcNow; start = DateTime.UtcNow;
@@ -640,7 +641,7 @@ namespace DiscImageChef.Commands
else else
{ {
mhddLog = new Core.MHDDLog(options.OutputPrefix + ".mhddlog.bin", dev, blocks, blockSize, 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"); initDataFile(options.OutputPrefix + ".bin");
ulong currentBlock = 0; ulong currentBlock = 0;
@@ -1334,7 +1335,7 @@ namespace DiscImageChef.Commands
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 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 = new TapeFileType();
currentTapeFile.Image = new ImageType(); currentTapeFile.Image = new ImageType();
@@ -2547,7 +2548,7 @@ namespace DiscImageChef.Commands
initDataFile(options.OutputPrefix + ".bin"); initDataFile(options.OutputPrefix + ".bin");
mhddLog = new Core.MHDDLog(options.OutputPrefix + ".mhddlog.bin", dev, blocks, blockSize, blocksToRead); 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; start = DateTime.UtcNow;
for(ulong i = 0; i < blocks; i += blocksToRead) for(ulong i = 0; i < blocks; i += blocksToRead)
@@ -2950,7 +2951,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 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"); initDataFile(options.OutputPrefix + ".bin");
start = DateTime.UtcNow; start = DateTime.UtcNow;
@@ -3897,7 +3898,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 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"); initDataFile(options.OutputPrefix + ".bin");
start = DateTime.UtcNow; start = DateTime.UtcNow;

11
DiscImageChef/Commands/MediaScan.cs
View File

@@ -34,6 +34,7 @@ using System;
using DiscImageChef.Console; using DiscImageChef.Console;
using DiscImageChef.Devices; using DiscImageChef.Devices;
using System.Collections.Generic; using System.Collections.Generic;
using DiscImageChef.Core.Logging;
namespace DiscImageChef.Commands namespace DiscImageChef.Commands
{ {
@@ -41,7 +42,7 @@ namespace DiscImageChef.Commands
{ {
static bool aborted; static bool aborted;
static Core.MHDDLog mhddLog; static Core.MHDDLog mhddLog;
static Core.IBGLog ibgLog; static IBGLog ibgLog;
public static void doMediaScan(MediaScanOptions options) public static void doMediaScan(MediaScanOptions options)
{ {
@@ -338,7 +339,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 Core.MHDDLog(MHDDLogPath, dev, blocks, blockSize, blocksToRead);
ibgLog = new Core.IBGLog(IBGLogPath, currentProfile); ibgLog = new IBGLog(IBGLogPath, currentProfile);
start = DateTime.UtcNow; start = DateTime.UtcNow;
for(ulong i = 0; i < blocks; i += blocksToRead) for(ulong i = 0; i < blocks; i += blocksToRead)
@@ -490,7 +491,7 @@ namespace DiscImageChef.Commands
else else
{ {
mhddLog = new Core.MHDDLog(MHDDLogPath, dev, blocks, blockSize, blocksToRead); mhddLog = new Core.MHDDLog(MHDDLogPath, dev, blocks, blockSize, blocksToRead);
ibgLog = new Core.IBGLog(IBGLogPath, currentProfile); ibgLog = new IBGLog(IBGLogPath, currentProfile);
ulong currentBlock = 0; ulong currentBlock = 0;
blocks = (ulong)(cylinders * heads * sectors); blocks = (ulong)(cylinders * heads * sectors);
@@ -920,7 +921,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 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) for(ulong i = 0; i < blocks; i += blocksToRead)
{ {
@@ -1106,7 +1107,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 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) for(ulong i = 0; i < blocks; i += blocksToRead)
{ {

1
DiscImageChef/DiscImageChef.csproj
View File

@@ -65,7 +65,6 @@
<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\IBGLog.cs" />
<Compile Include="Core\MHDDLog.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" />