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

Move markup to resources in image checksum command.

Browse Source
This commit is contained in:
Natalia Portillo
2025-08-18 15:55:47 +01:00
parent c1ba5931a8
commit 89c40a020f
4 changed files with 88 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
}

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

@@ -403,28 +403,28 @@
<data name="Checking_track_0_of_1" xml:space="preserve">
<value>Comprobando pista {0} de {1}</value>
</data>
<data name="Checksums_Disc_has_0" xml:space="preserve">
<data name="Checksums_Disc_has_0_1" xml:space="preserve">
<value>{0} del disco</value>
</data>
<data name="Checksums_Disk_has_0" xml:space="preserve">
<data name="Checksums_Disk_has_0_1" xml:space="preserve">
<value>{0} del disco:</value>
</data>
<data name="Checksums_each_track_separately" xml:space="preserve">
<value>Calcular el checksum de cada pista por separado.</value>
</data>
<data name="Checksums_File_0_has_1" xml:space="preserve">
<data name="Checksums_File_0_has_1_2" xml:space="preserve">
<value>{1} del fichero {0}</value>
</data>
<data name="Checksums_Media_has_0" xml:space="preserve">
<data name="Checksums_Media_has_0_1" xml:space="preserve">
<value>{0} del medio:</value>
</data>
<data name="Checksums_Tape_has_0" xml:space="preserve">
<data name="Checksums_Tape_has_0_1" xml:space="preserve">
<value>{0} de la cinta:</value>
</data>
<data name="Checksums_the_whole_disc" xml:space="preserve">
<value>Calcular el checksum del disco completo.</value>
</data>
<data name="Checksums_Track_0_has_1" xml:space="preserve">
<data name="Checksums_Track_0_has_1_2" xml:space="preserve">
<value>{1} de la pista {0}:</value>
</data>
<data name="Clear_existing_main_and_local_database" xml:space="preserve">

42
Aaru.Localization/UI.resx
View File

