From 7343de955812681f64ef0206ebe484ee9d2b3bd2 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Wed, 14 Jan 2026 16:26:59 +0000
Subject: [PATCH] Correct processing of headerless CD-Text coming from images,
 in image info command. Fixes #662

---
 .../.idea/runConfigurations/Aaru.xml          |  6 ++---
 Aaru.Core/Devices/Dumping/CompactDisc/Data.cs |  1 +
 Aaru.Core/ImageInfo.cs                        | 14 +++++-----
 .../ViewModels/Panels/ImageInfoViewModel.cs   | 27 +++++++++----------
 .../Windows/DecodeMediaTagsViewModel.cs       |  8 +++---
 5 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml b/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml
index 526b76710..d40221669 100644
--- a/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml
+++ b/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Aaru" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/Aaru/bin/Release/net10.0/linux-x64/aaru" />
-    <option name="PROGRAM_PARAMETERS" value="i create-sidecar &quot;OpenSolaris Disc 1 (708-0235-11).aif&quot;" />
-    <option name="WORKING_DIRECTORY" value="/mnt/datos/Dumps (bugs)/PC/Operating Systems/OpenSolaris Starter Kit (819-7180-10) (July 2006)/" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/Aaru/bin/Debug/net10.0/osx-arm64/aaru" />
+    <option name="PROGRAM_PARAMETERS" value="i info &quot;Tanxugueiras - Contra (CLVR012).aif&quot;" />
+    <option name="WORKING_DIRECTORY" value="/Volumes/iPhone/issue662/" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="ENV_FILE_PATHS" value="" />
     <option name="REDIRECT_INPUT_PATH" value="" />
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
index 5a0baa058..0c4e90097 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
@@ -49,6 +49,7 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Localization;
 using Aaru.Logging;
+using Humanizer;
 using Track = Aaru.CommonTypes.Structs.Track;
 using TrackType = Aaru.CommonTypes.Enums.TrackType;
 
diff --git a/Aaru.Core/ImageInfo.cs b/Aaru.Core/ImageInfo.cs
index f089568db..6628f2b0e 100644
--- a/Aaru.Core/ImageInfo.cs
+++ b/Aaru.Core/ImageInfo.cs
@@ -509,16 +509,14 @@ public static class ImageInfo
 
             if(errno == ErrorNumber.NoError)
             {
-                uint dataLen = Swapping.Swap(BitConverter.ToUInt32(cdtext, 0));
+                ushort dataLen = Swapping.Swap(BitConverter.ToUInt16(cdtext, 0));
 
-                if(dataLen + 4 != cdtext.Length)
+                if(dataLen + 2 != cdtext.Length)
                 {
                     var tmp = new byte[cdtext.Length + 4];
                     Array.Copy(cdtext, 0, tmp, 4, cdtext.Length);
-                    tmp[0] = (byte)((cdtext.Length & 0xFF000000) >> 24);
-                    tmp[1] = (byte)((cdtext.Length & 0xFF0000)   >> 16);
-                    tmp[2] = (byte)((cdtext.Length & 0xFF00)     >> 8);
-                    tmp[3] = (byte)(cdtext.Length & 0xFF);
+                    tmp[0] = (byte)((cdtext.Length + 2 & 0xFF00) >> 8);
+                    tmp[1] = (byte)(cdtext.Length + 2 & 0xFF);
                     cdtext = tmp;
                 }
 
@@ -868,7 +866,9 @@ public static class ImageInfo
             }
         }
 
-        if(imageFormat is IFluxImage fluxImage && fluxImage.GetAllFluxCaptures(out List<FluxCapture> captures) == ErrorNumber.NoError && captures is { Count: > 0 })
+        if(imageFormat is IFluxImage fluxImage                                                 &&
+           fluxImage.GetAllFluxCaptures(out List<FluxCapture> captures) == ErrorNumber.NoError &&
+           captures is { Count: > 0 })
             AaruLogging.WriteLine(Localization.Core.Image_flux_captures);
 
         if(imageFormat is not IOpticalMediaImage opticalImage) return;
diff --git a/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs
index 7a2475f11..7190f46ac 100644
--- a/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs
@@ -274,8 +274,9 @@ public sealed class ImageInfoViewModel : ViewModelBase
         }
 
         if(imageFormat.Info.ReadableMediaTags is { Count: > 0 })
