更新demo

更新demo

UnityProject/Packages/YooAsset/Runtime/CacheSystem/CacheFileInfo.cs

@@ -1,36 +1,19 @@
-using System;
-using System.IO;
-
+
 namespace YooAsset
 {
-	internal class CacheFileInfo
-	{
-		private static readonly BufferWriter SharedBuffer = new BufferWriter(1024);
+    public class CacheFileInfo
+    {
+        public string RemoteFileName { private set; get; }
+        public string FilePath { private set; get; }
+        public string FileCRC { private set; get; }
+        public long FileSize { private set; get; }
 
-		/// <summary>
-		/// 写入资源包信息
-		/// </summary>
-		public static void WriteInfoToFile(string filePath, string dataFileCRC, long dataFileSize)
-		{
-			using (FileStream fs = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.Read))
-			{
-				SharedBuffer.Clear();
-				SharedBuffer.WriteUTF8(dataFileCRC);
-				SharedBuffer.WriteInt64(dataFileSize);
-				SharedBuffer.WriteToStream(fs);
-				fs.Flush();
-			}
-		}
-
-		/// <summary>
-		/// 读取资源包信息
-		/// </summary>
-		public static void ReadInfoFromFile(string filePath, out string dataFileCRC, out long dataFileSize)
-		{
-			byte[] binaryData = FileUtility.ReadAllBytes(filePath);
-			BufferReader buffer = new BufferReader(binaryData);
-			dataFileCRC = buffer.ReadUTF8();
-			dataFileSize = buffer.ReadInt64();
-		}
-	}
+        public CacheFileInfo(string remoteFileName, string filePath, string fileCRC, long fileSize)
+        {
+            RemoteFileName = remoteFileName;
+            FilePath = filePath;
+            FileCRC = fileCRC;
+            FileSize = fileSize;
+        }
+    }
 }

UnityProject/Packages/YooAsset/Runtime/CacheSystem/CacheHelper.cs

@@ -0,0 +1,132 @@
+using System;
+using System.IO;
+
+namespace YooAsset
+{
+    internal static class CacheHelper
+    {
+        /// <summary>
+        /// 禁用Unity缓存系统在WebGL平台
+        /// </summary>
+        public static bool DisableUnityCacheOnWebGL = false;
+
+        #region 资源信息文件相关
+        private static readonly BufferWriter SharedBuffer = new BufferWriter(1024);
+
+        /// <summary>
+        /// 写入资源包信息
+        /// </summary>
+        public static void WriteInfoToFile(string filePath, string dataFileCRC, long dataFileSize)
+        {
+            using (FileStream fs = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.Read))
+            {
+                SharedBuffer.Clear();
+                SharedBuffer.WriteUTF8(dataFileCRC);
+                SharedBuffer.WriteInt64(dataFileSize);
+                SharedBuffer.WriteToStream(fs);
+                fs.Flush();
+            }
+        }
+
+        /// <summary>
+        /// 读取资源包信息
+        /// </summary>
+        public static void ReadInfoFromFile(string filePath, out string dataFileCRC, out long dataFileSize)
+        {
+            byte[] binaryData = FileUtility.ReadAllBytes(filePath);
+            BufferReader buffer = new BufferReader(binaryData);
+            dataFileCRC = buffer.ReadUTF8();
+            dataFileSize = buffer.ReadInt64();
+        }
+        #endregion
+
+        #region 资源文件验证相关
+        /// <summary>
+        /// 验证缓存文件（子线程内操作）
+        /// </summary>
+        public static EVerifyResult VerifyingCacheFile(VerifyCacheFileElement element, EVerifyLevel verifyLevel)
+        {
+            try
+            {
+                if (verifyLevel == EVerifyLevel.Low)
+                {
+                    if (File.Exists(element.InfoFilePath) == false)
+                        return EVerifyResult.InfoFileNotExisted;
+                    if (File.Exists(element.DataFilePath) == false)
+                        return EVerifyResult.DataFileNotExisted;
+                    return EVerifyResult.Succeed;
+                }
+                else
+                {
+                    if (File.Exists(element.InfoFilePath) == false)
+                        return EVerifyResult.InfoFileNotExisted;
+
+                    // 解析信息文件获取验证数据
+                    CacheHelper.ReadInfoFromFile(element.InfoFilePath, out element.DataFileCRC, out element.DataFileSize);
+                }
+            }
+            catch (Exception)
+            {
+                return EVerifyResult.Exception;
+            }
+
+            return VerifyingInternal(element.DataFilePath, element.DataFileSize, element.DataFileCRC, verifyLevel);
+        }
+
+        /// <summary>
+        /// 验证下载文件（子线程内操作）
+        /// </summary>
+        public static EVerifyResult VerifyingTempFile(VerifyTempFileElement element)
+        {
+            return VerifyingInternal(element.TempDataFilePath, element.FileSize, element.FileCRC, EVerifyLevel.High);
+        }
+
+        /// <summary>
+        /// 验证记录文件（主线程内操作）
+        /// </summary>
+        public static EVerifyResult VerifyingRecordFile(CacheManager cache, string cacheGUID)
+        {
+            var wrapper = cache.TryGetWrapper(cacheGUID);
+            if (wrapper == null)
+                return EVerifyResult.CacheNotFound;
+
+            EVerifyResult result = VerifyingInternal(wrapper.DataFilePath, wrapper.DataFileSize, wrapper.DataFileCRC, EVerifyLevel.High);
+            return result;
+        }
+
+        private static EVerifyResult VerifyingInternal(string filePath, long fileSize, string fileCRC, EVerifyLevel verifyLevel)
+        {
+            try
+            {
+                if (File.Exists(filePath) == false)
+                    return EVerifyResult.DataFileNotExisted;
+
+                // 先验证文件大小
+                long size = FileUtility.GetFileSize(filePath);
+                if (size < fileSize)
+                    return EVerifyResult.FileNotComplete;
+                else if (size > fileSize)
+                    return EVerifyResult.FileOverflow;
+
+                // 再验证文件CRC
+                if (verifyLevel == EVerifyLevel.High)
+                {
+                    string crc = HashUtility.FileCRC32(filePath);
+                    if (crc == fileCRC)
+                        return EVerifyResult.Succeed;
+                    else
+                        return EVerifyResult.FileCrcError;
+                }
+                else
+                {
+                    return EVerifyResult.Succeed;
+                }
+            }
+            catch (Exception)
+            {
+                return EVerifyResult.Exception;
+            }
+        }
+        #endregion
+    }
+}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/CacheManager.cs

