mediasnacks 0.14.0 → 0.15.0

package/.dockerignore

@@ -0,0 +1,5 @@
+.git
+.gitignore
+.github
+.DS_Store
+*.log

package/.github/workflows/test.yml

@@ -0,0 +1,28 @@
+name: Test
+
+on: [ push, pull_request, workflow_dispatch ]
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: docker/setup-buildx-action@v4
+
+      - name: Build image
+        uses: docker/build-push-action@v7
+        with:
+          context: .
+          load: true
+          tags: app-test
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Run tests
+        run: docker run --rm app-test

package/.zsh/completions/_mediasnacks

@@ -19,7 +19,6 @@ _mediasnacks_commands=(
   'rmcover:Removes cover art'
   'curltime:Measures request response timings'
   'gif:Video to GIF'
-  'vsplit:Split video at multiple time points'
   'flattendir:Moves unique files to the top dir and deletes empty dirs'
 )
 
@@ -30,7 +29,7 @@ fi
 
 local cmd="$words[2]"
 case "$cmd" in
-	avif|resize|sqcrop|moov2front|dropdups|seqcheck|hev1tohvc1|framediff|vdiff|vconcat|vtrim|dlaudio|dlvideo|unemoji|rmcover|curltime|gif|vsplit|flattendir)
+	avif|resize|sqcrop|moov2front|dropdups|seqcheck|hev1tohvc1|framediff|vdiff|vconcat|vtrim|dlaudio|dlvideo|unemoji|rmcover|curltime|gif|flattendir)
 		_files
 		;;
 	qdir)

package/Dockerfile

@@ -0,0 +1,14 @@
+FROM mwader/static-ffmpeg:8.0.1 AS ffmpeg
+FROM node:24-bookworm-slim
+
+COPY --from=ffmpeg /ffmpeg /usr/local/bin/ffmpeg
+COPY --from=ffmpeg /ffprobe /usr/local/bin/ffprobe
+
+ENV FORCE_COLOR=1
+WORKDIR /workspace
+
+COPY src/ src/
+COPY tests/ tests/
+COPY package.json .
+
+CMD ["node", "--test"]

package/Makefile

@@ -0,0 +1,5 @@
+.PHONY: *
+
+test:
+	@docker run --rm $$(docker build -q .)
+

package/README.md

@@ -33,8 +33,6 @@ Commands:
 
 - `curltime`: Measures request response timings
 - `gif`: Video to GIF
-- `vsplit`: Split video at multiple time points
-
 - `flattendir`: Moves unique files to the top dir and deletes empty dirs
 
 ### Glob Patterns and Literal Filenames

package/docker-shell.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+# Opens a shell in the Docker test environment with fixtures mounted
+
+set -e
+
+echo "Building Docker test image..."
+docker build -t mediasnacks-test .
+
+echo ""
+echo "Opening shell in Docker container..."
+echo "Fixtures directory is mounted at /workspace/tests/fixtures"
+echo ""
+echo "To generate fixtures:"
+echo "  cd /tmp"
+echo "  cp /workspace/tests/fixtures/lenna.png ."
+echo "  /workspace/src/cli.js avif lenna.png"
+echo "  sha1sum lenna.avif"
+echo "  cp lenna.avif /workspace/tests/fixtures/"
+echo ""
+
+docker run --rm -it \
+  -v "$(pwd)/tests/fixtures:/workspace/tests/fixtures" \
+  mediasnacks-test \
+  /bin/bash

package/package.json

@@ -1,14 +1,11 @@
 {
   "name": "mediasnacks",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "description": "Utilities for preparing videos, images, and audio for the web",
   "license": "MIT",
   "author": "Eric Fortis",
   "type": "module",
 	"bin": {
 		"mediasnacks": "src/cli.js"
-	},
-	"scripts": {
-		"test": "node --test"
 	}
 }

package/src/cli.js

@@ -30,7 +30,6 @@ const COMMANDS = {
 	
 	curltime: ['curltime.sh', 'Measures request response timings'],
 	gif: ['gif.sh', 'Video to GIF'],
-	vsplit: ['vsplit.sh', 'Split video at multiple time points'],
 	flattendir: ['flattendir.sh', 'Moves all files to top dir and deletes dirs']
 }
 

package/src/gif.sh

@@ -1,6 +1,6 @@
-#!/bin/zsh
+#!/bin/sh
 
-# Convert to GIF
+# Converts to GIF
 
 FPS=10
 WIDTH=600
@@ -10,7 +10,7 @@ usage() {
   exit 1
 }
 
