mediasnacks 0.30.1 → 0.30.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mediasnacks",
-	"version": "0.30.1",
+	"version": "0.30.3",
 	"description": "Utilities for optimizing and preparing videos and images",
 	"license": "MIT",
 	"author": "Eric Fortis",

package/src/avif.js

@@ -17,13 +17,13 @@ EXAMPLES
 `
 
 export default async function main() {
-	const { values, files } = await parseOptions(HELP, {
+	const { values, files, usage } = await parseOptions(HELP, {
 		outdir: { type: 'string', default: '' },
 		overwrite: { short: 'y', type: 'boolean' },
 	})
 
 	if (!files.length)
-		throw 'Invalid input image'
+		throw usage('Invalid input image')
 
 	for (const file of files) {
 		await avif({

package/src/base64.js

@@ -9,45 +9,59 @@ SYNOPSIS
 
 DESCRIPTION
   Encodes image to data URI
+ 
+OPTIONS
+  --css	Outputs CSS background-image
+  --img	Outputs HTML img tag with encoded src
   
 EXAMPLES
   mediasnacks base64 img
-  mediasnacks base64 --img img
   mediasnacks base64 --css img
+  mediasnacks base64 --img img
 `
 
-const MIMES = {
-	avif: 'image/avif',
-	gif: 'image/gif',
-	jpg: 'image/jpeg',
-	jpeg: 'image/jpeg',
-	png: 'image/png',
-	svg: 'image/svg+xml',
-	webp: 'image/webp',
+const mimes = new class {
+	#MIMES = {
+		apng: 'image/apng',
+		avif: 'image/avif',
+		bmp: 'image/bmp',
+		gif: 'image/gif',
+		heic: 'image/heic',
+		heif: 'image/heif',
+		ico: 'image/vnd.microsoft.icon',
+		jpeg: 'image/jpeg',
+		jpg: 'image/jpeg',
+		jxl: 'image/jxl',
+		png: 'image/png',
+		svg: 'image/svg+xml',
+		tga: 'image/x-targa',
+		tif: 'image/tiff',
+		webp: 'image/webp',
+	}
+	mimeFor(file) {
+		return this.#MIMES[parse(file).ext.toLowerCase().replace('.', '')] || 'application/octect'
+	}
 }
 
