mediasnacks 0.16.1 → 0.16.3

package/.zsh/completions/_mediasnacks

@@ -3,24 +3,30 @@
 _mediasnacks_commands=(
   'avif:Converts images to AVIF'
   'sqcrop:Square crops images'
-  'dropdups:Removes duplicate frames in a video'
+  
+  'resize:Resizes videos or images'
   'edgespic:Extracts first and last frames'
-  'framediff:ffplay with a filter for diffing adjacent frames'
   'gif:Video to GIF'
+  
+  'dropdups:Removes duplicate frames in a video'
+  'framediff:ffplay with a filter for diffing adjacent frames'
   'hev1tohvc1:Fixes video thumbnails not rendering in macOS Finder'
   'moov2front:Rearranges metadata for fast-start streaming'
-  'resize:Resizes videos or images'
   'vconcat:Concatenates videos'
   'vdiff:Plays a video with the difference of two videos'
   'vsplit:Splits a video into multiple clips from CSV timestamps'
   'vtrim:Trims video from start to end time'
+  
   'flattendir:Moves unique files to the top dir and deletes empty dirs'
   'seqcheck:Finds missing sequence number'
   'qdir:Sequentially runs all *.sh files in a folder'
+  
   'dlaudio: yt-dlp best audio'
   'dlvideo: yt-dlp best video'
+  
   'unemoji:Removes emojis from filenames'
   'rmcover:Removes cover art'
+  
   'curltime:Measures request response timings'
 )
 

package/README.md

@@ -13,45 +13,51 @@ npx mediasnacks <command> <args>
 ### Commands
 - `avif` Converts images to AVIF
 - `sqcrop` Square crops images
- 
-- `dropdups` Removes duplicate frames in a video
+
+
+- `resize` Resizes videos or images
 - `edgespic` Extracts first and last frames
-- `framediff`: Plays a video of adjacent frames diff
 - `gif`: Video to GIF
+
+
+- `dropdups` Removes duplicate frames in a video
+- `framediff`: Plays a video of adjacent frames diff
 - `hev1tohvc1`: Fixes video thumbnails not rendering in macOS Finder
 - `moov2front` Rearranges .mov and .mp4 metadata for fast-start streaming
-- `resize` Resizes videos or images
 - `vconcat`: Concatenates videos
 - `vdiff`: Plays a video with the difference of two videos
 - `vsplit`: Splits a video into multiple clips from CSV timestamps
 - `vtrim`: Trims video from start to end time
 
+
 - `flattendir`: Moves unique files to the top dir and deletes empty dirs
 - `qdir` Sequentially runs all *.sh files in a folder
 - `seqcheck` Finds missing sequence number
 
+
 - `dlaudio`: yt-dlp best audio
 - `dlvideo`: yt-dlp best video
 
+
 - `unemoji`: Removes emojis from filenames
 - `rmcover`: Removes cover art
 
+
 - `curltime`: Measures request response timings
 
 ### Globs
-Glob patterns are expanded by Node.js to match existing files.
+Glob patterns are expanded by Node.js.
 
 ```shell
-npx mediasnacks avif file[234].png
-  # Expands to: file2.png, file3.png, file4.png
+mediasnacks avif file[234].png
+# Expands to: file2.png, file3.png, file4.png
 ```
 
 ```shell
-npx mediasnacks avif -- file[234].png
-  # Literal filename: "file[234].png"
+mediasnacks avif -- file[234].png
+# Literal filename: "file[234].png"
 ```
 
-<br/>
 
 ---
 
@@ -59,7 +65,7 @@ npx mediasnacks avif -- file[234].png
 
 ### Converting Images to AVIF
 ```shell
-npx mediasnacks avif [-y | --overwrite] [--output-dir=<dir>] <images> 
+mediasnacks avif [-y | --overwrite] [--output-dir=<dir>] <images> 
 ```
 
 <br/>
@@ -72,17 +78,17 @@ Resizes videos and images. The aspect ratio is preserved when only one dimension
 - `-2` same as `-1` but rounds to the nearest even number
 
 ```shell
-npx mediasnacks resize [--width=<num>] [--height=<num>] [-y | --overwrite] [--output-dir=<dir>] <files>
+mediasnacks resize [--width=<num>] [--height=<num>] [-y | --overwrite] [--output-dir=<dir>] <files>
 ```
 
 Example: Overwrites the input file (-y)
 ```shell
-npx mediasnacks resize -y --width 480 'dir-a/**/*.png' 'dir-b/**/*.mp4'
+mediasnacks resize -y --width 480 'dir-a/**/*.png' 'dir-b/**/*.mp4'
 ```
 
 Example: Output directory (-o)
 ```shell
-npx mediasnacks resize --height 240 --output-dir /tmp/out video.mov
+mediasnacks resize --height 240 --output-dir /tmp/out video.mov
 ```
 
 <br/>
