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

General code refactor and reformat.

Browse Source
This commit is contained in:
Natalia Portillo
2018-12-31 13:17:27 +00:00
parent 6b12cd1a8e
commit f2caa8c40f
413 changed files with 3554 additions and 6549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DiscImageChef.Core/Devices/Dumping/ATA.cs
View File

@@ -46,7 +46,6 @@ using DiscImageChef.Core.Logging;
using DiscImageChef.Decoders.ATA;
using DiscImageChef.Decoders.PCMCIA;
using DiscImageChef.Devices;
using DiscImageChef.Filters;
using Schemas;
using MediaType = DiscImageChef.CommonTypes.MediaType;
using Tuple = DiscImageChef.Decoders.PCMCIA.Tuple;

26
DiscImageChef.Core/Devices/Dumping/SBC.cs
View File

@@ -46,7 +46,6 @@ using DiscImageChef.Console;
using DiscImageChef.Core.Logging;
using DiscImageChef.Decoders.SCSI;
using DiscImageChef.Devices;
using DiscImageChef.Filters;
using Schemas;
using MediaType = DiscImageChef.CommonTypes.MediaType;
using TrackType = DiscImageChef.CommonTypes.Enums.TrackType;
@@ -498,9 +497,7 @@ namespace DiscImageChef.Core.Devices.Dumping
pgMmc = new Modes.ModePage_01_MMC {PS = false, ReadRetryCount = 32, Parameter = 0x00};
currentModePage = new Modes.ModePage
{
Page = 0x01,
Subpage = 0x00,
PageResponse = Modes.EncodeModePage_01_MMC(pgMmc)
Page = 0x01, Subpage = 0x00, PageResponse = Modes.EncodeModePage_01_MMC(pgMmc)
};
}
else
@@ -521,9 +518,7 @@ namespace DiscImageChef.Core.Devices.Dumping
currentModePage = new Modes.ModePage
{
Page = 0x01,
Subpage = 0x00,
PageResponse = Modes.EncodeModePage_01(pg)
Page = 0x01, Subpage = 0x00, PageResponse = Modes.EncodeModePage_01(pg)
};
}
}
@@ -569,9 +564,7 @@ namespace DiscImageChef.Core.Devices.Dumping
{
new Modes.ModePage
{
Page = 0x01,
Subpage = 0x00,
PageResponse = Modes.EncodeModePage_01(pg)
Page = 0x01, Subpage = 0x00, PageResponse = Modes.EncodeModePage_01(pg)
}
}
};
@@ -634,8 +627,7 @@ namespace DiscImageChef.Core.Devices.Dumping
{
Modes.DecodedMode md = new Modes.DecodedMode
{
Header = new Modes.ModeHeader(),
Pages = new[] {currentModePage.Value}
Header = new Modes.ModeHeader(), Pages = new[] {currentModePage.Value}
};
md6 = Modes.EncodeMode6(md, dev.ScsiType);
md10 = Modes.EncodeMode10(md, dev.ScsiType);
@@ -672,7 +664,7 @@ namespace DiscImageChef.Core.Devices.Dumping
if(!ret && !force)
{
dumpLog.WriteLine($"Cannot write USB descriptors.");
dumpLog.WriteLine("Cannot write USB descriptors.");
throw new ArgumentException(outputPlugin.ErrorMessage);
}
}
@@ -688,7 +680,7 @@ namespace DiscImageChef.Core.Devices.Dumping
if(!ret && !force)
{
dumpLog.WriteLine($"Cannot write ATAPI IDENTIFY PACKET DEVICE.");
dumpLog.WriteLine("Cannot write ATAPI IDENTIFY PACKET DEVICE.");
throw new ArgumentException(outputPlugin.ErrorMessage);
}
}
@@ -702,7 +694,7 @@ namespace DiscImageChef.Core.Devices.Dumping
if(!ret && !force)
{
dumpLog.WriteLine($"Cannot write SCSI INQUIRY.");
dumpLog.WriteLine("Cannot write SCSI INQUIRY.");
throw new ArgumentException(outputPlugin.ErrorMessage);
}
@@ -723,7 +715,7 @@ namespace DiscImageChef.Core.Devices.Dumping
if(!ret && !force)
{
dumpLog.WriteLine($"Cannot write SCSI MODE SENSE (10).");
dumpLog.WriteLine("Cannot write SCSI MODE SENSE (10).");
throw new ArgumentException(outputPlugin.ErrorMessage);
}
}
@@ -744,7 +736,7 @@ namespace DiscImageChef.Core.Devices.Dumping
if(!ret && !force)
{
dumpLog.WriteLine($"Cannot write SCSI MODE SENSE (6).");
dumpLog.WriteLine("Cannot write SCSI MODE SENSE (6).");
throw new ArgumentException(outputPlugin.ErrorMessage);
}
}

