mediasnacks 0.22.2 → 0.22.3

package/package.json

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

package/src/dropdups.js

@@ -11,17 +11,22 @@ const PROFILE = PRORES_PROFILES.hq
 
 const HELP = `
 SYNOPSIS
-  mediasnacks dropdups [-n <bad-frame-number>] <video>
+  mediasnacks dropdups [-n <dup-frame-num>] <video>
 
 DESCRIPTION
   Removes sequentially duplicate frames and outputs ProRes 422 HQ.
 
 OPTIONS
-  -n, --bad-frame-number <n>  Known frame interval to drop.
-		         (default: n=0) auto-detects repeated frames (slower)
-             Ex.A: Use n=2 when every other frame is repeated.
-		         Ex.B: Use n=6 if e.g., a 25 fps got upped to 30 fps without interpolation.
+  -n, --dup-frame-num <n>  Known frame interval to drop.
+		                       Default: n=0, which auto-detects repeated frames (slower)
   -h, --help
+
+EXAMPLES
+  Use n=2 when every other frame is repeated:
+  mediasnacks dropdups -n2 vid.mov
+  
+	Use n=6 if e.g., a 25 fps got upped to 30 fps without interpolation.
+  mediasnacks dropdups -n6 vid.mov
 `.trim()
 
 
