From 89c40a020f39b615d34568898479288b2a5fec75 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 18 Aug 2025 15:55:47 +0100 Subject: [PATCH] Move markup to resources in image checksum command. --- Aaru.Localization/UI.Designer.cs | 24 +++---- Aaru.Localization/UI.es.resx | 12 ++-- Aaru.Localization/UI.resx | 42 ++++++------ Aaru/Commands/Image/Checksum.cs | 107 ++++++++++++++----------------- 4 files changed, 88 insertions(+), 97 deletions(-) diff --git a/Aaru.Localization/UI.Designer.cs b/Aaru.Localization/UI.Designer.cs index f7cde9afc..6aabf91b2 100644 --- a/Aaru.Localization/UI.Designer.cs +++ b/Aaru.Localization/UI.Designer.cs @@ -1269,15 +1269,15 @@ namespace Aaru.Localization { } } - public static string Checksums_Track_0_has_1 { + public static string Checksums_Track_0_has_1_2 { get { - return ResourceManager.GetString("Checksums_Track_0_has_1", resourceCulture); + return ResourceManager.GetString("Checksums_Track_0_has_1_2", resourceCulture); } } - public static string Checksums_Disc_has_0 { + public static string Checksums_Disc_has_0_1 { get { - return ResourceManager.GetString("Checksums_Disc_has_0", resourceCulture); + return ResourceManager.GetString("Checksums_Disc_has_0_1", resourceCulture); } } @@ -1311,15 +1311,15 @@ namespace Aaru.Localization { } } - public static string Checksums_File_0_has_1 { + public static string Checksums_File_0_has_1_2 { get { - return ResourceManager.GetString("Checksums_File_0_has_1", resourceCulture); + return ResourceManager.GetString("Checksums_File_0_has_1_2", resourceCulture); } } - public static string Checksums_Tape_has_0 { + public static string Checksums_Tape_has_0_1 { get { - return ResourceManager.GetString("Checksums_Tape_has_0", resourceCulture); + return ResourceManager.GetString("Checksums_Tape_has_0_1", resourceCulture); } } @@ -1341,9 +1341,9 @@ namespace Aaru.Localization { } } - public static string Checksums_Media_has_0 { + public static string Checksums_Media_has_0_1 { get { - return ResourceManager.GetString("Checksums_Media_has_0", resourceCulture); + return ResourceManager.GetString("Checksums_Media_has_0_1", resourceCulture); } } @@ -1353,9 +1353,9 @@ namespace Aaru.Localization { } } - public static string Checksums_Disk_has_0 { + public static string Checksums_Disk_has_0_1 { get { - return ResourceManager.GetString("Checksums_Disk_has_0", resourceCulture); + return ResourceManager.GetString("Checksums_Disk_has_0_1", resourceCulture); } } diff --git a/Aaru.Localization/UI.es.resx b/Aaru.Localization/UI.es.resx index 909ce3679..77a99626b 100644 --- a/Aaru.Localization/UI.es.resx +++ b/Aaru.Localization/UI.es.resx @@ -403,28 +403,28 @@ Comprobando pista {0} de {1} - + {0} del disco - + {0} del disco: Calcular el checksum de cada pista por separado. - + {1} del fichero {0} - + {0} del medio: - + {0} de la cinta: Calcular el checksum del disco completo. - + {1} de la pista {0}: diff --git a/Aaru.Localization/UI.resx b/Aaru.Localization/UI.resx index 518a4524a..0603565aa 100644 --- a/Aaru.Localization/UI.resx +++ b/Aaru.Localization/UI.resx @@ -626,33 +626,33 @@ In you are unsure, please press N to not continue. Unable to recognize image format, not checksumming - Hashing track {0} of {1} + [slateblue1]Hashing track [teal]{0}[/] of [teal]{1}[/][/] Hashing sector - Track {0} starts at sector {1} and ends at sector {2} + [slateblue1]Track [teal]{0}[/] starts at sector [lime]{1}[/] and ends at sector [lime]{2}[/][/] - Hashing sectors {0} to {2} of track {1} + [slateblue1]Hashing sectors [lime]{0}[/] to [violet]{2}[/] of track [teal]{1}[/][/] Error {0} while reading {1} sectors from sector {2}, not continuing... - - Track {0}'s {1}: + + [bold][slateblue1]Track [teal]{0}[/]'s [fuchsia]{1}[/]:[/][/] [rosybrown]{2}[/] {0} is track number, {1} is checksum name - - Disc's {0} + + [bold][slateblue1]Disc's [fuchsia]{0}[/]:[/] [rosybrown]{1}[/] {0} is checksum name - Hashing file {0} of {1} + [slateblue1]Hashing file [lime]{0}[/] of [violet]{1}[/][/] - Hashing file-less block {0} + [slateblue1]Hashing file-less block [lime]{0}[/][/] Error {0} while reading block {1}, not continuing... @@ -661,14 +661,14 @@ In you are unsure, please press N to not continue. File {0} starts at block {1} and ends at block {2} - Hashing blocks {0} to {2} of file {1} + [slateblue1]Hashing blocks [lime]{0}[/] to [violet]{2}[/] of file [teal]{1}[/][/] - - File {0}'s {1} + + [bold][slateblue1]File [teal]{0}[/teal]'s [fuchsia]{1}[/]:[/][/] [rosybrown]{2}[/] {0} is file's number, {1} is checksum name - - Tape's {0}: + + [bold][slateblue1]Tape's [fuchsia]{0}[/]:[/][/] [rosybrown]{1}[/] {0} is checksum name @@ -678,17 +678,17 @@ In you are unsure, please press N to not continue. Error {0} while reading {1} bytes from {2}, not continuing... - Hashing bytes {0} to {1} + [slateblue1]Hashing bytes [lime]{0}[/] to [violet]{1}[/][/] - - Media's {0}: + + [bold][slateblue1]Media's [fuchsia]{0}[/]:[/][/] [rosybrown]{1}[/] {0} is checksum name - Hashing sectors {0} to {1} + [slateblue1]Hashing sectors [lime]{0}[/] to [violet]{1}[/][/] - - Disk's {0}: + + [bold][slateblue1]Disk's [fuchsia]{0}[/]:[/][/] [rosybrown]{1}[/] {0} is checksum name @@ -3127,6 +3127,6 @@ Do you want to continue? [slateblue1]Optimal multiple read is [aqua]{0}[/] sectors.[/] - Unable to get separate tracks, not checksumming them + [yellow]Unable to get separate tracks, not checksumming them[/] \ No newline at end of file diff --git a/Aaru/Commands/Image/Checksum.cs b/Aaru/Commands/Image/Checksum.cs index edcbbb720..3fe5c0bd1 100644 --- a/Aaru/Commands/Image/Checksum.cs +++ b/Aaru/Commands/Image/Checksum.cs @@ -180,9 +180,9 @@ sealed class ChecksumCommand : Command foreach(Track currentTrack in inputTracks) { discTask.Description = - string.Format($"[slateblue1]{UI.Hashing_track_0_of_1}[/]", - $"[teal]{discTask.Value + 1}[/]", - $"[teal]{inputTracks.Count}[/]"); + string.Format(UI.Hashing_track_0_of_1, + discTask.Value + 1, + inputTracks.Count); ProgressTask trackTask = ctx.AddTask(UI.Hashing_sector); @@ -224,11 +224,10 @@ sealed class ChecksumCommand : Command out sector); trackTask.Description = - string - .Format($"[slateblue1]{UI.Hashing_sectors_0_to_2_of_track_1}[/]", - $"[lime]{doneSectors}[/]", - $"[teal]{currentTrack.Sequence}[/]", - $"[violet]{doneSectors + SECTORS_TO_READ}[/]"); + string.Format(UI.Hashing_sectors_0_to_2_of_track_1, + doneSectors, + currentTrack.Sequence, + doneSectors + SECTORS_TO_READ); if(errno != ErrorNumber.NoError) { @@ -253,11 +252,10 @@ sealed class ChecksumCommand : Command out sector); trackTask.Description = - string - .Format($"[slateblue1]{UI.Hashing_sectors_0_to_2_of_track_1}[/]", - $"[lime]{doneSectors}[/]", - $"[teal]{currentTrack.Sequence}[/]", - $"[violet]{doneSectors + (sectors - doneSectors)}[/]"); + string.Format(UI.Hashing_sectors_0_to_2_of_track_1, + doneSectors, + currentTrack.Sequence, + doneSectors + (sectors - doneSectors)); if(errno != ErrorNumber.NoError) { @@ -291,9 +289,10 @@ sealed class ChecksumCommand : Command foreach(CommonTypes.AaruMetadata.Checksum chk in trackChecksum.End()) { - AaruLogging - .WriteLine($"[bold][slateblue1]{string.Format(UI.Checksums_Track_0_has_1, - currentTrack.Sequence, chk.Type)}[/][/] [rosybrown]{chk.Value}[/]"); + AaruLogging.WriteLine(UI.Checksums_Track_0_has_1_2, + currentTrack.Sequence, + chk.Type, + chk.Value); } discTask.Increment(1); @@ -318,9 +317,7 @@ sealed class ChecksumCommand : Command foreach(CommonTypes.AaruMetadata.Checksum chk in mediaChecksum.End()) { - AaruLogging - .WriteLine($"[bold][slateblue1]{string.Format(UI.Checksums_Disc_has_0, chk.Type) - }:[/][/] [rosybrown]{chk.Value}[/]"); + AaruLogging.WriteLine(UI.Checksums_Disc_has_0_1, chk.Type, chk.Value); } }); @@ -355,9 +352,9 @@ sealed class ChecksumCommand : Command foreach(TapeFile currentFile in tapeImage.Files) { - tapeTask.Description = string.Format($"[slateblue1]{UI.Hashing_file_0_of_1}[/]", - $"[lime]{currentFile.File}[/]", - $"[violet]{tapeImage.Files.Count}[/]"); + tapeTask.Description = string.Format(UI.Hashing_file_0_of_1, + currentFile.File, + tapeImage.Files.Count); if(currentFile.FirstBlock - previousFileEnd != 0 && settings.WholeDisc) { @@ -366,9 +363,7 @@ sealed class ChecksumCommand : Command for(ulong i = previousFileEnd + 1; i < currentFile.FirstBlock; i++) { - preFileTask.Description = - string.Format($"[slateblue1]{UI.Hashing_file_less_block_0}[/]", - $"[lime]{i}[/]"); + preFileTask.Description = string.Format(UI.Hashing_file_less_block_0, i); errno = tapeImage.ReadSector(i, out byte[] hiddenSector); @@ -424,11 +419,10 @@ sealed class ChecksumCommand : Command return; } - fileTask.Description = - string.Format($"[slateblue1]{UI.Hashing_blocks_0_to_2_of_file_1}[/]", - $"[lime]{doneSectors}[/]", - $"[teal]{currentFile.File}[/]", - $"[violet]{doneSectors + SECTORS_TO_READ}[/]"); + fileTask.Description = string.Format(UI.Hashing_blocks_0_to_2_of_file_1, + doneSectors, + currentFile.File, + doneSectors + SECTORS_TO_READ); doneSectors += SECTORS_TO_READ; } @@ -450,11 +444,10 @@ sealed class ChecksumCommand : Command return; } - fileTask.Description = - string.Format($"[slateblue1]{UI.Hashing_blocks_0_to_2_of_file_1}[/]", - $"[lime]{doneSectors}[/]", - $"[teal]{currentFile.File}[/]", - $"[violet]{doneSectors + (sectors - doneSectors)}[/]"); + fileTask.Description = string.Format(UI.Hashing_blocks_0_to_2_of_file_1, + doneSectors, + currentFile.File, + doneSectors + (sectors - doneSectors)); doneSectors += sectors - doneSectors; } @@ -475,9 +468,10 @@ sealed class ChecksumCommand : Command { foreach(CommonTypes.AaruMetadata.Checksum chk in trackChecksum.End()) { - AaruLogging - .WriteLine($"[bold][slateblue1]{string.Format(UI.Checksums_File_0_has_1, - currentFile.File, chk.Type)}:[/][/] [rosybrown]{chk.Value}[/]"); + AaruLogging.WriteLine(UI.Checksums_File_0_has_1_2, + currentFile.File, + chk.Type, + chk.Value); } } } @@ -494,9 +488,7 @@ sealed class ChecksumCommand : Command for(ulong i = previousFileEnd + 1; i < tapeImage.Info.Sectors; i++) { - postFileTask.Description = - string.Format($"[slateblue1]{UI.Hashing_file_less_block_0}[/]", - $"[lime]{i}[/]"); + postFileTask.Description = string.Format(UI.Hashing_file_less_block_0, i); errno = tapeImage.ReadSector(i, out byte[] hiddenSector); @@ -520,9 +512,7 @@ sealed class ChecksumCommand : Command foreach(CommonTypes.AaruMetadata.Checksum chk in mediaChecksum.End()) { - AaruLogging - .WriteLine($"[bold][slateblue1]{string.Format(UI.Checksums_Tape_has_0, chk.Type)}[/][/] [rosybrown]{chk.Value - }[/]"); + AaruLogging.WriteLine(UI.Checksums_Tape_has_0_1, chk.Type, chk.Value); } } @@ -564,9 +554,9 @@ sealed class ChecksumCommand : Command } imageTask.Description = - string.Format($"[slateblue1]{UI.Hashing_bytes_0_to_1}[/]", - $"[lime]{doneBytes}[/]", - $"[violet]{doneBytes + BYTES_TO_READ}[/]"); + string.Format(UI.Hashing_bytes_0_to_1, + doneBytes, + doneBytes + BYTES_TO_READ); doneBytes += (ulong)bytesRead; @@ -607,8 +597,9 @@ sealed class ChecksumCommand : Command AaruLogging.WriteLine(); foreach(CommonTypes.AaruMetadata.Checksum chk in mediaChecksum.End()) - AaruLogging - .WriteLine($"[bold][blueslate1]{string.Format(UI.Checksums_Media_has_0, chk.Type)}[/][/] [rosybrown]{chk.Value}[/]"); + { + AaruLogging.WriteLine(UI.Checksums_Media_has_0_1, chk.Type, chk.Value); + } break; } @@ -649,9 +640,9 @@ sealed class ChecksumCommand : Command } diskTask.Description = - string.Format($"[slateblue1]{UI.Hashing_sectors_0_to_1}[/]", - $"[lime]{doneSectors}[/]", - $"[violet]{doneSectors + SECTORS_TO_READ}[/]"); + string.Format(UI.Hashing_sectors_0_to_1, + doneSectors, + doneSectors + SECTORS_TO_READ); doneSectors += SECTORS_TO_READ; } @@ -672,10 +663,9 @@ sealed class ChecksumCommand : Command return; } - diskTask.Description = - string.Format($"[slateblue1]{UI.Hashing_sectors_0_to_1}[/]", - $"[lime]{doneSectors}[/]", - $"[violet]{doneSectors + (sectors - doneSectors)}[/]"); + diskTask.Description = string.Format(UI.Hashing_sectors_0_to_1, + doneSectors, + doneSectors + (sectors - doneSectors)); doneSectors += sectors - doneSectors; } @@ -690,8 +680,9 @@ sealed class ChecksumCommand : Command AaruLogging.WriteLine(); foreach(CommonTypes.AaruMetadata.Checksum chk in mediaChecksum.End()) - AaruLogging - .WriteLine($"[bold][slateblue1]{string.Format(UI.Checksums_Disk_has_0, chk.Type)}[/][/] [rosybrown]{chk.Value}[/]"); + { + AaruLogging.WriteLine(UI.Checksums_Disk_has_0_1, chk.Type, chk.Value); + } break; }