diff --git a/Aaru.Decoders/Bluray/DDS.cs b/Aaru.Decoders/Bluray/DDS.cs index ffab749fa..8765c9073 100644 --- a/Aaru.Decoders/Bluray/DDS.cs +++ b/Aaru.Decoders/Bluray/DDS.cs @@ -35,6 +35,7 @@ using System.Diagnostics.CodeAnalysis; using System.Text; using Aaru.Helpers; using Aaru.Logging; +using Spectre.Console; namespace Aaru.Decoders.Bluray; @@ -195,10 +196,10 @@ public static class DDS sb.AppendFormat(Localization.Spare_Area_Full_Flags_0, response.SpareAreaFullFlags).AppendLine(); sb.AppendFormat(Localization.Disc_Type_Specific_Field_1_0, response.DiscTypeSpecificField1).AppendLine(); sb.AppendFormat(Localization.Disc_Type_Specific_Field_2_0, response.DiscTypeSpecificField2).AppendLine(); - sb.AppendFormat(Localization.Blu_ray_DDS_Status_Bits_in_hex_follows); - sb.AppendLine(PrintHex.ByteArrayToHexArrayString(response.StatusBits, 80)); - sb.AppendFormat(Localization.Blu_ray_DDS_Disc_Type_Specific_Data_in_hex_follows); - sb.AppendLine(PrintHex.ByteArrayToHexArrayString(response.DiscTypeSpecificData, 80)); + sb.AppendLine(Localization.Blu_ray_DDS_Status_Bits_in_hex_follows); + sb.AppendLine(Markup.Escape(PrintHex.ByteArrayToHexArrayString(response.StatusBits, color: true))); + sb.AppendLine(Localization.Blu_ray_DDS_Disc_Type_Specific_Data_in_hex_follows); + sb.AppendLine(Markup.Escape(PrintHex.ByteArrayToHexArrayString(response.DiscTypeSpecificData, color: true))); #if DEBUG if(response.Reserved1 != 0) diff --git a/Aaru.Decoders/Localization/Localization.es.resx b/Aaru.Decoders/Localization/Localization.es.resx index f3743597d..d6acfc82c 100644 --- a/Aaru.Decoders/Localization/Localization.es.resx +++ b/Aaru.Decoders/Localization/Localization.es.resx @@ -1092,11 +1092,11 @@ DDS-4 - Formato DDS: 0x{0:X2} - + [slateblue1]Formato DDS: [teal]0x{0:X2}[/][/] + - El DDS se ha actualizado {0} veces - + [slateblue1]El DDS se ha actualizado [teal]{0}[/] veces[/] + Definición de operación por defecto: {0} @@ -4133,11 +4133,11 @@ [slateblue1]El tipo de disco no está definido[/] - 1er campo específico del tipo de disco: 0x{0:X2} - + [slateblue1][teal]1er[/] campo específico del tipo de disco:[/] [teal]0x{0:X2}[/] + - 2º campo específico del tipo de disco: 0x{0:X8} - + [slateblue1][teal]2º[/] campo específico del tipo de disco:[/] [teal]0x{0:X8}[/] + [slateblue1]El disco usa un canal de [teal]69,0nm[/] dando [green]27[/]Gb por capa.[/] @@ -5684,11 +5684,11 @@ [slateblue1]Número de la primera sesión completa:[/] [teal]{0}[/] - Primer PSN de la Lista de Defectos: 0x{0:X8} - + [slateblue1]Primer PSN de la Lista de Defectos:[/] [lime]0x{0:X8}[/] + - Primer PSN del Área de la Unidad: 0x{0:X8} - + [slateblue1]Primer PSN del Área de la Unidad:[/] [lime]0x{0:X8}[/] + Primer bloque de entrada @@ -6269,11 +6269,11 @@ IORDY está soportado y puede ser desactivado - Tamaño ISA0: {0} - + [slateblue1]Tamaño ISA0:[/] [teal]{0}[/] + - Tamaño ISA1: {0} - + [slateblue1]Tamaño ISA1:[/] [teal]{0}[/] + ISO/IEC 10090: Disco óptico de 86 mm de lectura/escritura y una cara con 12500 pistas @@ -6338,8 +6338,8 @@ [slateblue1]Número de la última pista en la última sesión completa: [teal]{0}[/][/] - LSN 0 del último área de datos de usuario: 0x{0:X8} - + [slateblue1]LSN [lime]0[/] del último área de datos de usuario:[/] [lime]0x{0:X8}[/] + [slateblue1]Último PSN de datos de usuario para el disco:[/] [lime]{0}[/] @@ -7219,8 +7219,8 @@ [slateblue1]Potencia óptima de grabación: [teal]0x{0:X2}[/][/] - Tamaño OSA: {0} - + [slateblue1]Tamaño OSA:[/] [teal]{0}[/] + El puerto de salida 0 tiene canales @@ -7594,8 +7594,8 @@ Descriptor específico del protocolo (desconocido) con formato desconocido (hexadecimal): {0} - PSN del LSN 0 del área de datos de usuario: 0x{0:X8} - + [slateblue1]PSN del LSN [lime]0[/] del área de datos de usuario:[/] [lime]0x{0:X8}[/] + QIC-11 @@ -8331,8 +8331,8 @@ La protección contra escritura está activada - Valores completos del área de reserva: 0x{0:X2} - + [slateblue1]Valores completos del área de reserva:[/] [teal]0x{0:X2}[/] + Encontrado tamaño incorrecto de la información sobre el área de reserva de Blu-ray ({0} bytes) diff --git a/Aaru.Decoders/Localization/Localization.resx b/Aaru.Decoders/Localization/Localization.resx index d9c220561..93830662d 100644 --- a/Aaru.Decoders/Localization/Localization.resx +++ b/Aaru.Decoders/Localization/Localization.resx @@ -1240,38 +1240,38 @@ Found incorrect DDS signature (0x{0:X4}) - DDS Format: 0x{0:X2} - + [slateblue1]DDS Format: [teal]0x{0:X2}[/][/] + - First PSN of Drive Area: 0x{0:X8} - + [slateblue1]First PSN of Drive Area:[/] [lime]0x{0:X8}[/] + - First PSN of Defect List: 0x{0:X8} - + [slateblue1]First PSN of Defect List:[/] [lime]0x{0:X8}[/] + - PSN of User Data Area's LSN 0: 0x{0:X8} - + [slateblue1]PSN of User Data Area's LSN [lime]0[/]:[/] [lime]0x{0:X8}[/] + - Last User Data Area's LSN 0: 0x{0:X8} - + [slateblue1]Last User Data Area's LSN [lime]0[/]:[/] [lime]0x{0:X8}[/] + - ISA0 size: {0} - + [slateblue1]ISA0 size:[/] [teal]{0}[/] + - OSA size: {0} - + [slateblue1]OSA size:[/] [teal]{0}[/] + - ISA1 size: {0} - + [slateblue1]ISA1 size:[/] [teal]{0}[/] + - Spare Area Full Flags: 0x{0:X2} - + [slateblue1]Spare Area Full Flags:[/] [teal]0x{0:X2}[/] + - Disc Type Specific Field 1: 0x{0:X2} - + [slateblue1]Disc Type Specific Field [teal]1[/]:[/] [teal]0x{0:X2}[/] + - Disc Type Specific Field 2: 0x{0:X8} - + [slateblue1]Disc Type Specific Field [teal]2[/]:[/] [teal]0x{0:X8}[/] + Blu-ray DDS Status Bits in hex follows: @@ -2297,8 +2297,8 @@ Disc has been certified by a manufacturer - DDS has been updated {0} times - + [slateblue1]DDS has been updated [teal]{0}[/] times[/] + Group {0} is being formatted diff --git a/Aaru.Localization/Core.es.resx b/Aaru.Localization/Core.es.resx index 3089273aa..ea245018f 100644 --- a/Aaru.Localization/Core.es.resx +++ b/Aaru.Localization/Core.es.resx @@ -140,8 +140,8 @@ Estado de cartucho de Blu-ray - Estructura de definición del disco Blu-ray - + [bold][blue]Estructura de definición del disco Blu-ray:[/][/] + [bold][blue]Estructura de definición del disco Blu-ray contenida en la imagen:[/][/] diff --git a/Aaru.Localization/Core.resx b/Aaru.Localization/Core.resx index f1ad49a77..e6b401741 100644 --- a/Aaru.Localization/Core.resx +++ b/Aaru.Localization/Core.resx @@ -315,8 +315,8 @@ [bold][blue]Blu-ray Burst Cutting Area:[/][/] - Blu-ray Disc Definition Structure - + [bold][blue]Blu-ray Disc Definition Structure:[/][/] + Blu-ray Cartridge Status diff --git a/Aaru/Commands/Media/Info.cs b/Aaru/Commands/Media/Info.cs index f663c4a26..00c42ffcc 100644 --- a/Aaru/Commands/Media/Info.cs +++ b/Aaru/Commands/Media/Info.cs @@ -580,8 +580,8 @@ sealed class MediaInfoCommand : Command "SCSI READ DISC STRUCTURE", scsiInfo.BlurayDds); - AaruLogging.WriteLine($"[bold]{Localization.Core.Bluray_Disc_Definition_Structure}:[/]" + - $"\n{Markup.Escape(Decoders.Bluray.DDS.Prettify(scsiInfo.BlurayDds))}"); + AaruLogging.WriteLine(Localization.Core.Bluray_Disc_Definition_Structure); + AaruLogging.WriteLine(Decoders.Bluray.DDS.Prettify(scsiInfo.BlurayDds)); } if(scsiInfo.BlurayCartridgeStatus != null)