mediasnacks 0.24.0 → 0.26.0

package/src/moov2front.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import { ffmpeg, assertUserHasFFmpeg } from './utils/subprocess.js'
 import { uniqueFilenameFor, overwrite } from './utils/fs-utils.js'
 import { parseOptions } from './utils/parseOptions.js'
@@ -20,7 +19,7 @@ NOTES
 `.trim()
 
 
-async function main() {
+export default async function main() {
 	await assertUserHasFFmpeg()
 
 	const { values, files } = await parseOptions({
@@ -32,25 +31,23 @@ async function main() {
 		return
 	}
 
-	if (!files.length)
-		throw new Error(HELP)
+	if (!files.length) throw new Error('Missing input file(s)')
 
 	console.log('Optimizing video for progressive download…')
 	for (const file of files)
-		await moov2front(file)
+		try {
+			await moov2front(file)
+			console.log(file)
+		}
+		catch (err) {
+			console.error(err?.message || err)
+		}
 }
 
-async function moov2front(file) {
-	if (!/\.(mp4|mov)$/i.test(file)) {
-		console.log('(skipped: not mp4/mov)', file)
-		return
-	}
-	if (await moovIsBeforeMdat(file)) {
-		console.log('(skipped: no changes needed)', file)
-		return
-	}
+export async function moov2front(file) {
+	if (!/\.(mp4|mov)$/i.test(file)) throw new Error(`not mp4/mov. ${file}`)
+	if (await moovIsBeforeMdat(file)) throw new Error(`no changes needed. ${file}`)
 
-	console.log(file)
 	const tmp = uniqueFilenameFor(file)
 	await ffmpeg([
 		'-hide_banner',
@@ -71,9 +68,3 @@ async function moovIsBeforeMdat(file) {
 	const firstMatchedAtom = stderr.match(/type:'(moov|mdat)'/)?.[1]
 	return firstMatchedAtom === 'moov'
 }
-
-
-main().catch(err => {
-	console.error(err.message)
-	process.exit(1)
-})

package/src/{random.js → openrand.js}

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import { join } from 'node:path'
 import { spawn } from 'node:child_process'
 import { readdirSync } from 'node:fs'
@@ -7,13 +6,13 @@ import { parseOptions } from './utils/parseOptions.js'
 
 const HELP = `
 SYNOPSIS
-  mediasnacks random [-r | --recursive]
+  mediasnacks openrand [-r | --recursive]
 
 DESCRIPTION
   Opens a random file in the current working directory
 `.trim()
 
-async function main() {
+export default async function main() {
 	if (process.platform !== 'darwin')
 		throw new Error('Error: This command is only supported on macOS.')
 
@@ -27,17 +26,16 @@ async function main() {
 		return
 	}
 
-	spawn('open', [pickRandomFile('.', values.recursive)])
+	openrand('.', values.recursive)
 }
 
-function pickRandomFile(dir, recursive) {
+export function openrand(dir = '.', recursive = false) {
+	spawn('open', [pickRandomFile(dir, recursive)])
+}
+
+export function pickRandomFile(dir = '.', recursive = false) {
 	const files = readdirSync(dir, { withFileTypes: true, recursive })
 		.filter(entry => !entry.name.startsWith('.') && entry.isFile())
 		.map(entry => join(entry.parentPath, entry.name))
 	return files[Math.floor(Math.random() * files.length)]
 }
-
-main().catch(err => {
-	console.error(err.message)
-	process.exit(1)
-})

package/src/play.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import { spawn } from 'node:child_process'
 import { parseOptions } from './utils/parseOptions.js'
 import { findFiles } from './utils/fs-utils.js'
@@ -17,7 +16,7 @@ EXAMPLE
 `.trim()
 
 
