mediasnacks 0.12.0 → 0.12.2

package/README.md

@@ -38,26 +38,23 @@ Commands:
 
 ### Glob Patterns and Literal Filenames
 
-Most commands accept glob patterns (like `*.png` or `file[234].png`) to match multiple files. By default, these patterns are expanded by Node.js to match existing files.
+Most commands accept glob patterns (like `*.png` or `file[234].png`) to match multiple
+files. By default, these patterns are expanded by Node.js to match existing files.
 
-To treat arguments as literal filenames instead of glob patterns, use the `--` (double dash) separator:
+To treat arguments as literal filenames instead of
+glob patterns, use the `--` (double dash) separator:
 
 ```shell
-# This expands the pattern to match files: file2.png, file3.png, file4.png
+# Expands to: file2.png, file3.png, file4.png
 npx mediasnacks avif file[234].png
 
-# This treats the argument as a literal filename: "file[234].png"
+# Literal filename: "file[234].png"
 npx mediasnacks avif -- file[234].png
 
-# You can mix both: expand first pattern, treat second as literal
+# Mixed: expand first pattern, treat second as literal
 npx mediasnacks avif file2.png -- file[234].png
 ```
 
-This follows the standard POSIX convention where `--` stops option/pattern processing. Arguments after `--` are treated exactly as written, which is useful when:
-- Filenames contain special glob characters like `[`, `]`, `*`, or `?`
-- You want to pass a pattern to be processed later
-- Working with filenames that haven't been created yet
-
 <br/>
 
 ### Converting Images to AVIF
@@ -98,7 +95,7 @@ Rearranges .mov and .mp4 metadata to the start of the file for fast-start stream
 ```shell
 npx mediasnacks moov2front <videos>
 ```
-hat is Fast Start?
+What is Fast Start?
 - https://wiki.avblocks.com/avblocks-for-cpp/muxer-parameters/mp4
 - https://trac.ffmpeg.org/wiki/HowToCheckIfFaststartIsEnabledForPlayback
 

package/TODO.md

@@ -2,3 +2,6 @@
 
 - Test on Windows
 - Test on Linux
+
+
+Handle when shell expands, but files have special chars

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mediasnacks",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "Utilities for preparing videos, images, and audio for the web",
   "license": "MIT",
   "author": "Eric Fortis",

package/src/avif.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
-import { join } from 'node:path'
+import { join, basename } from 'node:path'
 
+import { parseOptions } from './utils/parseOptions.js'
 import { replaceExt, lstat } from './utils/fs-utils.js'
-import { parseArgsWithGlobs } from './utils/args-with-globs.js'
 import { ffmpeg, assertUserHasFFmpeg } from './utils/ffmpeg.js'
 
 
