mediasnacks 0.26.0 → 0.27.0

package/index.js

@@ -1,11 +1,14 @@
 export { avif } from './src/avif.js'
 export { countframes } from './src/countframes.js'
 export { detectdups } from './src/detectdups.js'
+export { dlaudio } from './src/dlaudio.js'
+export { dlvideo } from './src/dlvideo.js'
 export { dropdups } from './src/dropdups.js'
 export { edgespic } from './src/edgespic.js'
 export { frameseq } from './src/frameseq.js'
 export { hev1tohvc1 } from './src/hev1tohvc1.js'
 export { moov2front } from './src/moov2front.js'
+export { png } from './src/png.js'
 export { play } from './src/play.js'
 export { prores } from './src/prores.js'
 export { qdir } from './src/qdir.js'
@@ -14,5 +17,6 @@ export { resize } from './src/resize.js'
 export { seqcheck } from './src/seqcheck.js'
 export { sqcrop } from './src/sqcrop.js'
 export { ssim } from './src/ssim.js'
+export { unemoji } from './src/unemoji.js'
 export { vsplit } from './src/vsplit.js'
 export { vtrim } from './src/vtrim.js'

package/package.json

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

package/src/cli.js

@@ -8,7 +8,7 @@ import pkgJSON from '../package.json' with { type: 'json' }
 
 const COMMANDS = {
 	avif: ['./avif.js', 'Converts images to AVIF'],
-	png: ['./png.sh', 'Optimizes PNG images with oxipng'],
+	png: ['./png.js', 'Optimizes PNG images with oxipng'],
 	sqcrop: ['./sqcrop.js', 'Square crops images\n'],
 
 	resize: ['./resize.js', 'Resizes videos or images'],
@@ -35,10 +35,10 @@ const COMMANDS = {
 	openrand: ['./openrand.js', 'Opens a random file (macOS only)'],
 	play: ['./play.js', 'Plays filtered playlist with mpv\n'],
 
-	dlaudio: ['./dlaudio.sh', 'yt-dlp best audio'],
-	dlvideo: ['./dlvideo.sh', 'yt-dlp best video\n'],
+	dlaudio: ['./dlaudio.js', 'yt-dlp best audio'],
+	dlvideo: ['./dlvideo.js', 'yt-dlp best video\n'],
 
-	unemoji: ['./unemoji.sh', 'Removes emojis from filenames'],
+	unemoji: ['./unemoji.js', 'Removes emojis from filenames'],
 	rmcover: ['./rmcover.sh', 'Removes cover art'],
 }
 

package/src/dlaudio.js

@@ -0,0 +1,38 @@
+import { parseOptions } from './utils/parseOptions.js'
+import { runSilently } from './utils/subprocess.js'
+import { unemoji } from './unemoji.js'
+
+
+const HELP = `
+SYNOPSIS
+  mediasnacks dlaudio <url>
+
+DESCRIPTION
+  yt-dlp best m4a
+`.trim()
+
+export default async function main() {
+	const { values, positionals } = await parseOptions({
+		help: { short: 'h', type: 'boolean' }
+	})
+
+	if (values.help || !positionals[0]) {
+		console.log(HELP)
+		return
+	}
+
+	const f = await dlaudio(positionals[0])
+	console.log(f)
+}
+
+export async function dlaudio(url) {
+	const f = (await runSilently('yt-dlp', [
+		'--print', 'filename',
+		'--no-simulate',
+		'-o', '%(title)s.%(ext)s',
+		'-f', 'bestaudio[ext=m4a]/bestaudio',
+		url
+	])).stdout.trim()
+
+	return await unemoji(f) || f
+}

package/src/dlvideo.js

@@ -0,0 +1,32 @@
+import { parseOptions } from './utils/parseOptions.js'
+import { run } from './utils/subprocess.js'
+
+
+const HELP = `
+SYNOPSIS
+  mediasnacks dlvideo <url>
+
+DESCRIPTION
+  yt-dlp best mp4
+`.trim()
+
+export default async function main() {
+	const { values, positionals } = await parseOptions({
+		help: { short: 'h', type: 'boolean' }
+	})
+
+	if (values.help || !positionals[0]) {
+		console.log(HELP)
+		return
+	}
+
+	await dlvideo(positionals[0])
+}
+
+export async function dlvideo(url) {
+	await run('yt-dlp', [
+		'-o', '%(title)s.%(ext)s',
+		'-f', 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/mp4',
+		url
+	])
+}

package/src/png.js

@@ -0,0 +1,34 @@
+import { parseOptions } from './utils/parseOptions.js'
+import { run } from './utils/subprocess.js'
+
+
+const HELP = `
+SYNOPSIS
+  mediasnacks png <img1> [img2 ...]
+
+DESCRIPTION
+  Losslessly optimizes PNG images with oxipng at max level.
+
+EXAMPLE
+  mediasnacks png *.png
+`.trim()
+
+export default async function main() {
+	const { values, positionals } = await parseOptions({
+		help: { short: 'h', type: 'boolean' }
+	})
+
+	if (values.help || !positionals[0]) {
+		console.log(HELP)
+		return
+	}
+
+	await png(...positionals)
+}
+
+export async function png(...images) {
+	await run('oxipng', [
+		'--opt', 'max',
+		...images
+	])
+}

package/src/unemoji.js

@@ -0,0 +1,79 @@
+import { rename } from 'node:fs/promises'
+import { existsSync } from 'node:fs'
+import { dirname, basename, join } from 'node:path'
+import { parseOptions } from './utils/parseOptions.js'
+import { findFiles } from './utils/fs-utils.js'
+
+const EMOJI_RE = new RegExp(
+	'[' +
+	'\u{1F600}-\u{1F64F}' +   // Emoticons
+	'\u{1F300}-\u{1F5FF}' +   // Misc Symbols and Pictographs
+	'\u{1F680}-\u{1F6FF}' +   // Transport and Map
+	'\u{2600}-\u{26FF}' +     // Misc symbols
+	'\u{2700}-\u{27BF}' +     // Dingbats
+	'\u{1F900}-\u{1F9FF}' +   // Supplemental Symbols and Pictographs
+	'\u{1FA70}-\u{1FAFF}' +   // Symbols and Pictographs Extended-A
+	'\u{1F1E6}-\u{1F1FF}' +   // Regional Indicator Symbols
+	']',
+	'gu'
+)
+
+const HELP = `
+SYNOPSIS
+  mediasnacks unemoji [-r | --recursive] <dir>
+
+DESCRIPTION
+  Removes emoji from filenames in the current directory.
+  Does not overwrite files.
+  
+OPTIONS
+	-r, --recursive
+`.trim()
+
+export default async function main() {
+	const { values, positionals } = await parseOptions({
+		help: { short: 'h', type: 'boolean' },
+		recursive: { short: 'r', type: 'boolean' }
+	})
+
+	if (values.help) {
+		console.log(HELP)
+		return
+	}
+
+	if (positionals.length !== 1) throw new Error('Only one dir is accepted')
+
+	const files = findFiles({
+		dir: positionals[0],
+		regex: EMOJI_RE,
+		recursive: values.recursive,
+	})
+
+	for (const file of files)
+		try {
+			const newpath = await unemoji(file)
+			if (newpath)
+				console.log(`Renaming: ${file} -> ${newpath}`)
+		}
+		catch (err) {
+			console.error(err?.message || err)
+		}
+}
+
+export async function unemoji(file) {
+	const dir = dirname(file)
+	const base = basename(file)
+	const newbase = base.replace(EMOJI_RE, '')
+		.normalize('NFKC')
+		.replace(/\s+/g, ' ')
+		.replace(/\s+\./g, '.')
+		.trim()
+	if (base === newbase)
+		return null
+
+	const newpath = join(dir, newbase)
+	if (existsSync(newpath)) throw new Error(`Skipping (exists): ${file} -> ${newpath}`)
+
+	await rename(file, newpath)
+	return newpath
+}

package/src/utils/fs-utils.js

@@ -34,7 +34,7 @@ export async function mkDir(path) {
 	}
 }
 
