IReader fix

AXiX-official · AXiX-official · commit 3c268fcc7a94 · 2026-02-13T01:50:47.000+08:00
diff --git a/UnityAsset.NET.Variant.SourceGenerator/UnityAsset.NET.Variant.SourceGenerator.csproj b/UnityAsset.NET.Variant.SourceGenerator/UnityAsset.NET.Variant.SourceGenerator.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFrameworks>net9.0;net10.0</TargetFrameworks>
         <LangVersion>14</LangVersion>
         <IsRoslynAnalyzer>true</IsRoslynAnalyzer>
         <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
diff --git a/UnityAsset.NET/Asset.cs b/UnityAsset.NET/Asset.cs
@@ -36,7 +36,8 @@ public IUnityAsset Value
             {
                 if (_value == null)
                 {
-                    _value = UnityObjectFactory.Create(Info.Type, DataReader);
+                    using var reader = DataReader;
+                    _value = UnityObjectFactory.Create(Info.Type, reader);
                     if (IsNamedAsset)
                     {
                         _name = ((INamedObject)_value).m_Name;
diff --git a/UnityAsset.NET/AssetManager.cs b/UnityAsset.NET/AssetManager.cs
@@ -230,12 +230,12 @@ public async Task LoadDirectoryAsync(string directoryPath, bool ignoreDuplicated
 
     public void Clear()
     {
-        LoadedFiles = new();
+        LoadedAssets = new();
+        _loadedTypes = new();
         VirtualFileToFileMap = new();
+        LoadedFiles = new();
         Version = null;
         BuildTarget = null;
-        _loadedTypes = new();
-        LoadedAssets = new();
         
         _fileSystem.Clear();
         
diff --git a/UnityAsset.NET/Extensions/BundleFileExtensions.cs b/UnityAsset.NET/Extensions/BundleFileExtensions.cs
@@ -1,8 +1,5 @@
-﻿using System.Runtime.InteropServices;
-using UnityAsset.NET.Files;
-using UnityAsset.NET.Files.BundleFiles;
+﻿using UnityAsset.NET.Files;
 using UnityAsset.NET.Files.SerializedFiles;
-using UnityAsset.NET.IO;
 
 namespace UnityAsset.NET.Extensions;
 
diff --git a/UnityAsset.NET/FileSystem/DirectFileSystem/DirectFileSystem.cs b/UnityAsset.NET/FileSystem/DirectFileSystem/DirectFileSystem.cs
@@ -7,7 +7,7 @@ public class DirectFileSystem : IFileSystem
     public IFileSystem.ErrorHandler? OnError { get; set; }
     public List<IVirtualFile> LoadedFiles { get; private set; } = new();
 
-    public DirectFileSystem(IFileSystem.ErrorHandler? onError)
+    public DirectFileSystem(IFileSystem.ErrorHandler? onError = null)
     {
         OnError = onError;
     }
@@ -41,11 +41,6 @@ public Task<List<IVirtualFile>> LoadAsync(List<string> paths, IProgress<LoadProg
     
     public void Clear()
     {
-        LoadedFiles.Clear();
-    }
-    
-    public void Dispose()
-    {
-        Clear();
+        LoadedFiles = new();
     }
 }
diff --git a/UnityAsset.NET/FileSystem/IFileSystem.cs b/UnityAsset.NET/FileSystem/IFileSystem.cs
@@ -1,6 +1,6 @@
 ﻿namespace UnityAsset.NET.FileSystem;
 
-public interface IFileSystem : IDisposable
+public interface IFileSystem
 {
     public delegate void ErrorHandler(string filePath, Exception ex, string errorMessage);
     public ErrorHandler? OnError { get; set; }
diff --git a/UnityAsset.NET/FileSystem/IVirtualFile.cs b/UnityAsset.NET/FileSystem/IVirtualFile.cs
@@ -8,8 +8,7 @@ public static class FileTypeHelper
 {
     public static FileType GetFileType(IStreamProvider streamProvider)
     {
-        IReader reader = new CustomStreamReader(streamProvider);
-        reader.Seek(0);
+        using var reader = new CustomStreamReader(streamProvider);
         if (reader.Length > 7)
         {
             var signature = reader.ReadBytes(7);
@@ -23,8 +22,8 @@ public static FileType GetFileType(IStreamProvider streamProvider)
             {
                 return FileType.Unknown;
             }
-            
-            reader.Seek(0);
+
+            reader.Position = 0;
             
             var metadataSize = reader.ReadUInt32();
             UInt64 fileSize = reader.ReadUInt32();
@@ -38,7 +37,7 @@ public static FileType GetFileType(IStreamProvider streamProvider)
             {
                 if (reader.Length < 48)
                 {
-                    reader.Seek(0);
+                    ((IReader)reader).Seek(0);
                     return FileType.Unknown;
                 }
                 metadataSize = reader.ReadUInt32();
@@ -47,7 +46,6 @@ public static FileType GetFileType(IStreamProvider streamProvider)
                 unknown = reader.ReadInt64(); // unknown
             }
             
-            reader.Seek(0);
             if ((long)fileSize != reader.Length || (long)dataOffset > reader.Length)
             {
                 return FileType.Unknown;
diff --git a/UnityAsset.NET/Files/BundleFiles/BundleFile.cs b/UnityAsset.NET/Files/BundleFiles/BundleFile.cs
@@ -130,7 +130,7 @@ public BundleFile(string path, string? key = null, bool lazyLoad = true)
     public BundleFile(IStreamProvider streamProvider, string? key = null, bool lazyLoad = true)
     {
         var csProvider = new CustomStreamReaderProvider(streamProvider);
-        var reader = csProvider.CreateReader();
+        using var reader = csProvider.CreateReader();
         UnityCnKey = key;
         Header = Header.Parse(reader);
         if (Header.UnityRevision == "0.0.0")
@@ -159,9 +159,9 @@ public void ParseFilesWithTypeConversion()
         for (int i = 0; i < Files.Count; i++)
         {
             var subFile = Files[i];
-            if (subFile is { Parsed: false})
+            if (subFile is { CanBeSerializedFile: true, File: IReaderProvider provider})
             {
-                Files[i] = new FileWrapper(SerializedFile.Parse(this, subFile.FileProvider!), subFile.Info);
+                Files[i] = new FileWrapper(SerializedFile.Parse(this, provider), subFile.Info);
             }
         }
     }
diff --git a/UnityAsset.NET/Files/FileWrapper.cs b/UnityAsset.NET/Files/FileWrapper.cs
@@ -5,24 +5,14 @@ namespace UnityAsset.NET.Files;
 
 public class FileWrapper
 {
-    public readonly IReaderProvider? FileProvider;
-    private readonly IFile? _file;
-    public IFile File => _file ?? FileProvider!.CreateReader();
+    public IFile File { get; }
     public FileEntry Info { get; }
-    public bool Parsed { get; private set; }
     
-    public FileWrapper(IReaderProvider fileProvider, FileEntry info)
-    {
-        FileProvider = fileProvider;
-        Info = info;
-        Parsed = !CanBeSerializedFile;
-    }
     
     public FileWrapper(IFile file, FileEntry info)
     {
-        _file = file;
+        File = file;
         Info = info;
-        Parsed = !CanBeSerializedFile;
     }
     
     public bool CanBeSerializedFile => (Info.Flags & 0x04) != 0;
diff --git a/UnityAsset.NET/Files/SerializedFiles/SerializedFile.cs b/UnityAsset.NET/Files/SerializedFiles/SerializedFile.cs
@@ -36,7 +36,7 @@ public SerializedFile(SerializedFileHeader header, SerializedFileMetadata metada
     public SerializedFile(IVirtualFile file)
     {
         ReaderProvider = new CustomStreamReaderProvider(file);
-        var reader = ReaderProvider.CreateReader();
+        using var reader = ReaderProvider.CreateReader();
         Header = SerializedFileHeader.Parse(reader);
         reader.Endian = Header.Endianness;
         Metadata = SerializedFileMetadata.Parse(reader, Header.Version);
@@ -53,7 +53,7 @@ public SerializedFile(IVirtualFile file)
     
     public static SerializedFile Parse(BundleFile bf, IReaderProvider readerProvider)
     {
-        var reader = readerProvider.CreateReader();
+        using var reader = readerProvider.CreateReader();
         var header = SerializedFileHeader.Parse(reader);
         reader.Endian = header.Endianness;
         var metadata = SerializedFileMetadata.Parse(reader, header.Version);
diff --git a/UnityAsset.NET/IO/IReader.cs b/UnityAsset.NET/IO/IReader.cs
@@ -5,7 +5,7 @@
 
 namespace UnityAsset.NET.IO;
 
-public interface IReader : ISeek, IFile
+public interface IReader : ISeek, IDisposable
 {
     # region ISeek
 
diff --git a/UnityAsset.NET/IO/IReaderProvider.cs b/UnityAsset.NET/IO/IReaderProvider.cs
@@ -1,8 +1,9 @@
 using UnityAsset.NET.Enums;
+using UnityAsset.NET.Files;
 
 namespace UnityAsset.NET.IO;
 
-public interface IReaderProvider
+public interface IReaderProvider : IFile
 {
     public IReader CreateReader(Endianness endian = Endianness.BigEndian);
 }
diff --git a/UnityAsset.NET/IO/ISeek.cs b/UnityAsset.NET/IO/ISeek.cs
@@ -26,7 +26,6 @@ public void Seek(long offset, SeekOrigin origin = SeekOrigin.Begin)
                 break;
             }
         }
-        
     }
 
     public void Align(uint alignment)
diff --git a/UnityAsset.NET/IO/Reader/CustomStreamReader.cs b/UnityAsset.NET/IO/Reader/CustomStreamReader.cs
@@ -5,7 +5,7 @@
 
 namespace UnityAsset.NET.IO.Reader;
 
-public class CustomStreamReader : IReader, IDisposable
+public class CustomStreamReader : IReader
 {
     private readonly System.IO.Stream _stream; 
     
@@ -288,4 +288,16 @@ public void Dispose()
     {
         _stream.Dispose();
     }
+}
+
+public class CustomStreamReaderProvider : IReaderProvider
+{
+    private readonly IStreamProvider _streamProvider;
+
+    public CustomStreamReaderProvider(IStreamProvider streamProvider)
+    {
+        _streamProvider = streamProvider;
+    }
+    
+    public IReader CreateReader(Endianness endian = Endianness.BigEndian) => new CustomStreamReader(_streamProvider, endian);
 }
diff --git a/UnityAsset.NET/IO/Reader/CustomStreamReaderProvider.cs b/UnityAsset.NET/IO/Reader/CustomStreamReaderProvider.cs
diff --git a/UnityAsset.NET/IO/Reader/MemoryReader.cs b/UnityAsset.NET/IO/Reader/MemoryReader.cs
@@ -116,4 +116,9 @@ public string ReadNullTerminatedString()
     
     // TEMPORARY: make it writable 
     public Span<byte> AsWritableSpan => _data.Span;
+
+    public void Dispose()
+    {
+        
+    }
 }
diff --git a/UnityAsset.NET/IO/Reader/SlicedReader.cs b/UnityAsset.NET/IO/Reader/SlicedReader.cs
@@ -113,4 +113,25 @@ public SlicedReader(IReaderProvider readerProvider, ulong start, ulong length, E
         Length = (long)length;
         BaseReader.Position = (long)_offset;
     }
+
+    public void Dispose()
+    {
+        BaseReader.Dispose();
+    }
+}
+
+public class SlicedReaderProvider : IReaderProvider
+{
+    protected readonly IReaderProvider BaseReaderProvider;
+    protected readonly ulong Start;
+    protected readonly ulong Length;
+    
+    public SlicedReaderProvider(IReaderProvider readerProvider, ulong start, ulong length)
+    {
+        BaseReaderProvider = readerProvider;
+        Start = start;
+        Length = length;
+    }
+
+    public IReader CreateReader(Endianness endian) => new SlicedReader(BaseReaderProvider, Start, Length, endian);
 }
diff --git a/UnityAsset.NET/IO/Reader/SlicedReaderProvider.cs b/UnityAsset.NET/IO/Reader/SlicedReaderProvider.cs
diff --git a/UnityAsset.NET/IO/Stream/BlockStream.cs b/UnityAsset.NET/IO/Stream/BlockStream.cs
@@ -120,7 +120,7 @@ private void EnsureBlockLoaded(ulong position)
                 key: new(_baseReaderProvider, blockIndex),
                 factory: () =>
                 {
-                    var reader = _baseReaderProvider.CreateReader();
+                    using var reader = _baseReaderProvider.CreateReader();
                     reader.Position = (long)block.CompressedOffset;
                     var compressedData = reader.ReadBytes((int)block.CompressedSize);
                     if (_unityCnInfo != null && (block.CompressionType == CompressionType.Lz4 || block.CompressionType == CompressionType.Lz4HC))
diff --git a/UnityAsset.NET/TypeTree/AssemblyManager.cs b/UnityAsset.NET/TypeTree/AssemblyManager.cs
@@ -15,7 +15,7 @@ public static class AssemblyManager
     private static ConcurrentDictionary<Hash128, Type> TypeCache = new();
     private static readonly List<MetadataReference> References;
     
-    private static readonly object CompilationLock = new ();
+    private static readonly Lock CompilationLock = new ();
     private static readonly string AssemblyCachePath = Path.Combine(AppContext.BaseDirectory, "AssemblyCache");
     private static readonly string AssemblyNameSpace = "UnityAsset.NET.RuntimeTypes";
     private static readonly string CachedAssemblyPath = Path.Combine(AssemblyCachePath, $"{AssemblyNameSpace}.dll");
@@ -194,11 +194,6 @@ public static Type GetType(SerializedType type)
         {
             return cachedType;
         }
-        
-        /*if (RoslynBuilderHelper.PreDefinedTypeMap.TryGetValue(type.Nodes[0].Type, out var preDefinedType))
-        {
-            return preDefinedType;
-        }*/
 
         throw new Exception($"Unexpected type: {type}");
     }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ public IUnityAsset Value`
`36`	`36`	`{`
`37`	`37`	`if (_value == null)`
`38`	`38`	`{`
`39`		`- _value = UnityObjectFactory.Create(Info.Type, DataReader);`
	`39`	`+ using var reader = DataReader;`
	`40`	`+ _value = UnityObjectFactory.Create(Info.Type, reader);`
`40`	`41`	`if (IsNamedAsset)`
`41`	`42`	`{`
`42`	`43`	`_name = ((INamedObject)_value).m_Name;`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class DirectFileSystem : IFileSystem`
`7`	`7`	`public IFileSystem.ErrorHandler? OnError { get; set; }`
`8`	`8`	`public List<IVirtualFile> LoadedFiles { get; private set; } = new();`
`9`	`9`
`10`		`- public DirectFileSystem(IFileSystem.ErrorHandler? onError)`
	`10`	`+ public DirectFileSystem(IFileSystem.ErrorHandler? onError = null)`
`11`	`11`	`{`
`12`	`12`	`OnError = onError;`
`13`	`13`	`}`
`@@ -41,11 +41,6 @@ public Task<List<IVirtualFile>> LoadAsync(List<string> paths, IProgress<LoadProg`
`41`	`41`
`42`	`42`	`public void Clear()`
`43`	`43`	`{`
`44`		`- LoadedFiles.Clear();`
`45`		`- }`
`46`		`-`
`47`		`- public void Dispose()`
`48`		`- {`
`49`		`- Clear();`
	`44`	`+ LoadedFiles = new();`
`50`	`45`	`}`
`51`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace UnityAsset.NET.FileSystem;`
`2`	`2`
`3`		`-public interface IFileSystem : IDisposable`
	`3`	`+public interface IFileSystem`
`4`	`4`	`{`
`5`	`5`	`public delegate void ErrorHandler(string filePath, Exception ex, string errorMessage);`
`6`	`6`	`public ErrorHandler? OnError { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@ public static class FileTypeHelper`
`8`	`8`	`{`
`9`	`9`	`public static FileType GetFileType(IStreamProvider streamProvider)`
`10`	`10`	`{`
`11`		`- IReader reader = new CustomStreamReader(streamProvider);`
`12`		`- reader.Seek(0);`
	`11`	`+ using var reader = new CustomStreamReader(streamProvider);`
`13`	`12`	`if (reader.Length > 7)`
`14`	`13`	`{`
`15`	`14`	`var signature = reader.ReadBytes(7);`
`@@ -23,8 +22,8 @@ public static FileType GetFileType(IStreamProvider streamProvider)`
`23`	`22`	`{`
`24`	`23`	`return FileType.Unknown;`
`25`	`24`	`}`
`26`		`-`
`27`		`- reader.Seek(0);`
	`25`	`+`
	`26`	`+ reader.Position = 0;`
`28`	`27`
`29`	`28`	`var metadataSize = reader.ReadUInt32();`
`30`	`29`	`UInt64 fileSize = reader.ReadUInt32();`
`@@ -38,7 +37,7 @@ public static FileType GetFileType(IStreamProvider streamProvider)`
`38`	`37`	`{`
`39`	`38`	`if (reader.Length < 48)`
`40`	`39`	`{`
`41`		`- reader.Seek(0);`
	`40`	`+ ((IReader)reader).Seek(0);`
`42`	`41`	`return FileType.Unknown;`
`43`	`42`	`}`
`44`	`43`	`metadataSize = reader.ReadUInt32();`
`@@ -47,7 +46,6 @@ public static FileType GetFileType(IStreamProvider streamProvider)`
`47`	`46`	`unknown = reader.ReadInt64(); // unknown`
`48`	`47`	`}`
`49`	`48`
`50`		`- reader.Seek(0);`
`51`	`49`	`if ((long)fileSize != reader.Length \|\| (long)dataOffset > reader.Length)`
`52`	`50`	`{`
`53`	`51`	`return FileType.Unknown;`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public BundleFile(string path, string? key = null, bool lazyLoad = true)`
`130`	`130`	`public BundleFile(IStreamProvider streamProvider, string? key = null, bool lazyLoad = true)`
`131`	`131`	`{`
`132`	`132`	`var csProvider = new CustomStreamReaderProvider(streamProvider);`
`133`		`- var reader = csProvider.CreateReader();`
	`133`	`+ using var reader = csProvider.CreateReader();`
`134`	`134`	`UnityCnKey = key;`
`135`	`135`	`Header = Header.Parse(reader);`
`136`	`136`	`if (Header.UnityRevision == "0.0.0")`
`@@ -159,9 +159,9 @@ public void ParseFilesWithTypeConversion()`
`159`	`159`	`for (int i = 0; i < Files.Count; i++)`
`160`	`160`	`{`
`161`	`161`	`var subFile = Files[i];`
`162`		`- if (subFile is { Parsed: false})`
	`162`	`+ if (subFile is { CanBeSerializedFile: true, File: IReaderProvider provider})`
`163`	`163`	`{`
`164`		`- Files[i] = new FileWrapper(SerializedFile.Parse(this, subFile.FileProvider!), subFile.Info);`
	`164`	`+ Files[i] = new FileWrapper(SerializedFile.Parse(this, provider), subFile.Info);`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`	`}`