eprec 1.9.0 → 1.10.1

package/app/assets/styles.css

@@ -188,7 +188,6 @@ p {
 	grid-template-columns: repeat(auto-fit, minmax(var(--card-min-width), 1fr));
 }
 
-
 .app-card {
 	background: var(--color-surface);
 	border-radius: var(--radius-xl);

package/app/client/editing-workspace.tsx

@@ -466,11 +466,7 @@ export function EditingWorkspace(handle: Handle) {
 			primaryChapterId.length > 0 &&
 			secondaryChapterId.length > 0 &&
 			primaryChapterId !== secondaryChapterId
-		const commandPreview = buildCommandPreview(
-			sourceName,
-			chapters,
-			sourcePath,
-		)
+		const commandPreview = buildCommandPreview(sourceName, chapters, sourcePath)
 		const previewTime =
 			previewReady && previewDuration > 0
 				? (playhead / duration) * previewDuration
@@ -524,8 +520,7 @@ export function EditingWorkspace(handle: Handle) {
 									value={videoPathInput}
 									on={{
 										input: (event) => {
-											const target =
-												event.currentTarget as HTMLInputElement
+											const target = event.currentTarget as HTMLInputElement
 											updateVideoPathInput(target.value)
 										},
 									}}
@@ -854,10 +849,7 @@ export function EditingWorkspace(handle: Handle) {
 										</span>
 									</div>
 									<span
-										class={classNames(
-											'status-pill',
-											previewStatus.className,
-										)}
+										class={classNames('status-pill', previewStatus.className)}
 									>
 										{previewStatus.label}
 									</span>
@@ -1424,14 +1416,21 @@ function buildCommandPreview(
 			? sourcePath
 			: sourceName
 	return [
-		'bun process-course/edits/cli.ts edit-video \\',
-		`  --input "${inputPath}" \\`,
-		'  --transcript "transcript.json" \\',
-		'  --edited "transcript.txt" \\',
-		`  --output "${outputName}"`,
+		'eprec edit \\',
+		`  --input ${escapeShellArg(inputPath)} \\`,
+		`  --transcript ${escapeShellArg('transcript.json')} \\`,
+		`  --edited ${escapeShellArg('transcript.txt')} \\`,
+		`  --output ${escapeShellArg(outputName)}`,
 	].join('\n')
 }
 
+function escapeShellArg(value: string) {
+	if (value.length === 0) {
+		return "''"
+	}
+	return `'${value.replace(/'/g, "'\"'\"'")}'`
+}
+
 function findPreviousCut(cutRanges: CutRange[], playhead: number) {
 	let previous: CutRange | null = null
 	for (const range of cutRanges) {

package/app/routes/index.tsx

@@ -21,9 +21,7 @@ const indexHandler = {
 					</header>
 					<section class="app-card app-card--full">
 						<h2>Source video</h2>
-						<p class="app-muted">
-							Paste a video file path once the UI loads.
-						</p>
+						<p class="app-muted">Paste a video file path once the UI loads.</p>
 					</section>
 					<section class="app-card app-card--full">
 						<h2>Processing actions</h2>

package/app/video-api.ts

@@ -8,7 +8,11 @@ function isLocalhostOrigin(origin: string | null): boolean {
 	try {
 		const url = new URL(origin)
 		const hostname = url.hostname.toLowerCase()
-		return hostname === 'localhost' || hostname === '127.0.0.1' || hostname === '[::1]'
+		return (
+			hostname === 'localhost' ||
+			hostname === '127.0.0.1' ||
+			hostname === '[::1]'
+		)
 	} catch {
 		return false
 	}
@@ -71,13 +75,16 @@ function parseRangeHeader(
 		return { start: rangeStart, end: size - 1 }
 	}
 
-	const rangeEnd =
-		end === null || end >= size ? Math.max(size - 1, 0) : end
+	const rangeEnd = end === null || end >= size ? Math.max(size - 1, 0) : end
 	if (start > rangeEnd) return null
 	return { start, end: rangeEnd }
 }
 
-function buildVideoHeaders(contentType: string, length: number, origin: string | null) {
+function buildVideoHeaders(
+	contentType: string,
+	length: number,
+	origin: string | null,
+) {
 	return {
 		'Content-Type': contentType,
 		'Content-Length': String(length),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eprec",
   "type": "module",
-  "version": "1.9.0",
+  "version": "1.10.1",
   "license": "MIT",
   "repository": {
     "type": "git",

package/process-course/edits/edit-workspace.ts

@@ -70,21 +70,29 @@ function buildInstructions(options: {
 	transcriptTextPath: string
 	outputBasename: string
 }): string {
+	const outputPath = path.join(options.editsDirectory, options.outputBasename)
 	return [
 		'# Manual edit workflow',
 		'',
 		'1) Edit `transcript.txt` and delete whole words only.',
 		'2) Run:',
 		'',
-		`   bun process-course/edits/cli.ts edit-video \\`,
-		`     --input "${options.originalVideoPath}" \\`,
-		`     --transcript "${options.transcriptJsonPath}" \\`,
-		`     --edited "${options.transcriptTextPath}" \\`,
-		`     --output "${path.join(options.editsDirectory, options.outputBasename)}"`,
+		`   eprec edit \\`,
+		`     --input ${escapeShellArg(options.originalVideoPath)} \\`,
+		`     --transcript ${escapeShellArg(options.transcriptJsonPath)} \\`,
+		`     --edited ${escapeShellArg(options.transcriptTextPath)} \\`,
+		`     --output ${escapeShellArg(outputPath)}`,
 		'',
 		'If the transcript no longer matches, regenerate it with:',
 		'',
-		`   bun process-course/edits/regenerate-transcript.ts --dir "${options.editsDirectory}"`,
+		`   bun process-course/edits/regenerate-transcript.ts --dir ${escapeShellArg(options.editsDirectory)}`,
 		'',
 	].join('\n')
 }
+
+function escapeShellArg(value: string) {
+	if (value.length === 0) {
+		return "''"
+	}
+	return `'${value.replace(/'/g, "'\"'\"'")}'`
+}

package/src/app-server.test.ts

@@ -0,0 +1,70 @@
+import { test, expect } from 'bun:test'
+import { createShortcutInputHandler } from './app-server'
+
+type ShortcutCounts = {
+	open: number
+	restart: number
+	stop: number
+	help: number
+	spacing: number
+}
+
+function createShortcutCounts(): ShortcutCounts {
+	return {
+		open: 0,
+		restart: 0,
+		stop: 0,
+		help: 0,
+		spacing: 0,
+	}
+}
+
+function createShortcutHandler() {
+	const counts = createShortcutCounts()
+	const handler = createShortcutInputHandler({
+		open: () => {
+			counts.open += 1
+		},
+		restart: () => {
+			counts.restart += 1
+		},
+		stop: () => {
+			counts.stop += 1
+		},
+		help: () => {
+			counts.help += 1
+		},
+		spacing: () => {
+			counts.spacing += 1
+		},
+	})
+
+	return { counts, handler }
+}
+
+test('createShortcutInputHandler adds spacing for enter key', () => {
+	const { counts, handler } = createShortcutHandler()
+
+	handler.handleInput('\r')
+
+	expect(counts.spacing).toBe(1)
+})
+
+test('createShortcutInputHandler ignores linefeed after carriage return', () => {
+	const { counts, handler } = createShortcutHandler()
+
+	handler.handleInput('\r\n')
+
+	expect(counts.spacing).toBe(1)
+})
+
+test('createShortcutInputHandler maps shortcuts case-insensitively', () => {
+	const { counts, handler } = createShortcutHandler()
+
+	handler.handleInput('OrQh?')
+
+	expect(counts.open).toBe(1)
+	expect(counts.restart).toBe(1)
+	expect(counts.stop).toBe(1)
+	expect(counts.help).toBe(2)
+})

package/src/app-server.ts

@@ -26,6 +26,14 @@ const SHORTCUT_COLORS: Record<string, string> = {
 const ANSI_RESET = '\u001b[0m'
 const APP_ROOT = path.resolve(import.meta.dirname, '..')
 
+type ShortcutActions = {
+	open: () => void
+	restart: () => void
+	stop: () => void
+	help: () => void
+	spacing: () => void
+}
+
 function colorizeShortcut(key: string) {
 	if (!COLOR_ENABLED) {
 		return key
@@ -55,6 +63,7 @@ function getShortcutLines(url: string) {
 		`  ${colorizeShortcut('r')}: restart server`,
 		`  ${colorizeShortcut('q')}: quit server`,
 		`  ${colorizeShortcut('h')}: show shortcuts`,
+		`  ${colorizeShortcut('enter')}: add log spacing`,
 	]
 }
 
@@ -95,44 +104,70 @@ function openBrowser(url: string) {
 	}
 }
 
-function setupShortcutHandling(options: {
-	getUrl: () => string
-	restart: () => void
-	stop: () => void
-}) {
-	if (!process.stdin.isTTY || typeof process.stdin.setRawMode !== 'function') {
-		return () => {}
-	}
+export function createShortcutInputHandler(actions: ShortcutActions) {
+	let lastKey: string | null = null
 
-	const stdin = process.stdin
 	const handleKey = (key: string) => {
 		if (key === '\u0003') {
-			options.stop()
+			actions.stop()
+			return
+		}
+		if (key === '\r' || key === '\n') {
+			actions.spacing()
 			return
 		}
 		const lower = key.toLowerCase()
 		if (lower === 'o') {
-			openBrowser(options.getUrl())
+			actions.open()
 			return
 		}
 		if (lower === 'r') {
-			options.restart()
+			actions.restart()
 			return
 		}
 		if (lower === 'q') {
-			options.stop()
+			actions.stop()
 			return
 		}
 		if (lower === 'h' || lower === '?') {
-			logShortcuts(options.getUrl())
+			actions.help()
 		}
 	}
 
+	return {
+		handleInput: (input: string) => {
+			for (const key of input) {
+				if (key === '\n' && lastKey === '\r') {
+					lastKey = key
+					continue
+				}
+				handleKey(key)
+				lastKey = key
+			}
+		},
+	}
+}
+
+function setupShortcutHandling(options: {
+	getUrl: () => string
+	restart: () => void
+	stop: () => void
+}) {
+	if (!process.stdin.isTTY || typeof process.stdin.setRawMode !== 'function') {
+		return () => {}
+	}
+
+	const stdin = process.stdin
+	const shortcutHandler = createShortcutInputHandler({
+		open: () => openBrowser(options.getUrl()),
+		restart: options.restart,
+		stop: options.stop,
+		help: () => logShortcuts(options.getUrl()),
+		spacing: () => console.log(''),
+	})
+
 	const onData = (chunk: Buffer | string) => {
-		const input = chunk.toString()
-		for (const key of input) {
-			handleKey(key)
-		}
+		shortcutHandler.handleInput(chunk.toString())
 	}
 
 	stdin.setRawMode(true)