@@ -93,7 +99,7 @@ Rearranges .mov and .mp4 metadata to the start of the file for fast-start stream
 **Files are overwritten**
 
 ```shell
-npx mediasnacks moov2front <videos>
+mediasnacks moov2front <videos>
 ```
 What is Fast Start?
 - https://wiki.avblocks.com/avblocks-for-cpp/muxer-parameters/mp4
@@ -109,7 +115,6 @@ What is Fast Start?
 
 ![](./docs/macos-quick-action.png)
 
-
 For example, for `dropdups -n2 file.mov`
 
 - Open Automator

package/package.json

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

package/src/avif.js

@@ -8,7 +8,7 @@ import { ffmpeg, assertUserHasFFmpeg } from './utils/ffmpeg.js'
 
 
 const USAGE = `
-Usage: npx mediasnacks avif [-y | --overwrite] [--output-dir=<dir>] <images> 
+Usage: mediasnacks avif [-y | --overwrite] [--output-dir=<dir>] <images> 
 
 Converts images to AVIF.
 `.trim()

package/src/cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import { join } from 'node:path'
+import { styleText } from 'node:util'
 import { spawn } from 'node:child_process'
 import pkgJSON from '../package.json' with { type: 'json' }
 
@@ -9,13 +10,14 @@ const COMMANDS = {
 	avif: ['avif.js', 'Converts images to AVIF'],
 	sqcrop: ['sqcrop.js', 'Square crops images\n'],
 
-	dropdups: ['dropdups.js', 'Removes duplicate frames in a video'],
+	resize: ['resize.js', 'Resizes videos or images'],
 	edgespic: ['edgespic.js', 'Extracts first and last frames'],
+	gif: ['gif.sh', 'Video to GIF\n'],
+
+	dropdups: ['dropdups.js', 'Removes duplicate frames in a video'],
 	framediff: ['framediff.sh', 'Plays a video of adjacent frames diff'],
-	gif: ['gif.sh', 'Video to GIF'],
 	hev1tohvc1: ['hev1tohvc1.js', 'Fixes video thumbnails not rendering in macOS Finder '],
 	moov2front: ['moov2front.js', 'Rearranges .mov and .mp4 metadata for fast-start streaming'],
-	resize: ['resize.js', 'Resizes videos or images'],
 	vconcat: ['vconcat.sh', 'Concatenates videos'],
 	vdiff: ['vdiff.sh', 'Plays a video with the difference of two videos'],
 	vsplit: ['vsplit.js', 'Splits a video into multiple clips from CSV timestamps'],
@@ -39,7 +41,7 @@ Usage: mediasnacks <command> <args>
 
 Commands:
 ${Object.entries(COMMANDS).map(([cmd, [, title]]) =>
-	`   ${cmd.padEnd(12, ' ')}\t${title}`).join('\n')}
+	`   ${styleText('bold', cmd.padEnd(12, ' '))}\t${title}`).join('\n')}
 `.trim()
 
 

package/src/dropdups.js

@@ -18,7 +18,7 @@ const PROFILE = PRORES_PROFILES.hq
 
 
 const USAGE = `
-Usage: npx mediasnacks dropdups [-n <bad-frame-number>] <video>
+Usage: mediasnacks dropdups [-n <bad-frame-number>] <video>
 
 Removes duplicate frames and outputs ProRes 422 HQ.
 

package/src/edgespic.js

@@ -8,7 +8,7 @@ import { ffmpeg, videoAttrs, assertUserHasFFmpeg } from './utils/ffmpeg.js'
 
 
 const USAGE = `
-Usage: npx mediasnacks edgespic [--width=<num>] <files>
+Usage: mediasnacks edgespic [--width=<num>] <files>
 
 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.

package/src/flattendir.test.js

@@ -0,0 +1,36 @@
+import { test } from 'node:test'
+import { deepEqual } from 'node:assert/strict'
+import { readdirSync } from 'node:fs'
+
+import { mkTempDir, cli, dir, touch } from './utils/test-utils.js'
+
+test('flattendir moves files to top level and deletes empty dirs', () => {
+	const tmp = mkTempDir('flattendir')
+	dir(tmp, 'dir1', 'dir1-1')
+	dir(tmp, 'dir2')
+	touch(tmp, 'file1.txt')
+	touch(tmp, 'dir1', 'file2.txt')
+	touch(tmp, 'dir1', 'dir1-1', 'file3.txt')
+	touch(tmp, 'dir1', '.DS_Store')
+
+	cli('flattendir', tmp)
+	deepEqual(readdirSync(tmp).sort(), [
+		'file1.txt',
+		'file2.txt',
+		'file3.txt'
+	])
+})
+
+test('flattendir does not move files if filename collision occurs', () => {
+	const tmp = mkTempDir('flattendir-collision')
+	dir(tmp, 'dir1')
+	touch(tmp, 'file1.txt')
+	touch(tmp, 'dir1', 'file1.txt')
+
+	cli('flattendir', tmp)
+	deepEqual(readdirSync(tmp, { recursive: true }).sort(), [
+		'dir1',
+		'dir1/file1.txt',
+		'file1.txt'
+	])
+})

package/src/hev1tohvc1.js

@@ -6,7 +6,7 @@ import { videoAttrs, ffmpeg, assertUserHasFFmpeg } from './utils/ffmpeg.js'
 
 
 const USAGE = `
