Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 19 additions & 31 deletions harmony/pushy/src/main/ets/DownloadTask.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,22 +99,14 @@ export class DownloadTask {
}

private async listEntryNames(directory: string): Promise<string[]> {
const entryNames: string[] = [];
const files = await fileIo.listFile(directory);
const validFiles = files.filter(file => file !== '.' && file !== '..');

for (const file of files) {
if (file === '.' || file === '..') {
continue;
}

const filePath = `${directory}/${file}`;
const stat = await fileIo.stat(filePath);
if (!stat.isDirectory()) {
entryNames.push(file);
}
}
const stats = await Promise.all(
validFiles.map(file => fileIo.stat(`${directory}/${file}`)),
);

return entryNames;
return validFiles.filter((_, index) => !stats[index].isDirectory());
}

private async writeFileContent(
Expand Down Expand Up @@ -432,11 +424,10 @@ export class DownloadTask {
await this.recreateDirectory(params.unzipDirectory);

await zlib.decompressFile(params.targetFile, params.unzipDirectory);
const entryNames = await this.listEntryNames(params.unzipDirectory);
const manifestArrays = await this.readManifestArrays(
params.unzipDirectory,
true,
);
const [entryNames, manifestArrays] = await Promise.all([
this.listEntryNames(params.unzipDirectory),
this.readManifestArrays(params.unzipDirectory, true),
]);

NativePatchCore.buildArchivePatchPlan(
ARCHIVE_PATCH_TYPE_FROM_PACKAGE,
Expand Down Expand Up @@ -475,11 +466,10 @@ export class DownloadTask {
await this.recreateDirectory(params.unzipDirectory);

await zlib.decompressFile(params.targetFile, params.unzipDirectory);
const entryNames = await this.listEntryNames(params.unzipDirectory);
const manifestArrays = await this.readManifestArrays(
params.unzipDirectory,
false,
);
const [entryNames, manifestArrays] = await Promise.all([
this.listEntryNames(params.unzipDirectory),
this.readManifestArrays(params.unzipDirectory, false),
]);

const plan = NativePatchCore.buildArchivePatchPlan(
ARCHIVE_PATCH_TYPE_FROM_PPK,
Expand Down Expand Up @@ -524,11 +514,9 @@ export class DownloadTask {
.replace('resources/base/media/', '')
.split('.')[0];
const mediaBuffer = await resourceManager.getMediaByName(mediaName);
const [firstTarget, ...restTargets] = targets;
await this.writeFileContent(firstTarget, mediaBuffer.buffer);
for (const target of restTargets) {
await this.copySandboxFile(firstTarget, target);
}
await Promise.all(
targets.map(target => this.writeFileContent(target, mediaBuffer.buffer)),
);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
continue;
}
const fromContent = await resourceManager.getRawFd(currentFrom);
Expand All @@ -538,9 +526,9 @@ export class DownloadTask {
await fileIo.unlink(firstTarget);
}
saveFileToSandbox(fromContent, firstTarget);
for (const target of restTargets) {
await this.copySandboxFile(firstTarget, target);
}
await Promise.all(
restTargets.map(target => this.copySandboxFile(firstTarget, target)),
);
}
} catch (error) {
error.message =
Expand Down