@@ -17,12 +17,10 @@ Converts images to AVIF.
 async function main() {
 	await assertUserHasFFmpeg()
 
-	const { values, files } = await parseArgsWithGlobs({
-		options: {
-			'output-dir': { type: 'string', default: '' },
-			overwrite: { short: 'y', type: 'boolean', default: false },
-			help: { short: 'h', type: 'boolean', default: false },
-		}
+	const { values, files } = await parseOptions({
+		'output-dir': { type: 'string', default: '' },
+		overwrite: { short: 'y', type: 'boolean', default: false },
+		help: { short: 'h', type: 'boolean', default: false },
 	})
 
 	if (values.help) {
@@ -37,7 +35,7 @@ async function main() {
 	for (const file of files)
 		await toAvif({
 			file,
-			outFile: join(values['output-dir'], replaceExt(file, 'avif')),
+			outFile: join(values['output-dir'], replaceExt(basename(file), 'avif')),
 			overwrite: values.overwrite
 		})
 }

package/src/dropdups.js

@@ -2,7 +2,7 @@
 
 import { resolve, parse, format } from 'node:path'
 
-import { parseArgsWithGlobs } from './utils/args-with-globs.js'
+import { parseOptions } from './utils/parseOptions.js'
 import { ffmpeg, assertUserHasFFmpeg, run } from './utils/ffmpeg.js'
 
 
@@ -34,11 +34,9 @@ Options:
 async function main() {
 	await assertUserHasFFmpeg()
 
-	const { values, files } = await parseArgsWithGlobs({
-		options: {
-			'bad-frame-number': { short: 'n', type: 'string', default: '' },
-			help: { short: 'h', type: 'boolean', default: false },
-		}
+	const { values, files } = await parseOptions({
+		'bad-frame-number': { short: 'n', type: 'string', default: '' },
+		help: { short: 'h', type: 'boolean', default: false },
 	})
 
 	if (values.help) {

package/src/hev1tohvc1.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
+import { parseOptions } from './utils/parseOptions.js'
 import { uniqueFilenameFor, overwrite } from './utils/fs-utils.js'
-import { parseArgsWithGlobs } from './utils/args-with-globs.js'
 import { videoAttrs, ffmpeg, assertUserHasFFmpeg } from './utils/ffmpeg.js'
 
 
@@ -17,7 +17,7 @@ by changing the container’s sample entry code from HEV1 to HVC1.
 async function main() {
 	await assertUserHasFFmpeg()
 
-	const { files } = await parseArgsWithGlobs({})
+	const { files } = await parseOptions()
 
 	if (!files.length)
 		throw new Error(USAGE)

package/src/moov2front.js

@@ -2,7 +2,7 @@
 
 import { ffmpeg, assertUserHasFFmpeg } from './utils/ffmpeg.js'
 import { uniqueFilenameFor, overwrite } from './utils/fs-utils.js'
-import { parseArgsWithGlobs } from './utils/args-with-globs.js'
+import { parseOptions } from './utils/parseOptions.js'
 
 
 const USAGE = `
@@ -16,7 +16,7 @@ Files are overwritten.
 async function main() {
 	await assertUserHasFFmpeg()
 
-	const { files } = await parseArgsWithGlobs({})
+	const { files } = await parseOptions()
 
 	if (!files.length)
 		throw new Error(USAGE)

package/src/qdir.js

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
 
+import { join } from 'node:path'
 import { spawn } from 'node:child_process'
 import { parseArgs } from 'node:util'
-import { resolve, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
 import { readdir, writeFile, unlink, rename } from 'node:fs/promises'
+
 import { isFile } from './utils/fs-utils.js'
-import { fileURLToPath } from 'node:url'
 
 
 const USAGE = `

package/src/resize.js

@@ -3,8 +3,8 @@
 import { join } from 'node:path'
 import { rename } from 'node:fs/promises'
 
+import { parseOptions } from './utils/parseOptions.js'
 import { isFile, uniqueFilenameFor } from './utils/fs-utils.js'
-import { parseArgsWithGlobs } from './utils/args-with-globs.js'
 import { ffmpeg, videoAttrs, assertUserHasFFmpeg } from './utils/ffmpeg.js'
 
 
@@ -30,14 +30,12 @@ Details:
 async function main() {
 	await assertUserHasFFmpeg()
 
-	const { values, files } = await parseArgsWithGlobs({
-		options: {
-			width: { type: 'string', default: '-2' },
-			height: { type: 'string', default: '-2' },
-			'output-dir': { type: 'string', default: '' },
-			overwrite: { short: 'y', type: 'boolean', default: false },
-			help: { short: 'h', type: 'boolean', default: false },
-		}
+	const { values, files } = await parseOptions({
+		width: { type: 'string', default: '-2' },
+		height: { type: 'string', default: '-2' },
+		'output-dir': { type: 'string', default: '' },
+		overwrite: { short: 'y', type: 'boolean', default: false },
+		help: { short: 'h', type: 'boolean', default: false },
 	})
 
 	if (values.help) {
@@ -59,7 +57,7 @@ async function main() {
 	for (const file of files)
 		await resize({
 			file,
-			outFile: join(values['output-dir'], file),
+			outFile: join(values['output-dir'], file), // TODO basename ?
 			overwrite: values.overwrite,
 			width,
 			height,

package/src/seqcheck.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 
-import { resolve } from 'node:path'
 import { parseArgs } from 'node:util'
 import { readdirSync } from 'node:fs'
 import { fileURLToPath } from 'node:url'

package/src/sqcrop.js

@@ -4,8 +4,8 @@ import { join } from 'node:path'
 
 import { rename } from 'node:fs/promises'
 import { ffmpeg, assertUserHasFFmpeg } from './utils/ffmpeg.js'
-import { replaceExt, lstat, uniqueFilenameFor } from './utils/fs-utils.js'
-import { parseArgsWithGlobs } from './utils/args-with-globs.js'
+import { lstat, uniqueFilenameFor } from './utils/fs-utils.js'
+import { parseOptions } from './utils/parseOptions.js'
 
 
 const USAGE = `
@@ -18,12 +18,10 @@ Square crops images
 async function main() {
 	await assertUserHasFFmpeg()
 
-	const { values, files } = await parseArgsWithGlobs({
-		options: {
-			'output-dir': { type: 'string', default: '' },
-			overwrite: { short: 'y', type: 'boolean', default: false },
-			help: { short: 'h', type: 'boolean', default: false },
-		}
+	const { values, files } = await parseOptions({
+		'output-dir': { type: 'string', default: '' },
+		overwrite: { short: 'y', type: 'boolean', default: false },
+		help: { short: 'h', type: 'boolean', default: false },
 	})
 
 	if (values.help) {

package/src/utils/fs-utils.js

@@ -1,7 +1,7 @@
+import { lstatSync } from 'node:fs'
 import { randomUUID } from 'node:crypto'
 import { unlink, rename } from 'node:fs/promises'
 import { dirname, extname, join } from 'node:path'
-import { lstatSync } from 'node:fs'
 
 
 export const lstat = f => lstatSync(f, { throwIfNoEntry: false })

package/src/utils/parseOptions.js

@@ -0,0 +1,39 @@
+import { promisify, parseArgs } from 'node:util'
+import { glob as _glob } from 'node:fs'
+
+
+const glob = promisify(_glob)
+
+export async function parseOptions(options = {}, config = {}) {
+	const { values, positionals, tokens } = parseArgs({
+		allowPositionals: true,
+		options,
+		...config,
+		tokens: true
+	})
+	return {
+		values,
+		files: await resolveGlobs(positionals, tokens)
+	}
+}
+
+async function resolveGlobs(arr, tokens = []) {
+	const terminatorIndex = tokens.find(t => t.kind === 'option-terminator')?.index ?? -1
+	const set = new Set()
+
+	const globable = terminatorIndex === -1
+		? arr
+		: arr.slice(0, terminatorIndex)
+
+	for (const g of globable)
+		for (const file of await glob(g))
+			set.add(file)
+
+
+	if (terminatorIndex !== -1)
+		for (const literal of arr.slice(terminatorIndex))
+			set.add(literal)
+
+	return Array.from(set)
+}
+

package/src/utils/parseOptions.test.js

@@ -0,0 +1,59 @@
+import { join } from 'node:path'
+import { tmpdir } from 'node:os'
+import { equal, deepEqual } from 'node:assert/strict'
+import { mkdtemp, writeFile, rm } from 'node:fs/promises'
+import { test, describe, before, after } from 'node:test'
+
+import { parseOptions } from './parseOptions.js'
+
+
+describe('parseArgsWithGlobs', () => {
+	let testDir
+	let inTmpDir = f => join(testDir, f)
+	const testFiles = ['file1.png', 'file2.png', 'file3.png']
+
+	before(async () => {
+		testDir = await mkdtemp(join(tmpdir(), 'parse-args-'))
+		for (const file of testFiles)
+			await writeFile(inTmpDir(file), '')
+	})
+
+	after(() => rm(testDir))
+
+	test('parses args and globs files', async () => {
+		const { values, files } = await parseOptions({
+			'output-dir': { type: 'string' }
+		}, {
+			args: ['--output-dir', '/tmp', inTmpDir('file[12].png')],
+		})
+		equal(values['output-dir'], '/tmp')
+		deepEqual(files, [
+			inTmpDir('file1.png'),
+			inTmpDir('file2.png')
+		])
+	})
+
+	test('respects verbatim tokens', async () => {
+		const literal0 = 'literal-file[98].png'
+		const literal1 = 'literal-file[99].png'
+		const { files } = await parseOptions({}, {
+			args: [inTmpDir('file[12].png'), '--', literal0, literal1]
+		})
+		deepEqual(files, [
+			inTmpDir('file1.png'),
+			inTmpDir('file2.png'),
+			literal0,
+			literal1,
+		])
+	})
+
+	test('empty files array when no positionals', async () => {
+		const { files, values } = await parseOptions({
+			foo: { type: 'boolean' }
+		}, {
+			args: ['--foo'],
+		})
+		equal(values.foo, true)
+		deepEqual(files, [])
+	})
+})

package/src/vconcat.sh

@@ -11,7 +11,7 @@ fi
 
 list_file=$(mktemp -p .)
 for file in "$@"; do
-  echo "file '$file'" >> "$list_file"
+  printf "file %q\n" "$file" >> "$list_file"
 done
 
 first_video="$1"

package/tests/avif.test.js

@@ -0,0 +1,22 @@
+import { join } from 'node:path'
+import { test } from 'node:test'
+import { equal } from 'node:assert/strict'
+import { tmpdir } from 'node:os'
+import { execSync } from 'node:child_process'
+import { createHash } from 'node:crypto'
+import { mkdtempSync, readFileSync } from 'node:fs'
+
+function sha1(filePath) {
+	return createHash('sha1').update(readFileSync(filePath)).digest('hex')
+}
+
+test('PNG to AVIF', () => {
+	const tmp = mkdtempSync(join(tmpdir(), 'avif-test-'))
+	
+	execSync(`src/cli.js avif --output-dir ${tmp} tests/fixtures/lenna.png`, {
+		cwd: process.cwd(),
+		stdio: 'inherit'
+	})
+
+	equal(sha1(join(tmp, 'lenna.avif')), sha1('tests/fixtures/lenna.avif'))
+})

package/src/utils/args-with-globs.js

@@ -1,61 +0,0 @@
-import { promisify } from 'node:util'
-import { parseArgs } from 'node:util'
-import { glob as _glob } from 'node:fs'
-
-
-const glob = promisify(_glob)
-
-export async function parseArgsWithGlobs(config) {
-	const { values, positionals, tokens } = parseArgs({
-		allowPositionals: true,
-		...config,
-		tokens: true
-	})
-
-	const files = await globAll(positionals, tokens)
-
-	return { values, positionals, tokens, files }
-}
-
-export async function globAll(arr, tokens) {
-	const terminatorIndex = findTerminatorIndex(tokens)
-	const set = new Set()
-
-	if (terminatorIndex >= 0) {
-		// Glob arguments before the terminator
-		const beforeTerminator = arr.slice(0, terminatorIndex)
-		const afterTerminator = arr.slice(terminatorIndex)
-
-		for (const g of beforeTerminator)
-			for (const file of await glob(g))
-				set.add(file)
-
-		// Add arguments after terminator as literal strings
-		for (const literal of afterTerminator)
-			set.add(literal)
-	} else {
-		// No terminator, glob everything (current behavior)
-		for (const g of arr)
-			for (const file of await glob(g))
-				set.add(file)
-	}
-
-	return Array.from(set)
-}
-
-function findTerminatorIndex(tokens) {
-	if (!tokens) return -1
-	for (const token of tokens) {
-		if (token.kind === 'option-terminator') {
-			// Find the position in the positionals array
-			// The terminator itself is not in positionals, so we count preceding positionals
-			let positionalCount = 0
-			for (const t of tokens) {
-				if (t === token) break
-				if (t.kind === 'positional') positionalCount++
-			}
-			return positionalCount
-		}
-	}
-	return -1
-}

package/src/utils/args-with-globs.test.js

@@ -1,153 +0,0 @@
-import { equal, deepEqual } from 'node:assert/strict'
-import test, { describe, before, after } from 'node:test'
-import { mkdtemp, writeFile, rm } from 'node:fs/promises'
-import { join } from 'node:path'
-import { tmpdir } from 'node:os'
-import { globAll, parseArgsWithGlobs } from './args-with-globs.js'
-
-
-describe('globAll with token terminator', () => {
-	let testDir
-	const testFiles = ['test-file2.png', 'test-file3.png', 'test-file4.png', 'other-file.png']
-
-	before(async () => {
-		testDir = await mkdtemp(join(tmpdir(), 'glob-test-'))
-		for (const file of testFiles) {
-			await writeFile(join(testDir, file), '')
-		}
-	})
-
-	after(async () => {
-		await rm(testDir, { recursive: true, force: true })
-	})
-
-	test('globs patterns when no terminator present', async () => {
-		const pattern = join(testDir, 'test-file[234].png')
-		const result = await globAll([pattern])
-		const expected = testFiles.slice(0, 3).map(f => join(testDir, f)).sort()
-		deepEqual(result.sort(), expected)
-	})
-
-	test('globs patterns before terminator and keeps literals after', async () => {
-		const pattern = join(testDir, 'test-file[234].png')
-		const literal = 'my-literal-file[234].png'
-
-		// Simulate tokens from parseArgs with terminator
-		const tokens = [
-			{ kind: 'positional', index: 0, value: pattern },
-			{ kind: 'option-terminator', index: 1 },
-			{ kind: 'positional', index: 1, value: literal }
-		]
-
-		const result = await globAll([pattern, literal], tokens)
-		const expected = [
-			...testFiles.slice(0, 3).map(f => join(testDir, f)),
-			literal
-		].sort()
-		deepEqual(result.sort(), expected)
-	})
-
-	test('keeps all arguments literal when terminator is first', async () => {
-		const literal1 = 'literal-file[234].png'
-		const literal2 = 'another-file[567].png'
-
-		// Simulate tokens where terminator comes before all positionals
-		const tokens = [
-			{ kind: 'option-terminator', index: 0 },
-			{ kind: 'positional', index: 0, value: literal1 },
-			{ kind: 'positional', index: 1, value: literal2 }
-		]
-
-		const result = await globAll([literal1, literal2], tokens)
-		deepEqual(result.sort(), [literal1, literal2].sort())
-	})
-
-	test('handles no terminator with tokens (backwards compat)', async () => {
-		const pattern = join(testDir, 'test-file[234].png')
-
-		// Tokens without terminator
-		const tokens = [
-			{ kind: 'positional', index: 0, value: pattern }
-		]
-
-		const result = await globAll([pattern], tokens)
-		const expected = testFiles.slice(0, 3).map(f => join(testDir, f)).sort()
-		deepEqual(result.sort(), expected)
-	})
-
-	test('handles undefined tokens (backwards compat)', async () => {
-		const pattern = join(testDir, 'test-file[234].png')
-		const result = await globAll([pattern], undefined)
-		const expected = testFiles.slice(0, 3).map(f => join(testDir, f)).sort()
-		deepEqual(result.sort(), expected)
-	})
-
-	test('handles empty arrays', async () => {
-		const result = await globAll([])
-		deepEqual(result, [])
-	})
-
-	test('deduplicates results', async () => {
-		const pattern = join(testDir, 'test-file2.png')
-		const result = await globAll([pattern, pattern])
-		deepEqual(result, [join(testDir, 'test-file2.png')])
-	})
-})
-
-describe('parseArgsWithGlobs', () => {
-	let testDir
-	const testFiles = ['file1.png', 'file2.png', 'file3.png']
-
-	before(async () => {
-		testDir = await mkdtemp(join(tmpdir(), 'parse-args-test-'))
-		for (const file of testFiles) {
-			await writeFile(join(testDir, file), '')
-		}
-	})
-
-	after(async () => {
-		await rm(testDir, { recursive: true, force: true })
-	})
-
-	test('parses args and globs files in one call', async () => {
-		const pattern = join(testDir, 'file[12].png')
-		const { values, files } = await parseArgsWithGlobs({
-			args: ['--output-dir', '/tmp', pattern],
-			options: {
-				'output-dir': { type: 'string' }
-			}
-		})
-
-		equal(values['output-dir'], '/tmp')
-		deepEqual(files.sort(), [
-			join(testDir, 'file1.png'),
-			join(testDir, 'file2.png')
-		].sort())
-	})
-
-	test('respects verbatim token in parseArgsWithGlobs', async () => {
-		const pattern = join(testDir, 'file[12].png')
-		const literal = 'literal-file[99].png'
-		const { files } = await parseArgsWithGlobs({
-			args: [pattern, '--', literal]
-		})
-
-		deepEqual(files.sort(), [
-			join(testDir, 'file1.png'),
-			join(testDir, 'file2.png'),
-			literal
-		].sort())
-	})
-
-	test('returns empty files array when no positionals', async () => {
-		const { files, values } = await parseArgsWithGlobs({
-			args: ['--flag'],
-			options: {
-				flag: { type: 'boolean' }
-			}
-		})
-
-		equal(values.flag, true)
-		deepEqual(files, [])
-	})
-})