mediasnacks 0.27.0 → 0.28.0

package/src/play.js

@@ -8,25 +8,19 @@ SYNOPSIS
   mediasnacks play [--no-recursive] [query ...]
 
 DESCRIPTION
-  Plays a filtered playlist with mpv.
+  Plays a filtered playlist with mpv
  
 EXAMPLE
   cd Music
   mediasnacks play artistX artistY
-`.trim()
+`
 
 
 export default async function main() {
-	const { values, positionals } = await parseOptions({
+	const { values, positionals } = await parseOptions(HELP, {
 		recursive: { short: 'r', type: 'boolean', default: true },
-		help: { short: 'h', type: 'boolean' }
 	}, { allowNegative: true })
 
-	if (values.help) {
-		console.log(HELP)
-		return
-	}
-
 	const files = findFiles({
 		dir: '.',
 		regex: new RegExp(positionals.join('|'), 'i'),
@@ -35,7 +29,7 @@ export default async function main() {
 	})
 
 	if (!files.length)
-		throw new Error('No matching files found.')
+		throw 'No matching files found.'
 
 	play(files)
 }

package/src/png.js

@@ -11,19 +11,15 @@ DESCRIPTION
 
 EXAMPLE
   mediasnacks png *.png
-`.trim()
+`
 
 export default async function main() {
-	const { values, positionals } = await parseOptions({
-		help: { short: 'h', type: 'boolean' }
-	})
+	const { values, files } = await parseOptions(HELP)
 
-	if (values.help || !positionals[0]) {
-		console.log(HELP)
-		return
-	}
+	if (!files.length)
+		throw 'Missing input image(s)'
 
-	await png(...positionals)
+	await png(...files)
 }
 
 export async function png(...images) {

package/src/prores.js

@@ -1,9 +1,10 @@
 import { resolve, parse, join } from 'node:path'
 import { parseOptions } from './utils/parseOptions.js'
-import { assertUserHasFFmpeg, run } from './utils/subprocess.js'
+import { run } from './utils/subprocess.js'
 
+
+// https://github.com/oyvindln/vhs-decode/wiki/ProRes-The-Definitive-FFmpeg-Guide#profiles-can-be-the-following
 export const ProresProfiles = new class {
-	// https://github.com/oyvindln/vhs-decode/wiki/ProRes-The-Definitive-FFmpeg-Guide#profiles-can-be-the-following
 	profiles = {
 		// 10-bit color depth
 		0: '422 Proxy',
@@ -22,6 +23,7 @@ export const ProresProfiles = new class {
 	table = () => Object.entries(this.profiles)
 }
 
+
 const HELP = `
 SYNOPSIS
   mediasnacks prores [options] <video>
@@ -33,7 +35,6 @@ OPTIONS
   -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]) =>
@@ -46,29 +47,21 @@ TIME FORMAT
 EXAMPLES
   mediasnacks prores --end=60 video.mov   // outputs video.prores.mov
   mediasnacks prores -p2 *.mov
-`.trim()
+`
 
 
 export default async function main() {
-	await assertUserHasFFmpeg()
-
-	const { values, files } = await parseOptions({
+	const { values, files } = await parseOptions(HELP, {
 		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' }
+		start: { short: 's', type: 'string' },
+		end: { short: 'e', type: 'string' },
 	})
 
-	if (values.help) {
-		console.log(HELP)
-		return
-	}
-
 	if (!ProresProfiles.isValid(Number(values.profile)))
-		throw new Error('Invalid profile. Must be one of: ' + ProresProfiles.list().join(','))
+		throw 'Invalid profile. Must be one of: ' + ProresProfiles.list().join(',')
 
 	if (files.length !== 1)
-		throw new Error('Expected 1 argument: video file. See mediasnacks prores --help')
+		throw 'Expected 1 argument: video file.'
 
 	const video = resolve(files[0])
 	const { name, dir } = parse(video)

package/src/qdir.js

@@ -14,8 +14,7 @@ DESCRIPTION
   Sequentially runs all *.sh files in a folder (cwd by default). 
   Completed scripts get renamed with a ".done" extension,
   or to ".failed.$exitCode"
-`.trim()
-
+`
 
 function filter(f) {
 	return f.endsWith('.sh')
@@ -29,19 +28,12 @@ function newExt(exitCode) {
 
 
 export default async function main() {
-	const { values, positionals } = await parseOptions({
-		help: { short: 'h', type: 'boolean' }
-	})
-
-	if (values.help) {
-		console.log(HELP)
-		return
-	}
+	const { values, positionals } = await parseOptions(HELP)
 
 	const dir = positionals[0] || process.cwd()
 	const err = await qdir(dir)
 	if (err)
-		throw new Error(err)
+		throw err
 }
 
 

package/src/resize.js

@@ -3,72 +3,58 @@ import { rename } from 'node:fs/promises'
 
 import { parseOptions } from './utils/parseOptions.js'
 import { isFile, uniqueFilenameFor } from './utils/fs-utils.js'
-import { ffmpeg, assertUserHasFFmpeg } from './utils/subprocess.js'
+import { ffmpeg } from './utils/subprocess.js'
 import { videoAttrs } from './utils/videoAttrs.js'
 
 
 const HELP = `
 SYNOPSIS
-  mediasnacks resize [--width=<num>] [--height=<num>] [-y | --overwrite] [--outdir=<dir>] <files>
+  mediasnacks resize [options] <files>
 
 DESCRIPTION
   Resizes videos and images. The aspect ratio is preserved when only one dimension is specified.
 
+OPTIONS
+  --width <num>
+  --height <num>
+		Only one is needed. They are -2 by default:
+			-1 = auto-compute while preserving the aspect ratio (may result in an odd number)
+			-2 = same as -1 but rounds to the nearest even number
+	--outdir <dir>  Defaults to same dir of input file
+	-y, --overwrite
+		
 EXAMPLES
   Overwrites the input file (-y)
     mediasnacks resize -y --width 480 'dir-a/**/*.png' 'dir-b/**/*.mp4'
 
-  Output directory (-o)
+  Output directory
     mediasnacks resize --height 240 --outdir /tmp/out video.mov
-   
-OPTIONS
-	--width and --height are -2 by default:
-		-1 = auto-compute while preserving the aspect ratio (may result in an odd number)
-		-2 = same as -1 but rounds to the nearest even number
-`.trim()
-
+`
 
 export default async function main() {
-	await assertUserHasFFmpeg()
-
-	const { values, files } = await parseOptions({
+	const { values, files } = await parseOptions(HELP, {
 		width: { type: 'string', default: '-2' },
 		height: { type: 'string', default: '-2' },
 		outdir: { type: 'string', default: '' },
 		overwrite: { short: 'y', type: 'boolean' },
-		help: { short: 'h', type: 'boolean' },
 	})
 
-	if (values.help) {
-		console.log(HELP)
-		return
-	}
-
 	const width = Number(values.width)
 	const height = Number(values.height)
 
-	if (width <= 0 && height <= 0)
-		throw new Error('--width or --height need to be greater than 0')
-
-	if (!files.length)
-		throw new Error('No video files specified')
-
-
-	console.log('Resizing…')
-	for (const file of files)
-		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)
-		}
+	if (!files.length) throw 'No video files specified'
+	if (width <= 0 && height <= 0) throw '--width or --height must be > 0'
+
+	for (const file of files) {
+		await resize({
+			file,
+			outFile: join(values.outdir, file),
+			overwrite: values.overwrite,
+			width,
+			height,
+		})
+		console.log(file)
+	}
 }
 
 
@@ -78,10 +64,10 @@ export async function resize({ file, outFile, overwrite, width, height }) {
 		|| width < 0 && height === v.height
 		|| height < 0 && width === v.width
 	)
-		throw new Error(`no changes needed. ${file}`)
+		throw `no changes needed. ${file}`
 
 	if (!overwrite && isFile(outFile))
-		throw new Error(`output file exists but --overwrite=false. ${file}`)
+		throw `output file exists but --overwrite=false. ${file}`
 
 	const tmp = uniqueFilenameFor(file)
 	await ffmpeg([

package/src/seqcheck.js

@@ -1,5 +1,6 @@
-import { parseArgs } from 'node:util'
 import { readdirSync } from 'node:fs'
+import { parseOptions } from './utils/parseOptions.js'
+
 
 const LEFT_DELIM = '_'
 const RIGHT_DELIM = '.'
@@ -14,25 +15,14 @@ DESCRIPTION
 OPTIONS
   -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()
-
+`
 
-export default function main() {
-	const { values, positionals } = parseArgs({
-		options: {
-			'left-delimiter': { type: 'string', default: LEFT_DELIM },
-			'right-delimiter': { type: 'string', default: RIGHT_DELIM },
-			help: { short: 'h', type: 'boolean' },
-		},
-		allowPositionals: true,
+export default async function main() {
+	const { values, positionals } = await parseOptions(HELP, {
+		'left-delimiter': { type: 'string', default: LEFT_DELIM },
+		'right-delimiter': { type: 'string', default: RIGHT_DELIM },
 	})
 
-	if (values.help) {
-		console.log(HELP)
-		return
-	}
-
 	const dir = positionals[0] || process.cwd()
 	const missing = seqcheck(dir, values['left-delimiter'], values['right-delimiter'])
 	if (missing.length)

package/src/sqcrop.js

@@ -1,9 +1,10 @@
 import { join } from 'node:path'
 import { rename } from 'node:fs/promises'
 
-import { ffmpeg, assertUserHasFFmpeg } from './utils/subprocess.js'
+import { ffmpeg } from './utils/subprocess.js'
 import { lstat, uniqueFilenameFor } from './utils/fs-utils.js'
 import { parseOptions } from './utils/parseOptions.js'
+import { videoAttrs } from './utils/videoAttrs.js'
 
 
 const HELP = `
@@ -12,46 +13,34 @@ SYNOPSIS
 
 DESCRIPTION
   Square crops images
-`.trim()
-
+`
 
 export default async function main() {
-	await assertUserHasFFmpeg()
-
-	const { values, files } = await parseOptions({
+	const { values, files } = await parseOptions(HELP, {
 		outdir: { type: 'string', default: '' },
 		overwrite: { short: 'y', type: 'boolean' },
-		help: { short: 'h', type: 'boolean' },
 	})
 
-	if (values.help) {
-		console.log(HELP)
-		return
-	}
-
 	if (!files.length)
-		throw new Error('No images specified. See mediasnacks sqcrop --help')
-
-	console.log('Cropping…')
-	for (const file of files)
-		try {
-			await sqcrop({
-				file,
-				outFile: join(values.outdir, file),
-				overwrite: values.overwrite
-			})
-			console.log(file)
-		}
-		catch (err) {
-			console.error(err?.message || err)
-		}
+		throw 'No images specified'
+
+	for (const file of files) {
+		await sqcrop({
+			file,
+			outFile: join(values.outdir, file),
+			overwrite: values.overwrite
+		})
+		console.log(file)
+	}
 }
 
 export async function sqcrop({ file, outFile, overwrite }) {
 	const stOut = lstat(outFile)
+	const { width, height } = await videoAttrs(file)
 
-	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}`)
+	if (!overwrite && stOut?.isFile()) throw `output file exists. ${file}`
+	if (stOut?.mtimeMs > lstat(file)?.mtimeMs) throw `output file is newer. ${file}`
+	if (width === height) throw `already square. ${file}`
 
 	const tmp = uniqueFilenameFor(file)
 	await ffmpeg([

package/src/ssim.js

@@ -8,21 +8,13 @@ SYNOPSIS
 
 DESCRIPTION
   Computes the Structural Similarity Index (SSIM) between two images using FFmpeg.
-`.trim()
-
+`
 
 export default async function main() {
-	const { values, positionals } = await parseOptions({
-		help: { short: 'h', type: 'boolean' }
-	})
-
-	if (values.help) {
-		console.log(HELP)
-		return
-	}
+	const { values, positionals } = await parseOptions(HELP)
 
 	if (positionals.length !== 2)
-		throw new Error('Expected two images')
+		throw 'Expected two images'
 
 	const score = await ssim(...positionals)
 	console.log(score.toString())
@@ -37,6 +29,6 @@ export async function ssim(img1, img2) {
 	])
 	const match = stderr.match(/All:([\d.]+)/)
 	if (!match)
-		throw new Error(`Could not parse SSIM output:\n${stderr}`)
+		throw `Could not parse SSIM output:\n${stderr}`
 	return parseFloat(match[1])
 }

package/src/unemoji.js

@@ -4,6 +4,16 @@ import { dirname, basename, join } from 'node:path'
 import { parseOptions } from './utils/parseOptions.js'
 import { findFiles } from './utils/fs-utils.js'
 
+
+const HELP = `
+SYNOPSIS
+  mediasnacks unemoji [-r | --recursive] <dir>
+
+DESCRIPTION
+  Removes emoji from filenames in the current directory.
+  Does not overwrite files.
+`
+
 const EMOJI_RE = new RegExp(
 	'[' +
 	'\u{1F600}-\u{1F64F}' +   // Emoticons
@@ -18,30 +28,13 @@ const EMOJI_RE = new RegExp(
 	'gu'
 )
 
-const HELP = `
-SYNOPSIS
-  mediasnacks unemoji [-r | --recursive] <dir>
-
-DESCRIPTION
-  Removes emoji from filenames in the current directory.
-  Does not overwrite files.
-  
-OPTIONS
-	-r, --recursive
-`.trim()
-
 export default async function main() {
-	const { values, positionals } = await parseOptions({
-		help: { short: 'h', type: 'boolean' },
+	const { values, positionals } = await parseOptions(HELP, {
 		recursive: { short: 'r', type: 'boolean' }
 	})
 
-	if (values.help) {
-		console.log(HELP)
-		return
-	}
-
-	if (positionals.length !== 1) throw new Error('Only one dir is accepted')
+	if (positionals.length !== 1)
+		throw 'Must pass only one dir'
 
 	const files = findFiles({
 		dir: positionals[0],
@@ -49,15 +42,11 @@ export default async function main() {
 		recursive: values.recursive,
 	})
 
-	for (const file of files)
-		try {
-			const newpath = await unemoji(file)
-			if (newpath)
-				console.log(`Renaming: ${file} -> ${newpath}`)
-		}
-		catch (err) {
-			console.error(err?.message || err)
-		}
+	for (const file of files) {
+		const newpath = await unemoji(file)
+		if (newpath)
+			console.log(`Renaming: ${file} -> ${newpath}`)
+	}
 }
 
 export async function unemoji(file) {
@@ -72,7 +61,8 @@ export async function unemoji(file) {
 		return null
 
 	const newpath = join(dir, newbase)
-	if (existsSync(newpath)) throw new Error(`Skipping (exists): ${file} -> ${newpath}`)
+	if (existsSync(newpath))
+		throw `Skipping (exists): ${file} -> ${newpath}`
 
 	await rename(file, newpath)
 	return newpath

package/src/utils/parseOptions.js

@@ -1,10 +1,17 @@
 import { promisify, parseArgs } from 'node:util'
 import { glob as _glob } from 'node:fs'
 
-
 const glob = promisify(_glob)
 
-export async function parseOptions(options = {}, config = {}) {
+
+/**
+ * @param {string} helpText
+ * @param {import('node:util').ParseArgsOptionsConfig} [options]
+ * @param {Partial<import('node:util').ParseArgsConfig>} [config]
+ */
+export async function parseOptions(helpText, options = {}, config = {}) {
+	options.help = { short: 'h', type: 'boolean' }
+
 	const { values, positionals, tokens } = parseArgs({
 		args: process.argv.slice(3),
 		allowPositionals: true,
@@ -12,6 +19,12 @@ export async function parseOptions(options = {}, config = {}) {
 		...config,
 		tokens: true
 	})
+
+	if (values.help) {
+		console.log(helpText.trim())
+		process.exit(0)
+	}
+
 	return {
 		values,
 		positionals,

package/src/utils/subprocess.js

@@ -1,7 +1,7 @@
 import { spawn } from 'node:child_process'
 
 
-export async function assertUserHasFFmpeg() {
+async function assertUserHasFFmpeg() {
 	try {
 		await runSilently('ffmpeg', ['-version'])
 		await runSilently('ffprobe', ['-version'])
@@ -12,6 +12,7 @@ export async function assertUserHasFFmpeg() {
 }
 
 export async function ffmpeg(args) {
+	await assertUserHasFFmpeg()
 	return runSilently('ffmpeg', args)
 }
 

package/src/utils/videoAttrs.js

@@ -79,13 +79,13 @@ import { runSilently } from './subprocess.js'
  * @param {string} video Path to the video file.
  * @returns {Promise<VideoStream>} All video stream attributes.
  */
-export async function videoAttrs(v) {
+export async function videoAttrs(video) {
 	const { stdout } = await runSilently('ffprobe', [
 		'-v', 'error',
 		'-select_streams', 'v:0',
 		'-show_entries', 'stream',
 		'-of', 'json',
-		v
+		video
 	])
 	return JSON.parse(stdout).streams?.[0] || {}
 }

package/src/vsplit.js

@@ -2,7 +2,7 @@ import { readFileSync } from 'node:fs'
 import { resolve, parse, join } from 'node:path'
 
 import { parseOptions } from './utils/parseOptions.js'
-import { assertUserHasFFmpeg, run } from './utils/subprocess.js'
+import { run } from './utils/subprocess.js'
 
 
 // TODO looks like it's missing a frame (perhaps becaue of -c copy)
@@ -31,29 +31,20 @@ EXAMPLE
  
 SEE ALSO
 	mediasnacks vtrim
-`.trim()
+`
 
 
 export default async function main() {
-	await assertUserHasFFmpeg()
-
-	const { values, files } = await parseOptions({
-		help: { short: 'h', type: 'boolean' },
-	})
-
-	if (values.help) {
-		console.log(HELP)
-		return
-	}
+	const { values, files } = await parseOptions(HELP)
 
 	if (files.length !== 2)
-		throw new Error('Expected 2 arguments: CSV file and video file. See mediasnacks vsplit --help')
+		throw 'Expected 2 arguments: CSV file and video file.'
 
 	const [csvPath, videoPath] = files.map(f => resolve(f))
 
 	const clips = parseCSV(csvPath)
 	if (!clips.length)
-		throw new Error('CSV file contains no clips')
+		throw 'CSV file contains no clips'
 
 	console.log(`Splitting video into ${clips.length} clip${clips.length === 1 ? '' : 's'}…`)
 	await vsplit(videoPath, clips)
@@ -64,14 +55,14 @@ function parseCSV(csvPath) {
 	const lines = content.split('\n').filter(line => line.trim())
 
 	if (!lines.length)
-		throw new Error('CSV file is empty')
+		throw 'CSV file is empty'
 
 	const clips = []
 	for (let i = 1; i < lines.length; i++) { // unconditionally skips header 
 		const parts = lines[i].split(',').map(s => s.trim())
 
 		if (parts.length !== 2)
-			throw new Error(`Invalid CSV format at line ${i + 1}: expected 2 columns, got ${parts.length}`)
+			throw `Invalid CSV format at line ${i + 1}: expected 2 columns, got ${parts.length}`
 
 		clips.push(parts)
 	}
@@ -80,7 +71,7 @@ function parseCSV(csvPath) {
 
 export async function vsplit(videoPath, clips) {
 	const { dir, name, ext } = parse(videoPath)
-	const seqLen = Math.log10(clips.length) + 1 | 0
+	const seqLen = String(clips.length).length
 
 	for (let i = 0; i < clips.length; i++) {
 		const [start, end] = clips[i]

package/src/vtrim.js

@@ -1,11 +1,11 @@
 import { resolve, parse } from 'node:path'
 import { parseOptions } from './utils/parseOptions.js'
-import { ffmpeg, assertUserHasFFmpeg } from './utils/subprocess.js'
+import { ffmpeg } from './utils/subprocess.js'
 
 
 const HELP = `
 SYNOPSIS
-  mediasnacks vtrim [--start <time>] [--end <time>] <videos>
+  mediasnacks vtrim [options] <videos>
 
 DESCRIPTION
   Trims a video without re-encoding (fast, but approximate cuts).
@@ -16,25 +16,17 @@ OPTIONS
   
 SEE ALSO
 	mediasnacks vsplit
-`.trim()
+`
 
 
 export default async function main() {
-	await assertUserHasFFmpeg()
-
-	const { values, files } = await parseOptions({
-		start: { short: 's', type: 'string', default: '' },
-		end: { short: 'e', type: 'string', default: '' },
-		help: { short: 'h', type: 'boolean' }
+	const { values, files } = await parseOptions(HELP, {
+		start: { short: 's', type: 'string' },
+		end: { short: 'e', type: 'string' },
 	})
 
-	if (values.help) {
-		console.log(HELP)
-		return
-	}
-
 	if (!files.length)
-		throw new Error('No video specified. See mediasnacks vtrim --help')
+		throw 'No video specified.'
 
 	for (const file of files)
 		await vtrim({