mediasnacks 0.12.2 → 0.14.0

package/.zsh/completions/_mediasnacks

@@ -12,13 +12,14 @@ _mediasnacks_commands=(
   'framediff:ffplay with a filter for diffing adjacent frames'
   'vdiff:Plays a video with the difference of two videos'
   'vconcat:Concatenates videos'
+  'vtrim:Trims video from start to end time'
   'dlaudio: yt-dlp best audio'
   'dlvideo: yt-dlp best video'
   'unemoji:Removes emojis from filenames'
   'rmcover:Removes cover art'
   'curltime:Measures request response timings'
   'gif:Video to GIF'
-  'vcut:Split video in two parts by time'
+  'vsplit:Split video at multiple time points'
   'flattendir:Moves unique files to the top dir and deletes empty dirs'
 )
 
@@ -29,7 +30,7 @@ fi
 
 local cmd="$words[2]"
 case "$cmd" in
-	avif|resize|sqcrop|moov2front|dropdups|seqcheck|hev1tohvc1|framediff|vdiff|vconcat|dlaudio|dlvideo|unemoji|rmcover|curltime|gif|vcut|flattendir)
+	avif|resize|sqcrop|moov2front|dropdups|seqcheck|hev1tohvc1|framediff|vdiff|vconcat|vtrim|dlaudio|dlvideo|unemoji|rmcover|curltime|gif|vsplit|flattendir)
 		_files
 		;;
 	qdir)

package/README.md

@@ -23,6 +23,7 @@ Commands:
 - `framediff`: Plays a video of adjacent frames diff
 - `vdiff`: Plays a video with the difference of two videos
 - `vconcat`: Concatenates videos
+- `vtrim`: Trims video from start to end time
 
 - `dlaudio`: yt-dlp best audio
 - `dlvideo`: yt-dlp best video
@@ -32,7 +33,7 @@ Commands:
 
 - `curltime`: Measures request response timings
 - `gif`: Video to GIF
-- `vcut`: Split video in two parts at a given time
+- `vsplit`: Split video at multiple time points
 
 - `flattendir`: Moves unique files to the top dir and deletes empty dirs
 

package/package.json

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

package/src/cli.js

@@ -20,6 +20,7 @@ const COMMANDS = {
 	vdiff: ['vdiff.sh', 'Plays a video with the difference of two videos'],
 
 	vconcat: ['vconcat.sh', 'Concatenates videos'],
+	vtrim: ['vtrim.sh', 'Trims video from start to end time'],
 
 	dlaudio: ['dlaudio.sh', 'yt-dlp best audio'],
 	dlvideo: ['dlvideo.sh', 'yt-dlp best video'],
@@ -29,7 +30,7 @@ const COMMANDS = {
 	
 	curltime: ['curltime.sh', 'Measures request response timings'],
 	gif: ['gif.sh', 'Video to GIF'],
-	vcut: ['vcut.sh', 'Split video in two parts at a given time'],
+	vsplit: ['vsplit.sh', 'Split video at multiple time points'],
 	flattendir: ['flattendir.sh', 'Moves all files to top dir and deletes dirs']
 }
 

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

@@ -0,0 +1,50 @@
+#!/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/src/vtrim.sh

@@ -0,0 +1,35 @@
+#!/bin/zsh
+
+if [ "$#" -ne 3 ]; then
+	cat << EOF
+Usage:
+    $(basename $0) <start-time> <end-time> <video-file>
+
+Examples:
+    $(basename $0) 10 30 input.mp4
+    $(basename $0) 00:00:10 00:00:30 input.mkv
+    $(basename $0) 1:23.5 2:45.0 video.mov
+EOF
+	exit 1
+fi
+
+START="$1"
+END="$2"
+VIDEO="$3"
+
+if [ ! -f "$VIDEO" ]; then
+	echo "Error: file not found: $VIDEO"
+	exit 1
+fi
+
+BASENAME=$(basename "$VIDEO")
+DIRNAME=$(dirname "$VIDEO")
+EXT="${BASENAME##*.}"
+NAME="${BASENAME%.*}"
+
+outfile="$DIRNAME/${NAME}.trim.$EXT"
+
+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')
+})

package/src/vcut.sh

@@ -1,28 +0,0 @@
-#!/bin/zsh
-
-if [ "$#" -ne 2 ]; then
-    echo "Usage: $0 <video-file> <split-time>"
-    echo "Example:"
-    echo "  $0 input.mp4 123.45"
-    echo "  $0 input.mkv 00:02:03.500"
-    exit 1
-fi
-
-INPUT="$1"
-SPLIT="$2"
-
-if [ ! -f "$INPUT" ]; then
-    echo "Error: file not found: $INPUT"
-    exit 1
-fi
-
-BASENAME=$(basename "$INPUT")
-DIRNAME=$(dirname "$INPUT")
-EXT="${BASENAME##*.}"
-NAME="${BASENAME%.*}"
-
-OUT1="$DIRNAME/${NAME}_a.$EXT"
-OUT2="$DIRNAME/${NAME}_b.$EXT"
-
-ffmpeg -v error -y -i "$INPUT" -t "$SPLIT" -c copy "$OUT1"
-ffmpeg -v error -y -ss "$SPLIT" -i "$INPUT" -c copy "$OUT2"