+
 export default async function main() {
-	const { values, files } = await parseOptions(HELP, {
+	const { values, files, usage } = await parseOptions(HELP, {
 		css: { type: 'boolean' },
 		img: { type: 'boolean' },
 	})
 
-	if (files.length !== 1)
-		throw 'Only one file is accepted'
-
-	const { data, mime } = await base64(files[0])
+	if (files.length === 0) throw usage('Missing or invalid file')
+	if (files.length !== 1) throw usage('Only one file is accepted')
 
-	if (values.css)
-		console.log(`background-image: url(data:${mime};base64,${data})`)
-	else if (values.img)
-		console.log(`<img src="data:${mime};base64,${data}" />`)
-	else
-		console.log(data)
+	const { data, mime } = base64(files[0])
+	if (values.css) console.log(`background-image: url(data:${mime};base64,${data});`)
+	else if (values.img) console.log(`<img src="data:${mime};base64,${data}" />`)
+	else console.log(data)
 }
 
-export async function base64(file) {
+export function base64(file) {
 	return {
 		data: readFileSync(file).toString('base64'),
-		mime: MIMES[parse(file).ext.toLowerCase().replace('.', '')] || 'application/octect'
+		mime: mimes.mimeFor(file)
 	}
 }

package/src/countframes.js

@@ -22,7 +22,7 @@ EXAMPLES
 
 
 export default async function main() {
-	const { values, files } = await parseOptions(HELP, {
+	const { values, files, usage } = await parseOptions(HELP, {
 		fps: { type: 'string' },
 		start: { short: 's', type: 'string' },
 		end: { short: 'e', type: 'string' },
@@ -31,7 +31,7 @@ export default async function main() {
 	const { fps, start, end } = values
 	const video = files[0]
 	if (!video)
-		throw 'No video file specified'
+		throw usage('No video file specified')
 
 	const n = await countframes({ video, fps, start, end })
 	console.log(String(n))

package/src/detectdups.js

@@ -29,18 +29,18 @@ SEE ALSO
 
 
 export default async function main() {
-	const { values, files } = await parseOptions(HELP, {
+	const { values, files, usage } = await parseOptions(HELP, {
 		seek: { short: 's', type: 'string', },
 		duration: { short: 'd', type: 'string' },
 	})
 
 	if (files.length !== 1)
-		throw 'Invalid input file. One video file must be specified.'
+		throw usage('Invalid input file. One video file must be specified.')
 
 	const video = files[0]
 	const v = await videoAttrs(video)
 	if (v.codec_type !== 'video')
-		throw 'Invalid input file. Must be a video.'
+		throw usage('Invalid input file. Must be a video.')
 
 	const vDur = Number(v.duration)
 
@@ -52,9 +52,9 @@ export default async function main() {
 		? Number(values.duration)
 		: vDur > 60 ? 20 : vDur
 
-	if (isNaN(seek) || seek < 0) throw `Invalid --seek value: ${values.seek}`
-	if (isNaN(duration) || duration < 1) throw `Invalid --duration value: ${values.duration}`
-	if ((seek + duration) > vDur) throw `Invalid analysis range. Exceeds video duration: ${vDur}`
+	if (isNaN(seek) || seek < 0) throw usage(`Invalid --seek value: ${values.seek}`)
+	if (isNaN(duration) || duration < 1) throw usage(`Invalid --duration value: ${values.duration}`)
+	if ((seek + duration) > vDur) throw usage(`Invalid analysis range. Exceeds video duration: ${vDur}`)
 
 	const dups = await detectdups({ video: files[0], seek, duration })
 	const h = deltaHistogram(dups)

package/src/dlaudio.js

@@ -12,10 +12,10 @@ DESCRIPTION
 `
 
 export default async function main() {
-	const { values, positionals } = await parseOptions(HELP)
+	const { values, positionals, usage } = await parseOptions(HELP)
 
 	if (!positionals[0])
-		throw 'Missing URL'
+		throw usage('Missing URL')
 
 	const f = await dlaudio(positionals[0])
 	console.log(f)

package/src/dlvideo.js

@@ -11,10 +11,10 @@ DESCRIPTION
 `
 
 export default async function main() {
-	const { values, positionals } = await parseOptions(HELP)
+	const { values, positionals, usage } = await parseOptions(HELP)
 
 	if (!positionals[0])
-		throw 'Missing URL'
+		throw usage('Missing URL')
 
 	await dlvideo(positionals[0])
 }

package/src/dropdups.js

@@ -27,16 +27,16 @@ EXAMPLES
 
 
 export default async function main() {
-	const { values, files } = await parseOptions(HELP, {
+	const { values, files, usage } = await parseOptions(HELP, {
 		'dup-frame-num': { short: 'n', type: 'string' },
 	})
 
 	if (!files.length)
-		throw 'No video specified.'
+		throw usage('No video specified.')
 
 	let dupFrameNum = values['dup-frame-num']
 	if (dupFrameNum && !Number.isInteger(+dupFrameNum))
-		throw 'Invalid -n. It must be a positive integer.'
+		throw usage('Invalid -n. It must be a positive integer.')
 
 	for (const file of files)
 		await dropdups(resolve(file), dupFrameNum)

package/src/edgespic.js

@@ -24,13 +24,13 @@ EXAMPLES
 `
 
 export default async function main() {
-	const { values, files } = await parseOptions(HELP, {
+	const { values, files, usage } = await parseOptions(HELP, {
 		width: { short: 'w', type: 'string', default: String(WIDTH) }
 	})
 
 	const width = Number(values.width)
-	if (width <= 0 || !Number.isInteger(width)) throw '--width must be a positive number'
-	if (!files.length) throw 'No video files specified'
+	if (width <= 0 || !Number.isInteger(width)) throw usage('--width must be a positive number')
+	if (!files.length) throw usage('No video files specified')
 
 	const outDir = join(parse(files[0]).dir, 'edgespic')
 	await mkDir(outDir)

package/src/frameseq.js

@@ -28,7 +28,7 @@ EXAMPLES
 
 
 export default async function main() {
-	const { values, files } = await parseOptions(HELP, {
+	const { values, files, usage } = await parseOptions(HELP, {
 		fps: { short: 'f', type: 'string' },
 		start: { short: 's', type: 'string' },
 		end: { short: 'e', type: 'string' },
@@ -37,10 +37,10 @@ export default async function main() {
 
 	const { fps, start, end, outdir } = values
 	const video = files[0]
-	if (!video) throw 'No video files specified'
-	if (fps && isNaN(parseFloat(fps))) throw 'Invalid --fps'
-	if (start && isNaN(parseFloat(start))) throw 'Invalid --start'
-	if (end && isNaN(parseFloat(end))) throw 'Invalid --end'
+	if (!video) throw usage('No video files specified')
+	if (fps && isNaN(parseFloat(fps))) throw usage('Invalid --fps')
+	if (start && isNaN(parseFloat(start))) throw usage('Invalid --start')
+	if (end && isNaN(parseFloat(end))) throw usage('Invalid --end')
 
 	const nFrames = await countframes({ video, fps, start, end })
 	const pad = String(nFrames).length

package/src/gif.js

@@ -19,13 +19,13 @@ OPTIONS
 `
 
 export default async function main() {
-	const { values, files } = await parseOptions(HELP, {
+	const { values, files, usage } = await parseOptions(HELP, {
 		fps: { short: 'f', type: 'string', default: String(FPS) },
 		width: { short: 'w', type: 'string', default: String(WIDTH) },
 	})
 
 	if (!files.length)
-		throw 'Missing input file'
+		throw usage('Missing input file')
 
 	await gif(files[0], values.fps, values.width)
 }

package/src/hev1tohvc1.js

@@ -16,10 +16,10 @@ DESCRIPTION
 
 
 export default async function main() {
-	const { values, files } = await parseOptions(HELP)
+	const { values, files, usage } = await parseOptions(HELP)
 
 	if (!files.length)
-		throw 'Missing input file(s)'
+		throw usage('Missing input file(s)')
 
 	for (const file of files) {
 		await hev1tohvc1(file)

package/src/moov2front.js

@@ -17,10 +17,10 @@ SEE ALSO
 `
 
 export default async function main() {
-	const { values, files } = await parseOptions(HELP)
+	const { values, files, usage } = await parseOptions(HELP)
 
 	if (!files.length)
-		throw 'Missing input file(s)'
+		throw usage('Missing input file(s)')
 
 	for (const file of files) {
 		await moov2front(file)

package/src/openrand.js

@@ -14,12 +14,12 @@ DESCRIPTION
 `
 
 export default async function main() {
-	const { values, positionals } = await parseOptions(HELP, {
+	const { values, positionals, usage } = await parseOptions(HELP, {
 		recursive: { short: 'r', type: 'boolean' },
 	})
 
 	if (process.platform !== 'darwin')
-		throw 'This command is only supported on macOS.'
+		throw usage('This command is only supported on macOS.')
 
 	const dir = positionals[0] || '.'
 	openrand(dir, values.recursive)

package/src/play.js

@@ -17,7 +17,7 @@ EXAMPLE
 
 
 export default async function main() {
-	const { values, positionals } = await parseOptions(HELP, {
+	const { values, positionals, usage } = await parseOptions(HELP, {
 		recursive: { short: 'r', type: 'boolean', default: true },
 	}, { allowNegative: true })
 
@@ -29,7 +29,7 @@ export default async function main() {
 	})
 
 	if (!files.length)
-		throw 'No matching files found.'
+		throw usage('No matching files found.')
 
 	play(files)
 }

package/src/png.js

@@ -14,10 +14,10 @@ EXAMPLE
 `
 
 export default async function main() {
-	const { values, files } = await parseOptions(HELP)
+	const { values, files, usage } = await parseOptions(HELP)
 
 	if (!files.length)
-		throw 'Missing input image(s)'
+		throw usage('Missing input image(s)')
 
 	await png(...files)
 }

package/src/prores.js

@@ -51,17 +51,17 @@ EXAMPLES
 
 
 export default async function main() {
-	const { values, files } = await parseOptions(HELP, {
+	const { values, files, usage } = await parseOptions(HELP, {
 		profile: { short: 'p', type: 'string', default: String(ProresProfiles.default) },
 		start: { short: 's', type: 'string' },
 		end: { short: 'e', type: 'string' },
 	})
 
 	if (!ProresProfiles.isValid(Number(values.profile)))
-		throw 'Invalid profile. Must be one of: ' + ProresProfiles.list().join(',')
+		throw usage('Invalid profile. Must be one of: ' + ProresProfiles.list().join(','))
 
 	if (files.length !== 1)
-		throw 'Expected 1 argument: video file.'
+		throw usage('Expected 1 argument: video file.')
 
 	const video = resolve(files[0])
 	const { name, dir } = parse(video)

package/src/resize.js

@@ -32,7 +32,7 @@ EXAMPLES
 `
 
 export default async function main() {
-	const { values, files } = await parseOptions(HELP, {
+	const { values, files, usage } = await parseOptions(HELP, {
 		width: { type: 'string', default: '-2' },
 		height: { type: 'string', default: '-2' },
 		outdir: { type: 'string', default: '' },
@@ -42,8 +42,8 @@ export default async function main() {
 	const width = Number(values.width)
 	const height = Number(values.height)
 
-	if (!files.length) throw 'No video files specified'
-	if (width <= 0 && height <= 0) throw '--width or --height must be > 0'
+	if (!files.length) throw usage('No video files specified')
+	if (width <= 0 && height <= 0) throw usage('--width or --height must be > 0')
 
 	for (const file of files) {
 		await resize({

package/src/sqcrop.js

@@ -16,13 +16,13 @@ DESCRIPTION
 `
 
 export default async function main() {
-	const { values, files } = await parseOptions(HELP, {
+	const { values, files, usage } = await parseOptions(HELP, {
 		outdir: { type: 'string', default: '' },
 		overwrite: { short: 'y', type: 'boolean' },
 	})
 
 	if (!files.length)
-		throw 'No images specified'
+		throw usage('No images specified')
 
 	for (const file of files) {
 		await sqcrop({

package/src/ssim.js

@@ -11,10 +11,10 @@ DESCRIPTION
 `
 
 export default async function main() {
-	const { values, positionals } = await parseOptions(HELP)
+	const { values, positionals, usage } = await parseOptions(HELP)
 
 	if (positionals.length !== 2)
-		throw 'Expected two images'
+		throw usage('Expected two images')
 
 	const score = await ssim(...positionals)
 	console.log(score.toString())

package/src/unemoji.js

@@ -29,12 +29,12 @@ const EMOJI_RE = new RegExp(
 )
 
 export default async function main() {
-	const { values, positionals } = await parseOptions(HELP, {
+	const { values, positionals, usage } = await parseOptions(HELP, {
 		recursive: { short: 'r', type: 'boolean' }
 	})
 
 	if (positionals.length !== 1)
-		throw 'Must pass only one dir'
+		throw usage('Must pass only one dir')
 
 	const files = findFiles({
 		dir: positionals[0],

package/src/utils/parseOptions.js

@@ -1,4 +1,4 @@
-import { promisify, parseArgs } from 'node:util'
+import { promisify, parseArgs, styleText } from 'node:util'
 import { glob as _glob } from 'node:fs'
 
 const glob = promisify(_glob)
@@ -28,7 +28,10 @@ export async function parseOptions(helpText, options = {}, config = {}) {
 	return {
 		values,
 		positionals,
-		files: await resolveGlobs(positionals, tokens)
+		files: await resolveGlobs(positionals, tokens),
+		usage: err => err
+			? styleText('redBright', '' + err + '\n') + helpText
+			: helpText
 	}
 }
 

package/src/vsplit.js

@@ -35,10 +35,10 @@ SEE ALSO
 
 
 export default async function main() {
-	const { values, files } = await parseOptions(HELP)
+	const { values, files, usage } = await parseOptions(HELP)
 
 	if (files.length !== 2)
-		throw 'Expected 2 arguments: CSV file and video file.'
+		throw usage('Expected 2 arguments: CSV file and video file.')
 
 	const [csvPath, videoPath] = files.map(f => resolve(f))
 

package/src/vtrim.js

@@ -20,13 +20,13 @@ SEE ALSO
 
 
 export default async function main() {
-	const { values, files } = await parseOptions(HELP, {
+	const { values, files, usage } = await parseOptions(HELP, {
 		start: { short: 's', type: 'string' },
 		end: { short: 'e', type: 'string' },
 	})
 
 	if (!files.length)
-		throw 'No video specified.'
+		throw usage('No video specified.')
 
 	for (const file of files)
 		await vtrim({