From b9255b8b3e03b08cd04f48390ba55f7fea93c93d Mon Sep 17 00:00:00 2001
From: Rebecca Wallander <sakcheen@gamil.com>
Date: Sun, 12 Apr 2026 20:22:33 +0200
Subject: [PATCH] Address code quality issues

---
 Aaru.Core/Image/Convert/CSS/ConvertCssDvd.cs | 16 +------------
 Aaru.Core/Image/Merge/MergeCssDvd.cs         | 12 ----------
 Aaru.Filesystems/ISO9660/Mode2.cs            | 24 +++++---------------
 3 files changed, 7 insertions(+), 45 deletions(-)

diff --git a/Aaru.Core/Image/Convert/CSS/ConvertCssDvd.cs b/Aaru.Core/Image/Convert/CSS/ConvertCssDvd.cs
index 0839d95a0..df942d5f3 100644
--- a/Aaru.Core/Image/Convert/CSS/ConvertCssDvd.cs
+++ b/Aaru.Core/Image/Convert/CSS/ConvertCssDvd.cs
@@ -48,7 +48,6 @@ public partial class Convert
                                         (long)doneSectors,
                                         (long)trackSectors);
 
-                bool         useNotLong        = false;
                 bool         result            = false;
                 SectorStatus sectorStatus      = SectorStatus.NotDumped;
                 SectorStatus[] sectorStatusArray = new SectorStatus[1];
@@ -112,21 +111,8 @@ public partial class Convert
                         }
                     }
 
-                    if(!result && sector.Length % 2352 != 0)
-                    {
-                        if(!_force)
-                        {
-                            StoppingErrorMessage
-                              ?.Invoke(UI.Input_image_is_not_returning_raw_sectors_use_force_if_you_want_to_continue);
-
-                            return ErrorNumber.InOutError;
-                        }
-
-                        useNotLong = true;
-                    }
                 }
-
-                if(!useLong || useNotLong)
+                else
                 {
                     errno = sectorsToDo == 1
                                 ? inputOptical.ReadSector(doneSectors + track.StartSector,
diff --git a/Aaru.Core/Image/Merge/MergeCssDvd.cs b/Aaru.Core/Image/Merge/MergeCssDvd.cs
index 6125afd9c..ef8f844da 100644
--- a/Aaru.Core/Image/Merge/MergeCssDvd.cs
+++ b/Aaru.Core/Image/Merge/MergeCssDvd.cs
@@ -117,12 +117,6 @@ public sealed partial class Merger
                         return ErrorNumber.WriteError;
                     }
 
-                    if(!result && sector.Length % 2352 != 0)
-                    {
-                        StoppingErrorMessage?.Invoke(UI.Input_image_is_not_returning_long_sectors_not_continuing);
-
-                        return ErrorNumber.InOutError;
-                    }
                 }
                 else
                 {
@@ -252,12 +246,6 @@ public sealed partial class Merger
                     return ErrorNumber.WriteError;
                 }
 
-                if(!result && sector.Length % 2352 != 0)
-                {
-                    StoppingErrorMessage?.Invoke(UI.Input_image_is_not_returning_long_sectors_not_continuing);
-
-                    return ErrorNumber.InOutError;
-                }
             }
             else
             {
diff --git a/Aaru.Filesystems/ISO9660/Mode2.cs b/Aaru.Filesystems/ISO9660/Mode2.cs
index e93e458c3..d33325ce1 100644
--- a/Aaru.Filesystems/ISO9660/Mode2.cs
+++ b/Aaru.Filesystems/ISO9660/Mode2.cs
@@ -135,14 +135,9 @@ public sealed partial class ISO9660
 
             if(_blockSize == 2048)
             {
-                if(data.Length == 2064)
-                {
-                    buffer = Decoders.DVD.Sector.GetUserData(data);
-                }
-                else
-                {
-                    buffer = Sector.GetUserData(data, interleaved, fileNumber);
-                }
+                buffer = data.Length == 2064
+                              ? Decoders.DVD.Sector.GetUserData(data)
+                              : Sector.GetUserData(data, interleaved, fileNumber);
 
                 return ErrorNumber.NoError;
             }
@@ -239,16 +234,9 @@ public sealed partial class ISO9660
                     }
                 }
 
-                byte[] sectorData;
-
-                if(data.Length == 2064)
-                {
-                    sectorData = Decoders.DVD.Sector.GetUserData(data);
-                }
-                else
-                {
-                    sectorData = Sector.GetUserData(data, interleaved, fileNumber);
-                }
+                byte[] sectorData = data.Length == 2064
+                                  ? Decoders.DVD.Sector.GetUserData(data)
+                                  : Sector.GetUserData(data, interleaved, fileNumber);
 
                 ms.Write(sectorData, 0, sectorData.Length);
             }