aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2026-02-04 00:44:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add option to compare command to use long sectors for comparison.

Browse Source
This commit is contained in:
Natalia Portillo
2025-12-18 16:12:26 +00:00
parent bab040d0c2
commit 0a7437232c
4 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Aaru.Localization/UI.Designer.cs generated
View File

@@ -10503,5 +10503,11 @@ namespace Aaru.Localization {
return ResourceManager.GetString("Physical_Format_Information", resourceCulture);
}
}
public static string Use_long_sectors {
get {
return ResourceManager.GetString("Use_long_sectors", resourceCulture);
}
}
}
}

3
Aaru.Localization/UI.es.resx
View File

@@ -5252,4 +5252,7 @@ Probadores:
<data name="Physical_Format_Information" xml:space="preserve">
<value>Información del Formato Físico</value>
</data>
<data name="Use_long_sectors" xml:space="preserve">
<value>Usar sectores largos (con etiquetas).</value>
</data>
</root>

3
Aaru.Localization/UI.resx
View File

@@ -5330,4 +5330,7 @@ Do you want to continue?</value>
<data name="Physical_Format_Information" xml:space="preserve">
<value>Physical Format Information</value>
</data>
<data name="Use_long_sectors" xml:space="preserve">
<value>Use long sectors (with tags).</value>
</data>
</root>

30
Aaru/Commands/Image/Compare.cs
View File

@@ -32,6 +32,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Globalization;
using System.Linq;
using System.Text;
@@ -60,10 +61,11 @@ sealed class CompareCommand : Command<CompareCommand.Settings>
Statistics.AddCommand("compare");
AaruLogging.Debug(MODULE_NAME, "--debug={0}", settings.Debug);
AaruLogging.Debug(MODULE_NAME, "--input1={0}", Markup.Escape(settings.ImagePath1 ?? ""));
AaruLogging.Debug(MODULE_NAME, "--input2={0}", Markup.Escape(settings.ImagePath2 ?? ""));
AaruLogging.Debug(MODULE_NAME, "--verbose={0}", settings.Verbose);
AaruLogging.Debug(MODULE_NAME, "--debug={0}", settings.Debug);
AaruLogging.Debug(MODULE_NAME, "--input1={0}", Markup.Escape(settings.ImagePath1 ?? ""));
AaruLogging.Debug(MODULE_NAME, "--input2={0}", Markup.Escape(settings.ImagePath2 ?? ""));
AaruLogging.Debug(MODULE_NAME, "--long-sectors={0}", settings.LongSectors);
AaruLogging.Debug(MODULE_NAME, "--verbose={0}", settings.Verbose);
IFilter inputFilter1 = null;
IFilter inputFilter2 = null;
@@ -420,7 +422,7 @@ sealed class CompareCommand : Command<CompareCommand.Settings>
if(input1MediaImage is not null && input2MediaImage is null) imagesDiffer = true;
bool differentContents = false;
var differentContents = false;
if(input1MediaImage is not null && input2MediaImage is not null)
{
@@ -440,7 +442,12 @@ sealed class CompareCommand : Command<CompareCommand.Settings>
try
{
errno = input1MediaImage.ReadSector(sector, false, out byte[] image1Sector, out _);
errno = settings.LongSectors
? input1MediaImage.ReadSectorLong(sector,
false,
out byte[] image1Sector,
out _)
: input1MediaImage.ReadSector(sector, false, out image1Sector, out _);
if(errno != ErrorNumber.NoError)
{
@@ -449,7 +456,12 @@ sealed class CompareCommand : Command<CompareCommand.Settings>
sector));
}
errno = input2MediaImage.ReadSector(sector, false, out byte[] image2Sector, out _);
errno = settings.LongSectors
? input2MediaImage.ReadSectorLong(sector,
false,
out byte[] image2Sector,
out _)
: input2MediaImage.ReadSector(sector, false, out image2Sector, out _);
if(errno != ErrorNumber.NoError)
{
@@ -555,6 +567,10 @@ sealed class CompareCommand : Command<CompareCommand.Settings>
[LocalizedDescription(nameof(UI.Second_media_image_path))]
[CommandArgument(1, "<image-path1>")]
public string ImagePath2 { get; init; }
[LocalizedDescription(nameof(UI.Use_long_sectors))]
[DefaultValue(false)]
[CommandOption("-r|--long-sectors")]
public bool LongSectors { get; init; }
}
#endregion