mediasnacks 0.16.2 → 0.16.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mediasnacks",
-  "version": "0.16.2",
+  "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/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.