mediasnacks 0.20.1 → 0.21.0

package/.zsh/completions/_mediasnacks

@@ -29,8 +29,6 @@ _mediasnacks_commands=(
   
   'unemoji:Removes emojis from filenames'
   'rmcover:Removes cover art'
-  
-  'curltime:Measures request response timings'
 )
 
 if (( CURRENT == 2 )); then

package/README.md

@@ -60,8 +60,6 @@ mediasnacks <command> <args>
 - `rmcover`: Removes cover art
 
 
-- `curltime`: Measures request response timings
-
 ### Globs
 Glob patterns are expanded by Node.js.
 

package/package.json

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

package/src/cli.js

@@ -34,9 +34,7 @@ const COMMANDS = {
 	dlvideo: ['dlvideo.sh', 'yt-dlp best video\n'],
 
 	unemoji: ['unemoji.sh', 'Removes emojis from filenames'],
-	rmcover: ['rmcover.sh', 'Removes cover art\n'],
-
-	curltime: ['curltime.sh', 'Measures request response timings'],
+	rmcover: ['rmcover.sh', 'Removes cover art'],
 }
 
 const MAN = `

package/src/detectdups.js

@@ -71,7 +71,16 @@ async function main() {
 
 
 	const dups = await detectDuplicateFramesNums(files[0], seek, duration)
-	analyze(dups, seek, duration)
+	const h = deltaHistogram(dups)
+	const report = {
+		n: maxFreqKey(h),
+		histogram: h,
+		analyzed_region: {
+			start_sec: seek,
+			end_sec: seek + duration
+		},
+	}
+	console.log(JSON.stringify(report, null, 2))
 }
 
 export async function detectDuplicateFramesNums(video, seek, duration) {
@@ -106,29 +115,22 @@ export async function detectDuplicateFramesNums(video, seek, duration) {
 
 // This is only good for when there's one repeated frame in a cycle.
 // i.e. it's the wrong approach for e.g. 25 to 60, in which N=2 and N=3
-function analyze(dup_frames, seek, duration) {
+function deltaHistogram(dups) {
 	const histogram = {}
-	for (let i = 1; i < dup_frames.length; i++) {
-		const diff = dup_frames[i] - dup_frames[i - 1]
+	for (let i = 1; i < dups.length; i++) {
+		const diff = dups[i] - dups[i - 1]
 		histogram[diff] = (histogram[diff] || 0) + 1
 	}
-	console.log(JSON.stringify({
-		analyzed_region: {
-			start_sec: seek,
-			end_sec: seek + duration
-		},
-		histogram,
-		n: maxFreqKey(histogram)
-	}, null, 2))
+	return histogram
 }
 
-function maxFreqKey(hist) {
+function maxFreqKey(histogram) {
 	let maxKey = null
 	let maxVal = -1
-	for (const [key, val] of Object.entries(hist))
-		if (val > maxVal) {
-			maxVal = val
-			maxKey = key
+	for (const [k, v] of Object.entries(histogram))
+		if (v > maxVal) {
+			maxVal = v
+			maxKey = k
 		}
 	return maxKey !== null
 		? Number(maxKey)
@@ -136,7 +138,6 @@ function maxFreqKey(hist) {
 }
 
 
-
 if (import.meta.main)
 	main().catch(err => {
 		console.error(err.message || err)

package/src/detectdups.test.js

@@ -6,31 +6,19 @@ import { cli } from './utils/test-utils.js'
 const rel = f => join(import.meta.dirname, f)
 
 function detect(video) {
-	const { stdout } = cli('detectdups', rel(video), 0, 7)
+	const { stdout } = cli('detectdups', rel(video))
 	return JSON.parse(stdout).n
 }
 
-
-test('no dups', () =>
-	equal(detect('fixtures/big-buck-bunny/bbb_24fps_no_dups.mp4'), null))
-
+test('no dups', () => equal(detect('fixtures/big-buck-bunny/bbb_24fps_no_dups.mp4'), null))
 
 // These fixtures are badly retimed (non-interpolated, just duplicating a frame)
 
-test('24 to 48 (has dup at n=2)', () =>
-	equal(detect('fixtures/big-buck-bunny/bbb_24_to_48fps_dup.mp4'), 2))
-
-test('25 to 50 (has dup at n=2)', () =>
-	equal(detect('fixtures/big-buck-bunny/bbb_25_to_50fps_dup.mp4'), 2))
-
-
-test('24 to 30 (has dup at n=5)', () =>
-	equal(detect('fixtures/big-buck-bunny/bbb_24_to_30fps_dup.mp4'), 5))
-
-test('25 to 30 (has dup at n=6)', () =>
-	equal(detect('fixtures/big-buck-bunny/bbb_25_to_30fps_dup.mp4'), 6))
+test('24 to 48 (has dup at n=2)', () => equal(detect('fixtures/big-buck-bunny/bbb_24_to_48fps_dup.mp4'), 2))
+test('25 to 50 (has dup at n=2)', () => equal(detect('fixtures/big-buck-bunny/bbb_25_to_50fps_dup.mp4'), 2))
 
+test('24 to 30 (has dup at n=5)', () => equal(detect('fixtures/big-buck-bunny/bbb_24_to_30fps_dup.mp4'), 5))
+test('25 to 30 (has dup at n=6)', () => equal(detect('fixtures/big-buck-bunny/bbb_25_to_30fps_dup.mp4'), 6))
 
-test('24 to 25 (has dup at n=25)', () =>
-	equal(detect('fixtures/big-buck-bunny/bbb_24_to_25fps_dup.mp4'), 25))
+test('24 to 25 (has dup at n=25)', () => equal(detect('fixtures/big-buck-bunny/bbb_24_to_25fps_dup.mp4'), 25))
 

package/src/curltime.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# https://stackoverflow.com/a/47944496
-
-curl -so /dev/null -w "\
-   DNS Lookup  %{time_namelookup}
-TCP Handshake  %{time_connect}
-TLS Handshake  %{time_appconnect}
-         Wait  %{time_pretransfer}
-     Redirect  %{time_redirect}
-   First Byte  %{time_starttransfer}
-───────────────────────   
-        TOTAL  %{time_total}
-" "$@"