Add support for deleted files in PAKs

Norbyte · Jul 22, 2021 · ed3576b · ed3576b
1 parent 2cbce96
commit ed3576b
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 6 deletions.
diff --git a/ConverterApp/Properties/AssemblyInfo.cs b/ConverterApp/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.15.8.0")]
-[assembly: AssemblyFileVersion("1.15.8.0")]
+[assembly: AssemblyVersion("1.15.9.0")]
+[assembly: AssemblyFileVersion("1.15.9.0")]
diff --git a/Divine/CLI/CommandLinePackageProcessor.cs b/Divine/CLI/CommandLinePackageProcessor.cs
@@ -41,7 +41,7 @@ private static void ExtractSingleFile(string packagePath, string destinationPath
                 {
                     Package package = reader.Read();
                     // Try to match by full path
-                    AbstractFileInfo file = package.Files.Find(fileInfo => string.Compare(fileInfo.Name, packagedPath, StringComparison.OrdinalIgnoreCase) == 0);
+                    AbstractFileInfo file = package.Files.Find(fileInfo => string.Compare(fileInfo.Name, packagedPath, StringComparison.OrdinalIgnoreCase) == 0 && !fileInfo.IsDeletion());
                     if (file == null)
                     {
                         // Try to match by filename only

diff --git a/LSLib/LS/Common.cs b/LSLib/LS/Common.cs
@@ -9,7 +9,7 @@ public static class Common
 
 		public const int MinorVersion = 15;
 
-		public const int PatchVersion = 8;
+		public const int PatchVersion = 9;
 
 		/// <summary>
 		/// Returns the version number of the LSLib library

diff --git a/LSLib/LS/Mods/ModResources.cs b/LSLib/LS/Mods/ModResources.cs
@@ -121,6 +121,8 @@ private void AddLevelObjectsToMod(string modName, string path, AbstractFileInfo
 
         private void DiscoverPackagedFile(AbstractFileInfo file)
         {
+            if (file.IsDeletion()) return;
+
             if (file.Name.EndsWith("meta.lsx", StringComparison.Ordinal))
             {
                 var match = metaRe.Match(file.Name);

diff --git a/LSLib/LS/PackageCommon.cs b/LSLib/LS/PackageCommon.cs
@@ -157,6 +157,7 @@ public abstract class AbstractFileInfo
         public abstract UInt32 CRC();
         public abstract Stream MakeStream();
         public abstract void ReleaseStream();
+        public abstract bool IsDeletion();
     }
 
 
@@ -238,6 +239,11 @@ public void Dispose()
 
         public override Stream MakeStream()
         {
+            if (IsDeletion())
+            {
+                throw new InvalidOperationException("Cannot open file stream for a deleted file");
+            }
+
             if (_uncompressedStream != null)
             {
                 return _uncompressedStream;
@@ -447,6 +453,11 @@ internal FileEntry15 MakeEntryV15()
 
             return entry;
         }
+
+        public override bool IsDeletion()
+        {
+            return OffsetInFile == 0xdeadbeefdeadbeef;
+        }
     }
 
     public class FilesystemFileInfo : AbstractFileInfo, IDisposable
@@ -488,6 +499,11 @@ public static FilesystemFileInfo CreateFromEntry(string filesystemPath, string n
             info.CachedSize = fsInfo.Length;
             return info;
         }
+
+        public override bool IsDeletion()
+        {
+            return false;
+        }
     }
 
     public class StreamFileInfo : AbstractFileInfo
@@ -513,6 +529,11 @@ public static StreamFileInfo CreateFromStream(Stream stream, string name)
             };
             return info;
         }
+
+        public override bool IsDeletion()
+        {
+            return false;
+        }
     }
 
     public class Package
@@ -583,6 +604,8 @@ public void UncompressPackage(Package package, string outputPath, Func<AbstractF
                 ProgressUpdate(file.Name, currentSize, totalSize, file);
                 currentSize += (long)file.Size();
 
+                if (file.IsDeletion()) continue;
+
                 string outPath = outputPath + file.Name;
 
                 FileManager.TryToCreateDirectory(outPath);

diff --git a/LSLib/Properties/AssemblyInfo.cs b/LSLib/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.15.8.0")]
-[assembly: AssemblyFileVersion("1.15.8.0")]
+[assembly: AssemblyVersion("1.15.9.0")]
+[assembly: AssemblyFileVersion("1.15.9.0")]