mediasnacks 0.32.0 → 0.32.4

package/package.json

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

package/src/cli.js

@@ -55,7 +55,7 @@ SYNOPSIS
 
 COMMANDS
 ${commandsSummary().map(([cmd, desc]) =>
-	`  ${styleText('bold', cmd.padEnd(12, ' '))}\t${desc}`).join('\n')}
+	`  ${styleText('bold', cmd.padEnd(12))}\t${desc}`).join('\n')}
 `.trim()
 
 
@@ -77,11 +77,11 @@ async function main() {
 	if (!opt) throw HELP
 	if (!Object.hasOwn(COMMANDS, opt)) throw `'${opt}' is not a command. See mediasnacks --help\n`
 
-	const cmd = COMMANDS[opt][0]
-	if (cmd.endsWith('.js'))
-		await (await import(cmd)).default()
+	const prog = COMMANDS[opt][0]
+	if (prog.endsWith('.js'))
+		await (await import(prog)).default()
 	else
-		spawn(join(import.meta.dirname, cmd), args, { stdio: 'inherit' })
+		spawn(join(import.meta.dirname, prog), args, { stdio: 'inherit' })
 			.on('exit', process.exit)
 }
 

package/src/info.js

@@ -5,13 +5,32 @@ import { formatSeconds, cleanDecimals } from './utils/formatSeconds.js'
 
 const HELP = `
 SYNOPSIS
-  mediasnacks info [-a | --all] <file>
+  mediasnacks info [-a | --all] <files>
 
 DESCRIPTION
-  Prints all available attributes for the primary video stream from ffprobe.
+  Prints video or image attributes using ffprobe. By default, it’s similar to 
+  \`ls\` but prints the: width, height, fps, duration, codec, and filename.
 
 OPTIONS
-  -a, --all    Prints all attributes as JSON
+  -a, --all    Prints everything as JSON
+
+EXAMPLES
+  Short summary of each match:	
+    mediasnacks info *.mp4
+  
+  Sort by fps:
+    mediasnacks info *.* | sort -k3,3n
+
+  Move 60fps videos into 60fps/ subdir: 
+    FPS=60
+    DIR=\${FPS}fps
+    mkdir -p \$DIR
+    mediasnacks info *.* |
+      grep \${FPS}fps |
+      awk -F\\t '{print $NF}' |
+      while read -r f; do
+        mv -- "$f" \$DIR/
+      done  
 `
 
 export default async function main() {
@@ -19,45 +38,28 @@ export default async function main() {
 		all: { short: 'a', type: 'boolean' }
 	})
 
-	const video = files[0]
-	if (!video) throw usage('No video file specified')
+	if (!files[0]) throw usage('No video file specified')
 
-	if (values.all)
-		console.log(JSON.stringify(await videoAttrs(video), '', 2))
-	else
-		console.log(await infoSummary(video))
+	for (const video of files)
+		if (values.all)
+			console.log(JSON.stringify(await videoAttrs(video), '', 2))
+		else
+			console.log(`${await infoSummary(video)}\t${video}`)
 }
 
 
 export async function infoSummary(video) {
 	const v = await videoAttrs(video)
 	return [
-		`${v.width}x${v.height}`,
-		`${fps(v.r_frame_rate)}fps`,
-		formatSeconds(v.duration),
-		prettyCodecName(v.codec_name)
-	].join('  ')
+		String(v.width).padStart(4),
+		String(v.height).padStart(4),
+		`${fps(v.r_frame_rate)}fps`.padStart(7),
+		formatSeconds(v.duration, 0).padStart(8),
+		v.codec_name
+	].join('\t')
 }
 
 function fps(rFrameRate) {
 	const [num, den] = rFrameRate.split('/').map(Number)
 	return cleanDecimals((num / den).toFixed(2))
 }
-
-function prettyCodecName(codec) {
-	// ffmpeg -codecs | grep '^...V'
-	return {
-		'dnxhd': 'DNxHD',
-		'dvvideo': 'DV (Digital Video)',
-		'h264': 'H.264',
-		'hevc': 'H.265',
-		'jpeg2000': 'JPEG 2000',
-		'mpeg4': 'MPEG-4 Part 2',
-		'prores': 'ProRes',
-		'qtrle': 'QuickTime RLE',
-		'rawvideo': 'Uncompressed',
-	}[codec] || codec
-}
-
-
-

