eprec 1.6.0 → 1.7.0

package/package.json

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

package/process-course/chapter-processor.ts

@@ -54,6 +54,14 @@ import type {
 } from './types'
 import { createEditWorkspace } from './edits'
 
+export type ChapterProgressReporter = {
+	start: (options: { stepCount: number; label?: string }) => void
+	step: (label: string) => void
+	setLabel: (label: string) => void
+	finish: (label?: string) => void
+	skip: (label: string) => void
+}
+
 export interface ChapterProcessingOptions {
 	inputPath: string
 	outputDir: string
@@ -67,6 +75,7 @@ export interface ChapterProcessingOptions {
 	writeLogs: boolean
 	dryRun: boolean
 	previousProcessedChapter?: ProcessedChapterInfo | null
+	progress?: ChapterProgressReporter
 }
 
 export interface ChapterProcessingResult {
@@ -100,11 +109,16 @@ export async function processChapter(
 		)
 	}
 
+	const progress = options.progress
+	const stepCount = options.dryRun ? 1 : options.enableTranscription ? 8 : 7
+
 	const outputBasePath = path.join(
 		options.outputDir,
 		`${formatChapterFilename(chapter)}${path.extname(options.inputPath)}`,
 	)
 
+	progress?.start({ stepCount, label: 'Starting' })
+
 	// Check minimum duration before processing
 	if (duration < options.minChapterDurationSeconds) {
 		logInfo(
@@ -121,6 +135,7 @@ export async function processChapter(
 			])
 			logWritten = true
 		}
+		progress?.skip('Skipped (short)')
 		return { status: 'skipped', skipReason: 'short-initial', logWritten }
 	}
 
@@ -129,6 +144,7 @@ export async function processChapter(
 		logInfo(
 			`[dry-run] Would process chapter ${chapter.index + 1}: ${chapter.title}`,
 		)
+		progress?.finish('Dry run')
 		return { status: 'processed', skipReason: 'dry-run', logWritten: false }
 	}
 