@@ -29,7 +34,7 @@ async function main() {
 	await assertUserHasFFmpeg()
 
 	const { values, files } = await parseOptions({
-		'bad-frame-number': { short: 'n', type: 'string', default: '' },
+		'dup-frame-num': { short: 'n', type: 'string', default: '' },
 		help: { short: 'h', type: 'boolean' },
 	})
 
@@ -41,23 +46,23 @@ async function main() {
 	if (!files.length)
 		throw new Error('No video specified. See mediasnacks dropdups --help')
 
-	let nBadFrame = values['bad-frame-number']
-	if (nBadFrame && !/^\d+$/.test(nBadFrame))
-		throw new Error('Invalid --bad-frame-number. It must be a positive integer.')
+	let dupFrameNum = values['dup-frame-num']
+	if (dupFrameNum && !Number.isInteger(+dupFrameNum))
+		throw new Error('Invalid -n. It must be a positive integer.')
 
 	console.log('Dropping Duplicate Frames…')
 	for (const file of files)
-		await dropdups(resolve(file), nBadFrame)
+		await dropdups(resolve(file), dupFrameNum)
 }
 
-async function dropdups(video, nBadFrame) {
+async function dropdups(video, dupFrameNum) {
 	await run('ffmpeg', [
 		'-v', 'error',
 		'-stats',
 		'-an',
 		'-i', video,
-		'-vf', nBadFrame
-			? `decimate=cycle=${nBadFrame}`
+		'-vf', dupFrameNum
+			? `decimate=cycle=${dupFrameNum}`
 			: 'mpdecimate,setpts=N/FRAME_RATE/TB',
 		'-fps_mode', 'cfr',
 		'-c:v', 'prores_ks',

package/src/edgespic.js

@@ -13,10 +13,12 @@ SYNOPSIS
 
 DESCRIPTION
   Extracts the first and last frames from each video and saves them to the 'edgepics/' subfolder.
-  --width defaults to 640px and The aspect ratio is preserved.
+  
+OPTIONS
+  -w, --width    Default:640 The aspect ratio is preserved.
 
 EXAMPLES
-  mediasnacks edgespic --width 800 *.mov
+  mediasnacks edgespic -w 800 *.mov
   mediasnacks edgespic -w 600 'videos/**/*.mp4'
 `.trim()
 

package/src/flattendir.sh

@@ -1,8 +1,25 @@
 #!/bin/sh
 
-# Moves unique files to the top dir and deletes empty dirs
-# Usage: mediasnacks flattendir [folder]
-# Default: current working directory
+help() {
+  /bin/cat << EOF
+SYNOPSIS
+  mediasnacks flattendir [folder]
+
+DESCRIPTION
+  Moves unique files from subdirectories into the top-level folder, then
+  deletes empty directories. Defaults to the current working directory.
+EOF
+}
+
+if [ "$1" = "--help" ] || [ "$1" = "-h" ]; then
+  help
+  exit 0
+fi
+
+if [ $# -gt 0 ] && [ ! -d "$1" ]; then
+  help
+  exit 1
+fi
 
 DIR="${1:-$(pwd)}"
 

package/src/framediff.sh

@@ -1,14 +1,14 @@
 #!/bin/sh
 
 
-if [ "$1" = "--help" ] || [ "$1" = "-h" ]; then
-/bin/cat << EOF
+help() {
+  /bin/cat << EOF
 SYNOPSIS
   mediasnacks framediff <video>
 
 DESCRIPTION
   Runs FFplay with a video filter for diffing adjacent frames. Useful for
-  finding duplicate frames, which will show up a a black frame.
+  finding duplicate frames, which will show up as a black frame.
 
 TIPS
   Hit [s] to step frame-by-frame.
@@ -16,10 +16,24 @@ TIPS
 SEE ALSO
   mediasnacks detectdups, ffplay(1)
 EOF
+}
+
+if [ "$1" = "--help" ] || [ "$1" = "-h" ]; then
+  help
   exit 0
 fi
 
+if [ ! -f "$1" ]; then
+  help
+  exit 1
+fi
+
 ffplay -v error "$1" -vf "
     tblend=all_mode=difference,
     format=gray
 "
+
+# Not rendering the frame number:
+#	  'drawtext=text=%{n}:x=20:y=20:fontcolor=white:fontsize=48'
+#	…because in homebrew ffmpeg 8 is not compiled with the req libs:
+#	https://ayosec.github.io/ffmpeg-filters-docs/8.0/Filters/Video/drawtext.html

package/src/moov2front.js

@@ -1,5 +1,4 @@
 #!/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,6 +19,7 @@ NOTES
   Files are overwritten.
 `.trim()
 
+
 async function main() {
 	await assertUserHasFFmpeg()
 

package/src/play.js

@@ -1,13 +1,12 @@
 #!/usr/bin/env node
-import { join } from 'node:path'
 import { spawn } from 'node:child_process'
-import { readdirSync } from 'node:fs'
 import { parseOptions } from './utils/parseOptions.js'
+import { findFiles } from './utils/fs-utils.js'
 
 
 const HELP = `
 SYNOPSIS
-  mediasnacks play [--no-recursive] [-h | --help] [query ...]
+  mediasnacks play [--no-recursive] [query ...]
 
 DESCRIPTION
   Plays a filtered playlist with mpv.
@@ -29,33 +28,33 @@ async function main() {
 		process.exit(0)
 	}
 
-	const pattern = positionals.length
-		? positionals.join('|')
-		: ''
-	const files = findFiles('.', new RegExp(pattern, 'i'), values.recursive)
+	const files = findFiles({
+		dir: '.',
+		regex: new RegExp(positionals.join('|'), 'i'),
+		recursive: values.recursive,
+		ignoredDirs: ['.fcpbundle/']
+	})
 
-	if (!files.length) {
-		console.error('No matching files found.')
-		process.exit(0)
-	}
+	if (!files.length)
+		throw new Error('No matching files found.')
+
+	play(files)
+}
 
-	const child = spawn('mpv', ['--playlist=-'], {
+function play(files) {
+	const mpv = spawn('mpv', ['--playlist=-'], {
 		detached: true,
 		stdio: ['pipe', 'ignore', 'ignore']
 	})
-	child.stdin.end(files.join('\n'))
-	child.unref()
-}
-
-function findFiles(dir, regex, recursive = true) {
-	const IGNORED_DIRS = ['.fcpbundle/']
-	return readdirSync(dir, { withFileTypes: true, recursive })
-		.filter(entry =>
-			entry.isFile()
-			&& !entry.name.startsWith('.')
-			&& !IGNORED_DIRS.some(d => entry.parentPath.includes(d))
-			&& regex.test(entry.name))
-		.map(entry => join(entry.parentPath, entry.name))
+	mpv.stdin.end(files.join('\n'))
+	mpv.unref()
+
+	mpv.on('error', function (err) {
+		if (err.code === 'ENOENT')
+			console.error('Error: MPV is not installed')
+		else
+			console.log(err)
+	})
 }
 
 main().catch(err => {

package/src/prores.js

@@ -1,7 +1,5 @@
 #!/usr/bin/env node
-
 import { resolve, parse, join } from 'node:path'
-
 import { parseOptions } from './utils/parseOptions.js'
 import { assertUserHasFFmpeg, run } from './utils/subprocess.js'
 
@@ -23,7 +21,7 @@ DESCRIPTION
 
 OPTIONS
   -p, --profile <n>  ProRes profile (default: 3 (422 HQ))
-  -h, --help         Show this help message
+  -h, --help
 
 EXAMPLES
   mediasnacks prores video.mov
@@ -37,8 +35,8 @@ async function main() {
 	await assertUserHasFFmpeg()
 
 	const { values, files } = await parseOptions({
-		help: { short: 'h', type: 'boolean' },
 		profile: { short: 'p', type: 'string', default: String(PRORES_PROFILES.hq) },
+		help: { short: 'h', type: 'boolean' },
 	})
 
 	if (values.help) {

package/src/random.js

@@ -7,7 +7,7 @@ import { parseOptions } from './utils/parseOptions.js'
 
 const HELP = `
 SYNOPSIS
-  mediasnacks random [-r | --recursive] [-h | --help]
+  mediasnacks random [-r | --recursive]
 
 DESCRIPTION
   Opens a random file in the current working directory

package/src/resize.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-
 import { join } from 'node:path'
 import { rename } from 'node:fs/promises'
 

package/src/seqcheck.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-
 import { parseArgs } from 'node:util'
 import { readdirSync } from 'node:fs'
 

package/src/ssim.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-
 import { ffmpeg } from './utils/subprocess.js'
 
 

package/src/utils/fs-utils.js

@@ -1,5 +1,5 @@
-import { lstatSync } from 'node:fs'
 import { randomUUID } from 'node:crypto'
+import { lstatSync, readdirSync } from 'node:fs'
 import { mkdir, unlink, rename } from 'node:fs/promises'
 import { dirname, extname, join } from 'node:path'
 
@@ -33,3 +33,13 @@ export async function mkDir(path) {
 			throw err
 	}
 }
+
+export function findFiles({ dir, regex, recursive, ignoredDirs }) {
+	return readdirSync(dir, { withFileTypes: true, recursive })
+		.filter(entry =>
+			entry.isFile()
+			&& !entry.name.startsWith('.')
+			&& !ignoredDirs.some(d => entry.parentPath.includes(d))
+			&& regex.test(entry.name))
+		.map(entry => join(entry.parentPath, entry.name))
+}

package/src/vconcat.sh

@@ -1,14 +1,38 @@
 #!/bin/sh
 
-if [ "$#" -lt 2 ]; then
+
+help() {
   cat << EOF
+SYNOPSIS
+  mediasnacks vconcat <video1> <video2> …
+
+DESCRIPTION
+  Concatenates video files using FFmpeg's without re-encoding.
+  All videos must have compatible codecs and resolutions.
+
 EXAMPLES
-  $(basename "$0") vid1.mov vid2.mov [...]
-  $(basename "$0") *.mp4
+  mediasnacks vconcat vid1.mov vid2.mov
+  mediasnacks vconcat *.mp4
 EOF
+}
+
+if [ "$1" = "--help" ] || [ "$1" = "-h" ]; then
+  help
+  exit 0
+fi
+
+if [ "$#" -lt 2 ]; then
+  help
   exit 1
 fi
 
+for arg in "$@"; do
+  if [ ! -f "$arg" ]; then
+    help
+    exit 1
+  fi
+done
+
 list_file=$(mktemp -p .)
 for file in "$@"; do
   fname=$(printf '%s' "$file" | sed "s/'/'\\\\''/g") # Escape single quotes

package/src/vdiff.sh

@@ -1,10 +1,29 @@
 #!/bin/sh
 
-# Diffs two video files
-# The videos must have the same resolution and ideally the same framerate.
+
+help() {
+  /bin/cat << EOF
+SYNOPSIS
+  mediasnacks vdiff <video1> <video2>
+
+DESCRIPTION
+  Diffs two video files using FFplay with a blend filter. Videos must have
+  the same resolution and ideally the same framerate.
+EOF
+}
+
+if [ "$1" = "--help" ] || [ "$1" = "-h" ]; then
+  help
+  exit 0
+fi
+
+if [ $# -lt 2 ] || [ ! -f "$1" ] || [ ! -f "$2" ]; then
+  help
+  exit 1
+fi
+
 video1="$1"
 video2="$2"
-
 ffprobe -v error "$video1" || exit 1
 ffprobe -v error "$video2" || exit 1