mediasnacks 0.25.0 → 0.27.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/png.js

@@ -0,0 +1,34 @@
+import { parseOptions } from './utils/parseOptions.js'
+import { run } from './utils/subprocess.js'
+
+
+const HELP = `
+SYNOPSIS
+  mediasnacks png <img1> [img2 ...]
+
+DESCRIPTION
+  Losslessly optimizes PNG images with oxipng at max level.
+
+EXAMPLE
+  mediasnacks png *.png
+`.trim()
+
+export default async function main() {
+	const { values, positionals } = await parseOptions({
+		help: { short: 'h', type: 'boolean' }
+	})
+
+	if (values.help || !positionals[0]) {
+		console.log(HELP)
+		return
+	}
+
+	await png(...positionals)
+}
+
+export async function png(...images) {
+	await run('oxipng', [
+		'--opt', 'max',
+		...images
+	])
+}

package/src/prores.js

@@ -1,10 +1,9 @@
-#!/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 color depth
 		0: '422 Proxy',
@@ -50,7 +49,7 @@ EXAMPLES
 `.trim()
 
 
-async function main() {
+export default async function main() {
 	await assertUserHasFFmpeg()
 
 	const { values, files } = await parseOptions({
@@ -75,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',
@@ -89,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,4 +1,3 @@
-#!/usr/bin/env node
 import { join } from 'node:path'
 import { rename } from 'node:fs/promises'
 
@@ -10,7 +9,7 @@ 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.
@@ -20,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:
@@ -29,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' },
 	})
@@ -57,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,
@@ -91,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/unemoji.js

@@ -0,0 +1,79 @@
+import { rename } from 'node:fs/promises'
+import { existsSync } from 'node:fs'
+import { dirname, basename, join } from 'node:path'
+import { parseOptions } from './utils/parseOptions.js'
+import { findFiles } from './utils/fs-utils.js'
+
+const EMOJI_RE = new RegExp(
+	'[' +
+	'\u{1F600}-\u{1F64F}' +   // Emoticons
+	'\u{1F300}-\u{1F5FF}' +   // Misc Symbols and Pictographs
+	'\u{1F680}-\u{1F6FF}' +   // Transport and Map
+	'\u{2600}-\u{26FF}' +     // Misc symbols
+	'\u{2700}-\u{27BF}' +     // Dingbats
+	'\u{1F900}-\u{1F9FF}' +   // Supplemental Symbols and Pictographs
+	'\u{1FA70}-\u{1FAFF}' +   // Symbols and Pictographs Extended-A
+	'\u{1F1E6}-\u{1F1FF}' +   // Regional Indicator Symbols
+	']',
+	'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' },
+		recursive: { short: 'r', type: 'boolean' }
+	})
+
+	if (values.help) {
+		console.log(HELP)
+		return
+	}
+
+	if (positionals.length !== 1) throw new Error('Only one dir is accepted')
+
+	const files = findFiles({
+		dir: positionals[0],
+		regex: EMOJI_RE,
+		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)
+		}
+}
+
+export async function unemoji(file) {
+	const dir = dirname(file)
+	const base = basename(file)
+	const newbase = base.replace(EMOJI_RE, '')
+		.normalize('NFKC')
+		.replace(/\s+/g, ' ')
+		.replace(/\s+\./g, '.')
+		.trim()
+	if (base === newbase)
+		return null
+
+	const newpath = join(dir, newbase)
+	if (existsSync(newpath)) throw new Error(`Skipping (exists): ${file} -> ${newpath}`)
+
+	await rename(file, newpath)
+	return newpath
+}

package/src/utils/fs-utils.js

@@ -34,7 +34,7 @@ export async function mkDir(path) {
 	}
 }
 
-export function findFiles({ dir, regex, recursive, ignoredDirs }) {
+export function findFiles({ dir, regex, recursive, ignoredDirs = [] }) {
 	return readdirSync(dir, { withFileTypes: true, recursive })
 		.filter(entry =>
 			entry.isFile()

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/vsplit.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import { readFileSync } from 'node:fs'
 import { resolve, parse, join } from 'node:path'
 
@@ -35,7 +34,7 @@ SEE ALSO
 `.trim()
 
 
-async function main() {
+export default async function main() {
 	await assertUserHasFFmpeg()
 
 	const { values, files } = await parseOptions({
@@ -79,7 +78,7 @@ function parseCSV(csvPath) {
 	return clips
 }
 
-async function vsplit(videoPath, clips) {
+export async function vsplit(videoPath, clips) {
 	const { dir, name, ext } = parse(videoPath)
 	const seqLen = Math.log10(clips.length) + 1 | 0
 
@@ -97,8 +96,3 @@ async function vsplit(videoPath, clips) {
 		])
 	}
 }
-
-main().catch(err => {
-	console.error(err.message || err)
-	process.exit(1)
-})

package/src/vtrim.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import { resolve, parse } from 'node:path'
 import { parseOptions } from './utils/parseOptions.js'
 import { ffmpeg, assertUserHasFFmpeg } from './utils/subprocess.js'
@@ -14,14 +13,13 @@ DESCRIPTION
 OPTIONS
   -s, --start <time>   Start time (e.g. 10, 00:00:10, 1:23.5). Default: beginning.
   -e, --end <time>     End time (e.g. 30, 00:00:30, 2:45.0). Default: end of video.
-  -h, --help
   
 SEE ALSO
 	mediasnacks vsplit
 `.trim()
 
 
-async function main() {
+export default async function main() {
 	await assertUserHasFFmpeg()
 
 	const { values, files } = await parseOptions({
@@ -39,10 +37,14 @@ async function main() {
 		throw new Error('No video specified. See mediasnacks vtrim --help')
 
 	for (const file of files)
-		await vtrim(resolve(file), values.start, values.end)
+		await vtrim({
+			video: resolve(file),
+			start: values.start,
+			end: values.end
+		})
 }
 
-async function vtrim(video, start, end) {
+export async function vtrim({ video, start, end }) {
 	const { dir, name, ext } = parse(video)
 	await ffmpeg([
 		'-v', 'error',
@@ -54,8 +56,3 @@ async function vtrim(video, start, end) {
 		resolve(dir, `${name}.trim${ext}`)
 	].flat())
 }
-
-main().catch(err => {
-	console.error(err.message || err)
-	process.exit(1)
-})