Skip to content

Fix type warnings #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nathanstitt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix type warnings #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions job-results/reader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BlobReader, BlobWriter, Entry, TextWriter, ZipReader } from '@zip.js/zip.js'
import { BlobReader, BlobWriter, FileEntry as ZipFileEntry, TextWriter, ZipReader } from '@zip.js/zip.js'
import type { ResultsFile, ResultsManifest, FileEntry } from './types'
import { privateKeyFromBuffer } from '../util'
import logger from '../lib/logger'
Expand Down Expand Up @@ -40,7 +40,7 @@ export class ResultsReader {

const entries = await this.zipReader.getEntries()
for (const entry of entries) {
if (entry.getData && entry.filename == 'manifest.json') {
if (!entry.directory && entry.filename == 'manifest.json') {
const manifestText = await entry.getData(new TextWriter())
this.manifest = JSON.parse(manifestText) as ResultsManifest
}
Expand All @@ -57,18 +57,14 @@ export class ResultsReader {
const entries = await this.zipReader.getEntries()
for (const entry of entries) {
const file = this.manifest.files[entry.filename]
if (entry.getData && file) {
if (!entry.directory && file) {
const contents = await this.readFile(file, entry)
yield { ...file, contents }
}
}
}

private async readFile(fileEntry: ResultsFile, entry: Entry): Promise<ArrayBuffer> {
if (!entry.getData) {
throw new Error('Entry does not have data')
}

private async readFile(fileEntry: ResultsFile, entry: ZipFileEntry): Promise<ArrayBuffer> {
logger.info(`Reading file ${entry.filename}`)

const encryptedData = await entry.getData(new BlobWriter())
Expand Down
Loading