Skip to content

Commit 11035b9

Browse files
committed
CodeQA ?
1 parent b1b2f44 commit 11035b9

File tree

1 file changed

+22
-30
lines changed
  • CollapseLauncher/Classes/RepairManagement/Honkai

1 file changed

+22
-30
lines changed

CollapseLauncher/Classes/RepairManagement/Honkai/Fetch.cs

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ private class XmfSenadinaFileIdentifierProperty(SenadinaFileIdentifier? blocksPl
6868
public CancellationToken CancelToken { get; } = token;
6969
}
7070

71-
private string? _mainMetaRepoUrl;
72-
private readonly byte[] _collapseHeader = "Collapse"u8.ToArray();
71+
private string? _mainMetaRepoUrl;
72+
private readonly byte[] _collapseHeader = "Collapse"u8.ToArray();
7373

7474
private async Task Fetch(List<FilePropertiesRemote> assetIndex, CancellationToken token)
7575
{
@@ -114,20 +114,20 @@ private async Task Fetch(List<FilePropertiesRemote> assetIndex, CancellationToke
114114
GameRepoURL = gameRepoUrl;
115115

116116
// Initialize local audio manifest, blocks and patchConfig stream.
117-
SenadinaFileIdentifier? audioManifestSenadinaFileIdentifier = null;
118-
SenadinaFileIdentifier? blocksBaseManifestSenadinaFileIdentifier = null;
117+
SenadinaFileIdentifier? audioManifestSenadinaFileIdentifier = null;
118+
SenadinaFileIdentifier? blocksBaseManifestSenadinaFileIdentifier = null;
119119
SenadinaFileIdentifier? blocksPlatformManifestSenadinaFileIdentifier = null;
120-
SenadinaFileIdentifier? blocksCurrentManifestSenadinaFileIdentifier = null;
121-
SenadinaFileIdentifier? patchConfigManifestSenadinaFileIdentifier = null;
120+
SenadinaFileIdentifier? blocksCurrentManifestSenadinaFileIdentifier = null;
121+
SenadinaFileIdentifier? patchConfigManifestSenadinaFileIdentifier = null;
122122
/* 2025-05-01: This is disabled for now as we now fully use MhyMurmurHash2_64B for the hash
123123
SenadinaFileIdentifier? asbReferenceSenadinaFileIdentifier = null;
124124
*/
125125
_mainMetaRepoUrl = null;
126126

127127
// Get the status if the current game is Senadina version.
128-
GameTypeHonkaiVersion gameVersionKind = GameVersionManager.CastAs<GameTypeHonkaiVersion>();
129-
int[] versionArray = gameVersionKind.GetGameVersionApi()?.VersionArray!;
130-
bool IsSenadinaVersion = gameVersionKind.IsCurrentSenadinaVersion;
128+
GameTypeHonkaiVersion gameVersionKind = GameVersionManager.CastAs<GameTypeHonkaiVersion>();
129+
int[] versionArray = gameVersionKind.GetGameVersionApi()?.VersionArray!;
130+
bool IsSenadinaVersion = gameVersionKind.IsCurrentSenadinaVersion;
131131

132132
// TODO: Use FallbackCDNUtil to fetch the stream.
133133
if (IsSenadinaVersion && !IsOnlyRecoverMain)
@@ -563,27 +563,19 @@ private async Task BuildVideoIndex(DownloadClient downloadClient, CacheAsset? ca
563563
{
564564
// Get the remote stream and use CacheStream
565565
await using MemoryStream memoryStream = new MemoryStream();
566-
if (downloadClient != null)
567-
{
568-
ArgumentNullException.ThrowIfNull(cacheAsset);
569-
// Download the cache and store it to MemoryStream
570-
await downloadClient.DownloadAsync(cacheAsset.ConcatURL, memoryStream, false, cancelToken: token);
571-
memoryStream.Position = 0;
572-
573-
// Use CacheStream to decrypt and read it as Stream
574-
await using CacheStream cacheStream = new CacheStream(memoryStream, true, luckyNumber);
575-
// Enumerate and iterate the metadata to asset index
576-
await BuildAndEnumerateVideoVersioningFile(CGMetadata.Enumerate(cacheStream, Encoding.UTF8),
577-
assetIndex,
578-
ignoredAssetIDs,
579-
assetBundleURL,
580-
token);
581-
}
582-
else
583-
{
584-
throw new ObjectDisposedException("RepairManagement::Honkai::Fetch:BuildVideoIndex() error!" +
585-
"\r\n downloadClient is unexpectedly disposed.");
586-
}
566+
ArgumentNullException.ThrowIfNull(cacheAsset);
567+
// Download the cache and store it to MemoryStream
568+
await downloadClient.DownloadAsync(cacheAsset.ConcatURL, memoryStream, false, cancelToken: token);
569+
memoryStream.Position = 0;
570+
571+
// Use CacheStream to decrypt and read it as Stream
572+
await using CacheStream cacheStream = new CacheStream(memoryStream, true, luckyNumber);
573+
// Enumerate and iterate the metadata to asset index
574+
await BuildAndEnumerateVideoVersioningFile(CGMetadata.Enumerate(cacheStream, Encoding.UTF8),
575+
assetIndex,
576+
ignoredAssetIDs,
577+
assetBundleURL,
578+
token);
587579
}
588580

589581
private async Task BuildAndEnumerateVideoVersioningFile(IEnumerable<CGMetadata> enumEntry, List<FilePropertiesRemote> assetIndex, HonkaiRepairAssetIgnore ignoredAssetIDs, string assetBundleURL, CancellationToken token)

0 commit comments

Comments
 (0)