aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2026-07-08 18:16:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[analyze] Add option to ignore subchannels.

Browse Source
This commit is contained in:
Natalia Portillo
2026-04-11 09:29:34 +01:00
parent 0dbb583d1a
commit fe8da6033b
4 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11148,6 +11148,12 @@ namespace Aaru.Localization {
}
}
public static string Ignore_subchannels_during_analysis {
get {
return ResourceManager.GetString("Ignore_subchannels_during_analysis", resourceCulture);
}
}
public static string Resume_file_to_use_for_analysis {
get {
return ResourceManager.GetString("Resume_file_to_use_for_analysis", resourceCulture);

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

@@ -5569,6 +5569,9 @@ Probadores:
<data name="Image_Analyze_Command_Description" xml:space="preserve">
<value>Analiza sectores no volcados o dañados e informa de los archivos a los que afectan.</value>
</data>
<data name="Ignore_subchannels_during_analysis" xml:space="preserve">
<value>Ignora los subcanales dañados durante el análisis.</value>
</data>
<data name="Resume_file_to_use_for_analysis" xml:space="preserve">
<value>Archivo de reanudación a usar para el análisis.</value>
</data>

3
Aaru.Localization/UI.resx
View File

@@ -5653,6 +5653,9 @@ Do you want to continue?</value>
<data name="Image_Analyze_Command_Description" xml:space="preserve">
<value>Analyzes undumped and damaged sectors and reports the files they affect.</value>
</data>
<data name="Ignore_subchannels_during_analysis" xml:space="preserve">
<value>Ignore damaged subchannels during analysis.</value>
</data>
<data name="Resume_file_to_use_for_analysis" xml:space="preserve">
<value>Resume file to use for the analysis.</value>
</data>

31
Aaru/Commands/Image/Analyze.cs
View File

@@ -70,13 +70,14 @@ sealed class AnalyzeCommand : Command<AnalyzeCommand.Settings>
if(!parsedOptions.ContainsKey("debug")) parsedOptions.Add("debug", settings.Debug.ToString());
AaruLogging.Debug(MODULE_NAME, "--debug={0}", settings.Debug);
AaruLogging.Debug(MODULE_NAME, "--encoding={0}", Markup.Escape(settings.Encoding ?? ""));
AaruLogging.Debug(MODULE_NAME, "--input={0}", Markup.Escape(settings.ImagePath ?? ""));
AaruLogging.Debug(MODULE_NAME, "--namespace={0}", Markup.Escape(settings.Namespace ?? ""));
AaruLogging.Debug(MODULE_NAME, "--options={0}", Markup.Escape(settings.Options ?? ""));
AaruLogging.Debug(MODULE_NAME, "--resume-file={0}", Markup.Escape(settings.ResumeFile ?? ""));
AaruLogging.Debug(MODULE_NAME, "--verbose={0}", settings.Verbose);
AaruLogging.Debug(MODULE_NAME, "--debug={0}", settings.Debug);
AaruLogging.Debug(MODULE_NAME, "--encoding={0}", Markup.Escape(settings.Encoding ?? ""));
AaruLogging.Debug(MODULE_NAME, "--input={0}", Markup.Escape(settings.ImagePath ?? ""));
AaruLogging.Debug(MODULE_NAME, "--namespace={0}", Markup.Escape(settings.Namespace ?? ""));
AaruLogging.Debug(MODULE_NAME, "--options={0}", Markup.Escape(settings.Options ?? ""));
AaruLogging.Debug(MODULE_NAME, "--resume-file={0}", Markup.Escape(settings.ResumeFile ?? ""));
AaruLogging.Debug(MODULE_NAME, "--ignore-subchannels={0}", settings.IgnoreSubchannels);
AaruLogging.Debug(MODULE_NAME, "--verbose={0}", settings.Verbose);
IFilter inputFilter = null;
@@ -179,7 +180,7 @@ sealed class AnalyzeCommand : Command<AnalyzeCommand.Settings>
AaruLogging.WriteLine();
}
List<AffectedExtent> affectedExtents = GetAffectedExtents(baseImage, resume);
List<AffectedExtent> affectedExtents = GetAffectedExtents(baseImage, resume, settings.IgnoreSubchannels);
if(affectedExtents.Count == 0)
{
@@ -345,7 +346,7 @@ sealed class AnalyzeCommand : Command<AnalyzeCommand.Settings>
}
}
static List<AffectedExtent> GetAffectedExtents(IBaseImage image, Resume resume)
static List<AffectedExtent> GetAffectedExtents(IBaseImage image, Resume resume, bool ignoreSubchannels)
{
List<AffectedExtent> affected = [];
ulong totalSectors = image.Info.Sectors;
@@ -364,8 +365,11 @@ sealed class AnalyzeCommand : Command<AnalyzeCommand.Settings>
foreach((ulong start, ulong end) extent in badSectors)
affected.Add(new AffectedExtent(AffectedSectorKind.Error, extent.start, extent.end));
foreach((ulong start, ulong end) extent in subchannelSectors)
affected.Add(new AffectedExtent(AffectedSectorKind.Subchannel, extent.start, extent.end));
if(!ignoreSubchannels)
{
foreach((ulong start, ulong end) extent in subchannelSectors)
affected.Add(new AffectedExtent(AffectedSectorKind.Subchannel, extent.start, extent.end));
}
if(dumpedExtents.Count > 0)
{
@@ -762,9 +766,7 @@ sealed class AnalyzeCommand : Command<AnalyzeCommand.Settings>
ColorizeCell(file.Stream ?? string.Empty, fileKind));
}
else
{
table.AddRow(ColorizeCell(file.Path ?? string.Empty, fileKind), ColorizeCell(extents, fileKind));
}
}
AnsiConsole.Write(table);
@@ -919,6 +921,9 @@ sealed class AnalyzeCommand : Command<AnalyzeCommand.Settings>
[CommandOption("-n|--namespace")]
[DefaultValue(null)]
public string Namespace { get; init; }
[LocalizedDescription(nameof(UI.Ignore_subchannels_during_analysis))]
[CommandOption("--ignore-subchannel|--ignore-subchannels")]
public bool IgnoreSubchannels { get; init; }
[LocalizedDescription(nameof(UI.Resume_file_to_use_for_analysis))]
[CommandOption("-r|--resume-file")]
[DefaultValue(null)]