-while [[ $# -gt 0 ]]; do
+while [ $# -gt 0 ]; do
   case "$1" in
     --fps)
       FPS="$2";
@@ -26,10 +26,8 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
-[[ -z "$file" ]] && usage
-
-outfile="${file:r}.gif"
+[ -z "$file" ] && usage
 
 ffmpeg -v error -i "$file" \
   -vf "fps=${FPS},scale=${WIDTH}:-1" \
-  "$outfile"
+  "${file%.*}.gif"

package/src/sqcrop.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 import { join } from 'node:path'
-
 import { rename } from 'node:fs/promises'
+
 import { ffmpeg, assertUserHasFFmpeg } from './utils/ffmpeg.js'
 import { lstat, uniqueFilenameFor } from './utils/fs-utils.js'
 import { parseOptions } from './utils/parseOptions.js'

package/src/utils/parseOptions.test.js

@@ -1,7 +1,7 @@
 import { join } from 'node:path'
 import { tmpdir } from 'node:os'
 import { equal, deepEqual } from 'node:assert/strict'
-import { mkdtemp, writeFile, rmdir } from 'node:fs/promises'
+import { mkdtemp, writeFile, rm } from 'node:fs/promises'
 import { test, describe, before, after } from 'node:test'
 
 import { parseOptions } from './parseOptions.js'
@@ -18,7 +18,7 @@ describe('parseOptions', () => {
 			await writeFile(inTmpDir(file), '')
 	})
 
-	after(() => rmdir(testDir, { recursive: true }))
+	after(() => rm(testDir, { recursive: true }))
 
 	test('parses args and globs files', async () => {
 		const { values, files } = await parseOptions({

package/src/vconcat.sh

@@ -1,21 +1,25 @@
-#!/bin/zsh
+#!/bin/sh
 
-if (( $# < 2 )); then
+if [ "$#" -lt 2 ]; then
   cat << EOF
 Usage:
-    $(basename $0) vid1.mov vid2.mov [...]
-    $(basename $0) *.mp4
+    $(basename "$0") vid1.mov vid2.mov [...]
+    $(basename "$0") *.mp4
 EOF
   exit 1
 fi
 
 list_file=$(mktemp -p .)
 for file in "$@"; do
-  printf "file %q\n" "$file" >> "$list_file"
+  # Escape single quotes by replacing ' with '\''
+  escaped=$(printf '%s\n' "$file" | sed "s/'/'\\\\''/g")
+  printf "file '%s'\n" "$escaped" >> "$list_file"
 done
 
 first_video="$1"
-outfile="${first_video:r}.concat.${first_video:e}"
+name="${first_video%.*}"
+ext="${first_video##*.}"
+outfile="${name}.concat.${ext}"
 
 ffmpeg -v error -f concat -safe 0 -i "$list_file" -c copy "$outfile"
 

package/src/vtrim.sh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 
 if [ "$#" -ne 3 ]; then
 	cat << EOF
@@ -27,9 +27,13 @@ DIRNAME=$(dirname "$VIDEO")
 EXT="${BASENAME##*.}"
 NAME="${BASENAME%.*}"
 
-outfile="$DIRNAME/${NAME}.trim.$EXT"
+echo "start $START, end $END"
 
-ffmpeg -v error -y -i "$VIDEO" \
-	-ss "$START" \
+ffmpeg -v error -y \
+  -ss "$START" \
 	-to "$END" \
-	-c copy "$outfile"
+  -i "$VIDEO" \
+	-c copy "$DIRNAME/${NAME}.trim.$EXT"
+
+# For speed, we copy without re-encoding (with -ss before -i), but 
+# that means that the output isn’t going to be exact

package/tests/avif.test.js

@@ -1,15 +1,20 @@
 import { join } from 'node:path'
 import { test } from 'node:test'
-import { equal } from 'node:assert/strict'
 import { tmpdir } from 'node:os'
 import { execSync } from 'node:child_process'
+import { deepEqual } from 'node:assert/strict'
 import { mkdtempSync } from 'node:fs'
 
-import { sha1 } from './utils.js'
+import { videoAttrs } from '../src/utils/ffmpeg.js'
 
 
-test('PNG to AVIF', () => {
+test('PNG to AVIF', async () => {
 	const tmp = mkdtempSync(join(tmpdir(), 'avif-test-'))
-	execSync(`src/cli.js avif --output-dir ${tmp} tests/fixtures/lenna.png` )
-	equal(sha1(join(tmp, 'lenna.avif')), sha1('tests/fixtures/lenna.avif'))
+	execSync(`src/cli.js avif --output-dir ${tmp} ${join(import.meta.dirname, 'fixtures/lenna.png')}`)
+
+	deepEqual(
+		await videoAttrs(join(tmp, 'lenna.avif')),
+		await videoAttrs(join(import.meta.dirname, 'fixtures/lenna.avif')))
+		// That's because we use non-deterministic avif.
+		// Claude says: avif is deterministic only when it's single-threaded: '-threads 1'
 })

package/tests/vconcat.test.js

@@ -0,0 +1,21 @@
+import { join } from 'node:path'
+import { test } from 'node:test'
+import { ok } from 'node:assert/strict'
+import { tmpdir } from 'node:os'
+import { execSync } from 'node:child_process'
+import { mkdtempSync, cpSync } from 'node:fs'
+import { videoAttrs } from '../src/utils/ffmpeg.js'
+
+test('vconcat concatenates videos with single quotes in filenames', async () => {
+	const tmp = mkdtempSync(join(tmpdir(), 'vconcat-test-'))
+
+	const file1 = join(tmp, `video'1.mp4`)
+	const file2 = join(tmp, `video'2.mp4`)
+	cpSync('tests/fixtures/60fps.mp4', file1)
+	cpSync('tests/fixtures/60fps.mp4', file2)
+
+	execSync(`src/cli.js vconcat "${file1}" "${file2}"`)
+
+	const { duration } = await videoAttrs(join(tmp, `video'1.concat.mp4`))
+	ok(parseFloat(duration) === 60, `Duration should be 60s, got ${duration}s`)
+})

package/tests/vtrim.test.js

@@ -1,12 +1,12 @@
 import { join } from 'node:path'
 import { test } from 'node:test'
-import { equal } from 'node:assert/strict'
+import { ok } from 'node:assert/strict'
 import { tmpdir } from 'node:os'
 import { execSync } from 'node:child_process'
 import { mkdtempSync, cpSync } from 'node:fs'
-import { sha1 } from './utils.js'
+import { videoAttrs } from '../src/utils/ffmpeg.js'
 
-test('vtrim trims video from start to end time', () => {
+test('vtrim trims video from start to end time', async () => {
 	const tmp = mkdtempSync(join(tmpdir(), 'vtrim-test-'))
 
 	const inputFile = join(tmp, '60fps.mp4')
@@ -14,7 +14,7 @@ test('vtrim trims video from start to end time', () => {
 
 	execSync(`src/cli.js vtrim 5 10 ${inputFile}`)
 
-	const out = join(tmp, '60fps.trim.mp4')
-	const expected = 'tests/fixtures/60fps_2.mp4'
-	equal(sha1(out), sha1(expected), 'Trimmed video (5-10s) should match 60fps_2.mp4')
+	const { duration } = await videoAttrs(join(tmp, '60fps.trim.mp4'))
+	const EPSILON = 0.05
+	ok(Math.abs(parseFloat(duration) - 5) < EPSILON, `Duration should be 5s, got ${duration}s`)
 })

package/src/vsplit.sh

@@ -1,50 +0,0 @@
-#!/bin/zsh
-
-if [ "$#" -lt 2 ]; then
-	cat << EOF
-Usage:
-    $(basename $0) <split-time-1> [split-time-2 ...] <video-file>
-
-Examples:
-    $(basename $0) 123.45 video.mp4
-    $(basename $0) 60 120 180 video.mov
-    $(basename $0) 00:01:00 00:02:00 00:03:00 video.mkv
-EOF
-	exit 1
-fi
-
-VIDEO="${@[-1]}"
-SPLITS=("${@[1,-2]}")
-
-if [ ! -f "$VIDEO" ]; then
-	echo "Error: file not found: $VIDEO"
-	exit 1
-fi
-
-DIRNAME=$(dirname "$VIDEO")
-BASENAME=$(basename "$VIDEO")
-EXT="${BASENAME##*.}"
-NAME="${BASENAME%.*}"
-
-N_CLIPS=$((${#SPLITS[@]} + 1))
-
-for (( i=1; i<=$N_CLIPS; i++ )); do
-	outfile="$DIRNAME/${NAME}_${i}.$EXT"
-
-	if [ $i -eq 1 ]; then # First clip: [start, first_split]
-		ffmpeg -v error -y -i "$VIDEO" \
-			-t "${SPLITS[1]}" \
-			-c copy "$outfile"
-
-	elif [ $i -eq $N_CLIPS ]; then # Last clip: [last_split, end]
-		ffmpeg -v error -y -i "$VIDEO" \
-			-ss "${SPLITS[-1]}" \
-			-c copy "$outfile"
-
-	else # Middle clip: [split[i-1], split[i]]
-		ffmpeg -v error -y -i "$VIDEO" \
-			-ss "${SPLITS[$((i-1))]}" \
-			-to "${SPLITS[$i]}" \
-			-c copy "$outfile"
-	fi
-done

package/tests/vsplit.test.js

@@ -1,22 +0,0 @@
-import { join } from 'node:path'
-import { test } from 'node:test'
-import { equal } from 'node:assert/strict'
-import { tmpdir } from 'node:os'
-import { execSync } from 'node:child_process'
-import { mkdtempSync, cpSync } from 'node:fs'
-import { sha1 } from './utils.js'
-
-test('vsplit splits video at multiple time points', () => {
-	const tmp = mkdtempSync(join(tmpdir(), 'vsplit-test-'))
-
-	const inputFile = join(tmp, '60fps.mp4')
-	cpSync('tests/fixtures/60fps.mp4', inputFile)
-
-	execSync(`src/cli.js vsplit 5 10 15 20 25 ${inputFile}`)
-
-	for (let i = 1; i <= 6; i++) {
-		const generatedFile = join(tmp, `60fps_${i}.mp4`)
-		const expectedFile = `tests/fixtures/60fps_${i}.mp4`
-		equal(sha1(generatedFile), sha1(expectedFile), `60fps_${i}.mp4 hash should match expected`)
-	}
-})