more

Author: HeroponRikiBestest

SabreTools.Serialization/Wrappers/MicrosoftCabinet.Extraction.cs

@@ -226,7 +226,7 @@ private bool ExtractFolder(string? filename,
 
             // Loop through the files
             bool allExtracted = true;
-            var files = GetFiles(filename, folderIndex, ignorePrev);
+            var files = GetSpannedFiles(filename, folderIndex, ignorePrev);
             for (int i = 0; i < files.Length; i++)
             {
                 var file = files[i];

SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs

@@ -318,7 +318,7 @@ private static CompressionType GetCompressionType(CFFOLDER folder)
             GetData(folder);
 
             // Get all files for the folder
-            var files = GetFiles(filename, folderIndex);
+            var files = GetFiles(folderIndex, skipPrev);
             if (files.Length == 0)
                 return folder.DataBlocks;
 
@@ -389,12 +389,12 @@ public void GetData(CFFOLDER folder)
         }
 
         /// <summary>
-        /// Get all files for the current folder index
+        /// Get all files for the current folder, plus connected spanned folders.
         /// </summary>
         /// <param name="folderIndex">Index of the folder in the cabinet</param>
         /// <param name="ignorePrev">True to ignore previous links, false otherwise</param>
         /// <returns>Array of all files for the folder</returns>
-        private CFFILE[] GetFiles(string? filename, int folderIndex, bool ignorePrev = false, bool skipPrev = false, bool skipNext = false)
+        private CFFILE[] GetSpannedFiles(string? filename, int folderIndex, bool ignorePrev = false, bool skipPrev = false, bool skipNext = false)
         {
             // Ignore invalid archives
             if (Files == null)
@@ -435,7 +435,7 @@ private CFFILE[] GetFiles(string? filename, int folderIndex, bool ignorePrev = f
                 if (Prev?.Header != null && Prev.Folders != null)
                 {
                     int prevFolderIndex = Prev.FolderCount - 1;
-                    prevFiles = Prev.GetFiles(filename, prevFolderIndex, skipNext: true) ?? [];
+                    prevFiles = Prev.GetSpannedFiles(filename, prevFolderIndex, skipNext: true) ?? [];
                 }
             }
 
@@ -451,7 +451,7 @@ private CFFILE[] GetFiles(string? filename, int folderIndex, bool ignorePrev = f
                 if (Next?.Header != null && Next.Folders != null)
                 {
                     var nextFolder = Next.Folders[0];
-                    nextFiles = Next.GetFiles(filename, 0, skipPrev: true) ?? [];
+                    nextFiles = Next.GetSpannedFiles(filename, 0, skipPrev: true) ?? [];
                 }
             }
 
@@ -465,7 +465,7 @@ private CFFILE[] GetFiles(string? filename, int folderIndex, bool ignorePrev = f
         /// <param name="folderIndex">Index of the folder in the cabinet</param>
         /// <param name="ignorePrev">True to ignore previous links, false otherwise</param>
         /// <returns>Array of all files for the folder</returns>
-        private CFFILE[] GetFilesOld(int folderIndex, bool ignorePrev = false)
+        private CFFILE[] GetFiles(int folderIndex, bool ignorePrev = false)
         {
             // Ignore invalid archives
             if (Files == null)