mediasnacks 0.13.0 → 0.14.0

package/package.json

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

package/src/utils/parseOptions.test.js

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

package/src/vsplit.sh

@@ -1,46 +1,50 @@
 #!/bin/zsh
 
 if [ "$#" -lt 2 ]; then
-    cat << EOF
+	cat << EOF
 Usage:
     $(basename $0) <split-time-1> [split-time-2 ...] <video-file>
 
 Examples:
-    $(basename $0) 123.45 input.mp4
+    $(basename $0) 123.45 video.mp4
     $(basename $0) 60 120 180 video.mov
-    $(basename $0) 00:01:00 00:02:00 00:03:00 input.mkv
+    $(basename $0) 00:01:00 00:02:00 00:03:00 video.mkv
 EOF
-    exit 1
+	exit 1
 fi
 
 VIDEO="${@[-1]}"
 SPLITS=("${@[1,-2]}")
 
 if [ ! -f "$VIDEO" ]; then
-    echo "Error: file not found: $VIDEO"
-    exit 1
+	echo "Error: file not found: $VIDEO"
+	exit 1
 fi
 
-BASENAME=$(basename "$VIDEO")
 DIRNAME=$(dirname "$VIDEO")
+BASENAME=$(basename "$VIDEO")
 EXT="${BASENAME##*.}"
 NAME="${BASENAME%.*}"
 
-SEGMENT_COUNT=$((${#SPLITS[@]} + 1))
-
-for (( i=1; i<=$SEGMENT_COUNT; i++ )); do
-    OUTFILE="$DIRNAME/${NAME}_${i}.$EXT"
-
-    if [ $i -eq 1 ]; then
-        # First segment: from start to first split
-        ffmpeg -v error -y -i "$VIDEO" -t "${SPLITS[1]}" -c copy "$OUTFILE"
-    elif [ $i -eq $SEGMENT_COUNT ]; then
-        # Last segment: from last split to end
-        ffmpeg -v error -y -ss "${SPLITS[-1]}" -i "$VIDEO" -c copy "$OUTFILE"
-    else
-        # Middle segments: from split[i-1] to split[i]
-        PREV_SPLIT="${SPLITS[$((i-1))]}"
-        CURR_SPLIT="${SPLITS[$i]}"
-        ffmpeg -v error -y -ss "$PREV_SPLIT" -to "$CURR_SPLIT" -i "$VIDEO" -c copy "$OUTFILE"
-    fi
+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/src/vtrim.sh

@@ -1,7 +1,7 @@
 #!/bin/zsh
 
 if [ "$#" -ne 3 ]; then
-    cat << EOF
+	cat << EOF
 Usage:
     $(basename $0) <start-time> <end-time> <video-file>
 
@@ -10,7 +10,7 @@ Examples:
     $(basename $0) 00:00:10 00:00:30 input.mkv
     $(basename $0) 1:23.5 2:45.0 video.mov
 EOF
-    exit 1
+	exit 1
 fi
 
 START="$1"
@@ -18,8 +18,8 @@ END="$2"
 VIDEO="$3"
 
 if [ ! -f "$VIDEO" ]; then
-    echo "Error: file not found: $VIDEO"
-    exit 1
+	echo "Error: file not found: $VIDEO"
+	exit 1
 fi
 
 BASENAME=$(basename "$VIDEO")
@@ -27,6 +27,9 @@ DIRNAME=$(dirname "$VIDEO")
 EXT="${BASENAME##*.}"
 NAME="${BASENAME%.*}"
 
-OUTFILE="$DIRNAME/${NAME}.trim.$EXT"
+outfile="$DIRNAME/${NAME}.trim.$EXT"
 
-ffmpeg -v error -y -ss "$START" -to "$END" -i "$VIDEO" -c copy "$OUTFILE"
+ffmpeg -v error -y -i "$VIDEO" \
+	-ss "$START" \
+	-to "$END" \
+	-c copy "$outfile"

package/tests/avif.test.js

@@ -3,20 +3,13 @@ import { test } from 'node:test'
 import { equal } from 'node:assert/strict'
 import { tmpdir } from 'node:os'
 import { execSync } from 'node:child_process'
-import { createHash } from 'node:crypto'
-import { mkdtempSync, readFileSync } from 'node:fs'
+import { mkdtempSync } from 'node:fs'
+
+import { sha1 } from './utils.js'
 
-function sha1(filePath) {
-	return createHash('sha1').update(readFileSync(filePath)).digest('hex')
-}
 
 test('PNG to AVIF', () => {
 	const tmp = mkdtempSync(join(tmpdir(), 'avif-test-'))
-	
-	execSync(`src/cli.js avif --output-dir ${tmp} tests/fixtures/lenna.png`, {
-		cwd: process.cwd(),
-		stdio: 'inherit'
-	})
-
+	execSync(`src/cli.js avif --output-dir ${tmp} tests/fixtures/lenna.png` )
 	equal(sha1(join(tmp, 'lenna.avif')), sha1('tests/fixtures/lenna.avif'))
 })

package/tests/utils.js

@@ -0,0 +1,6 @@
+import { createHash } from 'node:crypto'
+import { readFileSync } from 'node:fs'
+
+export function sha1(filePath) {
+	return createHash('sha1').update(readFileSync(filePath)).digest('hex')
+}

package/tests/vsplit.test.js

@@ -0,0 +1,22 @@
+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`)
+	}
+})

package/tests/vtrim.test.js

@@ -0,0 +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 { mkdtempSync, cpSync } from 'node:fs'
+import { sha1 } from './utils.js'
+
+test('vtrim trims video from start to end time', () => {
+	const tmp = mkdtempSync(join(tmpdir(), 'vtrim-test-'))
+
+	const inputFile = join(tmp, '60fps.mp4')
+	cpSync('tests/fixtures/60fps.mp4', inputFile)
+
+	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')
+})