@@ -0,0 +1,136 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+    internal class CacheManager
+    {
+        internal class RecordWrapper
+        {
+            public string InfoFilePath { private set; get; }
+            public string DataFilePath { private set; get; }
+            public string DataFileCRC { private set; get; }
+            public long DataFileSize { private set; get; }
+
+            public RecordWrapper(string infoFilePath, string dataFilePath, string dataFileCRC, long dataFileSize)
+            {
+                InfoFilePath = infoFilePath;
+                DataFilePath = dataFilePath;
+                DataFileCRC = dataFileCRC;
+                DataFileSize = dataFileSize;
+            }
+        }
+
+        private readonly Dictionary<string, RecordWrapper> _wrappers = new Dictionary<string, RecordWrapper>();
+
+        /// <summary>
+        /// 所属包裹
+        /// </summary>
+        public readonly string PackageName;
+
+        /// <summary>
+        /// 验证级别
+        /// </summary>
+        public readonly EVerifyLevel BootVerifyLevel;
+
+
+        public CacheManager(string packageName, EVerifyLevel bootVerifyLevel)
+        {
+            PackageName = packageName;
+            BootVerifyLevel = bootVerifyLevel;
+        }
+
+        /// <summary>
+        /// 清空所有数据
+        /// </summary>
+        public void ClearAll()
+        {
+            _wrappers.Clear();
+        }
+
+        /// <summary>
+        /// 查询缓存记录
+        /// </summary>
+        public bool IsCached(string cacheGUID)
+        {
+            return _wrappers.ContainsKey(cacheGUID);
+        }
+
+        /// <summary>
+        /// 记录验证结果
+        /// </summary>
+        public void Record(string cacheGUID, RecordWrapper wrapper)
+        {
+            if (_wrappers.ContainsKey(cacheGUID) == false)
+            {
+                _wrappers.Add(cacheGUID, wrapper);
+            }
+            else
+            {
+                throw new Exception("Should never get here !");
+            }
+        }
+
+        /// <summary>
+        /// 丢弃验证结果并删除缓存文件
+        /// </summary>
+        public void Discard(string cacheGUID)
+        {
+            var wrapper = TryGetWrapper(cacheGUID);
+            if (wrapper != null)
+            {
+                try
+                {
+                    string dataFilePath = wrapper.DataFilePath;
+                    FileInfo fileInfo = new FileInfo(dataFilePath);
+                    if (fileInfo.Exists)
+                        fileInfo.Directory.Delete(true);
+                }
+                catch (Exception e)
+                {
+                    YooLogger.Error($"Failed to delete cache file ! {e.Message}");
+                }
+            }
+
+            if (_wrappers.ContainsKey(cacheGUID))
+            {
+                _wrappers.Remove(cacheGUID);
+            }
+        }
+
+        /// <summary>
+        /// 获取记录对象
+        /// </summary>
+        public RecordWrapper TryGetWrapper(string cacheGUID)
+        {
+            if (_wrappers.TryGetValue(cacheGUID, out RecordWrapper value))
+                return value;
+            else
+                return null;
+        }
+
+        /// <summary>
+        /// 获取缓存文件总数
+        /// </summary>
+        public int GetAllCachedFilesCount()
+        {
+            return _wrappers.Count;
+        }
+
+        /// <summary>
+        /// 获取缓存GUID集合
+        /// </summary>
+        public List<string> GetAllCachedGUIDs()
+        {
+            List<string> keys = new List<string>(_wrappers.Keys.Count);
+            var keyCollection = _wrappers.Keys;
+            foreach (var key in keyCollection)
+            {
+                keys.Add(key);
+            }
+            return keys;
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/CacheSystem.cs

@@ -1,217 +0,0 @@
-using System;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-
-namespace YooAsset
-{
-	internal static class CacheSystem
-	{
-		private readonly static Dictionary<string, PackageCache> _cachedDic = new Dictionary<string, PackageCache>(1000);
-
-		/// <summary>
-		/// 禁用Unity缓存系统在WebGL平台
-		/// </summary>
-		public static bool DisableUnityCacheOnWebGL = false;
-
-		/// <summary>
-		/// 初始化时的验证级别
-		/// </summary>
-		public static EVerifyLevel InitVerifyLevel { set; get; } = EVerifyLevel.Middle;
-
-		/// <summary>
-		/// 清空所有数据
-		/// </summary>
-		public static void ClearAll()
-		{
-			_cachedDic.Clear();
-		}
-
-		/// <summary>
-		/// 清空指定包裹的所有缓存数据
-		/// </summary>
-		public static void ClearPackage(string packageName)
-		{
-			var cache = GetOrCreateCache(packageName);
-			cache.ClearAll();
-		}
-
-		/// <summary>
-		/// 获取缓存文件总数
-		/// </summary>
-		public static int GetCachedFilesCount(string packageName)
-		{
-			var cache = GetOrCreateCache(packageName);
-			return cache.GetCachedFilesCount();
-		}
-
-		/// <summary>
-		/// 查询是否为验证文件
-		/// </summary>
-		public static bool IsCached(string packageName, string cacheGUID)
-		{
-			var cache = GetOrCreateCache(packageName);
-			return cache.IsCached(cacheGUID);
-		}
-
-		/// <summary>
-		/// 录入验证的文件
-		/// </summary>
-		public static void RecordFile(string packageName, string cacheGUID, PackageCache.RecordWrapper wrapper)
-		{
-			//YooLogger.Log($"Record file : {packageName} = {cacheGUID}");
-			var cache = GetOrCreateCache(packageName);
-			cache.Record(cacheGUID, wrapper);
-		}
-
-		/// <summary>
-		/// 丢弃验证的文件（同时删除文件）
-		/// </summary>
-		public static void DiscardFile(string packageName, string cacheGUID)
-		{
-			var cache = GetOrCreateCache(packageName);
-			var wrapper = cache.TryGetWrapper(cacheGUID);
-			if (wrapper == null)
-				return;
-
-			cache.Discard(cacheGUID);
-
-			try
-			{
-				string dataFilePath = wrapper.DataFilePath;
-				FileInfo fileInfo = new FileInfo(dataFilePath);
-				if (fileInfo.Exists)
-					fileInfo.Directory.Delete(true);
-			}
-			catch (Exception e)
-			{
-				YooLogger.Error($"Failed to delete cache file ! {e.Message}");
-			}
-		}
-
-		/// <summary>
-		/// 验证缓存文件（子线程内操作）
-		/// </summary>
-		public static EVerifyResult VerifyingCacheFile(VerifyCacheFileElement element)
-		{
-			try
-			{
-				if (InitVerifyLevel == EVerifyLevel.Low)
-				{
-					if (File.Exists(element.InfoFilePath) == false)
-						return EVerifyResult.InfoFileNotExisted;
-					if (File.Exists(element.DataFilePath) == false)
-						return EVerifyResult.DataFileNotExisted;
-					return EVerifyResult.Succeed;
-				}
-				else
-				{
-					if (File.Exists(element.InfoFilePath) == false)
-						return EVerifyResult.InfoFileNotExisted;
-
-					// 解析信息文件获取验证数据
-					CacheFileInfo.ReadInfoFromFile(element.InfoFilePath, out element.DataFileCRC, out element.DataFileSize);
-				}
-			}
-			catch (Exception)
-			{
-				return EVerifyResult.Exception;
-			}
-
-			return VerifyingInternal(element.DataFilePath, element.DataFileSize, element.DataFileCRC, InitVerifyLevel);
-		}
-
-		/// <summary>
-		/// 验证下载文件（子线程内操作）
-		/// </summary>
-		public static EVerifyResult VerifyingTempFile(VerifyTempFileElement element)
-		{
-			return VerifyingInternal(element.TempDataFilePath, element.FileSize, element.FileCRC, EVerifyLevel.High);
-		}
-
-		/// <summary>
-		/// 验证记录文件（主线程内操作）
-		/// </summary>
-		public static EVerifyResult VerifyingRecordFile(string packageName, string cacheGUID)
-		{
-			var cache = GetOrCreateCache(packageName);
-			var wrapper = cache.TryGetWrapper(cacheGUID);
-			if (wrapper == null)
-				return EVerifyResult.CacheNotFound;
-
-			EVerifyResult result = VerifyingInternal(wrapper.DataFilePath, wrapper.DataFileSize, wrapper.DataFileCRC, EVerifyLevel.High);
-			return result;
-		}
-
-		/// <summary>
-		/// 获取未被使用的缓存文件
-		/// </summary>
-		public static List<string> GetUnusedCacheGUIDs(ResourcePackage package)
-		{
-			var cache = GetOrCreateCache(package.PackageName);
-			var keys = cache.GetAllKeys();
-			List<string> result = new List<string>(keys.Count);
-			foreach (var cacheGUID in keys)
-			{
-				if (package.IsIncludeBundleFile(cacheGUID) == false)
-				{
-					result.Add(cacheGUID);
-				}
-			}
-			return result;
-		}
-
-		/// <summary>
-		/// 获取所有的缓存文件
-		/// </summary>
-		public static List<string> GetAllCacheGUIDs(ResourcePackage package)
-		{
-			var cache = GetOrCreateCache(package.PackageName);
-			return cache.GetAllKeys();
-		}
-
-		private static EVerifyResult VerifyingInternal(string filePath, long fileSize, string fileCRC, EVerifyLevel verifyLevel)
-		{
-			try
-			{
-				if (File.Exists(filePath) == false)
-					return EVerifyResult.DataFileNotExisted;
-
-				// 先验证文件大小
-				long size = FileUtility.GetFileSize(filePath);
-				if (size < fileSize)
-					return EVerifyResult.FileNotComplete;
-				else if (size > fileSize)
-					return EVerifyResult.FileOverflow;
-
-				// 再验证文件CRC
-				if (verifyLevel == EVerifyLevel.High)
-				{
-					string crc = HashUtility.FileCRC32(filePath);
-					if (crc == fileCRC)
-						return EVerifyResult.Succeed;
-					else
-						return EVerifyResult.FileCrcError;
-				}
-				else
-				{
-					return EVerifyResult.Succeed;
-				}
-			}
-			catch (Exception)
-			{
-				return EVerifyResult.Exception;
-			}
-		}
-		private static PackageCache GetOrCreateCache(string packageName)
-		{
-			if (_cachedDic.TryGetValue(packageName, out PackageCache cache) == false)
-			{
-				cache = new PackageCache(packageName);
-				_cachedDic.Add(packageName, cache);
-			}
-			return cache;
-		}
-	}
-}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/EVerifyLevel.cs

@@ -1,24 +1,24 @@
 
 namespace YooAsset
 {
-	/// <summary>
-	/// 下载文件校验等级
-	/// </summary>
-	public enum EVerifyLevel
-	{
-		/// <summary>
-		/// 验证文件存在
-		/// </summary>
-		Low,
+    /// <summary>
+    /// 下载文件校验等级
+    /// </summary>
+    public enum EVerifyLevel
+    {
+        /// <summary>
+        /// 验证文件存在
+        /// </summary>
+        Low,
 
-		/// <summary>
-		/// 验证文件大小
-		/// </summary>
-		Middle,
+        /// <summary>
+        /// 验证文件大小
+        /// </summary>
+        Middle,
 
-		/// <summary>
-		/// 验证文件大小和CRC
-		/// </summary>
-		High,
-	}
+        /// <summary>
+        /// 验证文件大小和CRC
+        /// </summary>
+        High,
+    }
 }

UnityProject/Packages/YooAsset/Runtime/CacheSystem/EVerifyResult.cs

@@ -1,54 +1,54 @@
 
 namespace YooAsset
 {
-	/// <summary>
-	/// 下载文件校验结果
-	/// </summary>
-	internal enum EVerifyResult
-	{
-		/// <summary>
-		/// 验证异常
-		/// </summary>
-		Exception = -7,
+    /// <summary>
+    /// 下载文件校验结果
+    /// </summary>
+    internal enum EVerifyResult
+    {
+        /// <summary>
+        /// 验证异常
+        /// </summary>
+        Exception = -7,
 
-		/// <summary>
-		/// 未找到缓存信息
-		/// </summary>
-		CacheNotFound = -6,
+        /// <summary>
+        /// 未找到缓存信息
+        /// </summary>
+        CacheNotFound = -6,
 
-		/// <summary>
-		/// 信息文件不存在
-		/// </summary>
-		InfoFileNotExisted = -5,
+        /// <summary>
+        /// 信息文件不存在
+        /// </summary>
+        InfoFileNotExisted = -5,
 
-		/// <summary>
-		/// 数据文件不存在
-		/// </summary>
-		DataFileNotExisted = -4,
+        /// <summary>
+        /// 数据文件不存在
+        /// </summary>
+        DataFileNotExisted = -4,
 
-		/// <summary>
-		/// 文件内容不足（小于正常大小）
-		/// </summary>
-		FileNotComplete = -3,
-		
-		/// <summary>
-		/// 文件内容溢出（超过正常大小）
-		/// </summary>
-		FileOverflow = -2,
-		
-		/// <summary>
-		/// 文件内容不匹配
-		/// </summary>
-		FileCrcError = -1,
+        /// <summary>
+        /// 文件内容不足（小于正常大小）
+        /// </summary>
+        FileNotComplete = -3,
 
-		/// <summary>
-		/// 默认状态（校验未完成）
-		/// </summary>
-		None = 0,
+        /// <summary>
+        /// 文件内容溢出（超过正常大小）
+        /// </summary>
+        FileOverflow = -2,
 
-		/// <summary>
-		/// 验证成功
-		/// </summary>
-		Succeed = 1,
-	}
+        /// <summary>
+        /// 文件内容不匹配
+        /// </summary>
+        FileCrcError = -1,
+
+        /// <summary>
+        /// 默认状态（校验未完成）
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// 验证成功
+        /// </summary>
+        Succeed = 1,
+    }
 }

UnityProject/Packages/YooAsset/Runtime/CacheSystem/Operation/ClearAllCacheFilesOperation.cs

@@ -0,0 +1,71 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+
+namespace YooAsset
+{
+    /// <summary>
+    /// 清理本地包裹所有的缓存文件
+    /// </summary>
+    public sealed class ClearAllCacheFilesOperation : AsyncOperationBase
+    {
+        private enum ESteps
+        {
+            None,
+            GetAllCacheFiles,
+            ClearAllCacheFiles,
+            Done,
+        }
+
+        private readonly CacheManager _cache;
+        private List<string> _allCacheGUIDs;
+        private int _fileTotalCount = 0;
+        private ESteps _steps = ESteps.None;
+
+        internal ClearAllCacheFilesOperation(CacheManager cache)
+        {
+            _cache = cache;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.GetAllCacheFiles;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.GetAllCacheFiles)
+            {
+                _allCacheGUIDs = _cache.GetAllCachedGUIDs();
+                _fileTotalCount = _allCacheGUIDs.Count;
+                YooLogger.Log($"Found all cache file count : {_fileTotalCount}");
+                _steps = ESteps.ClearAllCacheFiles;
+            }
+
+            if (_steps == ESteps.ClearAllCacheFiles)
+            {
+                for (int i = _allCacheGUIDs.Count - 1; i >= 0; i--)
+                {
+                    string cacheGUID = _allCacheGUIDs[i];
+                    _cache.Discard(cacheGUID);
+                    _allCacheGUIDs.RemoveAt(i);
+
+                    if (OperationSystem.IsBusy)
+                        break;
+                }
+
+                if (_fileTotalCount == 0)
+                    Progress = 1.0f;
+                else
+                    Progress = 1.0f - (_allCacheGUIDs.Count / _fileTotalCount);
+
+                if (_allCacheGUIDs.Count == 0)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/Operation/ClearUnusedCacheFilesOperation.cs

@@ -0,0 +1,87 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+
+namespace YooAsset
+{
+    /// <summary>
+    /// 清理本地包裹未使用的缓存文件
+    /// </summary>
+    public sealed class ClearUnusedCacheFilesOperation : AsyncOperationBase
+    {
+        private enum ESteps
+        {
+            None,
+            GetUnusedCacheFiles,
+            ClearUnusedCacheFiles,
+            Done,
+        }
+
+        private readonly ResourcePackage _package;
+        private readonly CacheManager _cache;
+        private List<string> _unusedCacheGUIDs;
+        private int _unusedFileTotalCount = 0;
+        private ESteps _steps = ESteps.None;
+
+        internal ClearUnusedCacheFilesOperation(ResourcePackage package, CacheManager cache)
+        {
+            _package = package;
+            _cache = cache;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.GetUnusedCacheFiles;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.GetUnusedCacheFiles)
+            {
+                _unusedCacheGUIDs = GetUnusedCacheGUIDs();
+                _unusedFileTotalCount = _unusedCacheGUIDs.Count;
+                YooLogger.Log($"Found unused cache file count : {_unusedFileTotalCount}");
+                _steps = ESteps.ClearUnusedCacheFiles;
+            }
+
+            if (_steps == ESteps.ClearUnusedCacheFiles)
+            {
+                for (int i = _unusedCacheGUIDs.Count - 1; i >= 0; i--)
+                {
+                    string cacheGUID = _unusedCacheGUIDs[i];
+                    _cache.Discard(cacheGUID);
+                    _unusedCacheGUIDs.RemoveAt(i);
+
+                    if (OperationSystem.IsBusy)
+                        break;
+                }
+
+                if (_unusedFileTotalCount == 0)
+                    Progress = 1.0f;
+                else
+                    Progress = 1.0f - (_unusedCacheGUIDs.Count / _unusedFileTotalCount);
+
+                if (_unusedCacheGUIDs.Count == 0)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+            }
+        }
+
+        private List<string> GetUnusedCacheGUIDs()
+        {
+            var allCacheGUIDs = _cache.GetAllCachedGUIDs();
+            List<string> result = new List<string>(allCacheGUIDs.Count);
+            foreach (var cacheGUID in allCacheGUIDs)
+            {
+                if (_package.IsIncludeBundleFile(cacheGUID) == false)
+                {
+                    result.Add(cacheGUID);
+                }
+            }
+            return result;
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/Operation/GetAllCacheFileInfosOperation.cs

@@ -0,0 +1,99 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+    public class GetAllCacheFileInfosOperation : AsyncOperationBase
+    {
+        private enum ESteps
+        {
+            None,
+            TryLoadCacheManifest,
+            GetCacheFileInfos,
+            Done,
+        }
+
+        private readonly PersistentManager _persistent;
+        private readonly CacheManager _cache;
+        private readonly string _packageVersion;
+        private LoadCacheManifestOperation _tryLoadCacheManifestOp;
+        private PackageManifest _manifest;
+        private ESteps _steps = ESteps.None;
+
+        private List<CacheFileInfo> _cacheFileInfos;
+
+        /// <summary>
+        /// 搜索结果
+        /// </summary>
+        public List<CacheFileInfo> Result
+        {
+            get { return _cacheFileInfos; }
+        }
+
+
+        internal GetAllCacheFileInfosOperation(PersistentManager persistent, CacheManager cache, string packageVersion)
+        {
+            _persistent = persistent;
+            _cache = cache;
+            _packageVersion = packageVersion;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.TryLoadCacheManifest;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.TryLoadCacheManifest)
+            {
+                if (_tryLoadCacheManifestOp == null)
+                {
+                    _tryLoadCacheManifestOp = new LoadCacheManifestOperation(_persistent, _packageVersion);
+                    OperationSystem.StartOperation(_cache.PackageName, _tryLoadCacheManifestOp);
+                }
+
+                if (_tryLoadCacheManifestOp.IsDone == false)
+                    return;
+
+                if (_tryLoadCacheManifestOp.Status == EOperationStatus.Succeed)
+                {
+                    _manifest = _tryLoadCacheManifestOp.Manifest;
+                    _steps = ESteps.GetCacheFileInfos;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _tryLoadCacheManifestOp.Error;
+                }
+            }
+
+            if (_steps == ESteps.GetCacheFileInfos)
+            {
+                var allCachedGUIDs = _cache.GetAllCachedGUIDs();
+                _cacheFileInfos = new List<CacheFileInfo>(allCachedGUIDs.Count);
+                for (int i = 0; i < allCachedGUIDs.Count; i++)
+                {
+                    var cachedGUID = allCachedGUIDs[i];
+                    var wrapper = _cache.TryGetWrapper(cachedGUID);
+                    if (wrapper != null)
+                    {
+                        if (_manifest.TryGetPackageBundleByCacheGUID(cachedGUID, out var packageBundle))
+                        {
+                            var cacheFileInfo = new CacheFileInfo(packageBundle.FileName, wrapper.DataFilePath, wrapper.DataFileCRC, wrapper.DataFileSize);
+                            _cacheFileInfos.Add(cacheFileInfo);
+                        }
+                    }
+                }
+
+                // 注意：总是返回成功
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Succeed;
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/Operation/GetAllCacheFileInfosOperation.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d37e37f5d78ddf8468adcf2dff1edfbb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Packages/YooAsset/Runtime/CacheSystem/Operation/Internal/FindCacheFilesOperation.cs

@@ -0,0 +1,131 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+    internal sealed class FindCacheFilesOperation : AsyncOperationBase
+    {
+        private enum ESteps
+        {
+            None,
+            Prepare,
+            UpdateCacheFiles,
+            Done,
+        }
+
+        private readonly PersistentManager _persistent;
+        private readonly CacheManager _cache;
+        private IEnumerator<DirectoryInfo> _filesEnumerator = null;
+        private float _verifyStartTime;
+        private ESteps _steps = ESteps.None;
+
+        /// <summary>
+        /// 需要验证的元素
+        /// </summary>
+        public readonly List<VerifyCacheFileElement> VerifyElements = new List<VerifyCacheFileElement>(5000);
+
+        public FindCacheFilesOperation(PersistentManager persistent, CacheManager cache)
+        {
+            _persistent = persistent;
+            _cache = cache;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.Prepare;
+            _verifyStartTime = UnityEngine.Time.realtimeSinceStartup;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.Prepare)
+            {
+                string rootPath = _persistent.SandboxCacheFilesRoot;
+                DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
+                if (rootDirectory.Exists)
+                {
+                    var directorieInfos = rootDirectory.EnumerateDirectories();
+                    _filesEnumerator = directorieInfos.GetEnumerator();
+                }
+                _steps = ESteps.UpdateCacheFiles;
+            }
+
+            if (_steps == ESteps.UpdateCacheFiles)
+            {
+                if (UpdateCacheFiles())
+                    return;
+
+                // 注意：总是返回成功
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Succeed;
+                float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyStartTime;
+                YooLogger.Log($"Find cache files elapsed time {costTime:f1} seconds");
+            }
+        }
+
+        private bool UpdateCacheFiles()
+        {
+            if (_filesEnumerator == null)
+                return false;
+
+            bool isFindItem;
+            while (true)
+            {
+                isFindItem = _filesEnumerator.MoveNext();
+                if (isFindItem == false)
+                    break;
+
+                var rootFoder = _filesEnumerator.Current;
+                var childDirectories = rootFoder.GetDirectories();
+                foreach (var chidDirectory in childDirectories)
+                {
+                    string cacheGUID = chidDirectory.Name;
+                    if (_cache.IsCached(cacheGUID))
+                        continue;
+
+                    // 创建验证元素类
+                    string fileRootPath = chidDirectory.FullName;
+                    string dataFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleDataFileName}";
+                    string infoFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleInfoFileName}";
+                    string dataFileExtension = FindDataFileExtension(chidDirectory);
+
+                    // 跳过断点续传的临时文件
+                    if (dataFileExtension == ".temp")
+                        continue;
+
+                    // 注意：根据配置需求数据文件会带文件格式
+                    if (_persistent.AppendFileExtension)
+                    {
+                        if (string.IsNullOrEmpty(dataFileExtension) == false)
+                            dataFilePath += dataFileExtension;
+                    }
+
+                    VerifyCacheFileElement element = new VerifyCacheFileElement(_cache.PackageName, cacheGUID, fileRootPath, dataFilePath, infoFilePath);
+                    VerifyElements.Add(element);
+                }
+
+                if (OperationSystem.IsBusy)
+                    break;
+            }
+
+            return isFindItem;
+        }
+        private string FindDataFileExtension(DirectoryInfo directoryInfo)
+        {
+            string dataFileExtension = string.Empty;
+            var fileInfos = directoryInfo.GetFiles();
+            foreach (var fileInfo in fileInfos)
+            {
+                if (fileInfo.Name.StartsWith(YooAssetSettings.CacheBundleDataFileName))
+                {
+                    dataFileExtension = fileInfo.Extension;
+                    break;
+                }
+            }
+            return dataFileExtension;
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/Operation/Internal/VerifyCacheFilesOperation.cs

@@ -0,0 +1,254 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+
+namespace YooAsset
+{
+    internal abstract class VerifyCacheFilesOperation : AsyncOperationBase
+    {
+        public static VerifyCacheFilesOperation CreateOperation(CacheManager cache, List<VerifyCacheFileElement> elements)
+        {
+#if UNITY_WEBGL
+            var operation = new VerifyCacheFilesWithoutThreadOperation(cache, elements);
+#else
+            var operation = new VerifyCacheFilesWithThreadOperation(cache, elements);
+#endif
+            return operation;
+        }
+    }
+
+    /// <summary>
+    /// 本地缓存文件验证（线程版）
+    /// </summary>
+    internal class VerifyCacheFilesWithThreadOperation : VerifyCacheFilesOperation
+    {
+        private enum ESteps
+        {
+            None,
+            InitVerify,
+            UpdateVerify,
+            Done,
+        }
+
+        private readonly ThreadSyncContext _syncContext = new ThreadSyncContext();
+        private readonly CacheManager _cache;
+        private List<VerifyCacheFileElement> _waitingList;
+        private List<VerifyCacheFileElement> _verifyingList;
+        private int _verifyMaxNum;
+        private int _verifyTotalCount;
+        private float _verifyStartTime;
+        private int _succeedCount;
+        private int _failedCount;
+        private ESteps _steps = ESteps.None;
+
+        public VerifyCacheFilesWithThreadOperation(CacheManager cache, List<VerifyCacheFileElement> elements)
+        {
+            _cache = cache;
+            _waitingList = elements;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.InitVerify;
+            _verifyStartTime = UnityEngine.Time.realtimeSinceStartup;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.InitVerify)
+            {
+                int fileCount = _waitingList.Count;
+
+                // 设置同时验证的最大数
+                ThreadPool.GetMaxThreads(out int workerThreads, out int ioThreads);
+                YooLogger.Log($"Work threads : {workerThreads}, IO threads : {ioThreads}");
+                _verifyMaxNum = Math.Min(workerThreads, ioThreads);
+                _verifyTotalCount = fileCount;
+                if (_verifyMaxNum < 1)
+                    _verifyMaxNum = 1;
+
+                _verifyingList = new List<VerifyCacheFileElement>(_verifyMaxNum);
+                _steps = ESteps.UpdateVerify;
+            }
+
+            if (_steps == ESteps.UpdateVerify)
+            {
+                _syncContext.Update();
+
+                Progress = GetProgress();
+                if (_waitingList.Count == 0 && _verifyingList.Count == 0)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                    float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyStartTime;
+                    YooLogger.Log($"Verify cache files elapsed time {costTime:f1} seconds");
+                }
+
+                for (int i = _waitingList.Count - 1; i >= 0; i--)
+                {
+                    if (OperationSystem.IsBusy)
+                        break;
+
+                    if (_verifyingList.Count >= _verifyMaxNum)
+                        break;
+
+                    var element = _waitingList[i];
+                    if (BeginVerifyFileWithThread(element))
+                    {
+                        _waitingList.RemoveAt(i);
+                        _verifyingList.Add(element);
+                    }
+                    else
+                    {
+                        YooLogger.Warning("The thread pool is failed queued.");
+                        break;
+                    }
+                }
+            }
+        }
+
+        private float GetProgress()
+        {
+            if (_verifyTotalCount == 0)
+                return 1f;
+            return (float)(_succeedCount + _failedCount) / _verifyTotalCount;
+        }
+        private bool BeginVerifyFileWithThread(VerifyCacheFileElement element)
+        {
+            return ThreadPool.QueueUserWorkItem(new WaitCallback(VerifyInThread), element);
+        }
+        private void VerifyInThread(object obj)
+        {
+            VerifyCacheFileElement element = (VerifyCacheFileElement)obj;
+            element.Result = CacheHelper.VerifyingCacheFile(element, _cache.BootVerifyLevel);
+            _syncContext.Post(VerifyCallback, element);
+        }
+        private void VerifyCallback(object obj)
+        {
+            VerifyCacheFileElement element = (VerifyCacheFileElement)obj;
+            _verifyingList.Remove(element);
+
+            if (element.Result == EVerifyResult.Succeed)
+            {
+                _succeedCount++;
+                var wrapper = new CacheManager.RecordWrapper(element.InfoFilePath, element.DataFilePath, element.DataFileCRC, element.DataFileSize);
+                _cache.Record(element.CacheGUID, wrapper);
+            }
+            else
+            {
+                _failedCount++;
+
+                YooLogger.Warning($"Failed verify file and delete files : {element.FileRootPath}");
+                element.DeleteFiles();
+            }
+        }
+    }
+
+    /// <summary>
+    /// 本地缓存文件验证（非线程版）
+    /// </summary>
+    internal class VerifyCacheFilesWithoutThreadOperation : VerifyCacheFilesOperation
+    {
+        private enum ESteps
+        {
+            None,
+            InitVerify,
+            UpdateVerify,
+            Done,
+        }
+
+        private readonly CacheManager _cache;
+        private List<VerifyCacheFileElement> _waitingList;
+        private List<VerifyCacheFileElement> _verifyingList;
+        private int _verifyMaxNum;
+        private int _verifyTotalCount;
+        private float _verifyStartTime;
+        private int _succeedCount;
+        private int _failedCount;
+        private ESteps _steps = ESteps.None;
+
+        public VerifyCacheFilesWithoutThreadOperation(CacheManager cache, List<VerifyCacheFileElement> elements)
+        {
+            _cache = cache;
+            _waitingList = elements;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.InitVerify;
+            _verifyStartTime = UnityEngine.Time.realtimeSinceStartup;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.InitVerify)
+            {
+                int fileCount = _waitingList.Count;
+
+                // 设置同时验证的最大数
+                _verifyMaxNum = fileCount;
+                _verifyTotalCount = fileCount;
+
+                _verifyingList = new List<VerifyCacheFileElement>(_verifyMaxNum);
+                _steps = ESteps.UpdateVerify;
+            }
+
+            if (_steps == ESteps.UpdateVerify)
+            {
+                Progress = GetProgress();
+                if (_waitingList.Count == 0 && _verifyingList.Count == 0)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                    float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyStartTime;
+                    YooLogger.Log($"Package verify elapsed time {costTime:f1} seconds");
+                }
+
+                for (int i = _waitingList.Count - 1; i >= 0; i--)
+                {
+                    if (OperationSystem.IsBusy)
+                        break;
+
+                    if (_verifyingList.Count >= _verifyMaxNum)
+                        break;
+
+                    var element = _waitingList[i];
+                    BeginVerifyFileWithoutThread(element);
+                    _waitingList.RemoveAt(i);
+                    _verifyingList.Add(element);
+                }
+
+                // 主线程内验证，可以清空列表
+                _verifyingList.Clear();
+            }
+        }
+
+        private float GetProgress()
+        {
+            if (_verifyTotalCount == 0)
+                return 1f;
+            return (float)(_succeedCount + _failedCount) / _verifyTotalCount;
+        }
+        private void BeginVerifyFileWithoutThread(VerifyCacheFileElement element)
+        {
+            element.Result = CacheHelper.VerifyingCacheFile(element, _cache.BootVerifyLevel);
+            if (element.Result == EVerifyResult.Succeed)
+            {
+                _succeedCount++;
+                var wrapper = new CacheManager.RecordWrapper(element.InfoFilePath, element.DataFilePath, element.DataFileCRC, element.DataFileSize);
+                _cache.Record(element.CacheGUID, wrapper);
+            }
+            else
+            {
+                _failedCount++;
+
+                YooLogger.Warning($"Failed verify file and delete files : {element.FileRootPath}");
+                element.DeleteFiles();
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/Operation/Internal/VerifyTempFileOperation.cs

@@ -0,0 +1,141 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+
+namespace YooAsset
+{
+    internal abstract class VerifyTempFileOperation : AsyncOperationBase
+    {
+        public EVerifyResult VerifyResult { protected set; get; }
+
+        public static VerifyTempFileOperation CreateOperation(VerifyTempFileElement element)
+        {
+#if UNITY_WEBGL
+            var operation = new VerifyTempFileWithoutThreadOperation(element);
+#else
+            var operation = new VerifyTempFileWithThreadOperation(element);
+#endif
+            return operation;
+        }
+    }
+
+    /// <summary>
+    /// 下载文件验证（线程版）
+    /// </summary>
+    internal class VerifyTempFileWithThreadOperation : VerifyTempFileOperation
+    {
+        private enum ESteps
+        {
+            None,
+            VerifyFile,
+            Waiting,
+            Done,
+        }
+
+        private readonly VerifyTempFileElement _element;
+        private ESteps _steps = ESteps.None;
+
+        public VerifyTempFileWithThreadOperation(VerifyTempFileElement element)
+        {
+            _element = element;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.VerifyFile;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.VerifyFile)
+            {
+                if (BeginVerifyFileWithThread(_element))
+                {
+                    _steps = ESteps.Waiting;
+                }
+            }
+
+            if (_steps == ESteps.Waiting)
+            {
+                int result = _element.Result;
+                if (result == 0)
+                    return;
+
+                VerifyResult = (EVerifyResult)result;
+                if (VerifyResult == EVerifyResult.Succeed)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = $"Failed verify file : {_element.TempDataFilePath} ! ErrorCode : {VerifyResult}";
+                }
+            }
+        }
+
+        private bool BeginVerifyFileWithThread(VerifyTempFileElement element)
+        {
+            return ThreadPool.QueueUserWorkItem(new WaitCallback(VerifyInThread), element);
+        }
+        private void VerifyInThread(object obj)
+        {
+            VerifyTempFileElement element = (VerifyTempFileElement)obj;
+            int result = (int)CacheHelper.VerifyingTempFile(element);
+            element.Result = result;
+        }
+    }
+
+    /// <summary>
+    /// 下载文件验证（非线程版）
+    /// </summary>
+    internal class VerifyTempFileWithoutThreadOperation : VerifyTempFileOperation
+    {
+        private enum ESteps
+        {
+            None,
+            VerifyFile,
+            Done,
+        }
+
+        private readonly VerifyTempFileElement _element;
+        private ESteps _steps = ESteps.None;
+
+        public VerifyTempFileWithoutThreadOperation(VerifyTempFileElement element)
+        {
+            _element = element;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.VerifyFile;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.VerifyFile)
+            {
+                _element.Result = (int)CacheHelper.VerifyingTempFile(_element);
+
+                VerifyResult = (EVerifyResult)_element.Result;
+                if (VerifyResult == EVerifyResult.Succeed)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = $"Failed verify file : {_element.TempDataFilePath} ! ErrorCode : {VerifyResult}";
+                }
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/Operation/PackageCachingOperation.cs

@@ -0,0 +1,74 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+    internal class PackageCachingOperation : AsyncOperationBase
+    {
+        private enum ESteps
+        {
+            None,
+            FindCacheFiles,
+            VerifyCacheFiles,
+            Done,
+        }
+
+        private readonly PersistentManager _persistent;
+        private readonly CacheManager _cache;
+        private FindCacheFilesOperation _findCacheFilesOp;
+        private VerifyCacheFilesOperation _verifyCacheFilesOp;
+        private ESteps _steps = ESteps.None;
+
+        public PackageCachingOperation(PersistentManager persistent, CacheManager cache)
+        {
+            _persistent = persistent;
+            _cache = cache;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.FindCacheFiles;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.FindCacheFiles)
+            {
+                if (_findCacheFilesOp == null)
+                {
+                    _findCacheFilesOp = new FindCacheFilesOperation(_persistent, _cache);
+                    OperationSystem.StartOperation(_cache.PackageName, _findCacheFilesOp);
+                }
+
+                Progress = _findCacheFilesOp.Progress;
+                if (_findCacheFilesOp.IsDone == false)
+                    return;
+
+                _steps = ESteps.VerifyCacheFiles;
+            }
+
+            if (_steps == ESteps.VerifyCacheFiles)
+            {
+                if (_verifyCacheFilesOp == null)
+                {
+                    _verifyCacheFilesOp = VerifyCacheFilesOperation.CreateOperation(_cache, _findCacheFilesOp.VerifyElements);
+                    OperationSystem.StartOperation(_cache.PackageName, _verifyCacheFilesOp);
+                }
+
+                Progress = _verifyCacheFilesOp.Progress;
+                if (_verifyCacheFilesOp.IsDone == false)
+                    return;
+
+                // 注意：总是返回成功
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Succeed;
+
+                int totalCount = _cache.GetAllCachedFilesCount();
+                YooLogger.Log($"Package '{_cache.PackageName}' cached files count : {totalCount}");
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/Operations/ClearAllCacheFilesOperation.cs

@@ -1,71 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-
-namespace YooAsset
-{
-	/// <summary>
-	/// 清理本地包裹所有的缓存文件
-	/// </summary>
-	public sealed class ClearAllCacheFilesOperation : AsyncOperationBase
-	{
-		private enum ESteps
-		{
-			None,
-			GetAllCacheFiles,
-			ClearAllCacheFiles,
-			Done,
-		}
-
-		private readonly ResourcePackage _package;
-		private List<string> _allCacheGUIDs;
-		private int _fileTotalCount = 0;
-		private ESteps _steps = ESteps.None;
-		
-		internal ClearAllCacheFilesOperation(ResourcePackage package)
-		{
-			_package = package;
-		}
-		internal override void Start()
-		{
-			_steps = ESteps.GetAllCacheFiles;
-		}
-		internal override void Update()
-		{
-			if (_steps == ESteps.None || _steps == ESteps.Done)
-				return;
-
-			if (_steps == ESteps.GetAllCacheFiles)
-			{
-				_allCacheGUIDs = CacheSystem.GetAllCacheGUIDs(_package);
-				_fileTotalCount = _allCacheGUIDs.Count;
-				YooLogger.Log($"Found all cache file count : {_fileTotalCount}");
-				_steps = ESteps.ClearAllCacheFiles;
-			}
-
-			if (_steps == ESteps.ClearAllCacheFiles)
-			{
-				for (int i = _allCacheGUIDs.Count - 1; i >= 0; i--)
-				{
-					string cacheGUID = _allCacheGUIDs[i];
-					CacheSystem.DiscardFile(_package.PackageName, cacheGUID);
-					_allCacheGUIDs.RemoveAt(i);
-
-					if (OperationSystem.IsBusy)
-						break;
-				}
-
-				if (_fileTotalCount == 0)
-					Progress = 1.0f;
-				else
-					Progress = 1.0f - (_allCacheGUIDs.Count / _fileTotalCount);
-
-				if (_allCacheGUIDs.Count == 0)
-				{
-					_steps = ESteps.Done;
-					Status = EOperationStatus.Succeed;
-				}
-			}
-		}
-	}
-}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/Operations/ClearUnusedCacheFilesOperation.cs

@@ -1,71 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-
-namespace YooAsset
-{
-	/// <summary>
-	/// 清理本地包裹未使用的缓存文件
-	/// </summary>
-	public sealed class ClearUnusedCacheFilesOperation : AsyncOperationBase
-	{
-		private enum ESteps
-		{
-			None,
-			GetUnusedCacheFiles,
-			ClearUnusedCacheFiles,
-			Done,
-		}
-
-		private readonly ResourcePackage _package;
-		private List<string> _unusedCacheGUIDs;
-		private int _unusedFileTotalCount = 0;
-		private ESteps _steps = ESteps.None;
-
-		internal ClearUnusedCacheFilesOperation(ResourcePackage package)
-		{
-			_package = package;
-		}
-		internal override void Start()
-		{
-			_steps = ESteps.GetUnusedCacheFiles;
-		}
-		internal override void Update()
-		{
-			if (_steps == ESteps.None || _steps == ESteps.Done)
-				return;
-
-			if (_steps == ESteps.GetUnusedCacheFiles)
-			{
-				_unusedCacheGUIDs = CacheSystem.GetUnusedCacheGUIDs(_package);
-				_unusedFileTotalCount = _unusedCacheGUIDs.Count;
-				YooLogger.Log($"Found unused cache file count : {_unusedFileTotalCount}");
-				_steps = ESteps.ClearUnusedCacheFiles;
-			}
-
-			if (_steps == ESteps.ClearUnusedCacheFiles)
-			{
-				for (int i = _unusedCacheGUIDs.Count - 1; i >= 0; i--)
-				{
-					string cacheGUID = _unusedCacheGUIDs[i];
-					CacheSystem.DiscardFile(_package.PackageName, cacheGUID);
-					_unusedCacheGUIDs.RemoveAt(i);
-
-					if (OperationSystem.IsBusy)
-						break;
-				}
-
-				if (_unusedFileTotalCount == 0)
-					Progress = 1.0f;
-				else
-					Progress = 1.0f - (_unusedCacheGUIDs.Count / _unusedFileTotalCount);
-
-				if (_unusedCacheGUIDs.Count == 0)
-				{
-					_steps = ESteps.Done;
-					Status = EOperationStatus.Succeed;
-				}
-			}
-		}
-	}
-}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/Operations/Internal/FindCacheFilesOperation.cs

@@ -1,175 +0,0 @@
-using System;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace YooAsset
-{
-	internal class FindCacheFilesOperation : AsyncOperationBase
-	{
-		private enum ESteps
-		{
-			None,
-			FindPrepare,
-			FindBundleFiles,
-			FindRawFiles,
-			Done,
-		}
-
-		private readonly string _packageName;
-		private float _verifyStartTime;
-		private IEnumerator<DirectoryInfo> _bundleFilesEnumerator = null;
-		private IEnumerator<DirectoryInfo> _rawFilesEnumerator = null;
-		private ESteps _steps = ESteps.None;
-
-		/// <summary>
-		/// 需要验证的元素
-		/// </summary>
-		public readonly List<VerifyCacheFileElement> VerifyElements = new List<VerifyCacheFileElement>(5000);
-
-		public FindCacheFilesOperation(string packageName)
-		{
-			_packageName = packageName;
-		}
-		internal override void Start()
-		{
-			_steps = ESteps.FindPrepare;
-			_verifyStartTime = UnityEngine.Time.realtimeSinceStartup;
-		}
-		internal override void Update()
-		{
-			if (_steps == ESteps.None || _steps == ESteps.Done)
-				return;
-
-			if (_steps == ESteps.FindPrepare)
-			{
-				// BundleFiles
-				{
-					string rootPath = PersistentTools.GetPersistent(_packageName).SandboxCacheBundleFilesRoot;
-					DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
-					if (rootDirectory.Exists)
-					{
-						var directorieInfos = rootDirectory.EnumerateDirectories();
-						_bundleFilesEnumerator = directorieInfos.GetEnumerator();
-					}
-				}
-
-				// RawFiles
-				{
-					string rootPath = PersistentTools.GetPersistent(_packageName).SandboxCacheRawFilesRoot;
-					DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
-					if (rootDirectory.Exists)
-					{
-						var directorieInfos = rootDirectory.EnumerateDirectories();
-						_rawFilesEnumerator = directorieInfos.GetEnumerator();
-					}
-				}
-
-				_steps = ESteps.FindBundleFiles;
-			}
-
-			if (_steps == ESteps.FindBundleFiles)
-			{
-				if (UpdateFindBundleFiles())
-					return;
-
-				_steps = ESteps.FindRawFiles;
-			}
-
-			if (_steps == ESteps.FindRawFiles)
-			{
-				if (UpdateFindRawFiles())
-					return;
-
-				// 注意：总是返回成功
-				_steps = ESteps.Done;
-				Status = EOperationStatus.Succeed;
-				float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyStartTime;
-				YooLogger.Log($"Find cache files elapsed time {costTime:f1} seconds");
-			}
-		}
-
-		private bool UpdateFindBundleFiles()
-		{
-			if (_bundleFilesEnumerator == null)
-				return false;
-
-			bool isFindItem;
-			while (true)
-			{
-				isFindItem = _bundleFilesEnumerator.MoveNext();
-				if (isFindItem == false)
-					break;
-
-				var rootFoder = _bundleFilesEnumerator.Current;
-				var childDirectories = rootFoder.GetDirectories();
-				foreach(var chidDirectory in childDirectories)
-				{
-					string cacheGUID = chidDirectory.Name;
-					if (CacheSystem.IsCached(_packageName, cacheGUID))
-						continue;
-
-					// 创建验证元素类
-					string fileRootPath = chidDirectory.FullName;
-					string dataFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleDataFileName}";
-					string infoFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleInfoFileName}";
-					VerifyCacheFileElement element = new VerifyCacheFileElement(_packageName, cacheGUID, fileRootPath, dataFilePath, infoFilePath);
-					VerifyElements.Add(element);
-				}
-
-				if (OperationSystem.IsBusy)
-					break;
-			}
-
-			return isFindItem;
-		}
-		private bool UpdateFindRawFiles()
-		{
-			if (_rawFilesEnumerator == null)
-				return false;
-
-			bool isFindItem;
-			while (true)
-			{
-				isFindItem = _rawFilesEnumerator.MoveNext();
-				if (isFindItem == false)
-					break;
-
-				var rootFoder = _rawFilesEnumerator.Current;
-				var childDirectories = rootFoder.GetDirectories();
-				foreach (var chidDirectory in childDirectories)
-				{
-					string cacheGUID = chidDirectory.Name;
-					if (CacheSystem.IsCached(_packageName, cacheGUID))
-						continue;
-
-					// 获取数据文件的后缀名
-					string dataFileExtension = string.Empty;
-					var fileInfos = chidDirectory.GetFiles();
-					foreach (var fileInfo in fileInfos)
-					{
-						if (fileInfo.Extension == ".temp")
-							continue;
-						if (fileInfo.Name.StartsWith(YooAssetSettings.CacheBundleDataFileName))
-						{
-							dataFileExtension = fileInfo.Extension;
-							break;
-						}
-					}
-
-					// 创建验证元素类
-					string fileRootPath = chidDirectory.FullName;
-					string dataFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleDataFileName}{dataFileExtension}";
-					string infoFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleInfoFileName}";
-					VerifyCacheFileElement element = new VerifyCacheFileElement(_packageName, cacheGUID, fileRootPath, dataFilePath, infoFilePath);
-					VerifyElements.Add(element);
-				}
-
-				if (OperationSystem.IsBusy)
-					break;
-			}
-
-			return isFindItem;
-		}
-	}
-}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/Operations/Internal/VerifyCacheFilesOperation.cs

@@ -1,250 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-
-namespace YooAsset
-{
-	internal abstract class VerifyCacheFilesOperation : AsyncOperationBase
-	{
-		public static VerifyCacheFilesOperation CreateOperation(List<VerifyCacheFileElement> elements)
-		{
-#if UNITY_WEBGL
-			var operation = new VerifyCacheFilesWithoutThreadOperation(elements);
-#else
-			var operation = new VerifyCacheFilesWithThreadOperation(elements);
-#endif
-			return operation;
-		}
-	}
-
-	/// <summary>
-	/// 本地缓存文件验证（线程版）
-	/// </summary>
-	internal class VerifyCacheFilesWithThreadOperation : VerifyCacheFilesOperation
-	{
-		private enum ESteps
-		{
-			None,
-			InitVerify,
-			UpdateVerify,
-			Done,
-		}
-
-		private readonly ThreadSyncContext _syncContext = new ThreadSyncContext();
-		private List<VerifyCacheFileElement> _waitingList;
-		private List<VerifyCacheFileElement> _verifyingList;
-		private int _verifyMaxNum;
-		private int _verifyTotalCount;
-		private float _verifyStartTime;
-		private int _succeedCount;
-		private int _failedCount;
-		private ESteps _steps = ESteps.None;
-
-		public VerifyCacheFilesWithThreadOperation(List<VerifyCacheFileElement> elements)
-		{
-			_waitingList = elements;
-		}
-		internal override void Start()
-		{
-			_steps = ESteps.InitVerify;
-			_verifyStartTime = UnityEngine.Time.realtimeSinceStartup;
-		}
-		internal override void Update()
-		{
-			if (_steps == ESteps.None || _steps == ESteps.Done)
-				return;
-
-			if (_steps == ESteps.InitVerify)
-			{
-				int fileCount = _waitingList.Count;
-
-				// 设置同时验证的最大数
-				ThreadPool.GetMaxThreads(out int workerThreads, out int ioThreads);
-				YooLogger.Log($"Work threads : {workerThreads}, IO threads : {ioThreads}");
-				_verifyMaxNum = Math.Min(workerThreads, ioThreads);
-				_verifyTotalCount = fileCount;
-				if (_verifyMaxNum < 1)
-					_verifyMaxNum = 1;
-
-				_verifyingList = new List<VerifyCacheFileElement>(_verifyMaxNum);
-				_steps = ESteps.UpdateVerify;
-			}
-
-			if (_steps == ESteps.UpdateVerify)
-			{
-				_syncContext.Update();
-
-				Progress = GetProgress();
-				if (_waitingList.Count == 0 && _verifyingList.Count == 0)
-				{
-					_steps = ESteps.Done;
-					Status = EOperationStatus.Succeed;
-					float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyStartTime;
-					YooLogger.Log($"Verify cache files elapsed time {costTime:f1} seconds");
-				}
-
-				for (int i = _waitingList.Count - 1; i >= 0; i--)
-				{
-					if (OperationSystem.IsBusy)
-						break;
-
-					if (_verifyingList.Count >= _verifyMaxNum)
-						break;
-
-					var element = _waitingList[i];
-					if (BeginVerifyFileWithThread(element))
-					{
-						_waitingList.RemoveAt(i);
-						_verifyingList.Add(element);
-					}
-					else
-					{
-						YooLogger.Warning("The thread pool is failed queued.");
-						break;
-					}
-				}
-			}
-		}
-
-		private float GetProgress()
-		{
-			if (_verifyTotalCount == 0)
-				return 1f;
-			return (float)(_succeedCount + _failedCount) / _verifyTotalCount;
-		}
-		private bool BeginVerifyFileWithThread(VerifyCacheFileElement element)
-		{
-			return ThreadPool.QueueUserWorkItem(new WaitCallback(VerifyInThread), element);
-		}
-		private void VerifyInThread(object obj)
-		{
-			VerifyCacheFileElement element = (VerifyCacheFileElement)obj;
-			element.Result = CacheSystem.VerifyingCacheFile(element);
-			_syncContext.Post(VerifyCallback, element);
-		}
-		private void VerifyCallback(object obj)
-		{
-			VerifyCacheFileElement element = (VerifyCacheFileElement)obj;
-			_verifyingList.Remove(element);
-
-			if (element.Result == EVerifyResult.Succeed)
-			{
-				_succeedCount++;
-				var wrapper = new PackageCache.RecordWrapper(element.InfoFilePath, element.DataFilePath, element.DataFileCRC, element.DataFileSize);
-				CacheSystem.RecordFile(element.PackageName, element.CacheGUID, wrapper);
-			}
-			else
-			{
-				_failedCount++;
-
-				YooLogger.Warning($"Failed verify file and delete files : {element.FileRootPath}");
-				element.DeleteFiles();
-			}
-		}
-	}
-
-	/// <summary>
-	/// 本地缓存文件验证（非线程版）
-	/// </summary>
-	internal class VerifyCacheFilesWithoutThreadOperation : VerifyCacheFilesOperation
-	{
-		private enum ESteps
-		{
-			None,
-			InitVerify,
-			UpdateVerify,
-			Done,
-		}
-
-		private List<VerifyCacheFileElement> _waitingList;
-		private List<VerifyCacheFileElement> _verifyingList;
-		private int _verifyMaxNum;
-		private int _verifyTotalCount;
-		private float _verifyStartTime;
-		private int _succeedCount;
-		private int _failedCount;
-		private ESteps _steps = ESteps.None;
-		
-		public VerifyCacheFilesWithoutThreadOperation(List<VerifyCacheFileElement> elements)
-		{
-			_waitingList = elements;
-		}
-		internal override void Start()
-		{
-			_steps = ESteps.InitVerify;
-			_verifyStartTime = UnityEngine.Time.realtimeSinceStartup;
-		}
-		internal override void Update()
-		{
-			if (_steps == ESteps.None || _steps == ESteps.Done)
-				return;
-
-			if (_steps == ESteps.InitVerify)
-			{
-				int fileCount = _waitingList.Count;
-
-				// 设置同时验证的最大数
-				_verifyMaxNum = fileCount;
-				_verifyTotalCount = fileCount;
-
-				_verifyingList = new List<VerifyCacheFileElement>(_verifyMaxNum);
-				_steps = ESteps.UpdateVerify;
-			}
-
-			if (_steps == ESteps.UpdateVerify)
-			{
-				Progress = GetProgress();
-				if (_waitingList.Count == 0 && _verifyingList.Count == 0)
-				{
-					_steps = ESteps.Done;
-					Status = EOperationStatus.Succeed;
-					float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyStartTime;
-					YooLogger.Log($"Package verify elapsed time {costTime:f1} seconds");
-				}
-
-				for (int i = _waitingList.Count - 1; i >= 0; i--)
-				{
-					if (OperationSystem.IsBusy)
-						break;
-
-					if (_verifyingList.Count >= _verifyMaxNum)
-						break;
-
-					var element = _waitingList[i];
-					BeginVerifyFileWithoutThread(element);
-					_waitingList.RemoveAt(i);
-					_verifyingList.Add(element);
-				}
-
-				// 主线程内验证，可以清空列表
-				_verifyingList.Clear();
-			}
-		}
-
-		private float GetProgress()
-		{
-			if (_verifyTotalCount == 0)
-				return 1f;
-			return (float)(_succeedCount + _failedCount) / _verifyTotalCount;
-		}
-		private void BeginVerifyFileWithoutThread(VerifyCacheFileElement element)
-		{
-			element.Result = CacheSystem.VerifyingCacheFile(element);
-			if (element.Result == EVerifyResult.Succeed)
-			{
-				_succeedCount++;
-				var wrapper = new PackageCache.RecordWrapper(element.InfoFilePath, element.DataFilePath, element.DataFileCRC, element.DataFileSize);
-				CacheSystem.RecordFile(element.PackageName, element.CacheGUID, wrapper);
-			}
-			else
-			{
-				_failedCount++;
-
-				YooLogger.Warning($"Failed verify file and delete files : {element.FileRootPath}");
-				element.DeleteFiles();
-			}
-		}
-	}
-}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/Operations/Internal/VerifyTempFileOperation.cs

@@ -1,141 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-
-namespace YooAsset
-{
-	internal abstract class VerifyTempFileOperation : AsyncOperationBase
-	{
-		public EVerifyResult VerifyResult { protected set; get; }
-
-		public static VerifyTempFileOperation CreateOperation(VerifyTempFileElement element)
-		{
-#if UNITY_WEBGL
-			var operation = new VerifyTempFileWithoutThreadOperation(element);
-#else
-			var operation = new VerifyTempFileWithThreadOperation(element);
-#endif
-			return operation;
-		}
-	}
-
-	/// <summary>
-	/// 下载文件验证（线程版）
-	/// </summary>
-	internal class VerifyTempFileWithThreadOperation : VerifyTempFileOperation
-	{
-		private enum ESteps
-		{
-			None,
-			VerifyFile,
-			Waiting,
-			Done,
-		}
-
-		private readonly VerifyTempFileElement _element;
-		private ESteps _steps = ESteps.None;
-
-		public VerifyTempFileWithThreadOperation(VerifyTempFileElement element)
-		{
-			_element = element;
-		}
-		internal override void Start()
-		{
-			_steps = ESteps.VerifyFile;
-		}
-		internal override void Update()
-		{
-			if (_steps == ESteps.None || _steps == ESteps.Done)
-				return;
-
-			if (_steps == ESteps.VerifyFile)
-			{
-				if (BeginVerifyFileWithThread(_element))
-				{
-					_steps = ESteps.Waiting;
-				}
-			}
-
-			if (_steps == ESteps.Waiting)
-			{
-				int result = _element.Result;
-				if (result == 0)
-					return;
-
-				VerifyResult = (EVerifyResult)result;
-				if (VerifyResult == EVerifyResult.Succeed)
-				{
-					_steps = ESteps.Done;
-					Status = EOperationStatus.Succeed;
-				}
-				else
-				{
-					_steps = ESteps.Done;
-					Status = EOperationStatus.Failed;
-					Error = $"Failed verify file : {_element.TempDataFilePath} ! ErrorCode : {VerifyResult}";
-				}
-			}
-		}
-
-		private bool BeginVerifyFileWithThread(VerifyTempFileElement element)
-		{
-			return ThreadPool.QueueUserWorkItem(new WaitCallback(VerifyInThread), element);
-		}
-		private void VerifyInThread(object obj)
-		{
-			VerifyTempFileElement element = (VerifyTempFileElement)obj;
-			int result = (int)CacheSystem.VerifyingTempFile(element);
-			element.Result = result;
-		}
-	}
-
-	/// <summary>
-	/// 下载文件验证（非线程版）
-	/// </summary>
-	internal class VerifyTempFileWithoutThreadOperation : VerifyTempFileOperation
-	{
-		private enum ESteps
-		{
-			None,
-			VerifyFile,
-			Done,
-		}
-
-		private readonly VerifyTempFileElement _element;
-		private ESteps _steps = ESteps.None;
-
-		public VerifyTempFileWithoutThreadOperation(VerifyTempFileElement element)
-		{
-			_element = element;
-		}
-		internal override void Start()
-		{
-			_steps = ESteps.VerifyFile;
-		}
-		internal override void Update()
-		{
-			if (_steps == ESteps.None || _steps == ESteps.Done)
-				return;
-
-			if (_steps == ESteps.VerifyFile)
-			{
-				_element.Result = (int)CacheSystem.VerifyingTempFile(_element);
-
-				VerifyResult = (EVerifyResult)_element.Result;
-				if (VerifyResult == EVerifyResult.Succeed)
-				{
-					_steps = ESteps.Done;
-					Status = EOperationStatus.Succeed;
-				}
-				else
-				{
-					_steps = ESteps.Done;
-					Status = EOperationStatus.Failed;
-					Error = $"Failed verify file : {_element.TempDataFilePath} ! ErrorCode : {VerifyResult}";
-				}
-			}
-		}
-	}
-}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/Operations/PackageCachingOperation.cs

@@ -1,72 +0,0 @@
-using System;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace YooAsset
-{
-	internal class PackageCachingOperation : AsyncOperationBase
-	{
-		private enum ESteps
-		{
-			None,
-			FindCacheFiles,
-			VerifyCacheFiles,
-			Done,
-		}
-
-		private readonly string _packageName;
-		private FindCacheFilesOperation _findCacheFilesOp;
-		private VerifyCacheFilesOperation _verifyCacheFilesOp;
-		private ESteps _steps = ESteps.None;
-
-		public PackageCachingOperation(string packageName)
-		{
-			_packageName = packageName;
-		}
-		internal override void Start()
-		{
-			_steps = ESteps.FindCacheFiles;
-		}
-		internal override void Update()
-		{
-			if (_steps == ESteps.None || _steps == ESteps.Done)
-				return;
-
-			if (_steps == ESteps.FindCacheFiles)
-			{
-				if (_findCacheFilesOp == null)
-				{
-					_findCacheFilesOp = new FindCacheFilesOperation(_packageName);
-					OperationSystem.StartOperation(_findCacheFilesOp);
-				}
-
-				Progress = _findCacheFilesOp.Progress;
-				if (_findCacheFilesOp.IsDone == false)
-					return;
-
-				_steps = ESteps.VerifyCacheFiles;
-			}
-
-			if (_steps == ESteps.VerifyCacheFiles)
-			{
-				if (_verifyCacheFilesOp == null)
-				{
-					_verifyCacheFilesOp = VerifyCacheFilesOperation.CreateOperation(_findCacheFilesOp.VerifyElements);
-					OperationSystem.StartOperation(_verifyCacheFilesOp);
-				}
-
-				Progress = _verifyCacheFilesOp.Progress;
-				if (_verifyCacheFilesOp.IsDone == false)
-					return;
-
-				// 注意：总是返回成功
-				_steps = ESteps.Done;
-				Status = EOperationStatus.Succeed;
-
-				int totalCount = CacheSystem.GetCachedFilesCount(_packageName);
-				YooLogger.Log($"Package '{_packageName}' cached files count : {totalCount}");
-			}
-		}
-	}
-}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/PackageCache.cs

@@ -1,111 +0,0 @@
-using System;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace YooAsset
-{
-	internal class PackageCache
-	{
-		internal class RecordWrapper
-		{
-			public string InfoFilePath { private set; get; }
-			public string DataFilePath { private set; get; }
-			public string DataFileCRC { private set; get; }
-			public long DataFileSize { private set; get; }
-
-			public RecordWrapper(string infoFilePath, string dataFilePath, string dataFileCRC, long dataFileSize)
-			{
-				InfoFilePath = infoFilePath;
-				DataFilePath = dataFilePath;
-				DataFileCRC = dataFileCRC;
-				DataFileSize = dataFileSize;
-			}
-		}
-
-		private readonly Dictionary<string, RecordWrapper> _wrappers = new Dictionary<string, RecordWrapper>();
-
-		/// <summary>
-		/// 包裹名称
-		/// </summary>
-		public string PackageName { private set; get; }
-
-
-		public PackageCache(string packageName)
-		{
-			PackageName = packageName;
-		}
-
-		/// <summary>
-		/// 清空所有数据
-		/// </summary>
-		public void ClearAll()
-		{
-			_wrappers.Clear();
-		}
-
-		/// <summary>
-		/// 获取缓存文件总数
-		/// </summary>
-		public int GetCachedFilesCount()
-		{
-			return _wrappers.Count;
-		}
-
-		/// <summary>
-		/// 查询缓存记录
-		/// </summary>
-		public bool IsCached(string cacheGUID)
-		{
-			return _wrappers.ContainsKey(cacheGUID);
-		}
-
-		/// <summary>
-		/// 记录验证结果
-		/// </summary>
-		public void Record(string cacheGUID, RecordWrapper wrapper)
-		{
-			if (_wrappers.ContainsKey(cacheGUID) == false)
-			{
-				_wrappers.Add(cacheGUID, wrapper);
-			}
-			else
-			{
-				throw new Exception("Should never get here !");
-			}
-		}
-
-		/// <summary>
-		/// 丢弃验证结果
-		/// </summary>
-		public void Discard(string cacheGUID)
-		{
-			if (_wrappers.ContainsKey(cacheGUID))
-			{
-				_wrappers.Remove(cacheGUID);
-			}
-		}
-
-		/// <summary>
-		/// 获取记录对象
-		/// </summary>
-		public RecordWrapper TryGetWrapper(string cacheGUID)
-		{
-			if (_wrappers.TryGetValue(cacheGUID, out RecordWrapper value))
-				return value;
-			else
-				return null;
-		}
-
-		internal List<string> GetAllKeys()
-		{
-			List<string> keys = new List<string>(_wrappers.Keys.Count);
-			var keyCollection = _wrappers.Keys;
-			foreach (var key in keyCollection)
-			{
-				keys.Add(key);
-			}
-			return keys;
-		}
-	}
-}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/Persistent.cs

@@ -1,163 +0,0 @@
-using System.IO;
-
-namespace YooAsset
-{
-	internal class Persistent
-	{
-		private readonly string _packageName;
-
-		public string BuildinRoot { private set; get; }
-		public string BuildinPackageRoot { private set; get; }
-
-		public string SandboxRoot { private set; get; }
-		public string SandboxPackageRoot { private set; get; }
-		public string SandboxCacheBundleFilesRoot { private set; get; }
-		public string SandboxCacheRawFilesRoot { private set; get; }
-		public string SandboxManifestFilesRoot { private set; get; }
-		public string SandboxAppFootPrintFilePath { private set; get; }
-
-
-		public Persistent(string packageName)
-		{
-			_packageName = packageName;
-		}
-
-		/// <summary>
-		/// 重写根路径
-		/// </summary>
-		public void OverwriteRootDirectory(string buildinRoot, string sandboxRoot)
-		{
-			if (string.IsNullOrEmpty(buildinRoot))
-				BuildinRoot = CreateDefaultBuildinRoot();
-			else
-				BuildinRoot = buildinRoot;
-
-			if (string.IsNullOrEmpty(sandboxRoot))
-				SandboxRoot = CreateDefaultSandboxRoot();
-			else
-				SandboxRoot = sandboxRoot;
-
-			BuildinPackageRoot = PathUtility.Combine(BuildinRoot, _packageName);
-			SandboxPackageRoot = PathUtility.Combine(SandboxRoot, _packageName);
-			SandboxCacheBundleFilesRoot = PathUtility.Combine(SandboxPackageRoot, YooAssetSettings.CachedBundleFileFolder);
-			SandboxCacheRawFilesRoot = PathUtility.Combine(SandboxPackageRoot, YooAssetSettings.CachedRawFileFolder);
-			SandboxManifestFilesRoot = PathUtility.Combine(SandboxPackageRoot, YooAssetSettings.ManifestFolderName);
-			SandboxAppFootPrintFilePath = PathUtility.Combine(SandboxPackageRoot, YooAssetSettings.AppFootPrintFileName);
-		}
-		private static string CreateDefaultBuildinRoot()
-		{
-			return PathUtility.Combine(UnityEngine.Application.streamingAssetsPath, YooAssetSettingsData.Setting.DefaultYooFolderName);
-		}
-		private static string CreateDefaultSandboxRoot()
-		{
-#if UNITY_EDITOR
-			// 注意：为了方便调试查看，编辑器下把存储目录放到项目里。
-			string projectPath = Path.GetDirectoryName(UnityEngine.Application.dataPath);
-			projectPath = PathUtility.RegularPath(projectPath);
-			return PathUtility.Combine(projectPath, YooAssetSettingsData.Setting.DefaultYooFolderName);
-#elif UNITY_STANDALONE
-			return PathUtility.Combine(UnityEngine.Application.dataPath, YooAssetSettingsData.Setting.DefaultYooFolderName);
-#else
-			return PathUtility.Combine(UnityEngine.Application.persistentDataPath, YooAssetSettingsData.Setting.DefaultYooFolderName);	
-#endif
-		}
-
-
-		/// <summary>
-		/// 删除沙盒里的包裹目录
-		/// </summary>
-		public void DeleteSandboxPackageFolder()
-		{
-			if (Directory.Exists(SandboxPackageRoot))
-				Directory.Delete(SandboxPackageRoot, true);
-		}
-		
-		/// <summary>
-		/// 删除沙盒内的缓存文件夹
-		/// </summary>
-		public void DeleteSandboxCacheFilesFolder()
-		{
-			// CacheBundleFiles
-			if (Directory.Exists(SandboxCacheBundleFilesRoot))
-				Directory.Delete(SandboxCacheBundleFilesRoot, true);
-
-			// CacheRawFiles
-			if (Directory.Exists(SandboxCacheRawFilesRoot))
-				Directory.Delete(SandboxCacheRawFilesRoot, true);
-		}
-
-		/// <summary>
-		/// 删除沙盒内的清单文件夹
-		/// </summary>
-		public void DeleteSandboxManifestFilesFolder()
-		{
-			if (Directory.Exists(SandboxManifestFilesRoot))
-				Directory.Delete(SandboxManifestFilesRoot, true);
-		}
-
-
-		/// <summary>
-		/// 获取沙盒内包裹的清单文件的路径
-		/// </summary>
-		public string GetSandboxPackageManifestFilePath(string packageVersion)
-		{
-			string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_packageName, packageVersion);
-			return PathUtility.Combine(SandboxManifestFilesRoot, fileName);
-		}
-
-		/// <summary>
-		/// 获取沙盒内包裹的哈希文件的路径
-		/// </summary>
-		public string GetSandboxPackageHashFilePath(string packageVersion)
-		{
-			string fileName = YooAssetSettingsData.GetPackageHashFileName(_packageName, packageVersion);
-			return PathUtility.Combine(SandboxManifestFilesRoot, fileName);
-		}
-
-		/// <summary>
-		/// 获取沙盒内包裹的版本文件的路径
-		/// </summary>
-		public string GetSandboxPackageVersionFilePath()
-		{
-			string fileName = YooAssetSettingsData.GetPackageVersionFileName(_packageName);
-			return PathUtility.Combine(SandboxManifestFilesRoot, fileName);
-		}
-
-		/// <summary>
-		/// 保存沙盒内默认的包裹版本
-		/// </summary>
-		public void SaveSandboxPackageVersionFile(string version)
-		{
-			string filePath = GetSandboxPackageVersionFilePath();
-			FileUtility.WriteAllText(filePath, version);
-		}
-
-
-		/// <summary>
-		/// 获取APP内包裹的清单文件的路径
-		/// </summary>
-		public string GetBuildinPackageManifestFilePath(string packageVersion)
-		{
-			string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_packageName, packageVersion);
-			return PathUtility.Combine(BuildinPackageRoot, fileName);
-		}
-
-		/// <summary>
-		/// 获取APP内包裹的哈希文件的路径
-		/// </summary>
-		public string GetBuildinPackageHashFilePath(string packageVersion)
-		{
-			string fileName = YooAssetSettingsData.GetPackageHashFileName(_packageName, packageVersion);
-			return PathUtility.Combine(BuildinPackageRoot, fileName);
-		}
-
-		/// <summary>
-		/// 获取APP内包裹的版本文件的路径
-		/// </summary>
-		public string GetBuildinPackageVersionFilePath()
-		{
-			string fileName = YooAssetSettingsData.GetPackageVersionFileName(_packageName);
-			return PathUtility.Combine(BuildinPackageRoot, fileName);
-		}
-	}
-}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/PersistentHelper.cs

@@ -0,0 +1,31 @@
+
+namespace YooAsset
+{
+    internal static class PersistentHelper
+    {
+        /// <summary>
+        /// 获取WWW加载本地资源的路径
+        /// </summary>
+        public static string ConvertToWWWPath(string path)
+        {
+#if UNITY_EDITOR
+            return StringUtility.Format("file:///{0}", path);
+#elif UNITY_WEBGL
+            return path;
+#elif UNITY_IPHONE
+            return StringUtility.Format("file://{0}", path);
+#elif UNITY_ANDROID
+            if (path.StartsWith("jar:file://"))
+                return path;
+            else
+                return StringUtility.Format("jar:file://{0}", path);
+#elif UNITY_STANDALONE_OSX
+            return new System.Uri(path).ToString();
+#elif UNITY_STANDALONE
+            return StringUtility.Format("file:///{0}", path);
+#else
+            return path;
+#endif
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/PersistentManager.cs

@@ -0,0 +1,211 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+    internal class PersistentManager
+    {
+        private readonly Dictionary<string, string> _cachedDataFilePaths = new Dictionary<string, string>(10000);
+        private readonly Dictionary<string, string> _cachedInfoFilePaths = new Dictionary<string, string>(10000);
+        private readonly Dictionary<string, string> _tempDataFilePaths = new Dictionary<string, string>(10000);
+        private readonly Dictionary<string, string> _buildinFilePaths = new Dictionary<string, string>(10000);
+
+        /// <summary>
+        /// 所属包裹
+        /// </summary>
+        public readonly string PackageName;
+
+        public string BuildinRoot { private set; get; }
+        public string BuildinPackageRoot { private set; get; }
+
+        public string SandboxRoot { private set; get; }
+        public string SandboxPackageRoot { private set; get; }
+        public string SandboxCacheFilesRoot { private set; get; }
+        public string SandboxManifestFilesRoot { private set; get; }
+        public string SandboxAppFootPrintFilePath { private set; get; }
+
+        public bool AppendFileExtension { private set; get; }
+
+
+        public PersistentManager(string packageName)
+        {
+            PackageName = packageName;
+        }
+
+        /// <summary>
+        /// 初始化
+        /// </summary>
+        public void Initialize(string buildinRoot, string sandboxRoot, bool appendFileExtension)
+        {
+            if (string.IsNullOrEmpty(buildinRoot))
+                BuildinRoot = CreateDefaultBuildinRoot();
+            else
+                BuildinRoot = buildinRoot;
+
+            if (string.IsNullOrEmpty(sandboxRoot))
+                SandboxRoot = CreateDefaultSandboxRoot();
+            else
+                SandboxRoot = sandboxRoot;
+
+            BuildinPackageRoot = PathUtility.Combine(BuildinRoot, PackageName);
+            SandboxPackageRoot = PathUtility.Combine(SandboxRoot, PackageName);
+            SandboxCacheFilesRoot = PathUtility.Combine(SandboxPackageRoot, YooAssetSettings.CacheFilesFolderName);
+            SandboxManifestFilesRoot = PathUtility.Combine(SandboxPackageRoot, YooAssetSettings.ManifestFolderName);
+            SandboxAppFootPrintFilePath = PathUtility.Combine(SandboxPackageRoot, YooAssetSettings.AppFootPrintFileName);
+            AppendFileExtension = appendFileExtension;
+        }
+        private static string CreateDefaultBuildinRoot()
+        {
+            return PathUtility.Combine(UnityEngine.Application.streamingAssetsPath, YooAssetSettingsData.Setting.DefaultYooFolderName);
+        }
+        private static string CreateDefaultSandboxRoot()
+        {
+#if UNITY_EDITOR
+            // 注意：为了方便调试查看，编辑器下把存储目录放到项目里。
+            string projectPath = Path.GetDirectoryName(UnityEngine.Application.dataPath);
+            projectPath = PathUtility.RegularPath(projectPath);
+            return PathUtility.Combine(projectPath, YooAssetSettingsData.Setting.DefaultYooFolderName);
+#elif UNITY_STANDALONE
+            return PathUtility.Combine(UnityEngine.Application.dataPath, YooAssetSettingsData.Setting.DefaultYooFolderName);
+#else
+            return PathUtility.Combine(UnityEngine.Application.persistentDataPath, YooAssetSettingsData.Setting.DefaultYooFolderName);	
+#endif
+        }
+
+        public string GetCachedDataFilePath(PackageBundle bundle)
+        {
+            if (_cachedDataFilePaths.TryGetValue(bundle.CacheGUID, out string filePath) == false)
+            {
+                string folderName = bundle.FileHash.Substring(0, 2);
+                filePath = PathUtility.Combine(SandboxCacheFilesRoot, folderName, bundle.CacheGUID, YooAssetSettings.CacheBundleDataFileName);
+                if (AppendFileExtension)
+                    filePath += bundle.FileExtension;
+                _cachedDataFilePaths.Add(bundle.CacheGUID, filePath);
+            }
+            return filePath;
+        }
+        public string GetCachedInfoFilePath(PackageBundle bundle)
+        {
+            if (_cachedInfoFilePaths.TryGetValue(bundle.CacheGUID, out string filePath) == false)
+            {
+                string folderName = bundle.FileHash.Substring(0, 2);
+                filePath = PathUtility.Combine(SandboxCacheFilesRoot, folderName, bundle.CacheGUID, YooAssetSettings.CacheBundleInfoFileName);
+                _cachedInfoFilePaths.Add(bundle.CacheGUID, filePath);
+            }
+            return filePath;
+        }
+        public string GetTempDataFilePath(PackageBundle bundle)
+        {
+            if (_tempDataFilePaths.TryGetValue(bundle.CacheGUID, out string filePath) == false)
+            {
+                string cachedDataFilePath = GetCachedDataFilePath(bundle);
+                filePath = $"{cachedDataFilePath}.temp";
+                _tempDataFilePaths.Add(bundle.CacheGUID, filePath);
+            }
+            return filePath;
+        }
+        public string GetBuildinFilePath(PackageBundle bundle)
+        {
+            if (_buildinFilePaths.TryGetValue(bundle.CacheGUID, out string filePath) == false)
+            {
+                filePath = PathUtility.Combine(BuildinPackageRoot, bundle.FileName);
+                _buildinFilePaths.Add(bundle.CacheGUID, filePath);
+            }
+            return filePath;
+        }
+
+        /// <summary>
+        /// 删除沙盒里的包裹目录
+        /// </summary>
+        public void DeleteSandboxPackageFolder()
+        {
+            if (Directory.Exists(SandboxPackageRoot))
+                Directory.Delete(SandboxPackageRoot, true);
+        }
+
+        /// <summary>
+        /// 删除沙盒内的缓存文件夹
+        /// </summary>
+        public void DeleteSandboxCacheFilesFolder()
+        {
+            if (Directory.Exists(SandboxCacheFilesRoot))
+                Directory.Delete(SandboxCacheFilesRoot, true);
+        }
+
+        /// <summary>
+        /// 删除沙盒内的清单文件夹
+        /// </summary>
+        public void DeleteSandboxManifestFilesFolder()
+        {
+            if (Directory.Exists(SandboxManifestFilesRoot))
+                Directory.Delete(SandboxManifestFilesRoot, true);
+        }
+
+
+        /// <summary>
+        /// 获取沙盒内包裹的清单文件的路径
+        /// </summary>
+        public string GetSandboxPackageManifestFilePath(string packageVersion)
+        {
+            string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
+            return PathUtility.Combine(SandboxManifestFilesRoot, fileName);
+        }
+
+        /// <summary>
+        /// 获取沙盒内包裹的哈希文件的路径
+        /// </summary>
+        public string GetSandboxPackageHashFilePath(string packageVersion)
+        {
+            string fileName = YooAssetSettingsData.GetPackageHashFileName(PackageName, packageVersion);
+            return PathUtility.Combine(SandboxManifestFilesRoot, fileName);
+        }
+
+        /// <summary>
+        /// 获取沙盒内包裹的版本文件的路径
+        /// </summary>
+        public string GetSandboxPackageVersionFilePath()
+        {
+            string fileName = YooAssetSettingsData.GetPackageVersionFileName(PackageName);
+            return PathUtility.Combine(SandboxManifestFilesRoot, fileName);
+        }
+
+        /// <summary>
+        /// 保存沙盒内默认的包裹版本
+        /// </summary>
+        public void SaveSandboxPackageVersionFile(string version)
+        {
+            string filePath = GetSandboxPackageVersionFilePath();
+            FileUtility.WriteAllText(filePath, version);
+        }
+
+
+        /// <summary>
+        /// 获取APP内包裹的清单文件的路径
+        /// </summary>
+        public string GetBuildinPackageManifestFilePath(string packageVersion)
+        {
+            string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
+            return PathUtility.Combine(BuildinPackageRoot, fileName);
+        }
+
+        /// <summary>
+        /// 获取APP内包裹的哈希文件的路径
+        /// </summary>
+        public string GetBuildinPackageHashFilePath(string packageVersion)
+        {
+            string fileName = YooAssetSettingsData.GetPackageHashFileName(PackageName, packageVersion);
+            return PathUtility.Combine(BuildinPackageRoot, fileName);
+        }
+
+        /// <summary>
+        /// 获取APP内包裹的版本文件的路径
+        /// </summary>
+        public string GetBuildinPackageVersionFilePath()
+        {
+            string fileName = YooAssetSettingsData.GetPackageVersionFileName(PackageName);
+            return PathUtility.Combine(BuildinPackageRoot, fileName);
+        }
+    }
+}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/PersistentTools.cs

@@ -1,51 +0,0 @@
-using System.IO;
-using System.Collections.Generic;
-
-namespace YooAsset
-{
-	internal class PersistentTools
-	{
-		private static readonly Dictionary<string, Persistent> _persitentDic = new Dictionary<string, Persistent>(100);
-
-		/// <summary>
-		/// 获取包裹的持久化类
-		/// </summary>
-		public static Persistent GetPersistent(string packageName)
-		{
-			if (_persitentDic.ContainsKey(packageName) == false)
-				throw new System.Exception("Should never get here !");
-			return _persitentDic[packageName];
-		}
-
-		/// <summary>
-		/// 获取或创建包裹的持久化类
-		/// </summary>
-		public static Persistent GetOrCreatePersistent(string packageName)
-		{
-			if (_persitentDic.ContainsKey(packageName) == false)
-			{
-				Persistent persistent = new Persistent(packageName);
-				_persitentDic.Add(packageName, persistent);
-			}
-			return _persitentDic[packageName];
-		}
-
-		/// <summary>
-		/// 获取WWW加载本地资源的路径
-		/// </summary>
-		public static string ConvertToWWWPath(string path)
-		{
-#if UNITY_EDITOR
-			return StringUtility.Format("file:///{0}", path);
-#elif UNITY_IPHONE
-			return StringUtility.Format("file://{0}", path);
-#elif UNITY_ANDROID
-			return path;
-#elif UNITY_STANDALONE
-			return StringUtility.Format("file:///{0}", path);
-#elif UNITY_WEBGL
-			return path;
-#endif
-		}
-	}
-}

UnityProject/Packages/YooAsset/Runtime/CacheSystem/VerifyElement.cs

@@ -2,59 +2,59 @@
 
 namespace YooAsset
 {
-	/// <summary>
-	/// 缓存文件验证元素
-	/// </summary>
-	internal class VerifyCacheFileElement
-	{
-		public string PackageName { private set; get; }
-		public string CacheGUID { private set; get; }
-		public string FileRootPath { private set; get; }
-		public string DataFilePath { private set; get; }
-		public string InfoFilePath { private set; get; }
+    /// <summary>
+    /// 缓存文件验证元素
+    /// </summary>
+    internal class VerifyCacheFileElement
+    {
+        public string PackageName { private set; get; }
+        public string CacheGUID { private set; get; }
+        public string FileRootPath { private set; get; }
+        public string DataFilePath { private set; get; }
+        public string InfoFilePath { private set; get; }
 
-		public EVerifyResult Result;
-		public string DataFileCRC;
-		public long DataFileSize;
+        public EVerifyResult Result;
+        public string DataFileCRC;
+        public long DataFileSize;
 
-		public VerifyCacheFileElement(string packageName, string cacheGUID, string fileRootPath, string dataFilePath, string infoFilePath)
-		{
-			PackageName = packageName;
-			CacheGUID = cacheGUID;
-			FileRootPath = fileRootPath;
-			DataFilePath = dataFilePath;
-			InfoFilePath = infoFilePath;
-		}
+        public VerifyCacheFileElement(string packageName, string cacheGUID, string fileRootPath, string dataFilePath, string infoFilePath)
+        {
+            PackageName = packageName;
+            CacheGUID = cacheGUID;
+            FileRootPath = fileRootPath;
+            DataFilePath = dataFilePath;
+            InfoFilePath = infoFilePath;
+        }
 
-		public void DeleteFiles()
-		{
-			try
-			{
-				Directory.Delete(FileRootPath, true);
-			}
-			catch (System.Exception e)
-			{
-				YooLogger.Warning($"Failed delete cache bundle folder : {e}");
-			}
-		}
-	}
+        public void DeleteFiles()
+        {
+            try
+            {
+                Directory.Delete(FileRootPath, true);
+            }
+            catch (System.Exception e)
+            {
+                YooLogger.Warning($"Failed delete cache bundle folder : {e}");
+            }
+        }
+    }
 
-	/// <summary>
-	/// 下载文件验证元素
-	/// </summary>
-	internal class VerifyTempFileElement
-	{
-		public string TempDataFilePath { private set; get; }
-		public string FileCRC { private set; get; }
-		public long FileSize { private set; get; }
+    /// <summary>
+    /// 下载文件验证元素
+    /// </summary>
+    internal class VerifyTempFileElement
+    {
+        public string TempDataFilePath { private set; get; }
+        public string FileCRC { private set; get; }
+        public long FileSize { private set; get; }
 
-		public int Result = 0; // 注意：原子操作对象
+        public int Result = 0; // 注意：原子操作对象
 
-		public VerifyTempFileElement(string tempDataFilePath, string fileCRC, long fileSize)
-		{
-			TempDataFilePath = tempDataFilePath;
-			FileCRC = fileCRC;
-			FileSize = fileSize;
-		}
-	}
+        public VerifyTempFileElement(string tempDataFilePath, string fileCRC, long fileSize)
+        {
+            TempDataFilePath = tempDataFilePath;
+            FileCRC = fileCRC;
+            FileSize = fileSize;
+        }
+    }
 }