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

Change --no-metadata to --metadata and --no-trim to --trim.

Browse Source
This commit is contained in:
Natalia Portillo
2020-01-04 02:28:17 +00:00
parent 9eec967646
commit 951aa79cce
11 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -352,7 +352,7 @@ namespace DiscImageChef.Core.Devices.Dumping
#region Trimming
if(_resume.BadBlocks.Count > 0 &&
!_aborted &&
!_notrim &&
_trim &&
newTrim)
{
start = DateTime.UtcNow;
@@ -595,7 +595,7 @@ namespace DiscImageChef.Core.Devices.Dumping
double totalChkDuration = 0;
if(!_nometadata)
if(_metadata)
{
_dumpLog.WriteLine("Creating sidecar.");
UpdateStatus?.Invoke("Creating sidecar.");

2
DiscImageChef.Core/Devices/Dumping/CompactDisc/Dump.cs
View File

@@ -962,7 +962,7 @@ namespace DiscImageChef.Core.Devices.Dumping
double totalChkDuration = 0;
if(!_nometadata)
if(_metadata)
WriteOpticalSidecar(blockSize, blocks, dskType, null, mediaTags, sessions, out totalChkDuration);
end = DateTime.UtcNow;

2
DiscImageChef.Core/Devices/Dumping/CompactDisc/Trim.cs
View File

@@ -59,7 +59,7 @@ namespace DiscImageChef.Core.Devices.Dumping
if(_resume.BadBlocks.Count <= 0 ||
_aborted ||
_notrim ||
!_trim ||
!newTrim)
return;

14
DiscImageChef.Core/Devices/Dumping/Dump.cs
View File

@@ -31,8 +31,7 @@ namespace DiscImageChef.Core.Devices.Dumping
readonly Encoding _encoding;
readonly bool _force;
readonly Dictionary<string, string> _formatOptions;
readonly bool _nometadata;
readonly bool _notrim;
readonly bool _metadata;
readonly string _outputPath;
readonly IWritableImage _outputPlugin;
readonly string _outputPrefix;
@@ -41,6 +40,7 @@ namespace DiscImageChef.Core.Devices.Dumping
readonly ushort _retryPasses;
readonly bool _stopOnError;
readonly DumpSubchannel _subchannel;
readonly bool _trim;
bool _aborted;
DicContext _ctx; // Master database context
Database.Models.Device _dbDev; // Device database entry
@@ -69,15 +69,15 @@ namespace DiscImageChef.Core.Devices.Dumping
/// <param name="encoding">Encoding to use when analyzing dump</param>
/// <param name="outputPath">Path to output file</param>
/// <param name="formatOptions">Formats to pass to output file plugin</param>
/// <param name="notrim">Do not trim errors from skipped sectors</param>
/// <param name="trim">Trim errors from skipped sectors</param>
/// <param name="dumpFirstTrackPregap">Try to read and dump as much first track pregap as possible</param>
/// <param name="preSidecar">Sidecar to store in dumped image</param>
/// <param name="skip">How many sectors to skip reading on error</param>
/// <param name="nometadata">Create metadata sidecar after dump?</param>
/// <param name="metadata">Create metadata sidecar after dump?</param>
public Dump(bool doResume, Device dev, string devicePath, IWritableImage outputPlugin, ushort retryPasses,
bool force, bool dumpRaw, bool persistent, bool stopOnError, Resume resume, DumpLog dumpLog,
Encoding encoding, string outputPrefix, string outputPath, Dictionary<string, string> formatOptions,
CICMMetadataType preSidecar, uint skip, bool nometadata, bool notrim, bool dumpFirstTrackPregap,
CICMMetadataType preSidecar, uint skip, bool metadata, bool trim, bool dumpFirstTrackPregap,
bool fixOffset, bool debug, DumpSubchannel subchannel, int speed)
{
_doResume = doResume;
@@ -97,8 +97,8 @@ namespace DiscImageChef.Core.Devices.Dumping
_formatOptions = formatOptions;
_preSidecar = preSidecar;
_skip = skip;
_nometadata = nometadata;
_notrim = notrim;
_metadata = metadata;
_trim = trim;
_dumpFirstTrackPregap = dumpFirstTrackPregap;
_aborted = false;
_fixOffset = fixOffset;

8
DiscImageChef.Core/Devices/Dumping/PlayStationPortable.cs
View File

@@ -419,7 +419,7 @@ namespace DiscImageChef.Core.Devices.Dumping
#region Trimming
if(_resume.BadBlocks.Count > 0 &&
!_aborted &&
!_notrim &&
_trim &&
newTrim)
{
start = DateTime.UtcNow;
@@ -651,7 +651,7 @@ namespace DiscImageChef.Core.Devices.Dumping
double totalChkDuration = 0;
if(!_nometadata)
if(_metadata)
{
WriteOpticalSidecar(BLOCK_SIZE, blocks, DSK_TYPE, null, null, 1, out totalChkDuration);
}
@@ -879,7 +879,7 @@ namespace DiscImageChef.Core.Devices.Dumping
#region Trimming
if(_resume.BadBlocks.Count > 0 &&
!_aborted &&
!_notrim &&
_trim &&
newTrim)
{
start = DateTime.UtcNow;
@@ -1117,7 +1117,7 @@ namespace DiscImageChef.Core.Devices.Dumping
double totalChkDuration = 0;
if(!_nometadata)
if(_metadata)
{
UpdateStatus?.Invoke("Creating sidecar.");
_dumpLog.WriteLine("Creating sidecar.");

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

@@ -530,7 +530,7 @@ namespace DiscImageChef.Core.Devices.Dumping
#region Trimming
if(_resume.BadBlocks.Count > 0 &&
!_aborted &&
!_notrim &&
_trim &&
newTrim)
{
start = DateTime.UtcNow;
@@ -986,7 +986,7 @@ namespace DiscImageChef.Core.Devices.Dumping
double totalChkDuration = 0;
if(!_nometadata)
if(_metadata)
{
// TODO: Layers
if(opticalDisc)

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

@@ -1250,7 +1250,7 @@ namespace DiscImageChef.Core.Devices.Dumping
double totalChkDuration = 0;
if(!_nometadata)
if(_metadata)
{
UpdateStatus?.Invoke("Creating sidecar.");
_dumpLog.WriteLine("Creating sidecar.");

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

@@ -415,7 +415,7 @@ namespace DiscImageChef.Core.Devices.Dumping
#region Trimming
if(_resume.BadBlocks.Count > 0 &&
!_aborted &&
!_notrim &&
_trim &&
newTrim)
{
start = DateTime.UtcNow;
@@ -544,7 +544,7 @@ namespace DiscImageChef.Core.Devices.Dumping
double totalChkDuration = 0;
if(!_nometadata)
if(_metadata)
{
UpdateStatus?.Invoke("Creating sidecar.");
_dumpLog.WriteLine("Creating sidecar.");

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

@@ -884,7 +884,7 @@ namespace DiscImageChef.Core.Devices.Dumping
#region Trimming
if(_resume.BadBlocks.Count > 0 &&
!_aborted &&
!_notrim &&
_trim &&
newTrim)
{
start = DateTime.UtcNow;
@@ -1167,7 +1167,7 @@ namespace DiscImageChef.Core.Devices.Dumping
double totalChkDuration = 0;
if(!_nometadata)
if(_metadata)
{
var layers = new LayersType
{