Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
3 changes: 1 addition & 2 deletions src/scripts/metadata/avif.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ import {
ComfyMetadataTags,
type IsobmffBoxContentRange
} from '@/types/metadataTypes'
import { readFileAsArrayBuffer } from '@/utils/fileUtil'
import { parseJsonWithNonFinite } from '@/utils/jsonUtil'

import { readFileAsArrayBuffer } from './readFile'

const readNullTerminatedString = (
dataView: DataView,
start: number,
Expand Down
3 changes: 1 addition & 2 deletions src/scripts/metadata/ebml.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ import {
type TextRange,
type VInt
} from '@/types/metadataTypes'
import { readFileAsArrayBuffer } from '@/utils/fileUtil'
import { parseJsonWithNonFinite } from '@/utils/jsonUtil'

import { readFileAsArrayBuffer } from './readFile'

const WEBM_SIGNATURE = [0x1a, 0x45, 0xdf, 0xa3]
const MAX_READ_BYTES = 2 * 1024 * 1024
const EBML_ID = {
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/metadata/flac.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { readFileAsArrayBuffer } from './readFile'
import { readFileAsArrayBuffer } from '@/utils/fileUtil'

export function getFromFlacBuffer(buffer: ArrayBuffer): Record<string, string> {
const dataView = new DataView(buffer)
Expand Down
3 changes: 1 addition & 2 deletions src/scripts/metadata/gltf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ import {
type GltfJsonData,
GltfSizeBytes
} from '@/types/metadataTypes'
import { readFileAsArrayBuffer } from '@/utils/fileUtil'
import { parseJsonWithNonFinite } from '@/utils/jsonUtil'

import { readFileAsArrayBuffer } from './readFile'

const MAX_READ_BYTES = 1 << 20

const isJsonChunk = (chunk: GltfChunkHeader | null): boolean =>
Expand Down
3 changes: 1 addition & 2 deletions src/scripts/metadata/isobmff.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ import {
ComfyMetadataTags,
type IsobmffBoxContentRange
} from '@/types/metadataTypes'
import { readFileAsArrayBuffer } from '@/utils/fileUtil'
import { parseJsonWithNonFinite } from '@/utils/jsonUtil'

import { readFileAsArrayBuffer } from './readFile'

// Set max read high, as atoms are stored near end of file
// while search is made to be efficient.
const MAX_READ_BYTES = 64 * 1024 * 1024
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { describe, expect, it } from 'vitest'
import { assert, describe, expect, it } from 'vitest'

import {
mockFileReaderAbort,
mockFileReaderError
} from './__fixtures__/helpers'
import { readFileAsArrayBuffer } from './readFile'
mockFileReaderError,
mockFileReaderResult
} from '@/scripts/metadata/__fixtures__/helpers'
import { readFileAsArrayBuffer } from '@/utils/fileUtil'
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

describe('readFileAsArrayBuffer', () => {
it('reads the whole file into an ArrayBuffer when no cap is given', async () => {
Expand All @@ -13,25 +14,33 @@ describe('readFileAsArrayBuffer', () => {

const buffer = await readFileAsArrayBuffer(file)

expect(buffer).toBeInstanceOf(ArrayBuffer)
expect(new Uint8Array(buffer!)).toEqual(bytes)
assert(buffer instanceof ArrayBuffer)
expect(new Uint8Array(buffer)).toEqual(bytes)
})

it('reads only the first maxBytes when a cap is given', async () => {
const file = new File([new Uint8Array(100)], 'test.bin')
const bytes = Uint8Array.from({ length: 100 }, (_, i) => i)
const file = new File([bytes], 'test.bin')

const buffer = await readFileAsArrayBuffer(file, 10)

expect(buffer?.byteLength).toBe(10)
assert(buffer instanceof ArrayBuffer)
expect(new Uint8Array(buffer)).toEqual(bytes.slice(0, 10))
})

it('returns an empty ArrayBuffer (not null) when maxBytes is 0', async () => {
const file = new File([new Uint8Array(10)], 'test.bin')

const buffer = await readFileAsArrayBuffer(file, 0)

expect(buffer).toBeInstanceOf(ArrayBuffer)
expect(buffer?.byteLength).toBe(0)
assert(buffer instanceof ArrayBuffer)
expect(buffer.byteLength).toBe(0)
})

it('resolves null when the read yields a non-ArrayBuffer result', async () => {
mockFileReaderResult('readAsArrayBuffer', 'not an array buffer')

expect(await readFileAsArrayBuffer(new File([], 'test.bin'))).toBeNull()
})

it('resolves null when the read fires an error', async () => {
Expand Down
File renamed without changes.
Loading