Skip to content

Commit f41c2d5

Browse files
committed
Use cached response for ZZZ fetch
1 parent a580f3c commit f41c2d5

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

CollapseLauncher/Classes/RepairManagement/Zenless/ZenlessRepair.Extensions.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using CollapseLauncher.Helper.StreamUtility;
22
using Hi3Helper;
33
using Hi3Helper.Data;
4+
using Hi3Helper.EncTool;
45
using Hi3Helper.EncTool.Parser.AssetIndex;
56
using Hi3Helper.EncTool.Parser.Sleepy;
67
using Hi3Helper.Shared.ClassStruct;
@@ -55,12 +56,10 @@ internal static async IAsyncEnumerable<PkgVersionProperties> RegisterSleepyFileI
5556
string persistentPath,
5657
[EnumeratorCancellation] CancellationToken token = default)
5758
{
58-
string manifestFileUrl = ConverterTool.CombineURLFromString(fileInfo.BaseUrl, fileInfo.ReferenceFileInfo.FileName);
59-
using HttpResponseMessage responseMessage = await httpClient.GetAsync(manifestFileUrl, HttpCompletionOption.ResponseHeadersRead, token);
59+
string manifestFileUrl = fileInfo.BaseUrl.CombineURLFromString(fileInfo.ReferenceFileInfo.FileName);
60+
string filePath = Path.Combine(persistentPath, fileInfo.ReferenceFileInfo.FileName + "_persist");
6061

61-
string filePath = Path.Combine(persistentPath, fileInfo.ReferenceFileInfo.FileName + "_persist");
62-
63-
await using Stream responseStream = await responseMessage.Content.ReadAsStreamAsync(token);
62+
await using Stream responseStream = (await httpClient.TryGetCachedStreamFrom(manifestFileUrl, null, token)).Stream;
6463
await using Stream responseInterceptedStream = new JsonFieldToEnumerableStream(needWriteToLocal ? filePath : null, responseStream);
6564

6665
IAsyncEnumerable<ZenlessResManifestAsset?> enumerable = JsonSerializer
@@ -196,7 +195,7 @@ private static FilePropertiesRemote GetNormalizedFilePropertyTypeBased(string re
196195
{
197196
string remoteAbsolutePath = type switch
198197
{
199-
FileType.Generic => ConverterTool.CombineURLFromString(remoteParentURL, remoteRelativePath),
198+
FileType.Generic => remoteParentURL.CombineURLFromString(remoteRelativePath),
200199
_ => remoteParentURL
201200
};
202201
string localAbsolutePath = Path.Combine(baseLocalPath, ConverterTool.NormalizePath(remoteRelativePath));

0 commit comments

Comments
 (0)