@@ -626,33 +626,33 @@ In you are unsure, please press N to not continue.</value>
<value>Unable to recognize image format, not checksumming</value>
</data>
<data name="Hashing_track_0_of_1" xml:space="preserve">
<value>Hashing track {0} of {1}</value>
<value>[slateblue1]Hashing track [teal]{0}[/] of [teal]{1}[/][/]</value>
</data>
<data name="Hashing_sector" xml:space="preserve">
<value>Hashing sector</value>
</data>
<data name="Track_0_starts_at_sector_1_and_ends_at_sector_2" xml:space="preserve">
<value>Track {0} starts at sector {1} and ends at sector {2}</value>
<value>[slateblue1]Track [teal]{0}[/] starts at sector [lime]{1}[/] and ends at sector [lime]{2}[/][/]</value>
</data>
<data name="Hashing_sectors_0_to_2_of_track_1" xml:space="preserve">
<value>Hashing sectors {0} to {2} of track {1}</value>
<value>[slateblue1]Hashing sectors [lime]{0}[/] to [violet]{2}[/] of track [teal]{1}[/][/]</value>
</data>
<data name="Error_0_while_reading_1_sectors_from_sector_2" xml:space="preserve">
<value>Error {0} while reading {1} sectors from sector {2}, not continuing...</value>
</data>
<data name="Checksums_Track_0_has_1" xml:space="preserve">
<value>Track {0}'s {1}:</value>
<data name="Checksums_Track_0_has_1_2" xml:space="preserve">
<value>[bold][slateblue1]Track [teal]{0}[/]'s [fuchsia]{1}[/]:[/][/] [rosybrown]{2}[/]</value>
<comment>{0} is track number, {1} is checksum name</comment>
</data>
<data name="Checksums_Disc_has_0" xml:space="preserve">
<value>Disc's {0}</value>
<data name="Checksums_Disc_has_0_1" xml:space="preserve">
<value>[bold][slateblue1]Disc's [fuchsia]{0}[/]:[/] [rosybrown]{1}[/]</value>
<comment>{0} is checksum name</comment>
</data>
<data name="Hashing_file_0_of_1" xml:space="preserve">
<value>Hashing file {0} of {1}</value>
<value>[slateblue1]Hashing file [lime]{0}[/] of [violet]{1}[/][/]</value>
</data>
<data name="Hashing_file_less_block_0" xml:space="preserve">
<value>Hashing file-less block {0}</value>
<value>[slateblue1]Hashing file-less block [lime]{0}[/][/]</value>
</data>
<data name="Error_0_while_reading_block_1" xml:space="preserve">
<value>Error {0} while reading block {1}, not continuing...</value>
@@ -661,14 +661,14 @@ In you are unsure, please press N to not continue.</value>
<value>File {0} starts at block {1} and ends at block {2}</value>
</data>
<data name="Hashing_blocks_0_to_2_of_file_1" xml:space="preserve">
<value>Hashing blocks {0} to {2} of file {1}</value>
<value>[slateblue1]Hashing blocks [lime]{0}[/] to [violet]{2}[/] of file [teal]{1}[/][/]</value>
</data>
<data name="Checksums_File_0_has_1" xml:space="preserve">
<value>File {0}'s {1}</value>
<data name="Checksums_File_0_has_1_2" xml:space="preserve">
<value>[bold][slateblue1]File [teal]{0}[/teal]'s [fuchsia]{1}[/]:[/][/] [rosybrown]{2}[/]</value>
<comment>{0} is file's number, {1} is checksum name</comment>
</data>
<data name="Checksums_Tape_has_0" xml:space="preserve">
<value>Tape's {0}:</value>
<data name="Checksums_Tape_has_0_1" xml:space="preserve">
<value>[bold][slateblue1]Tape's [fuchsia]{0}[/]:[/][/] [rosybrown]{1}[/]</value>
<comment>{0} is checksum name</comment>
</data>
<data name="Hashing_image" xml:space="preserve">
@@ -678,17 +678,17 @@ In you are unsure, please press N to not continue.</value>
<value>Error {0} while reading {1} bytes from {2}, not continuing...</value>
</data>
<data name="Hashing_bytes_0_to_1" xml:space="preserve">
<value>Hashing bytes {0} to {1}</value>
<value>[slateblue1]Hashing bytes [lime]{0}[/] to [violet]{1}[/][/]</value>
</data>
<data name="Checksums_Media_has_0" xml:space="preserve">
<value>Media's {0}:</value>
<data name="Checksums_Media_has_0_1" xml:space="preserve">
<value>[bold][slateblue1]Media's [fuchsia]{0}[/]:[/][/] [rosybrown]{1}[/]</value>
<comment>{0} is checksum name</comment>
</data>
<data name="Hashing_sectors_0_to_1" xml:space="preserve">
<value>Hashing sectors {0} to {1}</value>
<value>[slateblue1]Hashing sectors [lime]{0}[/] to [violet]{1}[/][/]</value>
</data>
<data name="Checksums_Disk_has_0" xml:space="preserve">
<value>Disk's {0}:</value>
<data name="Checksums_Disk_has_0_1" xml:space="preserve">
<value>[bold][slateblue1]Disk's [fuchsia]{0}[/]:[/][/] [rosybrown]{1}[/]</value>
<comment>{0} is checksum name</comment>
</data>
<data name="First_media_image_path" xml:space="preserve">
@@ -3127,6 +3127,6 @@ Do you want to continue?</value>
<value>[slateblue1]Optimal multiple read is [aqua]{0}[/] sectors.[/]</value>
</data>
<data name="Unable_to_get_separate_tracks_not_checksumming_them" xml:space="preserve">
<value>Unable to get separate tracks, not checksumming them</value>
<value>[yellow]Unable to get separate tracks, not checksumming them[/]</value>
</data>
</root>

107
Aaru/Commands/Image/Checksum.cs
View File

@@ -180,9 +180,9 @@ sealed class ChecksumCommand : Command<ChecksumCommand.Settings>
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<ChecksumCommand.Settings>
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<ChecksumCommand.Settings>
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<ChecksumCommand.Settings>
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<ChecksumCommand.Settings>
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<ChecksumCommand.Settings>
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<ChecksumCommand.Settings>
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<ChecksumCommand.Settings>
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<ChecksumCommand.Settings>
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<ChecksumCommand.Settings>
{
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<ChecksumCommand.Settings>
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<ChecksumCommand.Settings>
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<ChecksumCommand.Settings>
}
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<ChecksumCommand.Settings>
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<ChecksumCommand.Settings>
}
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<ChecksumCommand.Settings>
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<ChecksumCommand.Settings>
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;
}