Add DefaultUnityCNKey to Setting

Author: AXiX-official

UnityAsset.NET.sln

@@ -5,6 +5,8 @@ VisualStudioVersion = 17.9.34607.119
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnityAsset.NET", "UnityAsset.NET\UnityAsset.NET.csproj", "{B83CD1B5-07A2-4DB7-92C2-AD1D692945DE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{49107F77-825A-493A-A7E7-2196DC40DE24}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{B83CD1B5-07A2-4DB7-92C2-AD1D692945DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B83CD1B5-07A2-4DB7-92C2-AD1D692945DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B83CD1B5-07A2-4DB7-92C2-AD1D692945DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49107F77-825A-493A-A7E7-2196DC40DE24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49107F77-825A-493A-A7E7-2196DC40DE24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49107F77-825A-493A-A7E7-2196DC40DE24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49107F77-825A-493A-A7E7-2196DC40DE24}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

UnityAsset.NET/BundleFiles/BlocksAndCabsInfo.cs

@@ -32,156 +32,4 @@ public void Serialize(ref DataBuffer db) {
     public long SerializeSize => UncompressedDataHash.Length + 8 + 
                                  BlocksInfo.Sum(item => item.SerializeSize) + 
                                  DirectoryInfo.Sum(item => item.SerializeSize);
-
-    /*public void uncompresseFlags()
-    {
-        foreach (var block in BlocksInfo)
-        {
-            //block.flags &= ~StorageBlockFlags.CompressionTypeMask;
-            block.Flags &= 0x0;
-            block.CompressedSize = block.UncompressedSize;
-        }
-        Update();
-    }
-    
-    public void merge()
-    {
-        List<StorageBlockInfo> newBlocksInfo = new List<StorageBlockInfo>();
-
-        foreach (var block in BlocksInfo)
-        {
-            if (newBlocksInfo.Count > 0)
-            {
-                if (newBlocksInfo.Last().Flags != block.Flags)
-                {
-                    throw new Exception("Expected all blocks to have the same flags");
-                }
-                long newSize = (long)newBlocksInfo.Last().UncompressedSize + block.UncompressedSize;
-                if (newSize <= uint.MaxValue)
-                {
-                    newBlocksInfo.Last().UncompressedSize = (uint)newSize;
-                    newBlocksInfo.Last().CompressedSize += block.CompressedSize;
-                }
-                else
-                {
-                    newBlocksInfo.Add(block);
-                }
-            }
-            else
-            {
-                newBlocksInfo.Add(block);
-            }
-        }
-        
-        if (DirectoryInfo.Sum(x => x.Size) != newBlocksInfo.Sum(x => x.UncompressedSize))
-        {
-            throw new Exception("Expected all blocks size bigger than CAB size");
-        }
-
-        BlocksInfo = newBlocksInfo;
-        Update();
-    }
-    
-    public void ResizeBlocksInfos()
-    {
-        List<StorageBlockInfo> newBlocksInfo = new List<StorageBlockInfo>();
-        foreach (var block in BlocksInfo)
-        {
-            if (block.UncompressedSize > 0x00020000)
-            {
-                uint num = block.UncompressedSize / 0x00020000;
-                uint num2 = block.UncompressedSize % 0x00020000;
-                for (uint i = 0; i < num; i++)
-                {
-                    newBlocksInfo.Add(new StorageBlockInfo(0x00020000, 0x00020000, block.Flags));
-                }
-                if (num2 > 0)
-                {
-                    newBlocksInfo.Add(new StorageBlockInfo(num2, num2, block.Flags));
-                }
-            }
-            else
-            {
-                newBlocksInfo.Add(block);
-            }
-        }
-        BlocksInfo = newBlocksInfo;
-        Update();
-    }
-
-    public void Update(CompressionType compressionType = CompressionType.None)
-    {
-        // 写入数据到BlocksInfoBytes
-        var BlocksInfoStream = new MemoryStream();
-        using AssetWriter writer = new AssetWriter(BlocksInfoStream);
-        writer.Write(UncompressedDataHash);
-        writer.WriteInt32(BlocksInfo.Count);
-        foreach (var block in BlocksInfo)
-        {
-            //block.Write(writer);
-        }
-        writer.WriteInt32(DirectoryInfo.Count);
-        foreach (var node in DirectoryInfo)
-        {
-            //node.Write(writer);
-        }
-        
-        uncompressedSize = (uint)BlocksInfoStream.Length;
-        BlocksInfoBytes = Compression.CompressStream(BlocksInfoStream, compressionType);
-    }
-    
-    public void calculateSize(ref uint uncompressedBlocksInfoSize, ref uint compressedBlocksInfoSize)
-    {
-        uncompressedBlocksInfoSize = uncompressedSize;
-        compressedBlocksInfoSize = (uint)BlocksInfoBytes.Count;
-    }
-
-    public void FixSize(int diff)
-    {
-        
-        if (DirectoryInfo[^1].Size + diff <= UInt32.MaxValue && DirectoryInfo[^1].Size + diff > 0)
-        {
-            if (BlocksInfo[^1].UncompressedSize + diff <= UInt32.MaxValue && BlocksInfo[^1].UncompressedSize + diff > 0)
-            {
-                if (diff > 0)
-                {
-                    BlocksInfo[^1].UncompressedSize += (uint)diff;
-                    BlocksInfo[^1].CompressedSize += (uint)diff;
-                    DirectoryInfo[^1].Size += (uint)diff;
-                }
-                else
-                {
-                    BlocksInfo[^1].UncompressedSize -= (uint)-diff;
-                    BlocksInfo[^1].CompressedSize -= (uint)-diff;
-                    DirectoryInfo[^1].Size -= (uint)-diff;
-                }
-            }
-            else
-            {
-                if (BlocksInfo[^1].UncompressedSize + diff <= UInt32.MaxValue)
-                {
-                    BlocksInfo.Add(new StorageBlockInfo((uint)diff, (uint)diff ,BlocksInfo[^1].Flags));
-                    DirectoryInfo[^1].Size += (uint)diff;
-                }
-                else
-                {
-                    diff += (int)BlocksInfo[^1].UncompressedSize;
-                    diff = -diff;
-                    BlocksInfo.Remove(BlocksInfo[^1]);
-                    BlocksInfo[^1].UncompressedSize -= (uint)diff;
-                    BlocksInfo[^1].CompressedSize -= (uint)diff;
-                    DirectoryInfo[^1].Size -= (uint)diff;
-                }
-            }
-        }
-        else
-        {
-            throw new Exception("DirectoryInfo size overflow");
-        }
-    }
-    
-    public void Write(AssetWriter writer)
-    {
-        writer.Write(BlocksInfoBytes.ToArray());
-    }*/
 }

UnityAsset.NET/BundleFiles/BundleFile.cs

@@ -35,6 +35,7 @@ public class BundleFile
 
         if ((header.Flags & unityCNMask) != 0)
         {
+            if (key == null) key = Setting.DefaultUnityCNKey;
             if (key == null)
             {
                 throw new Exception($"UnityCN key is required for decryption. UnityCN Flag Mask: {unityCNMask}");
@@ -224,7 +225,6 @@ public void Serialize(ref DataBuffer db, CompressionType infoPacker = Compressio
             offset += cabSize;
         }
         cabDataBuffer.Seek(0);
-        cabDataBuffer.WriteToFile(@"F:\Rider\UnityAsset.NET\Test\cavn");
 
         var blocksInfo = new List<StorageBlockInfo>();
         var blocksSize = offset;

UnityAsset.NET/Compression/Compression.cs

@@ -118,18 +118,20 @@ public static long CompressToBytes(ReadOnlySpan<byte> uncompressedData, Span<byt
                 int compressedSizeHc = LZ4Codec.Encode(uncompressedData, compressedData, LZ4Level.L12_MAX);
                 return compressedSizeHc;
             case CompressionType.Lzma:
+            {
                 var encoder = new Encoder();
-                MemoryStream compressedStream = new MemoryStream();
-                MemoryStream subStream = new MemoryStream();
+                using MemoryStream compressedStream = new MemoryStream();
+                using MemoryStream subStream = new MemoryStream();
                 encoder.WriteCoderProperties(compressedStream);
-                MemoryStream uncompressedStream = new MemoryStream(uncompressedData.ToArray());
+                using MemoryStream uncompressedStream = new MemoryStream(uncompressedData.ToArray());
                 encoder.Code(uncompressedStream, subStream, -1, -1, null);
                 subStream.Position = 0;
                 subStream.CopyTo(compressedStream);
                 var size = compressedStream.Position;
                 compressedStream.Position = 0;
                 compressedStream.ReadExactly(compressedData.Slice(0, (int)size));
                 return size;
+            }
             default:
                 throw new ArgumentException($"Unsupported compression type {compressionType}");
         }

UnityAsset.NET/Setting.cs

@@ -3,4 +3,5 @@
 public static class Setting
 {
     public static UInt32 DefaultChunkSize = 0x00020000;
+    public static string? DefaultUnityCNKey = null;
 }