package/src/utils/ffmpeg.js

@@ -1,5 +1,6 @@
+import os from 'node:os'
 import { spawn } from 'node:child_process'
-import { printProgress } from './printProgress.js'
+import { printProgress, showCursor } from './printProgress.js'
 import { videoAttrs } from './videoAttrs.js'
 import { runSilently } from './subprocess.js'
 
@@ -32,16 +33,26 @@ export async function ffmpegWithProgress(input, args, onProgress = printProgress
 		...args
 	], { stdio: ['inherit', 'pipe', 'pipe'] })
 
-	p.stderr.pipe(process.stderr)
+	const startTime = performance.now()
 	p.stdout.on('data', chunk => {
 		const text = chunk.toString()
-		if (text.includes('progress=end'))
-			onProgress(1)
-		else {
+		const msElapsed = performance.now() - startTime
+		if (text.includes('progress=continue')) {
 			const m = text.match(/out_time_us=(\d+)/)
-			onProgress(Number(m[1]) / µsVideoDuration)
+			const progress = Number(m[1]) / µsVideoDuration
+			const msETA = msElapsed * (1 - progress) / progress
+			onProgress(progress, msElapsed, msETA)
 		}
+		else
+			onProgress(1, msElapsed, 0)
+	})
+	process.on('SIGINT', () => {
+		p?.kill('SIGINT')
+		showCursor()
+		console.log('\nAborted')
+		process.exit(128 + os.constants.signals.SIGINT)
 	})
+	p.stderr.pipe(process.stderr)
 
 	await new Promise((resolve, reject) => {
 		p.on('error', reject)

package/src/utils/formatSeconds.js

@@ -1,3 +1,12 @@
+/**
+ * Removes trailing zeros and a trailing decimal point.
+ *
+ * Examples:
+ *   cleanDecimals(3.1400) -> "3.14"
+ *   cleanDecimals(5.0) -> "5"
+ */
+export const cleanDecimals = Number
+
 /**
  * Converts seconds to a string like "9h9m9s".
  *
@@ -8,26 +17,16 @@
  *   formatSeconds(3661.25, 2) -> "1h1m1.25s"
  */
 export function formatSeconds(seconds, maxDecimals = 2) {
+	if (!Number.isFinite(+seconds))
+		return ''
 	const intSeconds = seconds | 0
 	const partialSeconds = seconds % 60
 	const minutes = (intSeconds % 3600) / 60 | 0
 	const hours = intSeconds / 3600 | 0
 
 	let result = ''
-	if (hours) result += `${hours}h`
-	if (minutes) result += `${minutes}m`
-	if (partialSeconds || !result) result += `${cleanDecimals(partialSeconds.toFixed(maxDecimals))}s`
+	if (hours) result += hours + 'h'
+	if (minutes) result += minutes + 'm'
+	if (partialSeconds || !result) result += cleanDecimals(partialSeconds.toFixed(maxDecimals)) + 's'
 	return result
 }
-
-
-/**
- * Removes trailing zeros and a trailing decimal point.
- *
- * Examples:
- *   cleanDecimals(3.1400) -> "3.14"
- *   cleanDecimals(5.0) -> "5"
- */
-export function cleanDecimals(number) {
-	return String(number).replace(/\.?0+$/, '') || '0'
-}

package/src/utils/parseOptions.js

@@ -10,48 +10,41 @@ const glob = promisify(_glob)
  * @param {Partial<import('node:util').ParseArgsConfig>} [config]
  */
 export async function parseOptions(helpText, options = {}, config = {}) {
+	helpText = helpText.trim()
 	options.help = { short: 'h', type: 'boolean' }
 
-	const { values, positionals, tokens } = parseArgs({
+	const { values, positionals } = parseArgs({
 		args: process.argv.slice(3),
 		allowPositionals: true,
 		options,
-		...config,
-		tokens: true
+		...config
 	})
 
 	if (values.help) {
-		console.log(helpText.trim())
+		console.log(helpText)
 		process.exit(0)
 	}
 
 	return {
 		values,
 		positionals,
-		files: await resolveGlobs(positionals, tokens),
+		files: await resolveGlobs(positionals),
 		usage: err => err
-			? styleText('redBright', '' + err + '\n') + helpText
+			? styleText('redBright', err + '\n') + helpText
 			: helpText
 	}
 }
 
-async function resolveGlobs(arr, tokens = []) {
-	const terminatorIndex = tokens.find(t => t.kind === 'option-terminator')?.index ?? -1
+async function resolveGlobs(arr) {
 	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)
-
+	for (const arg of arr) {
+		const matches = await glob(arg)
+		if (matches.length)
+			for (const file of matches)
+				set.add(file)
+		else
+			set.add(arg)
+	}
 	return Array.from(set)
 }
 

package/src/utils/parseTimecode.js

@@ -6,11 +6,11 @@ export function parseTimecode(time) {
 	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]
+	if (parts.length === 3) // HH:MM:SS or HH:MM:SS.mmm
+		return (3600 * parts[0]) + (60 * parts[1]) + parts[2]
 
-	// MM:SS or MM:SS.mmm
-	if (parts.length === 2) return parts[0] * 60 + parts[1]
+	if (parts.length === 2) // MM:SS or MM:SS.mmm
+		return (60 * parts[0]) + parts[1]
 
 	return parts[0]
 }

package/src/utils/printProgress.js

@@ -1,14 +1,34 @@
-export function printProgress(progress) {
-	process.stdout.write(`\r${progressBar(progress)} ${(progress * 100).toFixed(1)}%`)
+import { formatSeconds } from './formatSeconds.js'
+
+const HIDE_CURSOR = '\x1b[?25l'
+const SHOW_CURSOR = '\x1b[?25h'
+const ERASE_TO_END = '\x1b[K'
+
+export const showCursor = () => process.stdout.write(SHOW_CURSOR)
+
+export function printProgress(progress, msElapsed, msETA) {
+	const elapsed = msElapsed
+		? ` • ${formatSeconds(msElapsed / 1000, 0)}`
+		: ''
+	const eta = msETA
+		? ` • ETA ${formatSeconds(msETA / 1000, 0)}`
+		: ''
+	const percent = progress === 1
+		? '100%'
+		: `${(progress * 100).toFixed(1)}%`
+	process.stdout.write(HIDE_CURSOR)
+	process.stdout.write(`\r${progressBar(progress)} ${percent}${eta}${elapsed}${ERASE_TO_END}`)
 	if (progress === 1)
-		process.stdout.write('\n')
+		process.stdout.write('\n' + SHOW_CURSOR)
 }
 
-function progressBar(progress, width = 42) {
+function progressBar(progress, width = 44) {
+	width-- // for partial char
 	const nFull = (width * progress) | 0
 	const fPartial = (width * progress) - nFull
 	const nRemaining = width - nFull
+
 	const partials = ' ▏▎▍▌▋▊▉'
-	const partial = partials[Math.min(partials.length * fPartial | 0, partials.length - 1)]
-	return '█'.repeat(nFull) + partial + '⠂'.repeat(nRemaining)
+	const partial = partials.at(partials.length * fPartial)
+	return '█'.repeat(nFull) + partial + '•'.repeat(nRemaining)
 }

package/src/utils/test-utils.js

@@ -5,19 +5,10 @@ import { mkdtempSync, mkdirSync, writeFileSync } from 'node:fs'
 
 const rel = f => join(import.meta.dirname, f)
 
-export function mkTempDir(prefix = 'test-') {
-	return mkdtempSync(join(tmpdir(), prefix))
-}
+export const cli = (...args) => spawnSync(rel('../cli.js'), args)
 
-export function cli(...args) {
-	return spawnSync(rel('../cli.js'), args)
-}
+export const dir = (...args) => mkdirSync(join(...args), { recursive: true })
+export const touch = (...args) => writeFileSync(join(...args), '')
 
-export function dir(...args) {
-	return mkdirSync(join(...args), { recursive: true })
-}
-
-export function touch(...args) {
-	return writeFileSync(join(...args), '')
-}
+export const mkTempDir = (prefix = 'test-') => mkdtempSync(join(tmpdir(), prefix))