-            foreach(MediaTagType tag in imageFormat.Info.ReadableMediaTags.Order())
-                MediaTagsList.Add(tag.Humanize());
+        {
+            foreach(MediaTagType tag in imageFormat.Info.ReadableMediaTags.Order()) MediaTagsList.Add(tag.Humanize());
+        }
 
         if(imageFormat.Info.ReadableSectorTags is { Count: > 0 })
         {
@@ -456,16 +457,14 @@ public sealed class ImageInfoViewModel : ViewModelBase
 
             if(errno == ErrorNumber.NoError)
             {
-                uint dataLen = Swapping.Swap(BitConverter.ToUInt32(cdtext, 0));
+                ushort dataLen = Swapping.Swap(BitConverter.ToUInt16(cdtext, 0));
 
-                if(dataLen + 4 != cdtext.Length)
+                if(dataLen + 2 != cdtext.Length)
                 {
                     var tmp = new byte[cdtext.Length + 4];
                     Array.Copy(cdtext, 0, tmp, 4, cdtext.Length);
-                    tmp[0] = (byte)((cdtext.Length & 0xFF000000) >> 24);
-                    tmp[1] = (byte)((cdtext.Length & 0xFF0000)   >> 16);
-                    tmp[2] = (byte)((cdtext.Length & 0xFF00)     >> 8);
-                    tmp[3] = (byte)(cdtext.Length & 0xFF);
+                    tmp[0] = (byte)((cdtext.Length + 2 & 0xFF00) >> 8);
+                    tmp[1] = (byte)(cdtext.Length + 2 & 0xFF);
                     cdtext = tmp;
                 }
 
@@ -794,9 +793,8 @@ public sealed class ImageInfoViewModel : ViewModelBase
             try
             {
                 if(opticalMediaImage.Sessions is { Count: > 0 })
-                {
-                    foreach(Session session in opticalMediaImage.Sessions) Sessions.Add(session);
-                }
+                    foreach(Session session in opticalMediaImage.Sessions)
+                        Sessions.Add(session);
             }
             catch(Exception ex)
             {
@@ -806,9 +804,8 @@ public sealed class ImageInfoViewModel : ViewModelBase
             try
             {
                 if(opticalMediaImage.Tracks is { Count: > 0 })
-                {
-                    foreach(Track track in opticalMediaImage.Tracks) Tracks.Add(track);
-                }
+                    foreach(Track track in opticalMediaImage.Tracks)
+                        Tracks.Add(track);
             }
             catch(Exception ex)
             {
@@ -820,7 +817,7 @@ public sealed class ImageInfoViewModel : ViewModelBase
         if(imageFormat is IFluxImage fluxImage)
         {
             ErrorNumber fluxError = fluxImage.GetAllFluxCaptures(out List<FluxCapture> fluxCaptures);
-            
+
             if(fluxError == ErrorNumber.NoError && fluxCaptures is { Count: > 0 })
             {
                 FluxInfo = new FluxInfo
diff --git a/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs b/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs
index 8ab84c225..abbe36980 100644
--- a/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs
@@ -189,14 +189,12 @@ public sealed partial class DecodeMediaTagsViewModel : ViewModelBase
                 case MediaTagType.CD_TEXT:
                     dataLen = Swapping.Swap(BitConverter.ToUInt32(value.Data, 0));
 
-                    if(dataLen + 4 != value.Data.Length)
+                    if(dataLen + 2 != value.Data.Length)
                     {
                         var tmp = new byte[value.Data.Length + 4];
                         Array.Copy(value.Data, 0, tmp, 4, value.Data.Length);
-                        tmp[0]     = (byte)((value.Data.Length & 0xFF000000) >> 24);
-                        tmp[1]     = (byte)((value.Data.Length & 0xFF0000)   >> 16);
-                        tmp[2]     = (byte)((value.Data.Length & 0xFF00)     >> 8);
-                        tmp[3]     = (byte)(value.Data.Length & 0xFF);
+                        tmp[0]     = (byte)((value.Data.Length + 2 & 0xFF00) >> 8);
+                        tmp[1]     = (byte)(value.Data.Length + 2 & 0xFF);
                         value.Data = tmp;
                     }