@@ -139,6 +155,7 @@ export async function processChapter(
 
 	try {
 		// Step 1: Extract raw segment with padding trimmed
+		progress?.step('Extracting segment')
 		const rawTrimStart = chapter.start + CONFIG.rawTrimPaddingSeconds
 		const rawTrimEnd = chapter.end - CONFIG.rawTrimPaddingSeconds
 		const rawDuration = rawTrimEnd - rawTrimStart
@@ -156,6 +173,7 @@ export async function processChapter(
 		})
 
 		// Step 2: Normalize audio
+		progress?.step('Normalizing audio')
 		const analysis = await analyzeLoudness(paths.rawPath, 0, rawDuration)
 		await renderChapter({
 			inputPath: paths.rawPath,
@@ -170,8 +188,10 @@ export async function processChapter(
 		let commandFilenameOverride: string | null = null
 		let hasEditCommand = false
 		let commandNotes: Array<{ value: string; window: TimeRange }> = []
+		let usedSpliceStep = false
 
 		if (options.enableTranscription) {
+			progress?.step('Transcribing audio')
 			const transcriptionResult = await transcribeAndAnalyze({
 				normalizedPath: paths.normalizedPath,
 				transcriptionAudioPath: paths.transcriptionAudioPath,
@@ -192,6 +212,7 @@ export async function processChapter(
 					logWritten = true
 				}
 				await safeUnlink(outputBasePath)
+				progress?.skip('Skipped (transcript)')
 				return {
 					status: 'skipped',
 					skipReason: transcriptionResult.hasBadTake
@@ -213,6 +234,8 @@ export async function processChapter(
 						`Combine previous command detected for chapter ${chapter.index + 1}, but no previous chapter available. Processing normally.`,
 					)
 				} else {
+					progress?.step('Combining previous')
+					usedSpliceStep = true
 					const combineResult = await handleCombinePrevious({
 						chapter,
 						previousProcessedChapter: options.previousProcessedChapter,
@@ -227,8 +250,10 @@ export async function processChapter(
 					})
 					// If combine failed (returned null), continue with normal processing
 					if (combineResult !== null) {
+						progress?.finish('Combined')
 						return combineResult
 					}
+					progress?.setLabel('Splicing commands')
 					// Otherwise, fall through to normal processing
 				}
 			}
@@ -242,6 +267,9 @@ export async function processChapter(
 		)
 
 		// Step 5: Handle command splicing
+		if (!usedSpliceStep) {
+			progress?.step('Splicing commands')
+		}
 		const spliceResult = await handleCommandSplicing({
 			commandWindows,
 			normalizedPath: paths.normalizedPath,
@@ -252,6 +280,7 @@ export async function processChapter(
 		})
 
 		// Step 6: Detect speech bounds
+		progress?.step('Detecting speech')
 		const speechBounds = await detectSpeechBounds(
 			spliceResult.sourcePath,
 			0,
@@ -275,6 +304,7 @@ export async function processChapter(
 		}
 
 		// Step 7: Apply speech padding
+		progress?.step('Trimming')
 		const paddedStart = clamp(
 			speechBounds.start - CONFIG.preSpeechPaddingSeconds,
 			0,
@@ -314,10 +344,12 @@ export async function processChapter(
 				logWritten = true
 			}
 			await safeUnlink(outputBasePath)
+			progress?.skip('Skipped (trimmed)')
 			return { status: 'skipped', skipReason: 'short-trimmed', logWritten }
 		}
 
 		// Step 9: Write final output
+		progress?.step('Writing output')
 		await extractChapterSegment({
 			inputPath: spliceResult.sourcePath,
 			outputPath: finalOutputPath,
@@ -326,6 +358,7 @@ export async function processChapter(
 		})
 
 		// Step 10: Verify no jarvis in final output
+		progress?.step('Verifying output')
 		let jarvisWarning: JarvisWarning | undefined
 		await extractTranscriptionAudio({
 			inputPath: finalOutputPath,
@@ -412,6 +445,7 @@ export async function processChapter(
 			processedDuration: trimmedDuration,
 		}
 
+		progress?.finish('Complete')
 		return {
 			status: 'processed',
 			jarvisWarning,

package/process-course/edits/cli.ts

@@ -361,7 +361,8 @@ async function promptForEditsCommand(
 		{
 			name: 'edit-video - Edit a single video using transcript text edits',
 			value: 'edit-video',
-			description: 'edit-video --input <file> --transcript <json> --edited <txt>',
+			description:
+				'edit-video --input <file> --transcript <json> --edited <txt>',
 			keywords: ['transcript', 'cuts', 'remove', 'trim'],
 		},
 		{

package/src/process-course-video.ts

@@ -10,6 +10,7 @@ import { writeJarvisLogs, writeSummaryLogs } from '../process-course/summary'
 import {
 	processChapter,
 	type ChapterProcessingOptions,
+	type ChapterProgressReporter,
 } from '../process-course/chapter-processor'
 import type {
 	JarvisEdit,
@@ -20,6 +21,7 @@ import type {
 } from '../process-course/types'
 import { formatSeconds } from './utils'
 import { checkSegmentHasSpeech } from './speech-detection'
+import { setActiveSpinnerText } from '../cli-ux'
 
 interface ProcessingSummary {
 	totalSelected: number
@@ -35,6 +37,137 @@ interface ProcessingSummary {
 
 export type ProcessCourseOptions = Omit<CliArgs, 'shouldExit'>
 
+const PROGRESS_BAR_WIDTH = 12
+
+type SpinnerProgressContext = {
+	fileIndex: number
+	fileCount: number
+	fileName: string
+	chapterCount: number
+}
+
+type ChapterProgressContext = {
+	chapterIndex: number
+	chapterTitle: string
+}
+
+function clampProgress(value: number) {
+	return Math.max(0, Math.min(1, value))
+}
+
+function formatPercent(value: number) {
+	return `${Math.round(clampProgress(value) * 100)}%`
+}
+
+function formatProgressBar(value: number, width = PROGRESS_BAR_WIDTH) {
+	const clamped = clampProgress(value)
+	const filled = Math.round(clamped * width)
+	return `[${'#'.repeat(filled)}${'-'.repeat(width - filled)}]`
+}
+
+function truncateLabel(value: string, maxLength: number) {
+	const trimmed = value.trim()
+	if (trimmed.length <= maxLength) {
+		return trimmed
+	}
+	return `${trimmed.slice(0, Math.max(0, maxLength - 3))}...`
+}
+
+function buildProgressText(params: {
+	fileIndex: number
+	fileCount: number
+	fileName: string
+	chapterIndex: number
+	chapterCount: number
+	chapterTitle: string
+	stepIndex: number
+	stepCount: number
+	stepLabel: string
+}) {
+	const chapterProgress =
+		params.stepCount > 0 ? params.stepIndex / params.stepCount : 0
+	const fileProgress =
+		params.chapterCount > 0
+			? (params.chapterIndex - 1 + chapterProgress) / params.chapterCount
+			: 1
+	const fileLabel =
+		params.fileCount > 1
+			? `File ${params.fileIndex}/${params.fileCount}`
+			: 'File'
+	const fileName = truncateLabel(params.fileName, 22)
+	const fileSegment = fileName ? `${fileLabel} ${fileName}` : fileLabel
+	const chapterLabel = `Chapter ${params.chapterIndex}/${params.chapterCount}`
+	const chapterTitle = truncateLabel(params.chapterTitle, 26)
+	const chapterSegment = chapterTitle
+		? `${chapterLabel} ${chapterTitle}`
+		: chapterLabel
+	const stepSegment = truncateLabel(params.stepLabel, 28) || 'Working'
+	return `Processing course | ${fileSegment} ${formatPercent(fileProgress)} ${formatProgressBar(fileProgress)} | ${chapterSegment} ${formatPercent(chapterProgress)} ${formatProgressBar(chapterProgress)} | ${stepSegment}`
+}
+
+function createSpinnerProgressReporter(context: SpinnerProgressContext) {
+	const chapterCount = Math.max(1, context.chapterCount)
+	return {
+		createChapterProgress({ chapterIndex, chapterTitle }: ChapterProgressContext) {
+			let stepIndex = 0
+			let stepCount = 1
+			let stepLabel = 'Starting'
+
+			const normalizeStepCount = (value: number) =>
+				Math.max(1, Math.round(value))
+
+			const update = () => {
+				setActiveSpinnerText(
+					buildProgressText({
+						fileIndex: context.fileIndex,
+						fileCount: context.fileCount,
+						fileName: context.fileName,
+						chapterIndex,
+						chapterCount,
+						chapterTitle,
+						stepIndex,
+						stepCount,
+						stepLabel,
+					}),
+				)
+			}
+
+			const progress: ChapterProgressReporter = {
+				start({ stepCount: initialCount, label }) {
+					stepCount = normalizeStepCount(initialCount)
+					stepIndex = 0
+					stepLabel = label ?? 'Starting'
+					update()
+				},
+				step(label) {
+					stepCount = normalizeStepCount(stepCount)
+					stepIndex = Math.min(stepIndex + 1, stepCount)
+					stepLabel = label
+					update()
+				},
+				setLabel(label) {
+					stepLabel = label
+					update()
+				},
+				finish(label) {
+					stepCount = normalizeStepCount(stepCount)
+					stepIndex = stepCount
+					stepLabel = label ?? 'Complete'
+					update()
+				},
+				skip(label) {
+					stepCount = normalizeStepCount(stepCount)
+					stepIndex = stepCount
+					stepLabel = label
+					update()
+				},
+			}
+
+			return progress
+		},
+	}
+}
+
 export async function runProcessCourse(options: ProcessCourseOptions) {
 	const {
 		inputPaths,
@@ -53,7 +186,7 @@ export async function runProcessCourse(options: ProcessCourseOptions) {
 	await ensureFfmpegAvailable()
 
 	// Process each input file in turn
-	for (const inputPath of inputPaths) {
+	for (const [fileIndex, inputPath] of inputPaths.entries()) {
 		// Determine output directory for this file
 		let fileOutputDir: string
 		if (outputDir) {
@@ -72,6 +205,8 @@ export async function runProcessCourse(options: ProcessCourseOptions) {
 		}
 
 		await processInputFile({
+			fileIndex: fileIndex + 1,
+			fileCount: inputPaths.length,
 			inputPath,
 			outputDir: fileOutputDir,
 			minChapterDurationSeconds,
@@ -97,6 +232,8 @@ export async function runProcessCourseCli(rawArgs?: string[]) {
 }
 
 async function processInputFile(options: {
+	fileIndex: number
+	fileCount: number
 	inputPath: string
 	outputDir: string
 	minChapterDurationSeconds: number
@@ -110,6 +247,8 @@ async function processInputFile(options: {
 	whisperBinaryPath: string | undefined
 }) {
 	const {
+		fileIndex,
+		fileCount,
 		inputPath,
 		outputDir,
 		minChapterDurationSeconds,
@@ -168,6 +307,13 @@ async function processInputFile(options: {
 		? chapters.filter((chapter) => chapterIndexes.includes(chapter.index))
 		: chapters
 
+	const progressReporter = createSpinnerProgressReporter({
+		fileIndex,
+		fileCount,
+		fileName: path.basename(inputPath),
+		chapterCount: selectedChapters.length,
+	})
+
 	const summary: ProcessingSummary = {
 		totalSelected: selectedChapters.length,
 		processed: 0,
@@ -203,7 +349,11 @@ async function processInputFile(options: {
 	const processedChaptersWithSpeech: ProcessedChapterInfo[] = []
 	let previousProcessedChapter: ProcessedChapterInfo | null = null
 
-	for (const chapter of selectedChapters) {
+	for (const [chapterOffset, chapter] of selectedChapters.entries()) {
+		const chapterProgress = progressReporter.createChapterProgress({
+			chapterIndex: chapterOffset + 1,
+			chapterTitle: chapter.title,
+		})
 		// Determine which chapter to combine with
 		// Always use the most recent processed chapter with speech (if any)
 		const chapterToCombineWith: ProcessedChapterInfo | null =
@@ -222,6 +372,7 @@ async function processInputFile(options: {
 		const result = await processChapter(chapter, {
 			...processingOptions,
 			previousProcessedChapter: chapterToCombineWith,
+			progress: chapterProgress,
 		})
 
 		// Update summary based on result