-export function findFiles({ dir, regex, recursive, ignoredDirs }) {
+export function findFiles({ dir, regex, recursive, ignoredDirs = [] }) {
 	return readdirSync(dir, { withFileTypes: true, recursive })
 		.filter(entry =>
 			entry.isFile()

package/src/dlaudio.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-yt-dlp -o '%(title)s.%(ext)s' \
-  -f 'bestaudio[ext=m4a]/bestaudio' "$1"

package/src/dlvideo.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-yt-dlp -o '%(title)s.%(ext)s' \
-  -f 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/mp4' "$1"

package/src/png.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-help() {
-  /bin/cat << EOF
-SYNOPSIS
-  mediasnacks png <img1> [img2 ...]
-
-DESCRIPTION
-  Losslessly optimizes PNG images with oxipng at max level.
-
-EXAMPLE
-	mediasnacks png *.png
-EOF
-  exit "${1:-0}"
-}
-
-[ "$1" = "-h" ] && help
-[ $# -eq 0 ] && help 1
-
-oxipng --opt max "$@"

package/src/unemoji.sh

@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# Removes emoji's from filenames on the current working directory.
-# Does not overwrite files.
-
-find . -depth | while IFS= read -r file; do
-  dir=$(dirname "$file")
-  base=$(basename "$file")
-
-  # Remove Emojis
-  newbase=$(printf '%s' "$base" | perl -CSD -pe '
-    s/[\x{1F600}-\x{1F64F}]//g;  # Emoticons
-    s/[\x{1F300}-\x{1F5FF}]//g;  # Misc Symbols and Pictographs
-    s/[\x{1F680}-\x{1F6FF}]//g;  # Transport and Map
-    s/[\x{2600}-\x{26FF}]//g;    # Misc symbols
-    s/[\x{2700}-\x{27BF}]//g;    # Dingbats
-    s/[\x{1F900}-\x{1F9FF}]//g;  # Supplemental Symbols and Pictographs
-    s/[\x{1FA70}-\x{1FAFF}]//g;  # Symbols and Pictographs Extended-A
-    s/[\x{1F1E6}-\x{1F1FF}]//g;  # Regional Indicator Symbols
-  ')
-  
-  # Normalize to Unicode NFKC
-  newbase=$(printf '%s' "$newbase" | perl -CSD -MUnicode::Normalize -pe '$_ = NFKC($_)')
-
-  if [ "$base" != "$newbase" ]; then
-    newpath="$dir/$newbase"
-    echo "Renaming: $file -> $newpath"
-    mv -n "$file" "$newpath"
-  fi
-done