update file system

2024-07-05 15:10:07 +08:00
parent db8d09d0d6
commit 75511397d6
54 changed files with 510 additions and 1077 deletions
@@ -25,12 +25,9 @@ namespace YooAsset
        protected readonly Dictionary<string, string> _buildinFilePaths = new Dictionary<string, string>(10000);
        protected string _packageRoot;

-        /// <summary>
-        /// 解压文件系统
-        /// </summary>
+        // 解压文件系统
        public IFileSystem UnpackFileSystem { private set; get; }

-
        /// <summary>
        /// 包裹名称
        /// </summary>
@@ -110,27 +107,24 @@ namespace YooAsset
        }
        public virtual FSRequestPackageVersionOperation RequestPackageVersionAsync(params object[] args)
        {
-            throw new System.NotImplementedException();
+            var operation = new DBFSRequestPackageVersionOperation(this);
+            OperationSystem.StartOperation(PackageName, operation);
+            return operation;
        }
        public virtual FSClearAllBundleFilesOperation ClearAllBundleFilesAsync(params object[] args)
        {
-            var operation = new DBFSClearAllBundleFilesOperation(this);
-            OperationSystem.StartOperation(PackageName, operation);
-            return operation;
+            return UnpackFileSystem.ClearAllBundleFilesAsync();
        }
        public virtual FSClearUnusedBundleFilesOperation ClearUnusedBundleFilesAsync(params object[] args)
        {
            PackageManifest manifest = args[0] as PackageManifest;
-            var operation = new DBFSClearUnusedBundleFilesOperation(this, manifest);
-            OperationSystem.StartOperation(PackageName, operation);
-            return operation;
+            return UnpackFileSystem.ClearUnusedBundleFilesAsync(manifest);
        }
        public virtual FSDownloadFileOperation DownloadFileAsync(params object[] args)
        {
            PackageBundle bundle = args[0] as PackageBundle;
            int failedTryAgain = (int)args[2];
            int timeout = (int)args[3];
-
            string buidlinFilePath = GetBuildinFileLoadPath(bundle);
            return UnpackFileSystem.DownloadFileAsync(bundle, buidlinFilePath, failedTryAgain, timeout);
        }
