From 98925c4611ab6056e376889ea6021bb7b47ae6ae Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Fri, 21 Nov 2025 15:59:05 +0000 Subject: [PATCH] Update to new Spectre.Console.Cli API surface. --- Aaru/Commands/Archive/Extract.cs | 73 +++++++++++++----------- Aaru/Commands/Archive/Info.cs | 3 +- Aaru/Commands/Archive/List.cs | 3 +- Aaru/Commands/Configure.cs | 3 +- Aaru/Commands/Database/Statistics.cs | 11 ++-- Aaru/Commands/Database/Update.cs | 8 ++- Aaru/Commands/Device/DeviceReport.cs | 4 +- Aaru/Commands/Device/Info.cs | 3 +- Aaru/Commands/Device/List.cs | 3 +- Aaru/Commands/Filesystem/ExtractFiles.cs | 3 +- Aaru/Commands/Filesystem/Info.cs | 3 +- Aaru/Commands/Filesystem/Ls.cs | 3 +- Aaru/Commands/Filesystem/Options.cs | 13 ++--- Aaru/Commands/Formats.cs | 3 +- Aaru/Commands/Image/Checksum.cs | 3 +- Aaru/Commands/Image/Compare.cs | 3 +- Aaru/Commands/Image/Convert.cs | 3 +- Aaru/Commands/Image/CreateSidecar.cs | 3 +- Aaru/Commands/Image/Decode.cs | 3 +- Aaru/Commands/Image/Entropy.cs | 3 +- Aaru/Commands/Image/Info.cs | 3 +- Aaru/Commands/Image/Options.cs | 3 +- Aaru/Commands/Image/Print.cs | 3 +- Aaru/Commands/Image/Verify.cs | 13 ++--- Aaru/Commands/ListEncodings.cs | 3 +- Aaru/Commands/ListNamespaces.cs | 7 +-- Aaru/Commands/Media/Dump.cs | 2 +- Aaru/Commands/Media/Info.cs | 3 +- Aaru/Commands/Media/Scan.cs | 3 +- Aaru/Commands/Remote.cs | 3 +- 30 files changed, 114 insertions(+), 83 deletions(-) diff --git a/Aaru/Commands/Archive/Extract.cs b/Aaru/Commands/Archive/Extract.cs index c37830e30..6af222179 100644 --- a/Aaru/Commands/Archive/Extract.cs +++ b/Aaru/Commands/Archive/Extract.cs @@ -36,6 +36,8 @@ using System.ComponentModel; using System.IO; using System.Runtime.InteropServices; using System.Text; +using System.Threading; +using System.Threading.Tasks; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; @@ -50,12 +52,13 @@ using Spectre.Console.Cli; namespace Aaru.Commands.Archive; -sealed class ArchiveExtractCommand : Command +sealed class ArchiveExtractCommand : AsyncCommand { const int BUFFER_SIZE = 16777216; const string MODULE_NAME = "Extract-Files command"; - public override int Execute(CommandContext context, Settings settings) + public override async Task ExecuteAsync(CommandContext context, Settings settings, + CancellationToken cancellationToken) { MainClass.PrintCopyright(); @@ -223,47 +226,49 @@ sealed class ArchiveExtractCommand : Command if(!File.Exists(outputPath) && !Directory.Exists(outputPath)) { - AnsiConsole.Progress() - .AutoClear(true) - .HideCompleted(true) - .Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()) - .Start(ctx => - { - var position = 0; + await AnsiConsole.Progress() + .AutoClear(true) + .HideCompleted(true) + .Columns(new TaskDescriptionColumn(), + new ProgressBarColumn(), + new PercentageColumn()) + .Start(async ctx => + { + var position = 0; - var outputFile = - new FileStream(outputPath, - FileMode.CreateNew, - FileAccess.ReadWrite, - FileShare.None); + var outputFile = + new FileStream(outputPath, + FileMode.CreateNew, + FileAccess.ReadWrite, + FileShare.None); - ProgressTask task = - ctx.AddTask(string.Format(UI.Reading_file_0, Markup.Escape(fileName))); + ProgressTask task = + ctx.AddTask(string.Format(UI.Reading_file_0, Markup.Escape(fileName))); - task.MaxValue = uncompressedSize; - var outBuf = new byte[BUFFER_SIZE]; - Stream inputFile = filter.GetDataForkStream(); + task.MaxValue = uncompressedSize; + var outBuf = new byte[BUFFER_SIZE]; + Stream inputFile = filter.GetDataForkStream(); - while(position < stat.Length) - { - int bytesToRead; + while(position < stat.Length) + { + int bytesToRead; - if(stat.Length - position > BUFFER_SIZE) - bytesToRead = BUFFER_SIZE; - else - bytesToRead = (int)(stat.Length - position); + if(stat.Length - position > BUFFER_SIZE) + bytesToRead = BUFFER_SIZE; + else + bytesToRead = (int)(stat.Length - position); - int bytesRead = inputFile.EnsureRead(outBuf, 0, bytesToRead); + int bytesRead = inputFile.EnsureRead(outBuf, 0, bytesToRead); - outputFile.Write(outBuf, 0, bytesRead); + await outputFile.WriteAsync(outBuf, 0, bytesRead); - position += bytesToRead; - task.Increment(bytesToRead); - } + position += bytesToRead; + task.Increment(bytesToRead); + } - inputFile.Close(); - outputFile.Close(); - }); + inputFile.Close(); + outputFile.Close(); + }); var fi = new FileInfo(outputPath); diff --git a/Aaru/Commands/Archive/Info.cs b/Aaru/Commands/Archive/Info.cs index 73c1714bc..ef5b58d64 100644 --- a/Aaru/Commands/Archive/Info.cs +++ b/Aaru/Commands/Archive/Info.cs @@ -34,6 +34,7 @@ using System; using System.ComponentModel; using System.Text; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; @@ -49,7 +50,7 @@ sealed class ArchiveInfoCommand : Command { const string MODULE_NAME = "Analyze command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Archive/List.cs b/Aaru/Commands/Archive/List.cs index 1b3a6035d..8ecf0636c 100644 --- a/Aaru/Commands/Archive/List.cs +++ b/Aaru/Commands/Archive/List.cs @@ -34,6 +34,7 @@ using System; using System.ComponentModel; using System.IO; using System.Text; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; @@ -52,7 +53,7 @@ sealed class ArchiveListCommand : Command { const string MODULE_NAME = "Archive list command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Configure.cs b/Aaru/Commands/Configure.cs index d9f071289..595470613 100644 --- a/Aaru/Commands/Configure.cs +++ b/Aaru/Commands/Configure.cs @@ -30,6 +30,7 @@ // Copyright © 2011-2025 Natalia Portillo // ****************************************************************************/ +using System.Threading; using Aaru.CommonTypes.Enums; using Aaru.Localization; using Aaru.Logging; @@ -41,7 +42,7 @@ namespace Aaru.Commands; sealed class ConfigureCommand : Command { - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Database/Statistics.cs b/Aaru/Commands/Database/Statistics.cs index fdaa7ecfc..4b1ca5e41 100644 --- a/Aaru/Commands/Database/Statistics.cs +++ b/Aaru/Commands/Database/Statistics.cs @@ -31,6 +31,8 @@ // ****************************************************************************/ using System.Linq; +using System.Threading; +using System.Threading.Tasks; using Aaru.CommonTypes.Enums; using Aaru.Database; using Aaru.Database.Models; @@ -42,9 +44,10 @@ using Command = Aaru.Database.Models.Command; namespace Aaru.Commands.Database; -sealed class StatisticsCommand : Command +sealed class StatisticsCommand : AsyncCommand { - public override int Execute(CommandContext context, Settings settings) + public override async Task ExecuteAsync(CommandContext context, Settings settings, + CancellationToken cancellationToken) { MainClass.PrintCopyright(); @@ -67,7 +70,7 @@ sealed class StatisticsCommand : Command return (int)ErrorNumber.NothingFound; } - bool thereAreStats = false; + var thereAreStats = false; Table table; if(ctx.Commands.Any()) @@ -111,7 +114,7 @@ sealed class StatisticsCommand : Command }); } - ctx.SaveChanges(); + await ctx.SaveChangesAsync(cancellationToken); } foreach(string command in ctx.Commands.Select(c => c.Name).Distinct().OrderBy(c => c)) diff --git a/Aaru/Commands/Database/Update.cs b/Aaru/Commands/Database/Update.cs index 73299eb9d..9e373f6c7 100644 --- a/Aaru/Commands/Database/Update.cs +++ b/Aaru/Commands/Database/Update.cs @@ -34,6 +34,7 @@ using System; using System.ComponentModel; using System.Diagnostics; using System.IO; +using System.Threading; using System.Threading.Tasks; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; @@ -51,7 +52,8 @@ sealed class UpdateCommand : AsyncCommand const string MODULE_NAME = "Update command"; readonly bool _mainDbUpdate; - public override async Task ExecuteAsync(CommandContext context, Settings settings) + public override async Task ExecuteAsync(CommandContext context, Settings settings, + CancellationToken cancellationToken) { MainClass.PrintCopyright(); @@ -65,8 +67,8 @@ sealed class UpdateCommand : AsyncCommand File.Delete(Aaru.Settings.Settings.LocalDbPath); var ctx = AaruContext.Create(Aaru.Settings.Settings.LocalDbPath); - await ctx.Database.MigrateAsync(); - await ctx.SaveChangesAsync(); + await ctx.Database.MigrateAsync(cancellationToken); + await ctx.SaveChangesAsync(cancellationToken); } catch(Exception) when(!Debugger.IsAttached) { diff --git a/Aaru/Commands/Device/DeviceReport.cs b/Aaru/Commands/Device/DeviceReport.cs index 57fe5ea13..7479b0bce 100644 --- a/Aaru/Commands/Device/DeviceReport.cs +++ b/Aaru/Commands/Device/DeviceReport.cs @@ -35,6 +35,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.Json; +using System.Threading; using System.Threading.Tasks; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; @@ -61,7 +62,8 @@ sealed class DeviceReportCommand : AsyncCommand { const string MODULE_NAME = "Device-Report command"; - public override async Task ExecuteAsync(CommandContext context, Settings settings) + public override async Task ExecuteAsync(CommandContext context, Settings settings, + CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Device/Info.cs b/Aaru/Commands/Device/Info.cs index 9bcaf1208..dead0eab6 100644 --- a/Aaru/Commands/Device/Info.cs +++ b/Aaru/Commands/Device/Info.cs @@ -35,6 +35,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Structs.Devices.ATA; @@ -66,7 +67,7 @@ sealed class DeviceInfoCommand : Command { const string MODULE_NAME = "Device-Info command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Device/List.cs b/Aaru/Commands/Device/List.cs index 78880c286..42cf24fd9 100644 --- a/Aaru/Commands/Device/List.cs +++ b/Aaru/Commands/Device/List.cs @@ -32,6 +32,7 @@ using System.ComponentModel; using System.Linq; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.Core; @@ -48,7 +49,7 @@ sealed class ListDevicesCommand : Command { const string MODULE_NAME = "List-Devices command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Filesystem/ExtractFiles.cs b/Aaru/Commands/Filesystem/ExtractFiles.cs index 7f81b8139..81bfaecdd 100644 --- a/Aaru/Commands/Filesystem/ExtractFiles.cs +++ b/Aaru/Commands/Filesystem/ExtractFiles.cs @@ -36,6 +36,7 @@ using System.ComponentModel; using System.IO; using System.Runtime.InteropServices; using System.Text; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; @@ -56,7 +57,7 @@ sealed class ExtractFilesCommand : Command const long BUFFER_SIZE = 16777216; const string MODULE_NAME = "Extract-Files command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Filesystem/Info.cs b/Aaru/Commands/Filesystem/Info.cs index 2e8861b1e..d99991877 100644 --- a/Aaru/Commands/Filesystem/Info.cs +++ b/Aaru/Commands/Filesystem/Info.cs @@ -34,6 +34,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Text; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.AaruMetadata; using Aaru.CommonTypes.Enums; @@ -51,7 +52,7 @@ sealed class FilesystemInfoCommand : Command { const string MODULE_NAME = "Fs-info command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Filesystem/Ls.cs b/Aaru/Commands/Filesystem/Ls.cs index c38a5456f..88a25fcb5 100644 --- a/Aaru/Commands/Filesystem/Ls.cs +++ b/Aaru/Commands/Filesystem/Ls.cs @@ -36,6 +36,7 @@ using System.ComponentModel; using System.IO; using System.Linq; using System.Text; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; @@ -55,7 +56,7 @@ sealed class LsCommand : Command { const string MODULE_NAME = "Ls command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Filesystem/Options.cs b/Aaru/Commands/Filesystem/Options.cs index da054a5e3..e638e9897 100644 --- a/Aaru/Commands/Filesystem/Options.cs +++ b/Aaru/Commands/Filesystem/Options.cs @@ -32,6 +32,7 @@ using System; using System.Linq; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; @@ -39,7 +40,6 @@ using Aaru.Core; using Aaru.Localization; using Aaru.Logging; using JetBrains.Annotations; -using Serilog; using Spectre.Console; using Spectre.Console.Cli; @@ -49,7 +49,7 @@ sealed class ListOptionsCommand : Command { const string MODULE_NAME = "List-Options command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); @@ -73,8 +73,7 @@ sealed class ListOptionsCommand : Command var table = new Table { - Title = new TableTitle(string.Format(UI.Options_for_0, - fs.Name)) + Title = new TableTitle(string.Format(UI.Options_for_0, fs.Name)) }; table.AddColumn(new TableColumn(new Markup(UI.Title_Name).Centered())); @@ -90,9 +89,9 @@ sealed class ListOptionsCommand : Command $"[slateblue1]{Markup.Escape(option.description)}[/]"); AaruLogging.Information("({Name}) - {Type} - {Description}", - option.name, - TypeToString(option.type), - option.description); + option.name, + TypeToString(option.type), + option.description); } AnsiConsole.Write(table); diff --git a/Aaru/Commands/Formats.cs b/Aaru/Commands/Formats.cs index 2be9af8e7..b411912ca 100644 --- a/Aaru/Commands/Formats.cs +++ b/Aaru/Commands/Formats.cs @@ -31,6 +31,7 @@ // ****************************************************************************/ using System.Linq; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; @@ -46,7 +47,7 @@ sealed class FormatsCommand : Command { const string MODULE_NAME = "Formats command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Image/Checksum.cs b/Aaru/Commands/Image/Checksum.cs index a0f7b13ab..61abd792c 100644 --- a/Aaru/Commands/Image/Checksum.cs +++ b/Aaru/Commands/Image/Checksum.cs @@ -33,6 +33,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; @@ -54,7 +55,7 @@ sealed class ChecksumCommand : Command const int BYTES_TO_READ = 65536; const string MODULE_NAME = "Checksum command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Image/Compare.cs b/Aaru/Commands/Image/Compare.cs index 59ce94d1f..bcb00bb01 100644 --- a/Aaru/Commands/Image/Compare.cs +++ b/Aaru/Commands/Image/Compare.cs @@ -35,6 +35,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Text; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; @@ -53,7 +54,7 @@ sealed class CompareCommand : Command { const string MODULE_NAME = "Compare command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Image/Convert.cs b/Aaru/Commands/Image/Convert.cs index 58b1f0368..6525571fe 100644 --- a/Aaru/Commands/Image/Convert.cs +++ b/Aaru/Commands/Image/Convert.cs @@ -37,6 +37,7 @@ using System.IO; using System.Linq; using System.Text; using System.Text.Json; +using System.Threading; using System.Xml.Serialization; using Aaru.CommonTypes; using Aaru.CommonTypes.AaruMetadata; @@ -67,7 +68,7 @@ sealed class ConvertImageCommand : Command { const string MODULE_NAME = "Convert-image command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Image/CreateSidecar.cs b/Aaru/Commands/Image/CreateSidecar.cs index 774f58e71..58394bf66 100644 --- a/Aaru/Commands/Image/CreateSidecar.cs +++ b/Aaru/Commands/Image/CreateSidecar.cs @@ -36,6 +36,7 @@ using System.IO; using System.Linq; using System.Text; using System.Text.Json; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.AaruMetadata; using Aaru.CommonTypes.Enums; @@ -56,7 +57,7 @@ sealed class CreateSidecarCommand : Command static ProgressTask _progressTask1; static ProgressTask _progressTask2; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Image/Decode.cs b/Aaru/Commands/Image/Decode.cs index a4cbb02eb..6c74178f0 100644 --- a/Aaru/Commands/Image/Decode.cs +++ b/Aaru/Commands/Image/Decode.cs @@ -32,6 +32,7 @@ using System.ComponentModel; using System.Globalization; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; @@ -50,7 +51,7 @@ sealed class DecodeCommand : Command { const string MODULE_NAME = "Decode command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Image/Entropy.cs b/Aaru/Commands/Image/Entropy.cs index 2b3384a14..b99d7661b 100644 --- a/Aaru/Commands/Image/Entropy.cs +++ b/Aaru/Commands/Image/Entropy.cs @@ -31,6 +31,7 @@ // ****************************************************************************/ using System.ComponentModel; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; @@ -48,7 +49,7 @@ sealed class EntropyCommand : Command static ProgressTask _progressTask1; static ProgressTask _progressTask2; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Image/Info.cs b/Aaru/Commands/Image/Info.cs index 0d6b9a5c1..72b117ff9 100644 --- a/Aaru/Commands/Image/Info.cs +++ b/Aaru/Commands/Image/Info.cs @@ -31,6 +31,7 @@ // ****************************************************************************/ using System; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; @@ -46,7 +47,7 @@ sealed class ImageInfoCommand : Command { const string MODULE_NAME = "Image-info command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Image/Options.cs b/Aaru/Commands/Image/Options.cs index 84bcc5fe6..92d6e84cc 100644 --- a/Aaru/Commands/Image/Options.cs +++ b/Aaru/Commands/Image/Options.cs @@ -32,6 +32,7 @@ using System; using System.Linq; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; @@ -48,7 +49,7 @@ sealed class ListOptionsCommand : Command { const string MODULE_NAME = "List-Options command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Image/Print.cs b/Aaru/Commands/Image/Print.cs index 375033330..6ecfacc30 100644 --- a/Aaru/Commands/Image/Print.cs +++ b/Aaru/Commands/Image/Print.cs @@ -32,6 +32,7 @@ using System; using System.ComponentModel; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; @@ -48,7 +49,7 @@ sealed class PrintHexCommand : Command { const string MODULE_NAME = "PrintHex command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Image/Verify.cs b/Aaru/Commands/Image/Verify.cs index 1fccc652d..5f9126744 100644 --- a/Aaru/Commands/Image/Verify.cs +++ b/Aaru/Commands/Image/Verify.cs @@ -34,6 +34,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Diagnostics; using System.IO; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; @@ -52,7 +53,7 @@ sealed class VerifyCommand : Command { const string MODULE_NAME = "Verify command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); @@ -394,18 +395,16 @@ sealed class VerifyCommand : Command if(failingLbas.Count == (int)inputFormat.Info.Sectors) AaruLogging.Verbose($"\t[red]{UI.all_sectors}[/]"); else - { - foreach(ulong t in failingLbas) AaruLogging.Verbose("\t{0}", t); - } + foreach(ulong t in failingLbas) + AaruLogging.Verbose("\t{0}", t); AaruLogging.WriteLine($"[yellow3_1]{UI.LBAs_without_checksum}[/]"); if(unknownLbas.Count == (int)inputFormat.Info.Sectors) AaruLogging.Verbose($"\t[yellow3_1]{UI.all_sectors}[/]"); else - { - foreach(ulong t in unknownLbas) AaruLogging.Verbose("\t{0}", t); - } + foreach(ulong t in unknownLbas) + AaruLogging.Verbose("\t{0}", t); } var table = new Table(); diff --git a/Aaru/Commands/ListEncodings.cs b/Aaru/Commands/ListEncodings.cs index 6d613fc85..dfb8a6428 100644 --- a/Aaru/Commands/ListEncodings.cs +++ b/Aaru/Commands/ListEncodings.cs @@ -32,6 +32,7 @@ using System.Linq; using System.Text; +using System.Threading; using Aaru.CommonTypes.Enums; using Aaru.Core; using Aaru.Localization; @@ -45,7 +46,7 @@ sealed class ListEncodingsCommand : Command { const string MODULE_NAME = "List-Encodings command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/ListNamespaces.cs b/Aaru/Commands/ListNamespaces.cs index ba20d0caf..83b278c20 100644 --- a/Aaru/Commands/ListNamespaces.cs +++ b/Aaru/Commands/ListNamespaces.cs @@ -32,13 +32,13 @@ using System.Collections.Generic; using System.Linq; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; using Aaru.Core; using Aaru.Localization; using Aaru.Logging; -using Serilog; using Spectre.Console; using Spectre.Console.Cli; @@ -48,7 +48,7 @@ sealed class ListNamespacesCommand : Command { const string MODULE_NAME = "List-Namespaces command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); @@ -68,8 +68,7 @@ sealed class ListNamespacesCommand : Command Table table = new() { - Title = new TableTitle(string.Format(UI.Namespaces_for_0, - Markup.Escape(fs.Name))) + Title = new TableTitle(string.Format(UI.Namespaces_for_0, Markup.Escape(fs.Name))) }; table.Border(TableBorder.Rounded); diff --git a/Aaru/Commands/Media/Dump.cs b/Aaru/Commands/Media/Dump.cs index 985aa4fc0..c062fa55d 100644 --- a/Aaru/Commands/Media/Dump.cs +++ b/Aaru/Commands/Media/Dump.cs @@ -69,7 +69,7 @@ sealed class DumpMediaCommand : Command static ProgressTask _progressTask1; static ProgressTask _progressTask2; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Media/Info.cs b/Aaru/Commands/Media/Info.cs index 2b525a1b6..227729891 100644 --- a/Aaru/Commands/Media/Info.cs +++ b/Aaru/Commands/Media/Info.cs @@ -34,6 +34,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Structs; @@ -68,7 +69,7 @@ sealed class MediaInfoCommand : Command { const string MODULE_NAME = "Media-Info command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Media/Scan.cs b/Aaru/Commands/Media/Scan.cs index 360c1a447..27d9fe70f 100644 --- a/Aaru/Commands/Media/Scan.cs +++ b/Aaru/Commands/Media/Scan.cs @@ -32,6 +32,7 @@ using System; using System.ComponentModel; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.Core; @@ -50,7 +51,7 @@ sealed class MediaScanCommand : Command const string MODULE_NAME = "Media-Scan command"; static ProgressTask _progressTask1; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Remote.cs b/Aaru/Commands/Remote.cs index 0815d0ef5..23eb50d84 100644 --- a/Aaru/Commands/Remote.cs +++ b/Aaru/Commands/Remote.cs @@ -33,6 +33,7 @@ // TODO: Fix errors returned using System; +using System.Threading; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.Core; @@ -49,7 +50,7 @@ sealed class RemoteCommand : Command { const string MODULE_NAME = "Remote command"; - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { MainClass.PrintCopyright();