-Usage: npx mediasnacks hev1tohvc1 <videos>
+Usage: mediasnacks hev1tohvc1 <videos>
 
 This program fixes video thumbnails not rendering in macOS
 Finder, and fixes video not importable in Final Cut Pro. That’s done 

package/src/moov2front.js

@@ -6,7 +6,7 @@ import { parseOptions } from './utils/parseOptions.js'
 
 
 const USAGE = `
-Usage: npx mediasnacks moov2front <videos>
+Usage: mediasnacks moov2front <videos>
 
 Rearranges .mov and .mp4 metadata to the start of the file for fast-start streaming.
 

package/src/qdir.js

@@ -3,14 +3,13 @@
 import { join } from 'node:path'
 import { spawn } from 'node:child_process'
 import { parseArgs } from 'node:util'
-import { fileURLToPath } from 'node:url'
 import { readdir, writeFile, unlink, rename } from 'node:fs/promises'
 
 import { isFile } from './utils/fs-utils.js'
 
 
 const USAGE = `
-Usage: npx mediasnacks qdir [folder]
+Usage: mediasnacks qdir [folder]
 
 Sequentially runs all *.sh files in a folder (cwd by default). 
 `.trim()

package/src/resize.js

@@ -10,7 +10,7 @@ import { ffmpeg, videoAttrs, assertUserHasFFmpeg } from './utils/ffmpeg.js'
 
 
 const USAGE = `
-Usage: npx mediasnacks resize [--width=<num>] [--height=<num>] [-y | --overwrite] [--output-dir=<dir>] <files>
+Usage: mediasnacks resize [--width=<num>] [--height=<num>] [-y | --overwrite] [--output-dir=<dir>] <files>
 
 Resizes videos and images. The aspect ratio is preserved when only one dimension is specified.
 

package/src/seqcheck.js

@@ -2,11 +2,10 @@
 
 import { parseArgs } from 'node:util'
 import { readdirSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
 
 
 const USAGE = `
-Usage: npx mediasnacks seqcheck [options] [folder]
+Usage: mediasnacks seqcheck [options] [folder]
 
 Find missing numbered files in a sequence.
 

package/src/sqcrop.js

@@ -9,7 +9,7 @@ import { parseOptions } from './utils/parseOptions.js'
 
 
 const USAGE = `
-Usage: npx mediasnacks sqcrop [-y | --overwrite] [--output-dir=<dir>] <images> 
+Usage: mediasnacks sqcrop [-y | --overwrite] [--output-dir=<dir>] <images> 
 
 Square crops images
 `.trim()

package/src/unemoji.sh

@@ -17,6 +17,9 @@ find . -depth | while IFS= read -r file; do
     s/[\x{1FA70}-\x{1FAFF}]//g;  # Symbols and Pictographs Extended-A
     s/[\x{1F1E6}-\x{1F1FF}]//g;  # Regional Indicator Symbols
   ')
+  
+  # Normalize
+  newbase=$(printf '%s' "$newbase" | perl -CSD -MUnicode::Normalize -pe '$_ = NFKC($_)')
 
   if [ "$base" != "$newbase" ]; then
     newpath="$dir/$newbase"

package/src/utils/test-utils.js

@@ -2,7 +2,7 @@ import { join } from 'node:path'
 import { tmpdir } from 'node:os'
 import { spawnSync } from 'node:child_process'
 import { createHash } from 'node:crypto'
-import { mkdtempSync, readFileSync } from 'node:fs'
+import { mkdtempSync, readFileSync, mkdirSync, writeFileSync } from 'node:fs'
 
 const rel = f => join(import.meta.dirname, f)
 
@@ -19,3 +19,12 @@ export function sha1(filePath) {
 		.update(readFileSync(filePath))
 		.digest('base64')
 }
+
+export function dir(...args) {
+	return mkdirSync(join(...args), { recursive: true })
+}
+
+export function touch(...args) {
+	return writeFileSync(join(...args), '')
+}
+

package/src/vsplit.js

@@ -10,7 +10,7 @@ import { assertUserHasFFmpeg, run } from './utils/ffmpeg.js'
 // TODO looks like it's missing a frame (perhaps becaue of -c copy)
 
 const USAGE = `
-Usage: npx mediasnacks vsplit <csv> <video>
+Usage: mediasnacks vsplit <csv> <video>
 
 Splits a video into multiple clips from CSV timestamps.