update wechat file system
This commit is contained in:
何冠峰
+16
-55
@@ -1,87 +1,48 @@
|
||||
#if UNITY_WEBGL && WEIXINMINIGAME
|
||||
using System.Collections.Generic;
|
||||
using WeChatWASM;
|
||||
using YooAsset;
|
||||
using UnityEngine;
|
||||
using System.Linq;
|
||||
using UnityEngine;
|
||||
using YooAsset;
|
||||
using WeChatWASM;
|
||||
|
||||
internal class WXFSClearAllBundleFilesOperation : FSClearAllBundleFilesOperation
|
||||
{
|
||||
private enum ESteps
|
||||
{
|
||||
None,
|
||||
GetAllCacheFiles,
|
||||
ClearAllWXCacheBundleFiles,
|
||||
ClearAllCacheFiles,
|
||||
Done,
|
||||
}
|
||||
|
||||
private List<string> _wxBundleFilePaths;
|
||||
private int _fileTotalCount = 0;
|
||||
private WechatFileSystem _fileSystem;
|
||||
private readonly WechatFileSystem _fileSystem;
|
||||
private ESteps _steps = ESteps.None;
|
||||
|
||||
|
||||
internal WXFSClearAllBundleFilesOperation(WechatFileSystem fileSystem)
|
||||
{
|
||||
_fileSystem = fileSystem;
|
||||
var allCacheFilePathDic = _fileSystem.GetWXAllCacheFilePath();
|
||||
_wxBundleFilePaths = allCacheFilePathDic.Values.ToList();
|
||||
}
|
||||
internal override void InternalOnStart()
|
||||
{
|
||||
_steps = ESteps.GetAllCacheFiles;
|
||||
_steps = ESteps.ClearAllCacheFiles;
|
||||
}
|
||||
internal override void InternalOnUpdate()
|
||||
{
|
||||
if (_steps == ESteps.None || _steps == ESteps.Done)
|
||||
return;
|
||||
|
||||
if (_steps == ESteps.GetAllCacheFiles)
|
||||
if (_steps == ESteps.ClearAllCacheFiles)
|
||||
{
|
||||
if (_wxBundleFilePaths == null)
|
||||
WX.CleanAllFileCache((bool isOk) =>
|
||||
{
|
||||
_steps = ESteps.Done;
|
||||
Status = EOperationStatus.Failed;
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
_steps = ESteps.ClearAllWXCacheBundleFiles;
|
||||
_fileTotalCount = _wxBundleFilePaths.Count;
|
||||
}
|
||||
}
|
||||
|
||||
if (_steps == ESteps.ClearAllWXCacheBundleFiles)
|
||||
{
|
||||
for (int i = _wxBundleFilePaths.Count - 1; i >= 0; i--)
|
||||
{
|
||||
string bundlePath = _wxBundleFilePaths[i];
|
||||
if (_fileSystem.CheckWXFileIsExist(bundlePath))
|
||||
{
|
||||
WX.RemoveFile(bundlePath, (bool isOk) =>
|
||||
{
|
||||
Debug.Log($"{_wxBundleFilePaths.Count}---删除缓存文件路径成功====={bundlePath}==");
|
||||
_wxBundleFilePaths.Remove(bundlePath);
|
||||
});
|
||||
}
|
||||
if (isOk)
|
||||
YooLogger.Log("微信缓存清理成功！");
|
||||
else
|
||||
{
|
||||
_wxBundleFilePaths.Remove(bundlePath);
|
||||
//Debug.LogWarning($"Not Exit Cache file:{bundlePath}");
|
||||
}
|
||||
YooLogger.Log("微信缓存清理失败！");
|
||||
});
|
||||
|
||||
if (OperationSystem.IsBusy)
|
||||
break;
|
||||
}
|
||||
|
||||
if (_fileTotalCount == 0)
|
||||
Progress = 1.0f;
|
||||
else
|
||||
Progress = 1.0f - (_wxBundleFilePaths.Count / _fileTotalCount);
|
||||
|
||||
if (_wxBundleFilePaths.Count == 0)
|
||||
{
|
||||
_steps = ESteps.Done;
|
||||
Status = EOperationStatus.Succeed;
|
||||
}
|
||||
_steps = ESteps.Done;
|
||||
Status = EOperationStatus.Succeed;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+53
-139
@@ -1,35 +1,29 @@
|
||||
#if UNITY_WEBGL && WEIXINMINIGAME
|
||||
using System.Collections.Generic;
|
||||
using WeChatWASM;
|
||||
using YooAsset;
|
||||
using System.IO;
|
||||
using UnityEngine;
|
||||
using System.Linq;
|
||||
using YooAsset;
|
||||
using WeChatWASM;
|
||||
|
||||
|
||||
internal class WXFSClearUnusedBundleFilesAsync : FSClearUnusedBundleFilesOperation
|
||||
{
|
||||
private enum ESteps
|
||||
{
|
||||
None,
|
||||
LoadCachePackageInfo,
|
||||
VerifyFileData,
|
||||
LoadManifest,
|
||||
GetAllCacheFiles,
|
||||
WaitResult,
|
||||
GetUnusedCacheFiles,
|
||||
ClearUnusedCacheFiles,
|
||||
Done,
|
||||
}
|
||||
|
||||
private WechatFileSystem _fileSystem;
|
||||
private readonly WechatFileSystem _fileSystem;
|
||||
private readonly PackageManifest _manifest;
|
||||
private PackageManifest _cacheManifest;
|
||||
private List<string> _unusedBundleGUIDs;
|
||||
private ESteps _steps = ESteps.None;
|
||||
private DeserializeManifestOperation _deserializer;
|
||||
private byte[] _fileData;
|
||||
private string _packageHash;
|
||||
private List<string> _unusedCacheFiles;
|
||||
private int _unusedFileTotalCount = 0;
|
||||
private string _lastPackageVersion;
|
||||
private string _cacheManifestHashPath;
|
||||
private string _cacheManifestPath;
|
||||
private GetSavedFileListSuccessCallbackResult _result;
|
||||
private ESteps _steps = ESteps.None;
|
||||
|
||||
internal WXFSClearUnusedBundleFilesAsync(WechatFileSystem fileSystem, PackageManifest manifest)
|
||||
{
|
||||
@@ -38,98 +32,54 @@ internal class WXFSClearUnusedBundleFilesAsync : FSClearUnusedBundleFilesOperati
|
||||
}
|
||||
internal override void InternalOnStart()
|
||||
{
|
||||
_steps = ESteps.LoadCachePackageInfo;
|
||||
_steps = ESteps.GetAllCacheFiles;
|
||||
}
|
||||
internal override void InternalOnUpdate()
|
||||
{
|
||||
if (_steps == ESteps.None || _steps == ESteps.Done)
|
||||
return;
|
||||
|
||||
if (_steps == ESteps.LoadCachePackageInfo)
|
||||
if (_steps == ESteps.GetAllCacheFiles)
|
||||
{
|
||||
LoadManifestInfo();
|
||||
if(_fileData != null && _fileData.Length > 0 && !string.IsNullOrEmpty(_packageHash))
|
||||
{
|
||||
_steps = ESteps.VerifyFileData;
|
||||
}
|
||||
else
|
||||
_steps = ESteps.WaitResult;
|
||||
|
||||
var fileSystemMgr = WX.GetFileSystemManager();
|
||||
var option = new GetSavedFileListOption();
|
||||
fileSystemMgr.GetSavedFileList(option);
|
||||
option.fail += (FileError error) =>
|
||||
{
|
||||
_steps = ESteps.Done;
|
||||
Error = error.errMsg;
|
||||
Status = EOperationStatus.Failed;
|
||||
Error = "Failed to load cache package manifest file!";
|
||||
}
|
||||
}
|
||||
|
||||
if(_steps == ESteps.VerifyFileData)
|
||||
{
|
||||
string fileHash = HashUtility.BytesMD5(_fileData);
|
||||
if (fileHash == _packageHash)
|
||||
{
|
||||
_steps = ESteps.LoadManifest;
|
||||
}
|
||||
else
|
||||
{
|
||||
_steps = ESteps.Done;
|
||||
Status = EOperationStatus.Failed;
|
||||
Error = "Failed to verify cache package manifest file!";
|
||||
}
|
||||
}
|
||||
|
||||
if (_steps == ESteps.LoadManifest)
|
||||
{
|
||||
if (_deserializer == null)
|
||||
{
|
||||
_deserializer = new DeserializeManifestOperation(_fileData);
|
||||
OperationSystem.StartOperation(_fileSystem.PackageName, _deserializer);
|
||||
}
|
||||
|
||||
Progress = _deserializer.Progress;
|
||||
if (_deserializer.IsDone == false)
|
||||
return;
|
||||
|
||||
if (_deserializer.Status == EOperationStatus.Succeed)
|
||||
};
|
||||
option.success += (GetSavedFileListSuccessCallbackResult result) =>
|
||||
{
|
||||
_result = result;
|
||||
_steps = ESteps.GetUnusedCacheFiles;
|
||||
_cacheManifest = _deserializer.Manifest;
|
||||
}
|
||||
else
|
||||
{
|
||||
_steps = ESteps.Done;
|
||||
Status = EOperationStatus.Failed;
|
||||
Error = _deserializer.Error;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
if(_steps == ESteps.GetUnusedCacheFiles)
|
||||
if (_steps == ESteps.WaitResult)
|
||||
{
|
||||
_unusedBundleGUIDs = GetUnusedBundleGUIDs();
|
||||
_unusedFileTotalCount = _unusedBundleGUIDs.Count;
|
||||
return;
|
||||
}
|
||||
|
||||
if (_steps == ESteps.GetUnusedCacheFiles)
|
||||
{
|
||||
_unusedCacheFiles = GetUnusedCacheFiles();
|
||||
_unusedFileTotalCount = _unusedCacheFiles.Count;
|
||||
_steps = ESteps.ClearUnusedCacheFiles;
|
||||
YooLogger.Log($"Found unused cache files count : {_unusedFileTotalCount}");
|
||||
}
|
||||
|
||||
if (_steps == ESteps.ClearUnusedCacheFiles)
|
||||
{
|
||||
for (int i = _unusedBundleGUIDs.Count - 1; i >= 0; i--)
|
||||
for (int i = _unusedCacheFiles.Count - 1; i >= 0; i--)
|
||||
{
|
||||
string bundleGUID = _unusedBundleGUIDs[i];
|
||||
PackageBundle bundle = null;
|
||||
if(_cacheManifest.TryGetPackageBundleByBundleGUID(bundleGUID,out bundle))
|
||||
{
|
||||
if (bundle != null)
|
||||
{
|
||||
var cachePath = GetCachePathByFileName(bundle.FileName);
|
||||
WX.RemoveFile(cachePath, (bool isOk) =>
|
||||
{
|
||||
Debug.Log($"{_unusedBundleGUIDs.Count}---删除缓存文件路径成功====={cachePath}==");
|
||||
//_unusedBundleGUIDs.Remove(cachePath);
|
||||
});
|
||||
string cacheFilePath = _unusedCacheFiles[i];
|
||||
WX.RemoveFile(cacheFilePath, null);
|
||||
_unusedCacheFiles.RemoveAt(i);
|
||||
|
||||
//_fileSystem.DeleteCacheFile(bundleGUID);
|
||||
_unusedBundleGUIDs.RemoveAt(i);
|
||||
}
|
||||
}
|
||||
|
||||
if (OperationSystem.IsBusy)
|
||||
break;
|
||||
}
|
||||
@@ -137,74 +87,38 @@ internal class WXFSClearUnusedBundleFilesAsync : FSClearUnusedBundleFilesOperati
|
||||
if (_unusedFileTotalCount == 0)
|
||||
Progress = 1.0f;
|
||||
else
|
||||
Progress = 1.0f - (_unusedBundleGUIDs.Count / _unusedFileTotalCount);
|
||||
Progress = 1.0f - (_unusedCacheFiles.Count / _unusedFileTotalCount);
|
||||
|
||||
if (_unusedBundleGUIDs.Count == 0)
|
||||
if (_unusedCacheFiles.Count == 0)
|
||||
{
|
||||
CheckPackageVerion();
|
||||
_steps = ESteps.Done;
|
||||
Status = EOperationStatus.Succeed;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private List<string> GetUnusedBundleGUIDs()
|
||||
private List<string> GetUnusedCacheFiles()
|
||||
{
|
||||
var allBundleGUIDs = _cacheManifest.BundleDic3.Keys.ToList();
|
||||
List<string> result = new List<string>(allBundleGUIDs.Count);
|
||||
foreach (var bundleGUID in allBundleGUIDs)
|
||||
List<string> result = new List<string>(_result.fileList.Length);
|
||||
foreach (var fileInfo in _result.fileList)
|
||||
{
|
||||
if (_manifest.IsIncludeBundleFile(bundleGUID) == false)
|
||||
// 如果存储文件名是按照Bundle文件哈希值存储
|
||||
string bundleGUID = Path.GetFileNameWithoutExtension(fileInfo.filePath);
|
||||
if (_manifest.TryGetPackageBundleByBundleGUID(bundleGUID, out PackageBundle value) == false)
|
||||
{
|
||||
result.Add(bundleGUID);
|
||||
result.Add(fileInfo.filePath);
|
||||
}
|
||||
|
||||
// 如果存储文件名是按照Bundle文件名称存储
|
||||
/*
|
||||
string bundleName = Path.GetFileNameWithoutExtension(fileInfo.filePath);
|
||||
if (_manifest.TryGetPackageBundleByBundleName(bundleName, out PackageBundle value) == false)
|
||||
{
|
||||
result.Add(fileInfo.filePath);
|
||||
}
|
||||
*/
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private void LoadManifestInfo()
|
||||
{
|
||||
var packageName = _fileSystem.PackageName;
|
||||
var packageVersion = _manifest.PackageVersion;
|
||||
if (WX.StorageHasKeySync(YooAssets.DefaultPackageVersion_Key))
|
||||
{
|
||||
_lastPackageVersion = WX.StorageGetStringSync(YooAssets.DefaultPackageVersion_Key, YooAssets.DefaultPcakageVersion);
|
||||
Debug.Log($"==========Get Storage PackageVerion Succ==={_lastPackageVersion}");
|
||||
if (!string.IsNullOrEmpty(_lastPackageVersion) && (_lastPackageVersion != packageVersion))
|
||||
{
|
||||
_cacheManifestHashPath = GetCachePathByFileName(YooAssetSettingsData.GetPackageHashFileName(packageName, _lastPackageVersion));
|
||||
_cacheManifestPath = GetCachePathByFileName(YooAssetSettingsData.GetManifestBinaryFileName(packageName, _lastPackageVersion));
|
||||
if(string.IsNullOrEmpty(_cacheManifestHashPath) || string.IsNullOrEmpty(_cacheManifestPath)) { return; }
|
||||
|
||||
_packageHash = _fileSystem.ReadFileText(_cacheManifestHashPath);
|
||||
_fileData = _fileSystem.ReadFileData(_cacheManifestPath);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
WX.StorageSetStringSync(YooAssets.DefaultPackageVersion_Key, packageVersion);
|
||||
Debug.Log($"first Set Storage PackageVerion Succ==={packageVersion}");
|
||||
}
|
||||
}
|
||||
|
||||
private void CheckPackageVerion()
|
||||
{
|
||||
var packageName = _fileSystem.PackageName;
|
||||
var packageVersion = _manifest.PackageVersion;
|
||||
if (_lastPackageVersion != packageVersion)
|
||||
{
|
||||
WX.StorageSetStringSync(YooAssets.DefaultPackageVersion_Key, packageVersion);
|
||||
//删除旧的资源清单文件和哈希文件
|
||||
WX.RemoveFile(_cacheManifestHashPath, (bool isOk) => { Debug.Log("====Delect manifestHashPath Succ"); });
|
||||
WX.RemoveFile(_cacheManifestPath, (bool isOk) => { Debug.Log("====Delect manifestPath Succ"); });
|
||||
Debug.Log($"==========Set Storage PackageVerion Succ==={packageVersion}");
|
||||
}
|
||||
}
|
||||
|
||||
private string GetUnuseCachePathByBundleName(string fileName)
|
||||
{
|
||||
var filePath = $"StreamingAssets/WebGL/{fileName}";
|
||||
return WX.GetCachePath(filePath);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
Reference in New Issue
Block a user