3
DiscImageChef.Core/Devices/Dumping/SSC.cs
View File

@@ -652,8 +652,7 @@ namespace DiscImageChef.Core.Devices.Dumping
// TODO: Implement device firmware revision
sidecar.BlockMedia[0].Image = new ImageType
{
format = "Raw disk image (sector by sector copy)",
Value = outputPrefix + ".bin"
format = "Raw disk image (sector by sector copy)", Value = outputPrefix + ".bin"
};
sidecar.BlockMedia[0].LogicalBlocks = (long)blocks;
sidecar.BlockMedia[0].Size = (long)currentSize;

21
DiscImageChef.Core/Devices/Dumping/SecureDigital.cs
View File

@@ -45,7 +45,6 @@ using DiscImageChef.Console;
using DiscImageChef.Core.Logging;
using DiscImageChef.Decoders.MMC;
using DiscImageChef.Devices;
using DiscImageChef.Filters;
using Schemas;
using MediaType = DiscImageChef.CommonTypes.MediaType;
@@ -488,9 +487,7 @@ namespace DiscImageChef.Core.Devices.Dumping
{
cidDump = new DumpType
{
Image = outputPath,
Size = cid.Length,
Checksums = Checksum.GetChecksums(cid).ToArray()
Image = outputPath, Size = cid.Length, Checksums = Checksum.GetChecksums(cid).ToArray()
};
ret =
@@ -511,9 +508,7 @@ namespace DiscImageChef.Core.Devices.Dumping
{
csdDump = new DumpType
{
Image = outputPath,
Size = csd.Length,
Checksums = Checksum.GetChecksums(csd).ToArray()
Image = outputPath, Size = csd.Length, Checksums = Checksum.GetChecksums(csd).ToArray()
};
ret =
@@ -534,9 +529,7 @@ namespace DiscImageChef.Core.Devices.Dumping
{
sidecar.BlockMedia[0].MultiMediaCard.ExtendedCSD = new DumpType
{
Image = outputPath,
Size = ecsd.Length,
Checksums = Checksum.GetChecksums(ecsd).ToArray()
Image = outputPath, Size = ecsd.Length, Checksums = Checksum.GetChecksums(ecsd).ToArray()
};
ret = outputPlugin.WriteMediaTag(ecsd, MediaTagType.MMC_ExtendedCSD);
@@ -553,9 +546,7 @@ namespace DiscImageChef.Core.Devices.Dumping
{
ocrDump = new DumpType
{
Image = outputPath,
Size = ocr.Length,
Checksums = Checksum.GetChecksums(ocr).ToArray()
Image = outputPath, Size = ocr.Length, Checksums = Checksum.GetChecksums(ocr).ToArray()
};
ret =
@@ -576,9 +567,7 @@ namespace DiscImageChef.Core.Devices.Dumping
{
sidecar.BlockMedia[0].SecureDigital.SCR = new DumpType
{
Image = outputPath,
Size = scr.Length,
Checksums = Checksum.GetChecksums(scr).ToArray()
Image = outputPath, Size = scr.Length, Checksums = Checksum.GetChecksums(scr).ToArray()
};
ret = outputPlugin.WriteMediaTag(scr, MediaTagType.SD_SCR);

12
DiscImageChef.Core/Devices/Dumping/XGD.cs
View File

@@ -48,7 +48,6 @@ using DiscImageChef.Decoders.DVD;
using DiscImageChef.Decoders.SCSI;
using DiscImageChef.Decoders.Xbox;
using DiscImageChef.Devices;
using DiscImageChef.Filters;
using Schemas;
using MediaType = DiscImageChef.CommonTypes.MediaType;
using TrackType = DiscImageChef.CommonTypes.Enums.TrackType;
@@ -746,9 +745,7 @@ namespace DiscImageChef.Core.Devices.Dumping
pgMmc = new Modes.ModePage_01_MMC {PS = false, ReadRetryCount = 0x20, Parameter = 0x00};
currentModePage = new Modes.ModePage
{
Page = 0x01,
Subpage = 0x00,
PageResponse = Modes.EncodeModePage_01_MMC(pgMmc)
Page = 0x01, Subpage = 0x00, PageResponse = Modes.EncodeModePage_01_MMC(pgMmc)
};
}
@@ -825,8 +822,7 @@ namespace DiscImageChef.Core.Devices.Dumping
{
Modes.DecodedMode md = new Modes.DecodedMode
{
Header = new Modes.ModeHeader(),
Pages = new[] {currentModePage.Value}
Header = new Modes.ModeHeader(), Pages = new[] {currentModePage.Value}
};
md6 = Modes.EncodeMode6(md, dev.ScsiType);
md10 = Modes.EncodeMode10(md, dev.ScsiType);
@@ -914,9 +910,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].Layers = new LayersType
{
type = LayersTypeType.OTP,
typeSpecified = true,
Sectors = new SectorsType[1]
type = LayersTypeType.OTP, typeSpecified = true, Sectors = new SectorsType[1]
};
sidecar.OpticalDisc[0].Layers.Sectors[0] = new SectorsType {Value = (long)layerBreak};
sidecar.OpticalDisc[0].Sessions = 1;

6
DiscImageChef.Core/Devices/Info/Plextor.cs
View File

@@ -52,12 +52,12 @@ namespace DiscImageChef.Core.Devices.Info
public bool HidesSessions;
public bool Hiding;
public bool IsDvd;
public ushort PoweRecLast;
public ushort PoweRecMax;
public ushort PoweRecSelected;
public bool PoweRec;
public bool PoweRecEnabled;
public ushort PoweRecLast;
public ushort PoweRecMax;
public ushort PoweRecRecommendedSpeed;
public ushort PoweRecSelected;
public bool SecuRec;
public bool SilentMode;
public bool SilentModeEnabled;

5
DiscImageChef.Core/Devices/ReaderSCSI.cs
View File

@@ -53,10 +53,7 @@ namespace DiscImageChef.Core.Devices
bool syqReadLong10;
bool syqReadLong6;
ulong ScsiGetBlocks()
{
return ScsiGetBlockSize() ? 0 : Blocks;
}
ulong ScsiGetBlocks() => ScsiGetBlockSize() ? 0 : Blocks;
bool ScsiFindReadCommand()
{

5
DiscImageChef.Core/Devices/Report/DeviceReport.cs
View File

@@ -29,18 +29,19 @@
// ----------------------------------------------------------------------------
// Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/
using DiscImageChef.Devices;
namespace DiscImageChef.Core.Devices.Report
{
public partial class DeviceReport
{
bool debug;
Device dev;
bool debug;
public DeviceReport(Device device, bool debug)
{
this.dev = device;
dev = device;
this.debug = debug;
}
}

4
DiscImageChef.Core/Devices/Scanning/NVMe.cs
View File

@@ -37,9 +37,7 @@ namespace DiscImageChef.Core.Devices.Scanning
{
public static class Nvme
{
public static ScanResults Scan(string mhddLogPath, string ibgLogPath, string devicePath, Device dev)
{
public static ScanResults Scan(string mhddLogPath, string ibgLogPath, string devicePath, Device dev) =>
throw new NotImplementedException("NVMe devices not yet supported.");
}
}
}