@@ -176,7 +170,7 @@ namespace YooAsset

        public virtual bool Belong(PackageBundle bundle)
        {
-            return _wrappers.ContainsKey(bundle.BundleGUID);
+            return Belong(bundle.BundleGUID);
        }
        public virtual bool Belong(string bundleGUID)
        {
@@ -184,7 +178,7 @@ namespace YooAsset
        }
        public virtual bool Exists(PackageBundle bundle)
        {
-            return _wrappers.ContainsKey(bundle.BundleGUID);
+            return Exists(bundle.BundleGUID);
        }
        public virtual bool Exists(string bundleGUID)
        {
@@ -199,7 +193,7 @@ namespace YooAsset
        {
            if (Belong(bundle) == false)
                return false;
-            
+
 #if UNITY_ANDROID
            return RawFileBuildPipeline || bundle.Encrypted;
 #else
@@ -230,11 +224,11 @@ namespace YooAsset

        public virtual byte[] ReadFileBytes(PackageBundle bundle)
        {
-            return UnpackFileSystem.ReadFileBytes(bundle);
+            throw new System.NotImplementedException();
        }
        public virtual string ReadFileText(PackageBundle bundle)
        {
-            return UnpackFileSystem.ReadFileText(bundle);
+            throw new System.NotImplementedException();
        }

        public virtual FSLoadBundleOperation LoadBundleFile(PackageBundle bundle)
@@ -1,45 +0,0 @@
-
-namespace YooAsset
-{
-    internal sealed class DBFSClearAllBundleFilesOperation : FSClearAllBundleFilesOperation
-    {
-        private enum ESteps
-        {
-            None,
-            ClearUnpackFileSystem,
-            Done,
-        }
-
-        private readonly DefaultBuildinFileSystem _fileSystem;
-        private FSClearAllBundleFilesOperation _unpackClearAllBundleFilesOp;
-        private ESteps _steps = ESteps.None;
-
-        internal DBFSClearAllBundleFilesOperation(DefaultBuildinFileSystem fileSystem)
-        {
-            _fileSystem = fileSystem;
-        }
-        internal override void InternalOnStart()
-        {
-            _steps = ESteps.ClearUnpackFileSystem;
-        }
-        internal override void InternalOnUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.ClearUnpackFileSystem)
-            {
-                if (_unpackClearAllBundleFilesOp == null)
-                    _unpackClearAllBundleFilesOp = _fileSystem.UnpackFileSystem.ClearAllBundleFilesAsync();
-
-                Progress = _unpackClearAllBundleFilesOp.Progress;
-                if (_unpackClearAllBundleFilesOp.IsDone == false)
-                    return;
-
-                _steps = ESteps.Done;
-                Status = _unpackClearAllBundleFilesOp.Status;
-                Error = _unpackClearAllBundleFilesOp.Error;
-            }
-        }
-    }
-}
@@ -1,47 +0,0 @@
-
-namespace YooAsset
-{
-    internal sealed class DBFSClearUnusedBundleFilesOperation : FSClearUnusedBundleFilesOperation
-    {
-        private enum ESteps
-        {
-            None,
-            ClearUnpackFileSystem,
-            Done,
-        }
-
-        private readonly DefaultBuildinFileSystem _fileSystem;
-        private readonly PackageManifest _manifest;
-        private FSClearUnusedBundleFilesOperation _unpackClearUnusedBundleFilesOp;
-        private ESteps _steps = ESteps.None;
-
-        internal DBFSClearUnusedBundleFilesOperation(DefaultBuildinFileSystem fileSystem, PackageManifest manifest)
-        {
-            _fileSystem = fileSystem;
-            _manifest = manifest;
-        }
-        internal override void InternalOnStart()
-        {
-            _steps = ESteps.ClearUnpackFileSystem;
-        }
-        internal override void InternalOnUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.ClearUnpackFileSystem)
-            {
-                if (_unpackClearUnusedBundleFilesOp == null)
-                    _unpackClearUnusedBundleFilesOp = _fileSystem.UnpackFileSystem.ClearUnusedBundleFilesAsync(_manifest);
-
-                Progress = _unpackClearUnusedBundleFilesOp.Progress;
-                if (_unpackClearUnusedBundleFilesOp.IsDone == false)
-                    return;
-
-                _steps = ESteps.Done;
-                Status = _unpackClearUnusedBundleFilesOp.Status;
-                Error = _unpackClearUnusedBundleFilesOp.Error;
-            }
-        }
-    }
-}
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 1e0e1c080b28b3c45b401da4ac06f687
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -0,0 +1,57 @@
+
+namespace YooAsset
+{
+    internal class DBFSRequestPackageVersionOperation : FSRequestPackageVersionOperation
+    {
+        private enum ESteps
+        {
+            None,
+            GetPackageVersion,
+            Done,
+        }
+
+        private readonly DefaultBuildinFileSystem _fileSystem;
+        private RequestBuildinPackageVersionOperation _requestBuildinPackageVersionOp;
+        private ESteps _steps = ESteps.None;
+
+
+        internal DBFSRequestPackageVersionOperation(DefaultBuildinFileSystem fileSystem)
+        {
+            _fileSystem = fileSystem;
+        }
+        internal override void InternalOnStart()
+        {
+            _steps = ESteps.GetPackageVersion;
+        }
+        internal override void InternalOnUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.GetPackageVersion)
+            {
+                if (_requestBuildinPackageVersionOp == null)
+                {
+                    _requestBuildinPackageVersionOp = new RequestBuildinPackageVersionOperation(_fileSystem);
+                    OperationSystem.StartOperation(_fileSystem.PackageName, _requestBuildinPackageVersionOp);
+                }
+
+                if (_requestBuildinPackageVersionOp.IsDone == false)
+                    return;
+
+                if (_requestBuildinPackageVersionOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.Done;
+                    PackageVersion = _requestBuildinPackageVersionOp.PackageVersion;
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _requestBuildinPackageVersionOp.Error;
+                }
+            }
+        }
+    }
+}
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 624ca0ff2f0c7da4bb9c1a1d58e732b1
+guid: f0b6ec24639af3741847a6a7ef09986a
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2