-async function main() {
+export default async function main() {
 	const { values, positionals } = await parseOptions({
 		recursive: { short: 'r', type: 'boolean', default: true },
 		help: { short: 'h', type: 'boolean' }
@@ -41,7 +40,7 @@ async function main() {
 	play(files)
 }
 
-function play(files) {
+export function play(files) {
 	const mpv = spawn('mpv', ['--playlist=-'], {
 		detached: true,
 		stdio: ['pipe', 'ignore', 'ignore']
@@ -57,8 +56,3 @@ function play(files) {
 		process.exit(1)
 	})
 }
-
-main().catch(err => {
-	console.error(err.message)
-	process.exit(1)
-})

package/src/prores.js

@@ -1,20 +1,19 @@
-#!/usr/bin/env node
 import { resolve, parse, join } from 'node:path'
 import { parseOptions } from './utils/parseOptions.js'
 import { assertUserHasFFmpeg, run } from './utils/subprocess.js'
 
 export const ProresProfiles = new class {
-  // https://github.com/oyvindln/vhs-decode/wiki/ProRes-The-Definitive-FFmpeg-Guide#profiles-can-be-the-following
+	// https://github.com/oyvindln/vhs-decode/wiki/ProRes-The-Definitive-FFmpeg-Guide#profiles-can-be-the-following
 	profiles = {
-		// 10-bit
-		0: 'proxy',
-		1: 'lt',
-		2: 'standard',
-		3: 'hq',
+		// 10-bit color depth
+		0: '422 Proxy',
+		1: '422 LT',
+		2: '422 Standard',
+		3: '422 High Quality',
 
 		// 12-bit
 		4: '4444',
-		5: '4444xq'
+		5: '4444XQ'
 	}
 	default = 3
 
@@ -28,34 +27,36 @@ SYNOPSIS
   mediasnacks prores [options] <video>
 
 DESCRIPTION
-  Converts a video to ProRes
+  Converts a video to Apple ProRes
 
 OPTIONS
-  -p, --profile <n>    Default: 3 (422 HQ 10-bit)
-  -s, --start <time>   Start time (e.g. 5.0). Default: beginning.
-  -e, --end <time>     End time (e.g. 0:10.0). Default: end of video.
+  -p, --profile <n>    Default: ${ProresProfiles.default}
+  -s, --start <time>   In time. Unset means beginning
+  -e, --end <time>     Out time. Unset means end
   -h, --help
-
+  
 PROFILES
 ${ProresProfiles.table().map(([num, name]) =>
 	`  ${num}: ${name}`).join('\n')}
 
+TIME FORMAT
+  5.1      -- pure seconds
+  20:10.0  -- 20m 10s
+
 EXAMPLES
-  mediasnacks prores video.mov
+  mediasnacks prores --end=60 video.mov   // outputs video.prores.mov
   mediasnacks prores -p2 *.mov
-
-  Both output a file named: video.prores.mov
 `.trim()
 
 
-async function main() {
+export default async function main() {
 	await assertUserHasFFmpeg()
 
 	const { values, files } = await parseOptions({
 		profile: { short: 'p', type: 'string', default: String(ProresProfiles.default) },
 		start: { short: 's', type: 'string', default: '' },
 		end: { short: 'e', type: 'string', default: '' },
-		help: { short: 'h', type: 'boolean' },
+		help: { short: 'h', type: 'boolean' }
 	})
 
 	if (values.help) {
@@ -73,10 +74,11 @@ async function main() {
 	const { name, dir } = parse(video)
 	const output = join(dir, `${name}.prores.mov`)
 
-	await prores(video, values.start, values.end, values.profile, output)
+	const { profile, start, end } = values
+	await prores({ video, profile, start, end, output })
 }
 
-async function prores(video, start, end, profile, output) {
+export async function prores({ video, profile, start, end, output }) {
 	await run('ffmpeg', [
 		'-v', 'error',
 		'-stats',
@@ -87,9 +89,3 @@ async function prores(video, start, end, profile, output) {
 		output
 	].flat())
 }
-
-if (import.meta.main)
-	main().catch(err => {
-		console.error(err.message || err)
-		process.exit(1)
-	})

package/src/qdir.js

@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 import { join } from 'node:path'
 import { spawn } from 'node:child_process'
 import { readdir, writeFile, unlink, rename } from 'node:fs/promises'
@@ -30,7 +28,7 @@ function newExt(exitCode) {
 }
 
 
-async function main() {
+export default async function main() {
 	const { values, positionals } = await parseOptions({
 		help: { short: 'h', type: 'boolean' }
 	})
@@ -98,10 +96,3 @@ async function runShell(scriptPath) {
 function sleep(ms) {
 	return new Promise(resolve => setTimeout(resolve, ms))
 }
-
-
-if (import.meta.main)
-	main().catch(err => {
-		console.error(err.message || err)
-		process.exit(1)
-	})

package/src/resize.js

@@ -1,15 +1,15 @@
-#!/usr/bin/env node
 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 { ffmpeg, videoAttrs, assertUserHasFFmpeg } from './utils/subprocess.js'
+import { ffmpeg, assertUserHasFFmpeg } from './utils/subprocess.js'
+import { videoAttrs } from './utils/videoAttrs.js'
 
 
 const HELP = `
 SYNOPSIS
-  mediasnacks resize [--width=<num>] [--height=<num>] [-y | --overwrite] [--output-dir=<dir>] <files>
+  mediasnacks resize [--width=<num>] [--height=<num>] [-y | --overwrite] [--outdir=<dir>] <files>
 
 DESCRIPTION
   Resizes videos and images. The aspect ratio is preserved when only one dimension is specified.
@@ -19,7 +19,7 @@ EXAMPLES
     mediasnacks resize -y --width 480 'dir-a/**/*.png' 'dir-b/**/*.mp4'
 
   Output directory (-o)
-    mediasnacks resize --height 240 --output-dir /tmp/out video.mov
+    mediasnacks resize --height 240 --outdir /tmp/out video.mov
    
 OPTIONS
 	--width and --height are -2 by default:
@@ -28,13 +28,13 @@ OPTIONS
 `.trim()
 
 
-async function main() {
+export default async function main() {
 	await assertUserHasFFmpeg()
 
 	const { values, files } = await parseOptions({
 		width: { type: 'string', default: '-2' },
 		height: { type: 'string', default: '-2' },
-		'output-dir': { type: 'string', default: '' },
+		outdir: { type: 'string', default: '' },
 		overwrite: { short: 'y', type: 'boolean' },
 		help: { short: 'h', type: 'boolean' },
 	})
@@ -56,31 +56,33 @@ async function main() {
 
 	console.log('Resizing…')
 	for (const file of files)
-		await resize({
-			file,
-			outFile: join(values['output-dir'], file), // TODO basename ?
-			overwrite: values.overwrite,
-			width,
-			height,
-		})
+		try {
+			await resize({
+				file,
+				outFile: join(values.outdir, file), // TODO basename ?
+				overwrite: values.overwrite,
+				width,
+				height,
+			})
+			console.log(file)
+		}
+		catch (err) {
+			console.error(err?.message || err)
+		}
 }
 
 
-async function resize({ file, outFile, overwrite, width, height }) {
+export async function resize({ file, outFile, overwrite, width, height }) {
 	const v = await videoAttrs(file)
 	if (width === v.width && height === v.height
 		|| width < 0 && height === v.height
-		|| height < 0 && width === v.width) {
-		console.log('(skipped: no changes needed)', file)
-		return
-	}
+		|| height < 0 && width === v.width
+	)
+		throw new Error(`no changes needed. ${file}`)
 
-	if (!overwrite && isFile(outFile)) {
-		console.log('(skipped: output file exists but --overwrite=false)', file)
-		return
-	}
+	if (!overwrite && isFile(outFile))
+		throw new Error(`output file exists but --overwrite=false. ${file}`)
 
-	console.log(file)
 	const tmp = uniqueFilenameFor(file)
 	await ffmpeg([
 		'-i', file,
@@ -90,9 +92,3 @@ async function resize({ file, outFile, overwrite, width, height }) {
 	])
 	await rename(tmp, outFile)
 }
-
-
-main().catch(err => {
-	console.error(err.message)
-	process.exit(1)
-})

package/src/seqcheck.js

@@ -1,7 +1,8 @@
-#!/usr/bin/env node
 import { parseArgs } from 'node:util'
 import { readdirSync } from 'node:fs'
 
+const LEFT_DELIM = '_'
+const RIGHT_DELIM = '.'
 
 const HELP = `
 SYNOPSIS
@@ -11,17 +12,17 @@ DESCRIPTION
   Find missing numbered files in a sequence.
 
 OPTIONS
-  -ld, --left-delimiter <str>   Delimiter before the number (default: "_")
-  -rd, --right-delimiter <str>  Delimiter after the number (default: ".")
+  -ld, --left-delimiter <str>   Delimiter before the number (default: "${LEFT_DELIM}")
+  -rd, --right-delimiter <str>  Delimiter after the number (default: "${RIGHT_DELIM}")
   -h,  --help
 `.trim()
 
 
-function main() {
+export default function main() {
 	const { values, positionals } = parseArgs({
 		options: {
-			'left-delimiter': { type: 'string', default: '_' },
-			'right-delimiter': { type: 'string', default: '.' },
+			'left-delimiter': { type: 'string', default: LEFT_DELIM },
+			'right-delimiter': { type: 'string', default: RIGHT_DELIM },
 			help: { short: 'h', type: 'boolean' },
 		},
 		allowPositionals: true,
@@ -32,18 +33,19 @@ function main() {
 		return
 	}
 
-	const seq = extractSeqNums(
-		readdirSync(positionals[0] || process.cwd()),
-		values['left-delimiter'],
-		values['right-delimiter'])
-
-	const missing = findMissingNumbers(seq)
+	const dir = positionals[0] || process.cwd()
+	const missing = seqcheck(dir, values['left-delimiter'], values['right-delimiter'])
 	if (missing.length)
 		console.log('Missing:', missing)
 }
 
-export function extractSeqNums(names, leftDelimiter, rightDelimiter) {
-	const pattern = new RegExp(escapeRegex(leftDelimiter) + '(\\d+)' + escapeRegex(rightDelimiter))
+export function seqcheck(dir, leftDelim = LEFT_DELIM, rightDelim = RIGHT_DELIM) {
+	const seq = extractSeqNums(readdirSync(dir), leftDelim, rightDelim)
+	return findMissingNumbers(seq)
+}
+
+export function extractSeqNums(names, leftDelim, rightDelim) {
+	const pattern = new RegExp(escapeRegex(leftDelim) + '(\\d+)' + escapeRegex(rightDelim))
 	const seq = []
 	for (const name of names) {
 		const match = name.match(pattern)
@@ -66,7 +68,3 @@ export function findMissingNumbers(seq) {
 function escapeRegex(str) {
 	return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
 }
-
-
-if (import.meta.main)
-	main()

package/src/sqcrop.js

@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 import { join } from 'node:path'
 import { rename } from 'node:fs/promises'
 
@@ -10,18 +8,18 @@ import { parseOptions } from './utils/parseOptions.js'
 
 const HELP = `
 SYNOPSIS
-  mediasnacks sqcrop [-y | --overwrite] [--output-dir=<dir>] <images> 
+  mediasnacks sqcrop [-y | --overwrite] [--outdir=<dir>] <images> 
 
 DESCRIPTION
   Square crops images
 `.trim()
 
 
-async function main() {
+export default async function main() {
 	await assertUserHasFFmpeg()
 
 	const { values, files } = await parseOptions({
-		'output-dir': { type: 'string', default: '' },
+		outdir: { type: 'string', default: '' },
 		overwrite: { short: 'y', type: 'boolean' },
 		help: { short: 'h', type: 'boolean' },
 	})
@@ -36,26 +34,25 @@ async function main() {
 
 	console.log('Cropping…')
 	for (const file of files)
-		await sqcrop({
-			file,
-			outFile: join(values['output-dir'], file),
-			overwrite: values.overwrite
-		})
+		try {
+			await sqcrop({
+				file,
+				outFile: join(values.outdir, file),
+				overwrite: values.overwrite
+			})
+			console.log(file)
+		}
+		catch (err) {
+			console.error(err?.message || err)
+		}
 }
 
-async function sqcrop({ file, outFile, overwrite }) {
+export async function sqcrop({ file, outFile, overwrite }) {
 	const stOut = lstat(outFile)
 
-	if (!overwrite && stOut?.isFile()) {
-		console.log('(skipped: output file exists but --overwrite=false)', file)
-		return
-	}
-	if (stOut?.mtimeMs > lstat(file)?.mtimeMs) {
-		console.log('(skipped: outputFile is newer)', file)
-		return
-	}
+	if (!overwrite && stOut?.isFile()) throw new Error(`output file exists but --overwrite=false. ${file}`)
+	if (stOut?.mtimeMs > lstat(file)?.mtimeMs) throw new Error(`outputFile is newer. ${file}`)
 
-	console.log(file)
 	const tmp = uniqueFilenameFor(file)
 	await ffmpeg([
 		'-v', 'error',
@@ -66,8 +63,3 @@ async function sqcrop({ file, outFile, overwrite }) {
 	])
 	await rename(tmp, outFile)
 }
-
-main().catch(err => {
-	console.error(err.message)
-	process.exit(1)
-})

package/src/ssim.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import { ffmpeg } from './utils/subprocess.js'
 import { parseOptions } from './utils/parseOptions.js'
 
@@ -12,7 +11,7 @@ DESCRIPTION
 `.trim()
 
 
-async function main() {
+export default async function main() {
 	const { values, positionals } = await parseOptions({
 		help: { short: 'h', type: 'boolean' }
 	})
@@ -41,10 +40,3 @@ export async function ssim(img1, img2) {
 		throw new Error(`Could not parse SSIM output:\n${stderr}`)
 	return parseFloat(match[1])
 }
-
-
-if (import.meta.main)
-	main().catch(err => {
-		console.error(err.message)
-		process.exit(1)
-	})

package/src/utils/parseOptions.js

@@ -6,6 +6,7 @@ const glob = promisify(_glob)
 
 export async function parseOptions(options = {}, config = {}) {
 	const { values, positionals, tokens } = parseArgs({
+		args: process.argv.slice(3),
 		allowPositionals: true,
 		options,
 		...config,

package/src/utils/parseTimecode.js

@@ -0,0 +1,16 @@
+export function parseTimecode(time) {
+	if (Number.isFinite(time))
+		return time
+
+	const parts = time.split(':').map(Number)
+	if (parts.some(isNaN) || parts.length > 3)
+		throw new Error(`Invalid time: ${time}`)
+
+	// HH:MM:SS or HH:MM:SS.mmm
+	if (parts.length === 3) return parts[0] * 3600 + parts[1] * 60 + parts[2]
+
+	// MM:SS or MM:SS.mmm
+	if (parts.length === 2) return parts[0] * 60 + parts[1]
+
+	return parts[0]
+}

package/src/utils/subprocess.js

@@ -15,7 +15,7 @@ export async function ffmpeg(args) {
 	return runSilently('ffmpeg', args)
 }
 
-async function runSilently(program, args) {
+export async function runSilently(program, args) {
 	return new Promise((resolve, reject) => {
 		const stdout = []
 		const stderr = []
@@ -52,95 +52,3 @@ export async function run(program, args) {
 	})
 }
 
-
-/**
- * Describes disposition flags that define how the video stream should be treated
- * by players or downstream consumers.
- * @typedef {Object} VideoStreamDisposition
- * @prop {number} default Is whether this stream is the default selection.
- * @prop {number} dub is dubbed?
- * @prop {number} original is original?
- * @prop {number} comment contains commentary?
- * @prop {number} lyrics has lyrics?
- * @prop {number} karaoke is karaoke?
- * @prop {number} forced must always be rendered?
- * @prop {number} hearing_impaired targets hearing-impaired audiences?
- * @prop {number} visual_impaired targets visually-impaired audiences?
- * @prop {number} clean_effects removes certain effects or noise?
- * @prop {number} attached_pic represents embedded artwork?
- * @prop {number} timed_thumbnails timed thumbnail data?
- * @prop {number} non_diegetic non-diegetic content?
- * @prop {number} captions has captions?
- * @prop {number} descriptions has audio descriptions?
- * @prop {number} metadata has supplemental metadata?
- * @prop {number} dependent depends on another stream?
- * @prop {number} still_image still-image video content?
- * @prop {number} multilayer multilayer stream content?
- */
-
-/**
- * Describes metadata tags associated with a video stream.
- * @typedef {Object} VideoStreamTags
- * @prop {string} language stream language.
- * @prop {string} handler_name handler or track label.
- * @prop {string} vendor_id vendor for the encoder or container.
- */
-
-/**
- * Full set of attributes returned by ffprobe for a single video stream.
- * @typedef {Object} VideoStream
- * @prop {number} index Numerical index of the stream within the container.
- * @prop {string} codec_name Short codec identifier used by FFmpeg.
- * @prop {string} codec_long_name Descriptive codec name.
- * @prop {string} profile Codec profile used during encoding.
- * @prop {string} codec_type The media type, typically "video".
- * @prop {string} codec_tag_string Codec tag string declared in the container.
- * @prop {string} codec_tag Numeric codec tag in hexadecimal form.
- * @prop {number} width Video width in pixels.
- * @prop {number} height Video height in pixels.
- * @prop {number} coded_width Internal coded width, which may differ from output width.
- * @prop {number} coded_height Internal coded height.
- * @prop {number} has_b_frames Number of B-frames used by the encoder.
- * @prop {string} sample_aspect_ratio Pixel aspect ratio declared in the stream.
- * @prop {string} display_aspect_ratio Display aspect ratio after scaling.
- * @prop {string} pix_fmt Pixel format used by the video stream.
- * @prop {number} level Codec level used during encoding.
- * @prop {string} chroma_location The chroma sample position pattern.
- * @prop {string} field_order Field order (progressive, top-field-first, etc.).
- * @prop {number} refs Number of reference frames used by the encoder.
- * @prop {string} is_avc Indicates whether the stream uses AVC-style NAL units.
- * @prop {string} nal_length_size Length of NAL unit size prefixes.
- * @prop {string} id Stream identifier within the container.
- * @prop {string} r_frame_rate Raw frame rate reported by the demuxer.
- * @prop {string} avg_frame_rate Average frame rate.
- * @prop {string} time_base The fundamental time base of the stream.
- * @prop {number} start_pts Presentation timestamp where the stream begins.
- * @prop {string} start_time Wall-clock start time in seconds.
- * @prop {number} duration_ts Duration expressed in time-base units.
- * @prop {string} duration Stream duration in seconds.
- * @prop {string} bit_rate Declared bit rate of the video stream.
- * @prop {string} bits_per_raw_sample Bit depth of the raw samples.
- * @prop {string} nb_frames Number of frames according to the container.
- * @prop {number} extradata_size Size of the extra codec data.
- * @prop {VideoStreamDisposition} disposition Disposition flags describing playback intent.
- * @prop {VideoStreamTags} tags Metadata tags for the stream.
- */
-
-/**
- * Extracts full metadata for the primary video stream (v:0) using ffprobe.
- * @param {string} video Path to the video file.
- * @returns {Promise<VideoStream>} All video stream attributes.
- */
-export async function videoAttrs(v) {
-	const { stdout } = await runSilently('ffprobe', [
-		'-v', 'error',
-		'-select_streams', 'v:0',
-		'-show_entries', 'stream',
-		'-of', 'json',
-		v
-	])
-	return JSON.parse(stdout).streams?.[0] || {}
-}
-
-
-