From 402be6689f615225ca5892123e6c3c0a1731a348 Mon Sep 17 00:00:00 2001 From: Will Knowles Date: Thu, 27 Aug 2026 19:37:17 +0100 Subject: [PATCH 01/81] chore: prepare 2.0 packaging, Explorer integration and ffprobe Bumps to 2.0.0-alpha.1 and brings the build config in line with the other Diamond apps. - Add installer.nsh registering a 'Convert with Diamond File Converter' Explorer entry for both files and directories, plus fileAssociations for all 21 supported extensions. File Converter was the only one of the three apps with neither, so it had no shell integration at all. - Bundle ffprobe-static alongside ffmpeg. ffmpeg-static ships only ffmpeg.exe, so no metadata was previously available anywhere in the app. - Drop fluent-ffmpeg. Pipelines need filter_complex and explicit -map, which it obscures, and -progress pipe:1 reports more reliably than its percent field did. - Rename funding.yml to FUNDING.yml. GitHub requires the uppercase name, so the sponsor button was not rendering. - Add an npm test script. --- .github/{funding.yml => FUNDING.yml} | 0 installer.nsh | 17 +++++++++ package.json | 56 ++++++++++++++++++++++++++-- 3 files changed, 69 insertions(+), 4 deletions(-) rename .github/{funding.yml => FUNDING.yml} (100%) create mode 100644 installer.nsh diff --git a/.github/funding.yml b/.github/FUNDING.yml similarity index 100% rename from .github/funding.yml rename to .github/FUNDING.yml diff --git a/installer.nsh b/installer.nsh new file mode 100644 index 0000000..022eeb5 --- /dev/null +++ b/installer.nsh @@ -0,0 +1,17 @@ +!macro customInstall + ; Add "Convert with Diamond File Converter" to the context menu with icon + WriteRegStr HKCR "*\shell\DiamondFileConverter" "" "Convert with Diamond File Converter" + WriteRegStr HKCR "*\shell\DiamondFileConverter" "Icon" "$INSTDIR\${APP_EXECUTABLE_FILENAME}" + WriteRegStr HKCR "*\shell\DiamondFileConverter\command" "" '"$INSTDIR\${APP_EXECUTABLE_FILENAME}" "%1"' + + ; Add the same entry for directories, so a whole folder can be queued + WriteRegStr HKCR "Directory\shell\DiamondFileConverter" "" "Convert with Diamond File Converter" + WriteRegStr HKCR "Directory\shell\DiamondFileConverter" "Icon" "$INSTDIR\${APP_EXECUTABLE_FILENAME}" + WriteRegStr HKCR "Directory\shell\DiamondFileConverter\command" "" '"$INSTDIR\${APP_EXECUTABLE_FILENAME}" "%1"' +!macroend + +!macro customUninstall + ; Clean up the registry keys on uninstall + DeleteRegKey HKCR "*\shell\DiamondFileConverter" + DeleteRegKey HKCR "Directory\shell\DiamondFileConverter" +!macroend diff --git a/package.json b/package.json index 5e80c70..21ba205 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "diamond-file-converter", - "version": "1.0.0", + "version": "2.0.0-alpha.1", "description": "An Electron-based Windows app for converting audio, video, and image files.", "main": "src/main.js", "funding": { @@ -9,7 +9,8 @@ }, "scripts": { "start": "electron .", - "build": "electron-builder" + "build": "electron-builder", + "test": "node --test" }, "repository": { "type": "git", @@ -23,6 +24,52 @@ { "from": "node_modules/ffmpeg-static/ffmpeg.exe", "to": "ffmpeg/ffmpeg.exe" + }, + { + "from": "node_modules/ffprobe-static/bin/win32/x64/ffprobe.exe", + "to": "ffmpeg/ffprobe.exe" + } + ], + "fileAssociations": [ + { + "ext": [ + "mp3", + "wav", + "flac", + "ogg", + "aac", + "m4a", + "opus", + "wma" + ], + "name": "Audio File", + "role": "Editor" + }, + { + "ext": [ + "mp4", + "mkv", + "webm", + "avi", + "mov", + "wmv", + "flv" + ], + "name": "Video File", + "role": "Editor" + }, + { + "ext": [ + "jpg", + "jpeg", + "png", + "webp", + "gif", + "bmp", + "tiff" + ], + "name": "Image File", + "role": "Editor" } ], "publish": { @@ -39,7 +86,8 @@ "nsis": { "perMachine": true, "createDesktopShortcut": true, - "menuCategory": "Diamond Digital Development" + "menuCategory": "Diamond Digital Development", + "include": "installer.nsh" } }, "keywords": [], @@ -54,7 +102,7 @@ "electron-store": "^11.0.2", "electron-updater": "^6.8.3", "ffmpeg-static": "^5.2.0", - "fluent-ffmpeg": "^2.1.3", + "ffprobe-static": "^3.1.0", "material-icons": "^1.13.14" } } From 4b496da8abbec0fefc0eacf32c893855ddac848d Mon Sep 17 00:00:00 2001 From: Will Knowles Date: Thu, 27 Aug 2026 19:37:33 +0100 Subject: [PATCH 02/81] feat(core): add the 2.0 conversion architecture The v1 engine was a single fluent-ffmpeg call, ffmpeg(input).save(output), with no codec, bitrate, resolution, trim, quality or stream-copy control at any layer. These modules are the spine the 2.0 features need. They import no Electron, so they are unit-testable without launching the app. - formats.js Capability graph replacing the within-group cross-product. Cross-kind conversions are now representable: video to audio, video to frames or a thumbnail, images to video. Subsumes the gif-to-still special case that was hardcoded in main.js. - job.js Job schema with defaults derived from target-format capabilities, nested-merge patching for bulk edit, and validation that rejects impossible combinations without requiring metadata to be present. - ffmpeg-args.js Pure buildArgs(job) -> string[]. Stream copy, crf/bitrate, presets, resize with contain/cover/stretch, trim via input seek plus duration, per-format image quality, a palettegen chain for GIF, frame patterns, faststart. - runner.js Concurrency pool, per-job ids, per-job cancel, pause/resume, partial-output cleanup, structured progress parsed from -progress pipe:1. Replaces the single activeConversion global. - probe.js ffprobe wrapper with normalised output. Treats metadata as enrichment, so a failed probe never blocks a job. Discriminates cover art from real video streams. - paths.js Output routing (alongside, fixed, mirrored source tree), name templating and conflict policies. Output was previously hardcoded to the input directory. - scan.js Async recursive directory walk with depth and count limits and extension filters, replacing a synchronous one-level readdir that ran on the UI thread and discarded nested files. - pipeline.js Node graph schema and filter_complex compiler with cycle, port-type and reachability validation. Schema and compiler only; the flowchart editor is deliberately not in this slice. 53 tests cover the argument builder, the pipeline compiler, path resolution against a real filesystem, progress parsing and the directory scanner. --- src/core/ffmpeg-args.js | 299 +++++++++++++++++++ src/core/formats.js | 296 +++++++++++++++++++ src/core/job.js | 222 ++++++++++++++ src/core/paths.js | 170 +++++++++++ src/core/pipeline.js | 410 ++++++++++++++++++++++++++ src/core/probe.js | 142 +++++++++ src/core/runner.js | 375 ++++++++++++++++++++++++ src/core/scan.js | 147 ++++++++++ test/core.test.js | 631 ++++++++++++++++++++++++++++++++++++++++ 9 files changed, 2692 insertions(+) create mode 100644 src/core/ffmpeg-args.js create mode 100644 src/core/formats.js create mode 100644 src/core/job.js create mode 100644 src/core/paths.js create mode 100644 src/core/pipeline.js create mode 100644 src/core/probe.js create mode 100644 src/core/runner.js create mode 100644 src/core/scan.js create mode 100644 test/core.test.js diff --git a/src/core/ffmpeg-args.js b/src/core/ffmpeg-args.js new file mode 100644 index 0000000..b4cca7d --- /dev/null +++ b/src/core/ffmpeg-args.js @@ -0,0 +1,299 @@ +"use strict"; + +// ffmpeg argv construction. +// +// v1 delegated everything to fluent-ffmpeg and a single `.save(outputPath)` +// call, so the entire command was "read this, write that" and the output +// format was inferred from the file extension. This module builds the argv +// explicitly instead. It is a pure function of the job: no filesystem access, +// no spawning, no Electron. That is what makes it testable. + +const path = require("path"); +const formats = require("./formats"); +const { STREAM_MODE } = require("./job"); + +// Codecs that take a constant-quality value via -crf. Everything else that +// supports a quality knob uses -q:v, which runs on an inverted scale. +const CRF_CODECS = new Set(["libx264", "libx265", "libsvtav1", "libvpx-vp9", "libvpx"]); +// Codecs whose -preset flag ffmpeg understands. +const PRESET_CODECS = new Set(["libx264", "libx265", "libsvtav1"]); +// Codecs that need an explicit 8-bit 4:2:0 pixel format for player compatibility. +const NEEDS_YUV420P = new Set(["libx264", "libx265"]); + +const FRAME_PATTERN = "frame_%04d"; +const DEFAULT_ASSEMBLE_FPS = 25; +const DEFAULT_STILL_DURATION = 5; // seconds, for one image looped into a video + +/** + * Build the complete ffmpeg argument list for a job. + * + * @param {object} job a job from core/job.js + * @param {object} opts + * @param {string} opts.outputPath resolved by core/paths.js. For frame + * extraction this is the output *directory*. + * @param {boolean} [opts.progress] emit machine-readable progress on stdout + * @param {boolean} [opts.overwrite] pass -y (default true; the conflict policy + * is resolved before we ever get here) + * @returns {string[]} + */ +function buildArgs(job, opts = {}) { + const { outputPath, progress = true, overwrite = true } = opts; + if (!outputPath) throw new Error("buildArgs requires an outputPath."); + + const mode = job.mode ?? formats.MODE.TRANSCODE; + const target = formats.getFormat(job.output.ext); + if (!target) throw new Error(`Unknown target format: ${job.output.ext}`); + + const args = ["-hide_banner", "-nostdin"]; + args.push(overwrite ? "-y" : "-n"); + + // -- Input --------------------------------------------------------------- + + const { start, end } = job.trim ?? {}; + + // Input-side seek. Fast and frame-accurate for re-encodes; with -c copy it + // lands on the nearest preceding keyframe, which is inherent to remuxing. + if (start != null && start > 0) { + args.push("-ss", formatSeconds(start)); + } + + if (mode === formats.MODE.ASSEMBLE) { + const fps = job.video?.fps ?? DEFAULT_ASSEMBLE_FPS; + if (job.inputIsSequence) { + args.push("-framerate", String(fps), "-i", job.inputPath); + } else { + // A single still looped into a clip of a fixed length. + args.push("-loop", "1", "-framerate", String(fps), "-i", job.inputPath); + args.push("-t", formatSeconds(durationOrDefault(job, DEFAULT_STILL_DURATION))); + } + } else { + args.push("-i", job.inputPath); + } + + // Output-side duration. Paired with the input seek above, so it counts from + // the seek point rather than from the start of the source. + if (end != null && mode !== formats.MODE.ASSEMBLE) { + const from = start ?? 0; + if (end > from) args.push("-t", formatSeconds(end - from)); + } + + // -- Stream selection and filtering -------------------------------------- + + const videoMode = job.video?.mode ?? STREAM_MODE.ENCODE; + const audioMode = job.audio?.mode ?? STREAM_MODE.ENCODE; + + const wantsPalette = target.ext === "gif" && videoMode !== STREAM_MODE.DROP; + const videoFilters = buildVideoFilters(job, mode); + + if (wantsPalette) { + // A generated palette is the difference between a usable GIF and a + // 256-colour mess, and it is the one place the simple -vf chain cannot + // express what we need. + args.push("-filter_complex", buildPaletteChain(videoFilters)); + } else if (videoFilters.length > 0 && videoMode !== STREAM_MODE.DROP) { + args.push("-vf", videoFilters.join(",")); + } + + // -- Video --------------------------------------------------------------- + + if (videoMode === STREAM_MODE.DROP || mode === formats.MODE.EXTRACT) { + args.push("-vn"); + } else if (videoMode === STREAM_MODE.COPY) { + args.push("-c:v", "copy"); + } else { + const codec = job.video?.codec ?? target.defaultVideoCodec; + if (codec) args.push("-c:v", codec); + + if (target.kind === formats.KIND.IMAGE) { + pushImageQuality(args, job, target); + } else { + pushVideoQuality(args, job, codec); + } + + if (codec && PRESET_CODECS.has(codec) && job.video?.preset) { + args.push("-preset", job.video.preset); + } + if (codec && NEEDS_YUV420P.has(codec)) { + args.push("-pix_fmt", "yuv420p"); + } + } + + // -- Audio --------------------------------------------------------------- + + const targetTakesAudio = target.kind !== formats.KIND.IMAGE; + + if (!targetTakesAudio || audioMode === STREAM_MODE.DROP) { + args.push("-an"); + } else if (audioMode === STREAM_MODE.COPY) { + args.push("-c:a", "copy"); + } else { + const codec = job.audio?.codec ?? target.defaultAudioCodec; + if (codec) args.push("-c:a", codec); + if (job.audio?.bitrate) args.push("-b:a", normaliseBitrate(job.audio.bitrate)); + if (job.audio?.sampleRate) args.push("-ar", String(job.audio.sampleRate)); + if (job.audio?.channels) args.push("-ac", String(job.audio.channels)); + } + + // -- Mode-specific output shaping ---------------------------------------- + + let outputTarget = outputPath; + + if (mode === formats.MODE.FRAMES) { + // Every frame, written into a directory. -fps_mode passthrough keeps + // the source cadence instead of resampling it. + args.push("-fps_mode", "passthrough"); + outputTarget = path.join(outputPath, `${FRAME_PATTERN}.${target.ext}`); + } else if (mode === formats.MODE.THUMBNAIL) { + args.push("-frames:v", "1", "-update", "1"); + } + + if (target.ext === "mp4" || target.ext === "mov") { + // Move the index to the front so the file is streamable / seekable + // before it has fully downloaded. + args.push("-movflags", "+faststart"); + } + + // Extra raw filters carried on the job, and anything a pipeline appended. + if (Array.isArray(job.extraArgs) && job.extraArgs.length > 0) { + args.push(...job.extraArgs.map(String)); + } + + if (progress) { + args.push("-progress", "pipe:1", "-nostats"); + } + + args.push(outputTarget); + return args; +} + +/** The video filter chain, in application order. */ +function buildVideoFilters(job, mode) { + const filters = []; + + const scale = buildScaleFilter(job); + if (scale) filters.push(scale); + + // fps is an input flag for assembly, so only apply it as a filter elsewhere. + if (job.video?.fps && mode !== formats.MODE.ASSEMBLE) { + filters.push(`fps=${job.video.fps}`); + } + + if (Array.isArray(job.filters)) { + for (const f of job.filters) { + if (typeof f === "string" && f.trim()) filters.push(f.trim()); + } + } + + return filters; +} + +function buildScaleFilter(job) { + const width = job.video?.width ?? null; + const height = job.video?.height ?? null; + const scale = job.image?.scale ?? null; + + if (scale && !width && !height) { + // Proportional resize. -2 keeps the result divisible by two, which + // most codecs require. + return `scale=iw*${scale}:-2`; + } + if (!width && !height) return null; + + // -2 rather than -1 on the free axis, for the same divisibility reason. + if (width && !height) return `scale=${width}:-2`; + if (!width && height) return `scale=-2:${height}`; + + switch (job.video?.fitMode) { + case "stretch": + return `scale=${width}:${height}`; + case "cover": + return `scale=${width}:${height}:force_original_aspect_ratio=increase,crop=${width}:${height}`; + case "contain": + default: + return `scale=${width}:${height}:force_original_aspect_ratio=decrease`; + } +} + +/** + * GIF output split into a palette pass and an application pass. With no + * preceding filters the chain still needs an explicit [0:v] label. + */ +function buildPaletteChain(videoFilters) { + const pre = videoFilters.length > 0 ? `${videoFilters.join(",")},` : ""; + return `[0:v] ${pre}split[pal_a][pal_b];[pal_a]palettegen[pal];[pal_b][pal]paletteuse`; +} + +function pushVideoQuality(args, job, codec) { + const crf = job.video?.crf; + const bitrate = job.video?.bitrate; + + if (crf != null && codec && CRF_CODECS.has(codec)) { + args.push("-crf", String(crf)); + // VP9 treats -crf as a cap unless the target bitrate is released. + if (codec === "libvpx-vp9" || codec === "libvpx") args.push("-b:v", "0"); + return; + } + if (bitrate) { + args.push("-b:v", normaliseBitrate(bitrate)); + return; + } + if (crf != null) { + // Codecs without -crf still take the inverted -q:v scale. + args.push("-q:v", String(crf)); + } +} + +function pushImageQuality(args, job, target) { + const quality = job.image?.quality; + if (quality == null || !target.quality) return; + const { flag, min, max } = target.quality; + args.push(flag, String(clamp(quality, min, max))); +} + +/** Accepts 320, "320", "320k" or "320000" and returns an ffmpeg bitrate string. */ +function normaliseBitrate(value) { + if (typeof value === "string" && /[km]$/i.test(value.trim())) return value.trim().toLowerCase(); + const n = Number(value); + if (!Number.isFinite(n)) return String(value); + // Anything this large was given in bits per second already. + if (n >= 10000) return `${Math.round(n / 1000)}k`; + return `${Math.round(n)}k`; +} + +/** Seconds as a plain decimal; ffmpeg accepts this everywhere it accepts a time. */ +function formatSeconds(seconds) { + const n = Number(seconds); + if (!Number.isFinite(n)) return "0"; + return String(Math.round(n * 1000) / 1000); +} + +function durationOrDefault(job, fallback) { + const { start, end } = job.trim ?? {}; + if (start != null && end != null && end > start) return end - start; + if (end != null) return end; + return fallback; +} + +function clamp(value, min, max) { + return Math.min(max, Math.max(min, Number(value))); +} + +/** ffprobe argv for a single file. Kept here so both binaries are described together. */ +function buildProbeArgs(inputPath) { + return [ + "-v", "quiet", + "-print_format", "json", + "-show_format", + "-show_streams", + inputPath, + ]; +} + +module.exports = { + buildArgs, + buildProbeArgs, + buildVideoFilters, + buildScaleFilter, + normaliseBitrate, + FRAME_PATTERN, +}; diff --git a/src/core/formats.js b/src/core/formats.js new file mode 100644 index 0000000..d389e84 --- /dev/null +++ b/src/core/formats.js @@ -0,0 +1,296 @@ +"use strict"; + +// Format capability graph. +// +// This replaces the within-group cross-product that v1 used (buildEntries in +// constants.js), which made cross-kind conversions such as video -> audio +// structurally impossible to express. Here every format carries its own +// capability flags, and the legal conversions between two formats are derived +// from their kinds rather than assumed. + +const KIND = { + AUDIO: "audio", + VIDEO: "video", + IMAGE: "image", +}; + +// How a conversion is carried out. The mode decides the overall shape of the +// ffmpeg invocation, and whether the output is a single file or a directory. +const MODE = { + TRANSCODE: "transcode", // same kind in, same kind out + EXTRACT: "extract", // video in, audio out (video streams dropped) + FRAMES: "frames", // moving picture in, image sequence out (dir output) + THUMBNAIL: "thumbnail", // moving picture in, one still out at a timestamp + ASSEMBLE: "assemble", // image(s) in, video out +}; + +// Modes whose output is a directory of files rather than a single file. +const DIRECTORY_MODES = new Set([MODE.FRAMES]); + +const FORMATS = { + // -- Audio --------------------------------------------------------------- + mp3: { + ext: "mp3", label: "MP3", kind: KIND.AUDIO, + audioCodecs: ["libmp3lame"], defaultAudioCodec: "libmp3lame", + supportsStreamCopy: true, lossless: false, + }, + wav: { + ext: "wav", label: "WAV", kind: KIND.AUDIO, + audioCodecs: ["pcm_s16le", "pcm_s24le", "pcm_f32le"], defaultAudioCodec: "pcm_s16le", + supportsStreamCopy: true, lossless: true, + }, + flac: { + ext: "flac", label: "FLAC", kind: KIND.AUDIO, + audioCodecs: ["flac"], defaultAudioCodec: "flac", + supportsStreamCopy: true, lossless: true, + }, + ogg: { + ext: "ogg", label: "OGG", kind: KIND.AUDIO, + audioCodecs: ["libvorbis", "libopus"], defaultAudioCodec: "libvorbis", + supportsStreamCopy: true, lossless: false, + }, + aac: { + ext: "aac", label: "AAC", kind: KIND.AUDIO, + audioCodecs: ["aac"], defaultAudioCodec: "aac", + supportsStreamCopy: true, lossless: false, + }, + m4a: { + ext: "m4a", label: "M4A", kind: KIND.AUDIO, + audioCodecs: ["aac", "alac"], defaultAudioCodec: "aac", + supportsStreamCopy: true, lossless: false, + }, + opus: { + ext: "opus", label: "OPUS", kind: KIND.AUDIO, + audioCodecs: ["libopus"], defaultAudioCodec: "libopus", + supportsStreamCopy: true, lossless: false, + }, + wma: { + ext: "wma", label: "WMA", kind: KIND.AUDIO, + audioCodecs: ["wmav2"], defaultAudioCodec: "wmav2", + supportsStreamCopy: true, lossless: false, + }, + + // -- Video --------------------------------------------------------------- + mp4: { + ext: "mp4", label: "MP4", kind: KIND.VIDEO, + videoCodecs: ["libx264", "libx265", "libsvtav1", "mpeg4"], defaultVideoCodec: "libx264", + audioCodecs: ["aac", "libmp3lame", "ac3"], defaultAudioCodec: "aac", + supportsStreamCopy: true, supportsAlpha: false, + }, + mkv: { + ext: "mkv", label: "MKV", kind: KIND.VIDEO, + videoCodecs: ["libx264", "libx265", "libvpx-vp9", "libsvtav1"], defaultVideoCodec: "libx264", + audioCodecs: ["aac", "libmp3lame", "libopus", "flac", "ac3"], defaultAudioCodec: "aac", + supportsStreamCopy: true, supportsAlpha: false, + }, + webm: { + ext: "webm", label: "WebM", kind: KIND.VIDEO, + videoCodecs: ["libvpx-vp9", "libvpx", "libsvtav1"], defaultVideoCodec: "libvpx-vp9", + audioCodecs: ["libopus", "libvorbis"], defaultAudioCodec: "libopus", + supportsStreamCopy: true, supportsAlpha: true, + }, + avi: { + ext: "avi", label: "AVI", kind: KIND.VIDEO, + videoCodecs: ["mpeg4", "libx264", "mjpeg"], defaultVideoCodec: "mpeg4", + audioCodecs: ["libmp3lame", "ac3", "pcm_s16le"], defaultAudioCodec: "libmp3lame", + supportsStreamCopy: true, supportsAlpha: false, + }, + mov: { + ext: "mov", label: "MOV", kind: KIND.VIDEO, + videoCodecs: ["libx264", "libx265", "prores_ks", "mjpeg"], defaultVideoCodec: "libx264", + audioCodecs: ["aac", "alac", "pcm_s16le"], defaultAudioCodec: "aac", + supportsStreamCopy: true, supportsAlpha: false, + }, + wmv: { + ext: "wmv", label: "WMV", kind: KIND.VIDEO, + videoCodecs: ["wmv2", "msmpeg4v3"], defaultVideoCodec: "wmv2", + audioCodecs: ["wmav2"], defaultAudioCodec: "wmav2", + supportsStreamCopy: true, supportsAlpha: false, + }, + flv: { + ext: "flv", label: "FLV", kind: KIND.VIDEO, + videoCodecs: ["libx264", "flv"], defaultVideoCodec: "libx264", + audioCodecs: ["libmp3lame", "aac"], defaultAudioCodec: "libmp3lame", + supportsStreamCopy: true, supportsAlpha: false, + }, + + // -- Image --------------------------------------------------------------- + jpg: { + ext: "jpg", label: "JPG", kind: KIND.IMAGE, + videoCodecs: ["mjpeg"], defaultVideoCodec: "mjpeg", + supportsStreamCopy: false, supportsAlpha: false, animated: false, + // ffmpeg -q:v for mjpeg runs 2 (best) to 31 (worst) + quality: { flag: "-q:v", min: 2, max: 31, default: 3, inverted: true }, + }, + png: { + ext: "png", label: "PNG", kind: KIND.IMAGE, + videoCodecs: ["png"], defaultVideoCodec: "png", + supportsStreamCopy: false, supportsAlpha: true, animated: false, lossless: true, + quality: { flag: "-compression_level", min: 0, max: 9, default: 6, inverted: false }, + }, + webp: { + ext: "webp", label: "WebP", kind: KIND.IMAGE, + videoCodecs: ["libwebp"], defaultVideoCodec: "libwebp", + supportsStreamCopy: false, supportsAlpha: true, animated: true, + quality: { flag: "-quality", min: 0, max: 100, default: 80, inverted: false }, + }, + gif: { + ext: "gif", label: "GIF", kind: KIND.IMAGE, + videoCodecs: ["gif"], defaultVideoCodec: "gif", + supportsStreamCopy: false, supportsAlpha: true, animated: true, + }, + bmp: { + ext: "bmp", label: "BMP", kind: KIND.IMAGE, + videoCodecs: ["bmp"], defaultVideoCodec: "bmp", + supportsStreamCopy: false, supportsAlpha: false, animated: false, lossless: true, + }, + tiff: { + ext: "tiff", label: "TIFF", kind: KIND.IMAGE, + videoCodecs: ["tiff"], defaultVideoCodec: "tiff", + supportsStreamCopy: false, supportsAlpha: true, animated: false, lossless: true, + }, +}; + +// Alternate extensions mapped onto their canonical key. Carried over from v1. +const EXT_ALIASES = { + jpeg: "jpg", + tif: "tiff", + jfif: "jpg", +}; + +const SUPPORTED_EXTENSIONS = Object.keys(FORMATS); + +// Image formats that hold exactly one frame. Used to decide whether a moving +// source has to be exploded into a sequence rather than written as one file. +const STATIC_IMAGE_EXTS = new Set( + Object.values(FORMATS) + .filter(f => f.kind === KIND.IMAGE && !f.animated) + .map(f => f.ext) +); + +/** Resolve a raw extension (with or without a leading dot) to a canonical key. */ +function canonicalExt(raw) { + if (typeof raw !== "string") return null; + const cleaned = raw.replace(/^\./, "").toLowerCase(); + const resolved = EXT_ALIASES[cleaned] ?? cleaned; + return FORMATS[resolved] ? resolved : null; +} + +function getFormat(ext) { + const key = canonicalExt(ext); + return key ? FORMATS[key] : null; +} + +function kindOf(ext) { + return getFormat(ext)?.kind ?? null; +} + +function isSupported(ext) { + return canonicalExt(ext) !== null; +} + +/** + * Every mode by which `fromExt` may legally become `toExt`, most useful first. + * An empty array means the conversion is not supported. + */ +function allowedModes(fromExt, toExt) { + const from = getFormat(fromExt); + const to = getFormat(toExt); + if (!from || !to) return []; + + const modes = []; + + if (from.kind === to.kind) { + // An animated source landing in a single-frame target cannot be one + // file, so it explodes into a sequence instead. This subsumes the + // gif -> static special case that v1 hardcoded in main.js. + if (from.kind === KIND.IMAGE && from.animated && !to.animated) { + modes.push(MODE.FRAMES, MODE.THUMBNAIL); + } else { + modes.push(MODE.TRANSCODE); + } + } else if (from.kind === KIND.VIDEO && to.kind === KIND.AUDIO) { + modes.push(MODE.EXTRACT); + } else if (from.kind === KIND.VIDEO && to.kind === KIND.IMAGE) { + // A still target gets one frame or all of them; an animated target + // (gif, animated webp) can hold the motion directly. + if (to.animated) modes.push(MODE.TRANSCODE, MODE.FRAMES, MODE.THUMBNAIL); + else modes.push(MODE.FRAMES, MODE.THUMBNAIL); + } else if (from.kind === KIND.IMAGE && to.kind === KIND.VIDEO) { + modes.push(MODE.ASSEMBLE); + } + + return modes; +} + +function defaultMode(fromExt, toExt) { + return allowedModes(fromExt, toExt)[0] ?? null; +} + +function canConvert(fromExt, toExt) { + return allowedModes(fromExt, toExt).length > 0; +} + +function producesDirectory(mode) { + return DIRECTORY_MODES.has(mode); +} + +/** Every format `ext` can be converted into, as UI-ready descriptors. */ +function targetsFor(ext) { + const from = getFormat(ext); + if (!from) return []; + + const targets = []; + for (const to of Object.values(FORMATS)) { + const modes = allowedModes(from.ext, to.ext); + if (modes.length === 0) continue; + targets.push({ + ext: to.ext, + label: to.label, + kind: to.kind, + group: to.kind.charAt(0).toUpperCase() + to.kind.slice(1), + modes, + mode: modes[0], + sameKind: to.kind === from.kind, + }); + } + return targets; +} + +/** + * The v1 renderer's `{ [ext]: { type, targets } }` shape, restricted to + * same-kind targets so the existing format grid behaves exactly as it did. + * Cross-kind targets are already available through targetsFor(); surfacing + * them in the UI is TODO item 6. + */ +function buildLegacyConversionMap() { + const map = {}; + for (const from of Object.values(FORMATS)) { + map[from.ext] = { + type: from.kind, + targets: targetsFor(from.ext) + .filter(t => t.sameKind) + .map(t => ({ ext: t.ext, label: t.label, group: t.group })), + }; + } + return map; +} + +module.exports = { + KIND, + MODE, + FORMATS, + EXT_ALIASES, + SUPPORTED_EXTENSIONS, + STATIC_IMAGE_EXTS, + canonicalExt, + getFormat, + kindOf, + isSupported, + allowedModes, + defaultMode, + canConvert, + producesDirectory, + targetsFor, + buildLegacyConversionMap, +}; diff --git a/src/core/job.js b/src/core/job.js new file mode 100644 index 0000000..f5c731e --- /dev/null +++ b/src/core/job.js @@ -0,0 +1,222 @@ +"use strict"; + +// The job model. +// +// v1 had no job concept at all: the convert IPC took two positional strings +// (filePath, targetExt) and every encoding decision was left to ffmpeg's +// extension sniffing. A job is the unit the 2.0 card grid binds to, the unit +// the runner schedules, and the unit ffmpeg-args compiles. + +const formats = require("./formats"); + +const STATUS = { + PENDING: "pending", + RUNNING: "running", + DONE: "done", + ERROR: "error", + CANCELLED: "cancelled", + SKIPPED: "skipped", +}; + +const STREAM_MODE = { + COPY: "copy", // remux without re-encoding + ENCODE: "encode", + DROP: "drop", +}; + +const CONFLICT = { + ASK: "ask", + OVERWRITE: "overwrite", + UNIQUE: "unique", + SKIP: "skip", +}; + +const OUTPUT_ROUTING = { + ALONGSIDE: "alongside", // next to the input, v1's only behaviour + FIXED: "fixed", // one chosen directory + MIRROR: "mirror", // rebuild the source tree under a chosen root +}; + +let idCounter = 0; + +function generateId() { + idCounter += 1; + return `job_${Date.now().toString(36)}_${idCounter.toString(36)}`; +} + +/** + * Build a fully-populated job from a sparse spec. Anything not supplied is + * filled from the target format's own capability defaults, so a job created + * with nothing but an input path and a target extension is already runnable. + */ +function createJob(spec = {}) { + const inputPath = spec.inputPath ?? null; + const sourceExt = spec.sourceExt ?? (inputPath ? formats.canonicalExt(extnameOf(inputPath)) : null); + const targetExt = formats.canonicalExt(spec.targetExt ?? spec.output?.ext ?? "") ?? null; + + const targetFormat = targetExt ? formats.getFormat(targetExt) : null; + const mode = spec.mode ?? (sourceExt && targetExt ? formats.defaultMode(sourceExt, targetExt) : null); + + return { + id: spec.id ?? generateId(), + inputPath, + sourceExt, + inputMeta: spec.inputMeta ?? null, + mode, + + output: { + routing: spec.output?.routing ?? OUTPUT_ROUTING.ALONGSIDE, + dir: spec.output?.dir ?? null, + mirrorRoot: spec.output?.mirrorRoot ?? null, + nameTemplate: spec.output?.nameTemplate ?? "{name}", + ext: targetExt, + onConflict: spec.output?.onConflict ?? CONFLICT.UNIQUE, + }, + + video: { + mode: spec.video?.mode ?? defaultVideoMode(targetFormat, mode), + codec: spec.video?.codec ?? targetFormat?.defaultVideoCodec ?? null, + crf: spec.video?.crf ?? null, + bitrate: spec.video?.bitrate ?? null, + preset: spec.video?.preset ?? null, + width: spec.video?.width ?? null, + height: spec.video?.height ?? null, + fitMode: spec.video?.fitMode ?? "contain", + fps: spec.video?.fps ?? null, + }, + + audio: { + mode: spec.audio?.mode ?? defaultAudioMode(targetFormat, mode), + codec: spec.audio?.codec ?? targetFormat?.defaultAudioCodec ?? null, + bitrate: spec.audio?.bitrate ?? null, + sampleRate: spec.audio?.sampleRate ?? null, + channels: spec.audio?.channels ?? null, + }, + + image: { + quality: spec.image?.quality ?? targetFormat?.quality?.default ?? null, + scale: spec.image?.scale ?? null, + }, + + // Null means "from the start" / "to the end". Seconds, as floats. + trim: { + start: spec.trim?.start ?? null, + end: spec.trim?.end ?? null, + }, + + // Extra raw filters, and the pipeline this job was built from (if any). + filters: spec.filters ?? [], + pipelineId: spec.pipelineId ?? null, + + status: spec.status ?? STATUS.PENDING, + progress: spec.progress ?? 0, + error: spec.error ?? null, + outputPath: spec.outputPath ?? null, + }; +} + +function defaultVideoMode(targetFormat, mode) { + if (!targetFormat) return STREAM_MODE.ENCODE; + if (mode === formats.MODE.EXTRACT) return STREAM_MODE.DROP; + if (targetFormat.kind === formats.KIND.AUDIO) return STREAM_MODE.DROP; + return STREAM_MODE.ENCODE; +} + +function defaultAudioMode(targetFormat, mode) { + if (!targetFormat) return STREAM_MODE.ENCODE; + if (targetFormat.kind === formats.KIND.IMAGE) return STREAM_MODE.DROP; + if (mode === formats.MODE.ASSEMBLE) return STREAM_MODE.DROP; + return STREAM_MODE.ENCODE; +} + +function extnameOf(filePath) { + const base = String(filePath).split(/[\\/]/).pop() ?? ""; + const dot = base.lastIndexOf("."); + return dot > 0 ? base.slice(dot + 1) : ""; +} + +/** + * Apply a partial patch to a job, merging nested sections rather than + * replacing them. This is what bulk-editing a multi-card selection uses. + */ +function patchJob(job, patch = {}) { + const next = { ...job }; + for (const [key, value] of Object.entries(patch)) { + if (value && typeof value === "object" && !Array.isArray(value) && typeof job[key] === "object" && job[key] !== null) { + next[key] = { ...job[key], ...value }; + } else { + next[key] = value; + } + } + return next; +} + +/** + * Structural validation. Returns { valid, errors[] }. Metadata is deliberately + * not required: a job is valid before its probe has returned, so cards can + * render immediately and enrich later. + */ +function validateJob(job) { + const errors = []; + + if (!job.inputPath) errors.push("Job has no input path."); + if (!job.sourceExt) errors.push("Input file type is not recognised."); + if (!job.output?.ext) errors.push("Job has no target format."); + + if (job.sourceExt && job.output?.ext) { + if (!formats.canConvert(job.sourceExt, job.output.ext)) { + errors.push(`Cannot convert ${job.sourceExt} to ${job.output.ext}.`); + } else if (job.mode && !formats.allowedModes(job.sourceExt, job.output.ext).includes(job.mode)) { + errors.push(`Mode "${job.mode}" is not valid for ${job.sourceExt} to ${job.output.ext}.`); + } + } + + const target = job.output?.ext ? formats.getFormat(job.output.ext) : null; + + if (job.video?.mode === STREAM_MODE.COPY && target && !target.supportsStreamCopy) { + errors.push(`${target.label} does not support copying the video stream.`); + } + if (job.audio?.mode === STREAM_MODE.COPY && target && !target.supportsStreamCopy) { + errors.push(`${target.label} does not support copying the audio stream.`); + } + if (job.video?.mode === STREAM_MODE.DROP && job.audio?.mode === STREAM_MODE.DROP) { + errors.push("Both video and audio are set to be dropped, so there is nothing to write."); + } + + if (job.video?.codec && target?.videoCodecs && !target.videoCodecs.includes(job.video.codec)) { + errors.push(`${target.label} does not support the video codec "${job.video.codec}".`); + } + if (job.audio?.mode === STREAM_MODE.ENCODE && job.audio?.codec && target?.audioCodecs && !target.audioCodecs.includes(job.audio.codec)) { + errors.push(`${target.label} does not support the audio codec "${job.audio.codec}".`); + } + + const { start, end } = job.trim ?? {}; + if (start !== null && start !== undefined && start < 0) errors.push("Trim start cannot be negative."); + if (start != null && end != null && end <= start) errors.push("Trim end must be after trim start."); + + if (job.output?.routing === OUTPUT_ROUTING.FIXED && !job.output.dir) { + errors.push("A fixed output directory was selected but no directory was given."); + } + if (job.output?.routing === OUTPUT_ROUTING.MIRROR && !job.output.mirrorRoot) { + errors.push("Mirrored output was selected but no source root was given."); + } + + return { valid: errors.length === 0, errors }; +} + +/** True when this job writes a directory of files rather than a single file. */ +function producesDirectory(job) { + return formats.producesDirectory(job.mode); +} + +module.exports = { + STATUS, + STREAM_MODE, + CONFLICT, + OUTPUT_ROUTING, + generateId, + createJob, + patchJob, + validateJob, + producesDirectory, +}; diff --git a/src/core/paths.js b/src/core/paths.js new file mode 100644 index 0000000..45eb3ed --- /dev/null +++ b/src/core/paths.js @@ -0,0 +1,170 @@ +"use strict"; + +// Output path resolution. +// +// v1 hardcoded the output directory to the input's own directory in both +// branches of the convert handler, so there was no destination concept at all. +// This module owns routing, name templating and conflict resolution. + +const fs = require("fs"); +const path = require("path"); + +const { OUTPUT_ROUTING, CONFLICT } = require("./job"); +const formats = require("./formats"); + +/** + * The next free filename: "file (1).ext", "file (2).ext", ... + * Lifted unchanged from main.js so existing behaviour is preserved exactly. + */ +function getUniquePath(filePath) { + if (!fs.existsSync(filePath)) return filePath; + const ext = path.extname(filePath); + const stem = path.basename(filePath, ext); + const dir = path.dirname(filePath); + let i = 1; + let candidate; + do { + candidate = path.join(dir, `${stem} (${i})${ext}`); + i++; + } while (fs.existsSync(candidate)); + return candidate; +} + +/** The next free directory name: "dir (1)", "dir (2)", ... */ +function getUniqueDirPath(dirPath) { + if (!fs.existsSync(dirPath)) return dirPath; + let i = 1; + let candidate; + do { + candidate = `${dirPath} (${i})`; + i++; + } while (fs.existsSync(candidate)); + return candidate; +} + +/** + * Expand a name template. Supported tokens: + * {name} input basename without extension + * {ext} target extension, no dot + * {src} source extension, no dot + * {index} 1-based position in the batch + * {date} YYYY-MM-DD + * {time} HHMMSS + * {preset} preset name, or "" when the job has none + * Unknown tokens are left alone rather than silently blanked, so a typo is + * visible in the output filename instead of vanishing. + */ +function applyNameTemplate(template, context) { + const now = context.now instanceof Date ? context.now : new Date(); + const pad = (n) => String(n).padStart(2, "0"); + + const values = { + name: context.name ?? "", + ext: context.ext ?? "", + src: context.src ?? "", + index: context.index != null ? String(context.index) : "", + date: `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())}`, + time: `${pad(now.getHours())}${pad(now.getMinutes())}${pad(now.getSeconds())}`, + preset: context.preset ?? "", + }; + + return String(template ?? "{name}").replace(/\{(\w+)\}/g, (match, key) => + Object.prototype.hasOwnProperty.call(values, key) ? values[key] : match + ); +} + +/** Strip characters Windows will not accept in a filename. */ +function sanitiseName(name) { + return String(name) + .replace(/[<>:"/\\|?*\x00-\x1f]/g, "_") + .replace(/[. ]+$/, "") + .trim() || "output"; +} + +/** The directory a job's output belongs in, before conflict resolution. */ +function resolveOutputDir(job) { + const inputDir = path.dirname(job.inputPath); + const routing = job.output?.routing ?? OUTPUT_ROUTING.ALONGSIDE; + + switch (routing) { + case OUTPUT_ROUTING.FIXED: + return job.output.dir ?? inputDir; + + case OUTPUT_ROUTING.MIRROR: { + // Rebuild the input's position under the source root inside the + // destination, so a nested folder ingest keeps its shape. + const root = job.output.mirrorRoot; + const dest = job.output.dir ?? inputDir; + if (!root) return dest; + const relative = path.relative(root, inputDir); + if (!relative || relative.startsWith("..") || path.isAbsolute(relative)) return dest; + return path.join(dest, relative); + } + + case OUTPUT_ROUTING.ALONGSIDE: + default: + return inputDir; + } +} + +/** + * Resolve the final output path for a job. + * + * Returns { outputPath, isDirectory, action } where action is "write", + * "skip" or "ask". "ask" means the caller has to prompt, which is the one + * decision this module deliberately does not make on its own. + */ +function resolveOutputPath(job, context = {}) { + const targetExt = job.output.ext; + const dir = resolveOutputDir(job); + const inputExt = path.extname(job.inputPath); + const stem = path.basename(job.inputPath, inputExt); + + const name = sanitiseName(applyNameTemplate(job.output.nameTemplate, { + name: stem, + ext: targetExt, + src: job.sourceExt ?? inputExt.replace(/^\./, ""), + index: context.index, + preset: context.preset, + now: context.now, + })); + + const isDirectory = formats.producesDirectory(job.mode); + const candidate = isDirectory ? path.join(dir, name) : path.join(dir, `${name}.${targetExt}`); + + const exists = fs.existsSync(candidate); + if (!exists) return { outputPath: candidate, isDirectory, action: "write" }; + + switch (job.output.onConflict) { + case CONFLICT.OVERWRITE: + return { outputPath: candidate, isDirectory, action: "write" }; + case CONFLICT.SKIP: + return { outputPath: candidate, isDirectory, action: "skip" }; + case CONFLICT.ASK: + return { outputPath: candidate, isDirectory, action: "ask" }; + case CONFLICT.UNIQUE: + default: + return { + outputPath: isDirectory ? getUniqueDirPath(candidate) : getUniquePath(candidate), + isDirectory, + action: "write", + }; + } +} + +/** Create the directory an output will be written into. */ +function ensureParentDir(outputPath, isDirectory) { + const dir = isDirectory ? outputPath : path.dirname(outputPath); + fs.mkdirSync(dir, { recursive: true }); + return dir; +} + +module.exports = { + getUniquePath, + getUniqueDirPath, + applyNameTemplate, + sanitiseName, + resolveOutputDir, + resolveOutputPath, + ensureParentDir, +}; diff --git a/src/core/pipeline.js b/src/core/pipeline.js new file mode 100644 index 0000000..970a389 --- /dev/null +++ b/src/core/pipeline.js @@ -0,0 +1,410 @@ +"use strict"; + +// Pipeline schema and compiler. +// +// This slice deliberately ships no flowchart editor. What it ships is the +// thing the editor will draw: a validated node graph, and a compiler that +// turns that graph into an ffmpeg filter_complex plus stream maps. Defining +// the data model first is what lets the editor later be a pure view layer +// over an already-tested representation. + +const PORT = { + VIDEO: "video", + AUDIO: "audio", + ANY: "any", +}; + +/** + * Node type registry. `inputs`/`outputs` describe ports; `emit` renders the + * ffmpeg filter body for that node, or returns null for nodes that carry no + * filter of their own (input, output, encode). + */ +const NODE_TYPES = { + input: { + label: "Input", + inputs: [], + outputs: [{ name: "video", type: PORT.VIDEO }, { name: "audio", type: PORT.AUDIO }], + emit: () => null, + }, + + trim: { + label: "Trim", + inputs: [{ name: "in", type: PORT.ANY }], + outputs: [{ name: "out", type: PORT.ANY }], + required: [], + emit: (params, portType) => { + const parts = []; + if (params.start != null) parts.push(`start=${num(params.start)}`); + if (params.end != null) parts.push(`end=${num(params.end)}`); + if (parts.length === 0) return null; + const filter = portType === PORT.AUDIO ? "atrim" : "trim"; + const reset = portType === PORT.AUDIO ? "asetpts=PTS-STARTPTS" : "setpts=PTS-STARTPTS"; + return `${filter}=${parts.join(":")},${reset}`; + }, + }, + + scale: { + label: "Scale", + inputs: [{ name: "in", type: PORT.VIDEO }], + outputs: [{ name: "out", type: PORT.VIDEO }], + required: [], + emit: (params) => { + const w = params.width ?? -2; + const h = params.height ?? -2; + if (params.width == null && params.height == null) return null; + switch (params.fitMode) { + case "stretch": return `scale=${w}:${h}`; + case "cover": return `scale=${w}:${h}:force_original_aspect_ratio=increase,crop=${w}:${h}`; + default: return `scale=${w}:${h}:force_original_aspect_ratio=decrease`; + } + }, + }, + + crop: { + label: "Crop", + inputs: [{ name: "in", type: PORT.VIDEO }], + outputs: [{ name: "out", type: PORT.VIDEO }], + required: ["width", "height"], + emit: (params) => + `crop=${num(params.width)}:${num(params.height)}:${num(params.x ?? 0)}:${num(params.y ?? 0)}`, + }, + + fps: { + label: "Frame rate", + inputs: [{ name: "in", type: PORT.VIDEO }], + outputs: [{ name: "out", type: PORT.VIDEO }], + required: ["fps"], + emit: (params) => `fps=${num(params.fps)}`, + }, + + volume: { + label: "Volume", + inputs: [{ name: "in", type: PORT.AUDIO }], + outputs: [{ name: "out", type: PORT.AUDIO }], + required: ["volume"], + emit: (params) => `volume=${num(params.volume)}`, + }, + + concat: { + label: "Concatenate", + inputs: [{ name: "a", type: PORT.ANY }, { name: "b", type: PORT.ANY }], + outputs: [{ name: "out", type: PORT.ANY }], + variadic: true, + emit: (_params, portType, arity) => { + const n = arity ?? 2; + return portType === PORT.AUDIO + ? `concat=n=${n}:v=0:a=1` + : `concat=n=${n}:v=1:a=0`; + }, + }, + + overlay: { + label: "Overlay", + inputs: [{ name: "base", type: PORT.VIDEO }, { name: "overlay", type: PORT.VIDEO }], + outputs: [{ name: "out", type: PORT.VIDEO }], + required: [], + emit: (params) => `overlay=${num(params.x ?? 0)}:${num(params.y ?? 0)}`, + }, + + encode: { + label: "Encode", + inputs: [{ name: "video", type: PORT.VIDEO }, { name: "audio", type: PORT.AUDIO }], + outputs: [{ name: "video", type: PORT.VIDEO }, { name: "audio", type: PORT.AUDIO }], + // Encoding settings are applied to the job, not the filter graph. + emit: () => null, + }, + + output: { + label: "Output", + inputs: [{ name: "video", type: PORT.VIDEO }, { name: "audio", type: PORT.AUDIO }], + outputs: [], + emit: () => null, + }, +}; + +function createPipeline(spec = {}) { + return { + id: spec.id ?? `pl_${Date.now().toString(36)}`, + name: spec.name ?? "Untitled pipeline", + version: 1, + nodes: spec.nodes ?? [], + edges: spec.edges ?? [], + }; +} + +/** + * Structural validation of a graph. + * @returns {{valid: boolean, errors: string[], warnings: string[], order: string[]|null}} + */ +function validate(pipeline) { + const errors = []; + const warnings = []; + + const nodes = Array.isArray(pipeline?.nodes) ? pipeline.nodes : []; + const edges = Array.isArray(pipeline?.edges) ? pipeline.edges : []; + + if (nodes.length === 0) { + return { valid: false, errors: ["Pipeline has no nodes."], warnings, order: null }; + } + + const byId = new Map(); + for (const node of nodes) { + if (!node.id) { errors.push("A node is missing an id."); continue; } + if (byId.has(node.id)) errors.push(`Duplicate node id "${node.id}".`); + if (!NODE_TYPES[node.type]) errors.push(`Node "${node.id}" has unknown type "${node.type}".`); + byId.set(node.id, node); + } + + const inputs = nodes.filter(n => n.type === "input"); + const outputs = nodes.filter(n => n.type === "output"); + if (inputs.length === 0) errors.push("Pipeline has no input node."); + if (outputs.length === 0) errors.push("Pipeline has no output node."); + if (outputs.length > 1) errors.push("Pipeline has more than one output node."); + + // -- Edge integrity and port types --------------------------------------- + for (const edge of edges) { + const from = byId.get(edge.from); + const to = byId.get(edge.to); + if (!from) { errors.push(`Edge references unknown source node "${edge.from}".`); continue; } + if (!to) { errors.push(`Edge references unknown target node "${edge.to}".`); continue; } + + const fromSpec = NODE_TYPES[from.type]; + const toSpec = NODE_TYPES[to.type]; + if (!fromSpec || !toSpec) continue; + + const outPort = fromSpec.outputs.find(p => p.name === edge.fromPort); + const inPort = toSpec.inputs.find(p => p.name === edge.toPort); + + if (!outPort) errors.push(`Node "${from.id}" has no output port "${edge.fromPort}".`); + if (!inPort && !toSpec.variadic) errors.push(`Node "${to.id}" has no input port "${edge.toPort}".`); + + if (outPort && inPort) { + const compatible = + outPort.type === inPort.type || + outPort.type === PORT.ANY || + inPort.type === PORT.ANY; + if (!compatible) { + errors.push(`Cannot connect ${outPort.type} output of "${from.id}" to ${inPort.type} input of "${to.id}".`); + } + } + } + + // -- Required params ----------------------------------------------------- + for (const node of nodes) { + const spec = NODE_TYPES[node.type]; + if (!spec?.required) continue; + for (const key of spec.required) { + if (node.params?.[key] == null) { + errors.push(`Node "${node.id}" (${spec.label}) is missing required setting "${key}".`); + } + } + } + + // -- Cycles -------------------------------------------------------------- + const order = topoSort(nodes, edges); + if (order === null) { + errors.push("Pipeline contains a cycle, so it cannot be run."); + } + + // -- Reachability -------------------------------------------------------- + if (order && outputs.length === 1) { + const reaching = collectAncestors(outputs[0].id, edges); + for (const node of nodes) { + if (node.id === outputs[0].id) continue; + if (!reaching.has(node.id)) { + warnings.push(`Node "${node.id}" (${NODE_TYPES[node.type]?.label ?? node.type}) is not connected to the output and will be ignored.`); + } + } + } + + return { valid: errors.length === 0, errors, warnings, order }; +} + +/** Kahn's algorithm. Returns node ids in dependency order, or null on a cycle. */ +function topoSort(nodes, edges) { + const indegree = new Map(nodes.map(n => [n.id, 0])); + const adjacency = new Map(nodes.map(n => [n.id, []])); + + for (const edge of edges) { + if (!indegree.has(edge.from) || !indegree.has(edge.to)) continue; + adjacency.get(edge.from).push(edge.to); + indegree.set(edge.to, indegree.get(edge.to) + 1); + } + + const queue = [...indegree.entries()].filter(([, d]) => d === 0).map(([id]) => id); + const order = []; + + while (queue.length > 0) { + const id = queue.shift(); + order.push(id); + for (const next of adjacency.get(id) ?? []) { + indegree.set(next, indegree.get(next) - 1); + if (indegree.get(next) === 0) queue.push(next); + } + } + + return order.length === nodes.length ? order : null; +} + +function collectAncestors(nodeId, edges) { + const seen = new Set([nodeId]); + const stack = [nodeId]; + while (stack.length > 0) { + const current = stack.pop(); + for (const edge of edges) { + if (edge.to === current && !seen.has(edge.from)) { + seen.add(edge.from); + stack.push(edge.from); + } + } + } + return seen; +} + +/** + * Compile a validated pipeline into ffmpeg pieces. + * + * @returns {{filterComplex: string|null, maps: string[], extraArgs: string[], encode: object|null}} + * `maps` are ready to be paired with -map. `encode` carries any + * settings from an encode node for the job to absorb. + */ +function compile(pipeline) { + const result = validate(pipeline); + if (!result.valid) { + const err = new Error(`Pipeline is not valid: ${result.errors[0]}`); + err.errors = result.errors; + throw err; + } + + const byId = new Map(pipeline.nodes.map(n => [n.id, n])); + const chains = []; + // nodeId -> { portName -> { label, type } } + const outputLabels = new Map(); + + let labelCounter = 0; + const nextLabel = (hint) => `${hint}${labelCounter++}`; + + const incomingFor = (nodeId, portName) => + pipeline.edges.filter(e => e.to === nodeId && (portName == null || e.toPort === portName)); + + for (const nodeId of result.order) { + const node = byId.get(nodeId); + const spec = NODE_TYPES[node.type]; + + if (node.type === "input") { + // The single source file is always ffmpeg input 0. + outputLabels.set(nodeId, { + video: { label: "0:v", type: PORT.VIDEO }, + audio: { label: "0:a", type: PORT.AUDIO }, + }); + continue; + } + + if (node.type === "output") continue; + + if (node.type === "encode") { + // Passthrough in the graph; its params are read separately below. + const ports = {}; + for (const port of spec.inputs) { + const edge = incomingFor(nodeId, port.name)[0]; + if (!edge) continue; + const upstream = outputLabels.get(edge.from)?.[edge.fromPort]; + if (upstream) ports[port.name] = upstream; + } + outputLabels.set(nodeId, ports); + continue; + } + + // Gather this node's inputs in declared port order. + const incoming = spec.variadic + ? incomingFor(nodeId) + : spec.inputs.map(p => incomingFor(nodeId, p.name)[0]).filter(Boolean); + + if (incoming.length === 0) { + // Nothing feeds it, so it contributes nothing. + outputLabels.set(nodeId, {}); + continue; + } + + const sources = incoming + .map(edge => outputLabels.get(edge.from)?.[edge.fromPort]) + .filter(Boolean); + + if (sources.length === 0) { + outputLabels.set(nodeId, {}); + continue; + } + + // An ANY-typed node takes its concrete type from what it is fed. + const portType = sources[0].type; + const body = spec.emit(node.params ?? {}, portType, sources.length); + + if (!body) { + // A no-op node (a trim with no bounds set) forwards its input + // rather than inserting an empty link into the chain. + outputLabels.set(nodeId, { [spec.outputs[0]?.name ?? "out"]: sources[0] }); + continue; + } + + const outLabel = nextLabel(portType === PORT.AUDIO ? "a" : "v"); + chains.push(`${sources.map(s => `[${s.label}]`).join("")}${body}[${outLabel}]`); + + const outPortName = spec.outputs[0]?.name ?? "out"; + outputLabels.set(nodeId, { [outPortName]: { label: outLabel, type: portType } }); + } + + // -- Resolve what the output node is actually fed ------------------------- + const outputNode = pipeline.nodes.find(n => n.type === "output"); + const maps = []; + for (const port of NODE_TYPES.output.inputs) { + const edge = incomingFor(outputNode.id, port.name)[0]; + if (!edge) continue; + const upstream = outputLabels.get(edge.from)?.[edge.fromPort]; + if (upstream) maps.push(`[${upstream.label}]`); + } + + const encodeNode = pipeline.nodes.find(n => n.type === "encode"); + + return { + filterComplex: chains.length > 0 ? chains.join(";") : null, + maps, + extraArgs: [], + encode: encodeNode?.params ?? null, + warnings: result.warnings, + }; +} + +/** + * Fold a compiled pipeline into a job, so the runner needs to know nothing + * about pipelines at all. + */ +function applyToJob(job, pipeline) { + const compiled = compile(pipeline); + const extraArgs = []; + + if (compiled.filterComplex) extraArgs.push("-filter_complex", compiled.filterComplex); + for (const map of compiled.maps) extraArgs.push("-map", map); + + return { + ...job, + pipelineId: pipeline.id, + extraArgs: [...(job.extraArgs ?? []), ...extraArgs], + video: { ...job.video, ...(compiled.encode?.video ?? {}) }, + audio: { ...job.audio, ...(compiled.encode?.audio ?? {}) }, + }; +} + +function num(value) { + const n = Number(value); + return Number.isFinite(n) ? String(n) : "0"; +} + +module.exports = { + PORT, + NODE_TYPES, + createPipeline, + validate, + compile, + applyToJob, + topoSort, +}; diff --git a/src/core/probe.js b/src/core/probe.js new file mode 100644 index 0000000..14f93e4 --- /dev/null +++ b/src/core/probe.js @@ -0,0 +1,142 @@ +"use strict"; + +// ffprobe wrapper. +// +// v1 never set an ffprobe path and never shipped the binary, so no metadata +// was available anywhere in the app. Probing here is treated as *enrichment*, +// not a precondition: a failed probe returns a result with `ok: false` and the +// job stays runnable. Cards render filename and size immediately and fill in +// duration, resolution and codecs when this resolves. + +const { execFile } = require("child_process"); +const { buildProbeArgs } = require("./ffmpeg-args"); + +const PROBE_TIMEOUT_MS = 30000; +const MAX_BUFFER = 8 * 1024 * 1024; + +let ffprobePath = null; + +function setFfprobePath(binaryPath) { + ffprobePath = binaryPath; +} + +function getFfprobePath() { + return ffprobePath; +} + +/** + * Probe a single file. + * Always resolves; never rejects. Check `.ok` before trusting the fields. + */ +function probe(inputPath) { + return new Promise((resolve) => { + if (!ffprobePath) { + resolve({ ok: false, error: "ffprobe path has not been configured.", inputPath }); + return; + } + + execFile( + ffprobePath, + buildProbeArgs(inputPath), + { timeout: PROBE_TIMEOUT_MS, maxBuffer: MAX_BUFFER, windowsHide: true }, + (err, stdout) => { + if (err) { + resolve({ ok: false, error: err.message, inputPath }); + return; + } + try { + resolve(normalise(JSON.parse(stdout), inputPath)); + } catch (parseErr) { + resolve({ ok: false, error: `Could not parse ffprobe output: ${parseErr.message}`, inputPath }); + } + } + ); + }); +} + +/** Flatten ffprobe's raw JSON into the shape the UI actually binds to. */ +function normalise(raw, inputPath) { + const streams = Array.isArray(raw.streams) ? raw.streams : []; + const format = raw.format ?? {}; + + const videoStreams = streams.filter(s => s.codec_type === "video"); + const audioStreams = streams.filter(s => s.codec_type === "audio"); + const subtitleStreams = streams.filter(s => s.codec_type === "subtitle"); + + // Cover art and other attached stills report as video streams with a + // single frame. Treating those as "this file has video" would put a + // resolution badge on an MP3, so they are separated out. + const motionStreams = videoStreams.filter(s => !isAttachedPicture(s)); + const primaryVideo = motionStreams[0] ?? null; + const primaryAudio = audioStreams[0] ?? null; + + const duration = toNumber(format.duration) + ?? toNumber(primaryVideo?.duration) + ?? toNumber(primaryAudio?.duration) + ?? null; + + return { + ok: true, + inputPath, + duration, + size: toNumber(format.size), + bitrate: toNumber(format.bit_rate), + formatName: format.format_name ?? null, + hasVideo: motionStreams.length > 0, + hasAudio: audioStreams.length > 0, + hasSubtitles: subtitleStreams.length > 0, + + video: primaryVideo ? { + codec: primaryVideo.codec_name ?? null, + width: toNumber(primaryVideo.width), + height: toNumber(primaryVideo.height), + fps: parseFrameRate(primaryVideo.avg_frame_rate) ?? parseFrameRate(primaryVideo.r_frame_rate), + pixelFormat: primaryVideo.pix_fmt ?? null, + bitrate: toNumber(primaryVideo.bit_rate), + } : null, + + audio: primaryAudio ? { + codec: primaryAudio.codec_name ?? null, + sampleRate: toNumber(primaryAudio.sample_rate), + channels: toNumber(primaryAudio.channels), + channelLayout: primaryAudio.channel_layout ?? null, + bitrate: toNumber(primaryAudio.bit_rate), + } : null, + + streamCounts: { + video: motionStreams.length, + audio: audioStreams.length, + subtitle: subtitleStreams.length, + }, + }; +} + +function isAttachedPicture(stream) { + if (stream.disposition?.attached_pic === 1) return true; + // Still-image codecs carried inside a media container are cover art. + return ["mjpeg", "png", "bmp", "gif"].includes(stream.codec_name) && !stream.avg_frame_rate?.startsWith("0/"); +} + +/** ffprobe reports frame rates as "30000/1001" rationals. */ +function parseFrameRate(value) { + if (typeof value !== "string" || !value.includes("/")) return null; + const [num, den] = value.split("/").map(Number); + if (!Number.isFinite(num) || !Number.isFinite(den) || den === 0) return null; + const fps = num / den; + if (fps <= 0) return null; + return Math.round(fps * 1000) / 1000; +} + +function toNumber(value) { + if (value == null) return null; + const n = Number(value); + return Number.isFinite(n) ? n : null; +} + +module.exports = { + setFfprobePath, + getFfprobePath, + probe, + normalise, + parseFrameRate, +}; diff --git a/src/core/runner.js b/src/core/runner.js new file mode 100644 index 0000000..62fab5a --- /dev/null +++ b/src/core/runner.js @@ -0,0 +1,375 @@ +"use strict"; + +// The job runner. +// +// v1 ran a strictly sequential `for await` loop in the renderer against a +// single `activeConversion` global in main, so there was exactly one ffmpeg +// process, no per-job identity, and cancel was all-or-nothing. This runner +// owns a concurrency pool, gives every job an id, and can cancel one job +// without touching the others. + +const { EventEmitter } = require("events"); +const { spawn } = require("child_process"); +const fs = require("fs"); +const os = require("os"); + +const { STATUS } = require("./job"); +const { buildArgs } = require("./ffmpeg-args"); +const paths = require("./paths"); + +function defaultConcurrency() { + const cpus = os.cpus()?.length ?? 2; + return Math.max(1, Math.min(4, Math.floor(cpus / 2))); +} + +class JobRunner extends EventEmitter { + /** + * @param {object} options + * @param {string} options.ffmpegPath + * @param {number} [options.concurrency] + * @param {(job, candidatePath) => Promise<{action: string, outputPath?: string}>} [options.conflictResolver] + * Called when a job's conflict policy is "ask". Must resolve to + * { action: "write" | "skip" | "cancel", outputPath }. + */ + constructor(options = {}) { + super(); + this.ffmpegPath = options.ffmpegPath ?? "ffmpeg"; + this.concurrency = options.concurrency ?? defaultConcurrency(); + this.conflictResolver = options.conflictResolver ?? null; + + this.queue = []; // jobs waiting to start + this.active = new Map(); // jobId -> { job, child, outputPath, isDirectory } + this.results = new Map(); // jobId -> result + this.running = false; + this.paused = false; + this._cancelledAll = false; + } + + setConcurrency(n) { + this.concurrency = Math.max(1, Number(n) || 1); + if (this.running && !this.paused) this._pump(); + } + + enqueue(job) { + this.queue.push(job); + if (this.running && !this.paused) this._pump(); + return job.id; + } + + enqueueAll(jobs) { + for (const job of jobs) this.queue.push(job); + if (this.running && !this.paused) this._pump(); + return jobs.map(j => j.id); + } + + start() { + if (this.running) return; + this.running = true; + this.paused = false; + this._cancelledAll = false; + this._pump(); + } + + /** Stop starting new jobs. Jobs already running are left to finish. */ + pause() { + this.paused = true; + this.emit("paused"); + } + + resume() { + if (!this.paused) return; + this.paused = false; + this.emit("resumed"); + this._pump(); + } + + /** Cancel one job, whether it is running or still queued. */ + cancel(jobId) { + const entry = this.active.get(jobId); + if (entry) { + entry.cancelled = true; + try { entry.child.kill(); } catch (_) { /* already gone */ } + return true; + } + + const index = this.queue.findIndex(j => j.id === jobId); + if (index !== -1) { + const [job] = this.queue.splice(index, 1); + this._finish(job, { status: STATUS.CANCELLED }); + return true; + } + return false; + } + + cancelAll() { + this._cancelledAll = true; + + const queued = this.queue.splice(0, this.queue.length); + for (const job of queued) this._finish(job, { status: STATUS.CANCELLED }); + + for (const jobId of [...this.active.keys()]) this.cancel(jobId); + + if (this.active.size === 0) this._checkIdle(); + } + + get pending() { return this.queue.length; } + get activeCount() { return this.active.size; } + + _pump() { + if (!this.running || this.paused) return; + while (this.active.size < this.concurrency && this.queue.length > 0) { + const job = this.queue.shift(); + this._run(job).catch((err) => { + this._finish(job, { status: STATUS.ERROR, error: err.message }); + }); + } + this._checkIdle(); + } + + async _run(job) { + if (this._cancelledAll) { + this._finish(job, { status: STATUS.CANCELLED }); + return; + } + + // -- Decide where this is going --------------------------------------- + let resolved; + try { + resolved = paths.resolveOutputPath(job); + } catch (err) { + this._finish(job, { status: STATUS.ERROR, error: err.message }); + return; + } + + if (resolved.action === "skip") { + this._finish(job, { status: STATUS.SKIPPED, outputPath: resolved.outputPath }); + return; + } + + if (resolved.action === "ask") { + if (!this.conflictResolver) { + // Without a resolver, falling back to a unique name is safer + // than overwriting something the user did not agree to lose. + resolved = { ...resolved, outputPath: resolved.isDirectory + ? paths.getUniqueDirPath(resolved.outputPath) + : paths.getUniquePath(resolved.outputPath) }; + } else { + const answer = await this.conflictResolver(job, resolved.outputPath); + if (!answer || answer.action === "cancel") { + this._finish(job, { status: STATUS.CANCELLED }); + return; + } + if (answer.action === "skip") { + this._finish(job, { status: STATUS.SKIPPED, outputPath: resolved.outputPath }); + return; + } + if (answer.outputPath) resolved = { ...resolved, outputPath: answer.outputPath }; + } + } + + const { outputPath, isDirectory } = resolved; + + try { + paths.ensureParentDir(outputPath, isDirectory); + } catch (err) { + this._finish(job, { status: STATUS.ERROR, error: `Could not create the output folder: ${err.message}` }); + return; + } + + // -- Spawn ------------------------------------------------------------- + let args; + try { + args = buildArgs(job, { outputPath }); + } catch (err) { + this._finish(job, { status: STATUS.ERROR, error: err.message }); + return; + } + + const child = spawn(this.ffmpegPath, args, { windowsHide: true }); + const entry = { job, child, outputPath, isDirectory, cancelled: false, stderr: "" }; + this.active.set(job.id, entry); + + job.status = STATUS.RUNNING; + this.emit("status", { jobId: job.id, status: STATUS.RUNNING }); + + const duration = durationOf(job); + let carry = ""; + + child.stdout.setEncoding("utf8"); + child.stdout.on("data", (chunk) => { + carry += chunk; + const lines = carry.split("\n"); + carry = lines.pop() ?? ""; + const update = parseProgressLines(lines, duration); + if (update) this.emit("progress", { jobId: job.id, ...update }); + }); + + // ffmpeg writes all diagnostics to stderr; keep only the tail so a + // failure has a usable message without buffering an entire log. + child.stderr.setEncoding("utf8"); + child.stderr.on("data", (chunk) => { + entry.stderr = (entry.stderr + chunk).slice(-4000); + }); + + child.on("error", (err) => { + this.active.delete(job.id); + this._cleanupPartial(outputPath, isDirectory); + this._finish(job, { status: STATUS.ERROR, error: `Could not start ffmpeg: ${err.message}` }); + this._pump(); + }); + + child.on("close", (code) => { + this.active.delete(job.id); + + if (entry.cancelled || this._cancelledAll) { + this._cleanupPartial(outputPath, isDirectory); + this._finish(job, { status: STATUS.CANCELLED }); + } else if (code === 0) { + this.emit("progress", { jobId: job.id, percent: 100 }); + this._finish(job, { + status: STATUS.DONE, + outputPath, + isDirectory, + fileCount: isDirectory ? countFiles(outputPath) : 1, + }); + } else { + this._cleanupPartial(outputPath, isDirectory); + this._finish(job, { + status: STATUS.ERROR, + error: lastMeaningfulLine(entry.stderr) || `ffmpeg exited with code ${code}.`, + }); + } + + this._pump(); + }); + } + + _finish(job, result) { + job.status = result.status; + if (result.outputPath) job.outputPath = result.outputPath; + if (result.error) job.error = result.error; + + const payload = { jobId: job.id, ...result }; + this.results.set(job.id, payload); + this.emit("status", payload); + } + + _cleanupPartial(outputPath, isDirectory) { + try { + if (!fs.existsSync(outputPath)) return; + if (isDirectory) fs.rmSync(outputPath, { recursive: true, force: true }); + else fs.unlinkSync(outputPath); + } catch (_) { + // A partial file we cannot remove is not worth failing the job over. + } + } + + _checkIdle() { + if (this.running && this.active.size === 0 && this.queue.length === 0) { + this.running = false; + this.emit("idle", { results: [...this.results.values()] }); + } + } +} + +/** + * Parse a block of `-progress pipe:1` key=value lines. + * Returns null when the block carried nothing worth emitting. + */ +function parseProgressLines(lines, durationSeconds) { + let outTimeUs = null; + let speed = null; + let fps = null; + let ended = false; + + for (const line of lines) { + const eq = line.indexOf("="); + if (eq === -1) continue; + const key = line.slice(0, eq).trim(); + const value = line.slice(eq + 1).trim(); + + switch (key) { + case "out_time_us": + case "out_time_ms": { + // Despite the name, ffmpeg reports out_time_ms in microseconds. + const n = Number(value); + if (Number.isFinite(n) && n >= 0) outTimeUs = n; + break; + } + case "speed": { + const n = parseFloat(value); + if (Number.isFinite(n)) speed = n; + break; + } + case "fps": { + const n = parseFloat(value); + if (Number.isFinite(n)) fps = n; + break; + } + case "progress": + if (value === "end") ended = true; + break; + } + } + + if (outTimeUs === null && !ended) return null; + + const outSeconds = outTimeUs != null ? outTimeUs / 1e6 : null; + + // Without a known duration (still images, some streams) there is nothing + // to divide by, so percent stays null and the UI shows indeterminate + // rather than the frozen 0% v1 displayed. + let percent = null; + if (ended) { + percent = 100; + } else if (durationSeconds && durationSeconds > 0 && outSeconds != null) { + percent = Math.min(99.9, (outSeconds / durationSeconds) * 100); + } + + let eta = null; + if (percent != null && percent < 100 && durationSeconds && speed && speed > 0 && outSeconds != null) { + eta = Math.max(0, (durationSeconds - outSeconds) / speed); + } + + return { + percent: percent != null ? Math.round(percent * 10) / 10 : null, + outSeconds, + speed, + fps, + eta, + }; +} + +function durationOf(job) { + const meta = job.inputMeta; + const { start, end } = job.trim ?? {}; + + if (start != null && end != null && end > start) return end - start; + + const full = meta?.duration ?? null; + if (!full) return end ?? null; + if (start != null) return Math.max(0, full - start); + if (end != null) return Math.min(full, end); + return full; +} + +function countFiles(dirPath) { + try { + return fs.readdirSync(dirPath).length; + } catch (_) { + return 0; + } +} + +/** The last non-empty stderr line, which is where ffmpeg puts the real reason. */ +function lastMeaningfulLine(stderr) { + if (!stderr) return null; + const lines = stderr.split(/\r?\n/).map(l => l.trim()).filter(Boolean); + return lines.length > 0 ? lines[lines.length - 1] : null; +} + +module.exports = { + JobRunner, + parseProgressLines, + defaultConcurrency, +}; diff --git a/src/core/scan.js b/src/core/scan.js new file mode 100644 index 0000000..12817fe --- /dev/null +++ b/src/core/scan.js @@ -0,0 +1,147 @@ +"use strict"; + +// Directory ingest. +// +// v1's only folder handling was a synchronous fs.readdirSync one level deep, +// inside the drop handler, on the UI thread, with nested subfolders enumerated +// and then silently discarded by the format lookup. This walks properly: +// async, recursive, depth-limited, and filtered by the format graph. + +const fs = require("fs/promises"); +const path = require("path"); +const formats = require("./formats"); + +const DEFAULT_MAX_DEPTH = 16; +const DEFAULT_MAX_FILES = 20000; + +/** + * Walk a set of input paths and return the supported media files beneath them. + * + * @param {string[]} inputPaths files and/or directories + * @param {object} [options] + * @param {number} [options.maxDepth] how far to recurse (0 = the given dir only) + * @param {number} [options.maxFiles] stop after this many matches + * @param {string[]} [options.include] extensions to keep (default: all supported) + * @param {string[]} [options.exclude] extensions to drop + * @param {boolean} [options.followSymlinks] + * @param {boolean} [options.recursive] default true + * @returns {Promise<{files: string[], skipped: number, truncated: boolean, errors: object[]}>} + */ +async function scanPaths(inputPaths, options = {}) { + const { + maxDepth = DEFAULT_MAX_DEPTH, + maxFiles = DEFAULT_MAX_FILES, + include = null, + exclude = null, + followSymlinks = false, + recursive = true, + } = options; + + const includeSet = include ? new Set(include.map(e => formats.canonicalExt(e)).filter(Boolean)) : null; + const excludeSet = exclude ? new Set(exclude.map(e => formats.canonicalExt(e)).filter(Boolean)) : null; + + const files = []; + const errors = []; + const seen = new Set(); + let skipped = 0; + let truncated = false; + + const accept = (filePath) => { + const ext = formats.canonicalExt(path.extname(filePath)); + if (!ext) { skipped++; return; } + if (includeSet && !includeSet.has(ext)) { skipped++; return; } + if (excludeSet && excludeSet.has(ext)) { skipped++; return; } + + const key = path.resolve(filePath).toLowerCase(); + if (seen.has(key)) return; + seen.add(key); + + if (files.length >= maxFiles) { truncated = true; return; } + files.push(filePath); + }; + + async function walk(dir, depth) { + if (truncated) return; + + let entries; + try { + entries = await fs.readdir(dir, { withFileTypes: true }); + } catch (err) { + errors.push({ path: dir, error: err.message }); + return; + } + + // Files before directories, so a shallow ingest surfaces usable results + // before it disappears into deep subtrees. + const dirs = []; + for (const entry of entries) { + if (truncated) return; + const full = path.join(dir, entry.name); + + if (entry.isDirectory()) { + dirs.push(full); + } else if (entry.isFile()) { + accept(full); + } else if (entry.isSymbolicLink() && followSymlinks) { + try { + const stat = await fs.stat(full); + if (stat.isDirectory()) dirs.push(full); + else if (stat.isFile()) accept(full); + } catch (err) { + errors.push({ path: full, error: err.message }); + } + } + } + + if (!recursive || depth >= maxDepth) return; + for (const sub of dirs) { + if (truncated) return; + await walk(sub, depth + 1); + } + } + + for (const inputPath of inputPaths) { + if (truncated) break; + let stat; + try { + stat = await fs.stat(inputPath); + } catch (err) { + errors.push({ path: inputPath, error: err.message }); + continue; + } + if (stat.isDirectory()) await walk(inputPath, 0); + else if (stat.isFile()) accept(inputPath); + } + + return { files, skipped, truncated, errors }; +} + +/** + * The common root of a set of paths, used as the mirror root when a folder + * ingest should rebuild its structure in the destination. + */ +function commonRoot(paths) { + if (!paths || paths.length === 0) return null; + if (paths.length === 1) return path.dirname(paths[0]); + + const split = paths.map(p => path.resolve(path.dirname(p)).split(/[\\/]/)); + const first = split[0]; + const shared = []; + + for (let i = 0; i < first.length; i++) { + const segment = first[i]; + if (split.every(parts => parts[i]?.toLowerCase() === segment.toLowerCase())) shared.push(segment); + else break; + } + + if (shared.length === 0) return null; + // A drive-letter-only result ("E:") needs its separator back to be a path. + return shared.length === 1 ? `${shared[0]}${path.sep}` : shared.join(path.sep); +} + +module.exports = { + scanPaths, + commonRoot, + DEFAULT_MAX_DEPTH, + DEFAULT_MAX_FILES, +}; diff --git a/test/core.test.js b/test/core.test.js new file mode 100644 index 0000000..2d81624 --- /dev/null +++ b/test/core.test.js @@ -0,0 +1,631 @@ +"use strict"; + +const test = require("node:test"); +const assert = require("node:assert/strict"); +const os = require("os"); +const fs = require("fs"); +const path = require("path"); + +const formats = require("../src/core/formats"); +const { createJob, patchJob, validateJob, STREAM_MODE, CONFLICT, OUTPUT_ROUTING } = require("../src/core/job"); +const { buildArgs, normaliseBitrate, buildScaleFilter } = require("../src/core/ffmpeg-args"); +const paths = require("../src/core/paths"); +const pipeline = require("../src/core/pipeline"); +const { parseProgressLines } = require("../src/core/runner"); +const { scanPaths, commonRoot } = require("../src/core/scan"); +const probe = require("../src/core/probe"); + +// Find the flag/value pair for a flag, so assertions do not depend on argv order. +function valueOf(args, flag) { + const i = args.indexOf(flag); + return i === -1 ? undefined : args[i + 1]; +} + +// --------------------------------------------------------------------------- +// formats +// --------------------------------------------------------------------------- + +test("formats: canonicalises aliases and rejects unknowns", () => { + assert.equal(formats.canonicalExt(".JPEG"), "jpg"); + assert.equal(formats.canonicalExt("tif"), "tiff"); + assert.equal(formats.canonicalExt("mp4"), "mp4"); + assert.equal(formats.canonicalExt("exe"), null); + assert.equal(formats.canonicalExt(null), null); +}); + +test("formats: expresses the cross-kind conversions v1 could not", () => { + // The whole point of replacing the within-group cross-product. + assert.deepEqual(formats.allowedModes("mp4", "mp3"), [formats.MODE.EXTRACT]); + assert.ok(formats.allowedModes("mp4", "png").includes(formats.MODE.FRAMES)); + assert.deepEqual(formats.allowedModes("png", "mp4"), [formats.MODE.ASSEMBLE]); +}); + +test("formats: animated source into a still target explodes into frames", () => { + // This subsumes v1's hardcoded isGifToStaticImage special case. + assert.equal(formats.defaultMode("gif", "png"), formats.MODE.FRAMES); + assert.ok(formats.producesDirectory(formats.MODE.FRAMES)); + // ...but gif -> animated webp stays a single file. + assert.equal(formats.defaultMode("gif", "webp"), formats.MODE.TRANSCODE); + assert.equal(formats.producesDirectory(formats.MODE.TRANSCODE), false); +}); + +test("formats: audio cannot become video or images", () => { + assert.equal(formats.canConvert("mp3", "mp4"), false); + assert.equal(formats.canConvert("mp3", "png"), false); + assert.equal(formats.canConvert("mp3", "flac"), true); +}); + +test("formats: legacy map stays within-group so the v1 grid is unchanged", () => { + const map = formats.buildLegacyConversionMap(); + assert.equal(Object.keys(map).length, 21); + assert.equal(map.mp4.type, "video"); + assert.equal(map.mp4.targets.length, 7); + assert.ok(map.mp4.targets.every(t => t.group === "Video")); + assert.equal(map.mp3.targets.length, 8); + assert.equal(map.jpg.targets.length, 6); +}); + +// --------------------------------------------------------------------------- +// job +// --------------------------------------------------------------------------- + +test("job: fills defaults from the target format", () => { + const job = createJob({ inputPath: "C:\\in\\clip.mov", targetExt: "mp4" }); + assert.equal(job.sourceExt, "mov"); + assert.equal(job.output.ext, "mp4"); + assert.equal(job.mode, formats.MODE.TRANSCODE); + assert.equal(job.video.codec, "libx264"); + assert.equal(job.audio.codec, "aac"); + assert.equal(job.video.mode, STREAM_MODE.ENCODE); +}); + +test("job: audio target drops video automatically", () => { + const job = createJob({ inputPath: "C:\\in\\clip.mp4", targetExt: "mp3" }); + assert.equal(job.mode, formats.MODE.EXTRACT); + assert.equal(job.video.mode, STREAM_MODE.DROP); + assert.equal(job.audio.mode, STREAM_MODE.ENCODE); +}); + +test("job: image target drops audio automatically", () => { + const job = createJob({ inputPath: "C:\\in\\clip.mp4", targetExt: "png" }); + assert.equal(job.audio.mode, STREAM_MODE.DROP); +}); + +test("job: patch merges nested sections rather than replacing them", () => { + const job = createJob({ inputPath: "a.mp4", targetExt: "mp4" }); + const patched = patchJob(job, { video: { crf: 20 } }); + assert.equal(patched.video.crf, 20); + assert.equal(patched.video.codec, "libx264", "sibling fields must survive the patch"); +}); + +test("job: validation catches impossible combinations", () => { + assert.ok(validateJob(createJob({ inputPath: "a.mp4", targetExt: "mp4" })).valid); + + const noTarget = validateJob(createJob({ inputPath: "a.mp4" })); + assert.equal(noTarget.valid, false); + + const bothDropped = createJob({ inputPath: "a.mp4", targetExt: "mp4" }); + bothDropped.video.mode = STREAM_MODE.DROP; + bothDropped.audio.mode = STREAM_MODE.DROP; + assert.equal(validateJob(bothDropped).valid, false); + + const badCopy = createJob({ inputPath: "a.mp4", targetExt: "png" }); + badCopy.video.mode = STREAM_MODE.COPY; + assert.equal(validateJob(badCopy).valid, false, "PNG cannot stream-copy"); + + const badCodec = createJob({ inputPath: "a.mp4", targetExt: "webm" }); + badCodec.video.codec = "libx264"; + assert.equal(validateJob(badCodec).valid, false, "WebM cannot carry H.264"); + + const badTrim = createJob({ inputPath: "a.mp4", targetExt: "mp4", trim: { start: 10, end: 5 } }); + assert.equal(validateJob(badTrim).valid, false); +}); + +test("job: validation does not require metadata", () => { + // Cards must be valid before the probe returns. + const job = createJob({ inputPath: "a.mp4", targetExt: "mp4" }); + assert.equal(job.inputMeta, null); + assert.ok(validateJob(job).valid); +}); + +// --------------------------------------------------------------------------- +// ffmpeg-args +// --------------------------------------------------------------------------- + +test("args: stream copy remuxes without re-encoding", () => { + const job = createJob({ inputPath: "in.mkv", targetExt: "mp4" }); + job.video.mode = STREAM_MODE.COPY; + job.audio.mode = STREAM_MODE.COPY; + const args = buildArgs(job, { outputPath: "out.mp4" }); + + assert.equal(valueOf(args, "-c:v"), "copy"); + assert.equal(valueOf(args, "-c:a"), "copy"); + assert.ok(!args.includes("-crf")); + assert.equal(args[args.length - 1], "out.mp4"); +}); + +test("args: re-encode carries crf, preset and a compatible pixel format", () => { + const job = createJob({ inputPath: "in.mov", targetExt: "mp4" }); + job.video.crf = 21; + job.video.preset = "slow"; + job.audio.bitrate = 192; + const args = buildArgs(job, { outputPath: "out.mp4" }); + + assert.equal(valueOf(args, "-c:v"), "libx264"); + assert.equal(valueOf(args, "-crf"), "21"); + assert.equal(valueOf(args, "-preset"), "slow"); + assert.equal(valueOf(args, "-pix_fmt"), "yuv420p"); + assert.equal(valueOf(args, "-b:a"), "192k"); + assert.equal(valueOf(args, "-movflags"), "+faststart"); +}); + +test("args: VP9 releases the bitrate cap so -crf is constant quality", () => { + const job = createJob({ inputPath: "in.mp4", targetExt: "webm" }); + job.video.crf = 30; + const args = buildArgs(job, { outputPath: "out.webm" }); + assert.equal(valueOf(args, "-crf"), "30"); + assert.equal(valueOf(args, "-b:v"), "0"); +}); + +test("args: trim seeks on the input and bounds with a duration", () => { + const job = createJob({ inputPath: "in.mp4", targetExt: "mp4", trim: { start: 5, end: 12.5 } }); + const args = buildArgs(job, { outputPath: "out.mp4" }); + + assert.equal(valueOf(args, "-ss"), "5"); + assert.equal(valueOf(args, "-t"), "7.5", "duration counts from the seek point"); + assert.ok(args.indexOf("-ss") < args.indexOf("-i"), "-ss must precede -i for a fast seek"); + assert.ok(args.indexOf("-t") > args.indexOf("-i"), "-t must follow -i"); +}); + +test("args: audio extraction drops video entirely", () => { + const job = createJob({ inputPath: "in.mp4", targetExt: "mp3" }); + const args = buildArgs(job, { outputPath: "out.mp3" }); + assert.ok(args.includes("-vn")); + assert.equal(valueOf(args, "-c:a"), "libmp3lame"); +}); + +test("args: resize honours the fit mode", () => { + const contain = createJob({ inputPath: "in.mp4", targetExt: "mp4" }); + contain.video.width = 1280; contain.video.height = 720; + assert.equal(valueOf(buildArgs(contain, { outputPath: "o.mp4" }), "-vf"), + "scale=1280:720:force_original_aspect_ratio=decrease"); + + const cover = patchJob(contain, { video: { fitMode: "cover" } }); + assert.equal(valueOf(buildArgs(cover, { outputPath: "o.mp4" }), "-vf"), + "scale=1280:720:force_original_aspect_ratio=increase,crop=1280:720"); + + const stretch = patchJob(contain, { video: { fitMode: "stretch" } }); + assert.equal(valueOf(buildArgs(stretch, { outputPath: "o.mp4" }), "-vf"), "scale=1280:720"); +}); + +test("args: a single axis keeps the result divisible by two", () => { + assert.equal(buildScaleFilter({ video: { width: 640 } }), "scale=640:-2"); + assert.equal(buildScaleFilter({ video: { height: 480 } }), "scale=-2:480"); + assert.equal(buildScaleFilter({ video: {} }), null); +}); + +test("args: image quality uses the target format's own flag and scale", () => { + const jpg = createJob({ inputPath: "in.png", targetExt: "jpg" }); + assert.equal(valueOf(buildArgs(jpg, { outputPath: "o.jpg" }), "-q:v"), "3"); + + const png = createJob({ inputPath: "in.jpg", targetExt: "png" }); + assert.equal(valueOf(buildArgs(png, { outputPath: "o.png" }), "-compression_level"), "6"); + + const webp = createJob({ inputPath: "in.png", targetExt: "webp" }); + assert.equal(valueOf(buildArgs(webp, { outputPath: "o.webp" }), "-quality"), "80"); + + // Out-of-range values are clamped to the format's own bounds. + const clamped = patchJob(jpg, { image: { quality: 99 } }); + assert.equal(valueOf(buildArgs(clamped, { outputPath: "o.jpg" }), "-q:v"), "31"); +}); + +test("args: frame extraction writes a numbered pattern inside the output dir", () => { + const job = createJob({ inputPath: "in.gif", targetExt: "png" }); + assert.equal(job.mode, formats.MODE.FRAMES); + const args = buildArgs(job, { outputPath: path.join("C:", "out", "clip") }); + + assert.ok(args[args.length - 1].endsWith(`frame_%04d.png`)); + assert.equal(valueOf(args, "-fps_mode"), "passthrough"); +}); + +test("args: GIF output builds a palette so it is not a 256-colour mess", () => { + const job = createJob({ inputPath: "in.mp4", targetExt: "gif" }); + job.video.fps = 15; + const args = buildArgs(job, { outputPath: "out.gif" }); + const fc = valueOf(args, "-filter_complex"); + + assert.ok(fc.includes("palettegen")); + assert.ok(fc.includes("paletteuse")); + assert.ok(fc.includes("fps=15"), "preceding filters must survive into the palette chain"); + assert.ok(!args.includes("-vf"), "the palette chain replaces -vf, it does not coexist with it"); +}); + +test("args: assembling stills into video loops a single image", () => { + const job = createJob({ inputPath: "still.png", targetExt: "mp4" }); + assert.equal(job.mode, formats.MODE.ASSEMBLE); + const args = buildArgs(job, { outputPath: "out.mp4" }); + assert.ok(args.includes("-loop")); + assert.equal(valueOf(args, "-framerate"), "25"); +}); + +test("args: progress is machine-readable by default", () => { + const job = createJob({ inputPath: "in.mp4", targetExt: "mp4" }); + const args = buildArgs(job, { outputPath: "o.mp4" }); + assert.equal(valueOf(args, "-progress"), "pipe:1"); + assert.ok(args.includes("-nostats")); + + const quiet = buildArgs(job, { outputPath: "o.mp4", progress: false }); + assert.ok(!quiet.includes("-progress")); +}); + +test("args: bitrate accepts the forms a UI will actually produce", () => { + assert.equal(normaliseBitrate(192), "192k"); + assert.equal(normaliseBitrate("192k"), "192k"); + assert.equal(normaliseBitrate(192000), "192k"); + assert.equal(normaliseBitrate("320K"), "320k"); +}); + +test("args: an unresolvable output path is a hard error, not a silent skip", () => { + const job = createJob({ inputPath: "in.mp4", targetExt: "mp4" }); + assert.throws(() => buildArgs(job, {}), /outputPath/); +}); + +// --------------------------------------------------------------------------- +// paths +// --------------------------------------------------------------------------- + +test("paths: name templating expands the documented tokens", () => { + const now = new Date(2026, 7, 27, 14, 5, 9); + const out = paths.applyNameTemplate("{name}_{src}-to-{ext}_{index}_{date}_{time}", { + name: "holiday", src: "mov", ext: "mp4", index: 3, now, + }); + assert.equal(out, "holiday_mov-to-mp4_3_2026-08-27_140509"); +}); + +test("paths: unknown tokens are left visible rather than silently blanked", () => { + assert.equal(paths.applyNameTemplate("{name}-{nope}", { name: "a" }), "a-{nope}"); +}); + +test("paths: names are made safe for Windows", () => { + assert.equal(paths.sanitiseName('ac:d"e/f\\g|h?i*j'), "a_b_c_d_e_f_g_h_i_j"); + assert.equal(paths.sanitiseName("trailing dots..."), "trailing dots"); + assert.equal(paths.sanitiseName(" "), "output"); +}); + +test("paths: mirror routing rebuilds the source tree under the destination", () => { + const job = createJob({ + inputPath: path.join("C:", "src", "a", "b", "clip.mov"), + targetExt: "mp4", + output: { + routing: OUTPUT_ROUTING.MIRROR, + mirrorRoot: path.join("C:", "src"), + dir: path.join("D:", "out"), + }, + }); + assert.equal(paths.resolveOutputDir(job), path.join("D:", "out", "a", "b")); +}); + +test("paths: alongside routing reproduces v1 behaviour exactly", () => { + const job = createJob({ inputPath: path.join("C:", "src", "clip.mov"), targetExt: "mp4" }); + assert.equal(paths.resolveOutputDir(job), path.join("C:", "src")); +}); + +test("paths: conflict policies resolve against the real filesystem", () => { + const dir = fs.mkdtempSync(path.join(os.tmpdir(), "dfc-paths-")); + try { + const input = path.join(dir, "clip.mov"); + fs.writeFileSync(input, ""); + fs.writeFileSync(path.join(dir, "clip.mp4"), ""); // the collision + + const base = { inputPath: input, targetExt: "mp4" }; + + const unique = paths.resolveOutputPath(createJob({ ...base, output: { onConflict: CONFLICT.UNIQUE } })); + assert.equal(unique.action, "write"); + assert.equal(path.basename(unique.outputPath), "clip (1).mp4"); + + const overwrite = paths.resolveOutputPath(createJob({ ...base, output: { onConflict: CONFLICT.OVERWRITE } })); + assert.equal(overwrite.action, "write"); + assert.equal(path.basename(overwrite.outputPath), "clip.mp4"); + + assert.equal(paths.resolveOutputPath(createJob({ ...base, output: { onConflict: CONFLICT.SKIP } })).action, "skip"); + assert.equal(paths.resolveOutputPath(createJob({ ...base, output: { onConflict: CONFLICT.ASK } })).action, "ask"); + + // No collision at all, so the policy never comes into play. + const clean = paths.resolveOutputPath(createJob({ ...base, targetExt: "mkv" })); + assert.equal(clean.action, "write"); + assert.equal(path.basename(clean.outputPath), "clip.mkv"); + } finally { + fs.rmSync(dir, { recursive: true, force: true }); + } +}); + +test("paths: frame extraction resolves to a directory, not a file", () => { + const job = createJob({ inputPath: path.join("C:", "src", "loop.gif"), targetExt: "png" }); + const resolved = paths.resolveOutputPath(job); + assert.equal(resolved.isDirectory, true); + assert.equal(path.basename(resolved.outputPath), "loop"); +}); + +// --------------------------------------------------------------------------- +// pipeline +// --------------------------------------------------------------------------- + +function linearPipeline() { + return pipeline.createPipeline({ + name: "scale then output", + nodes: [ + { id: "in", type: "input" }, + { id: "sc", type: "scale", params: { width: 640, height: 360, fitMode: "contain" } }, + { id: "out", type: "output" }, + ], + edges: [ + { from: "in", fromPort: "video", to: "sc", toPort: "in" }, + { from: "sc", fromPort: "out", to: "out", toPort: "video" }, + { from: "in", fromPort: "audio", to: "out", toPort: "audio" }, + ], + }); +} + +test("pipeline: a linear graph compiles to filter_complex and maps", () => { + const compiled = pipeline.compile(linearPipeline()); + assert.match(compiled.filterComplex, /^\[0:v\]scale=640:360:force_original_aspect_ratio=decrease\[v\d\]$/); + assert.equal(compiled.maps.length, 2); + assert.ok(compiled.maps.some(m => m === "[0:a]"), "audio passes straight through"); +}); + +test("pipeline: cycles are rejected", () => { + const cyclic = pipeline.createPipeline({ + nodes: [ + { id: "in", type: "input" }, + { id: "a", type: "fps", params: { fps: 30 } }, + { id: "b", type: "fps", params: { fps: 60 } }, + { id: "out", type: "output" }, + ], + edges: [ + { from: "in", fromPort: "video", to: "a", toPort: "in" }, + { from: "a", fromPort: "out", to: "b", toPort: "in" }, + { from: "b", fromPort: "out", to: "a", toPort: "in" }, // the cycle + { from: "b", fromPort: "out", to: "out", toPort: "video" }, + ], + }); + + const result = pipeline.validate(cyclic); + assert.equal(result.valid, false); + assert.ok(result.errors.some(e => /cycle/i.test(e))); + assert.throws(() => pipeline.compile(cyclic), /not valid/); +}); + +test("pipeline: mismatched port types are rejected", () => { + const bad = pipeline.createPipeline({ + nodes: [ + { id: "in", type: "input" }, + { id: "v", type: "volume", params: { volume: 2 } }, + { id: "out", type: "output" }, + ], + edges: [ + { from: "in", fromPort: "video", to: "v", toPort: "in" }, // video into an audio filter + { from: "v", fromPort: "out", to: "out", toPort: "audio" }, + ], + }); + const result = pipeline.validate(bad); + assert.equal(result.valid, false); + assert.ok(result.errors.some(e => /Cannot connect video output/.test(e))); +}); + +test("pipeline: missing required settings are rejected", () => { + const bad = pipeline.createPipeline({ + nodes: [ + { id: "in", type: "input" }, + { id: "c", type: "crop", params: { width: 100 } }, // height missing + { id: "out", type: "output" }, + ], + edges: [ + { from: "in", fromPort: "video", to: "c", toPort: "in" }, + { from: "c", fromPort: "out", to: "out", toPort: "video" }, + ], + }); + const result = pipeline.validate(bad); + assert.equal(result.valid, false); + assert.ok(result.errors.some(e => /height/.test(e))); +}); + +test("pipeline: a graph with no output node is rejected", () => { + const bad = pipeline.createPipeline({ nodes: [{ id: "in", type: "input" }], edges: [] }); + assert.equal(pipeline.validate(bad).valid, false); +}); + +test("pipeline: disconnected nodes warn but do not fail", () => { + const graph = linearPipeline(); + graph.nodes.push({ id: "orphan", type: "fps", params: { fps: 10 } }); + const result = pipeline.validate(graph); + assert.equal(result.valid, true); + assert.ok(result.warnings.some(w => /orphan/.test(w))); +}); + +test("pipeline: an ANY-typed node takes its type from what feeds it", () => { + const graph = pipeline.createPipeline({ + nodes: [ + { id: "in", type: "input" }, + { id: "t", type: "trim", params: { start: 1, end: 4 } }, + { id: "out", type: "output" }, + ], + edges: [ + { from: "in", fromPort: "audio", to: "t", toPort: "in" }, + { from: "t", fromPort: "out", to: "out", toPort: "audio" }, + ], + }); + const compiled = pipeline.compile(graph); + assert.match(compiled.filterComplex, /atrim=start=1:end=4,asetpts=PTS-STARTPTS/); +}); + +test("pipeline: a no-op node forwards its input instead of emitting an empty link", () => { + const graph = pipeline.createPipeline({ + nodes: [ + { id: "in", type: "input" }, + { id: "t", type: "trim", params: {} }, // no bounds set + { id: "out", type: "output" }, + ], + edges: [ + { from: "in", fromPort: "video", to: "t", toPort: "in" }, + { from: "t", fromPort: "out", to: "out", toPort: "video" }, + ], + }); + const compiled = pipeline.compile(graph); + assert.equal(compiled.filterComplex, null); + assert.deepEqual(compiled.maps, ["[0:v]"]); +}); + +test("pipeline: applying to a job produces runnable ffmpeg args", () => { + const job = createJob({ inputPath: "in.mp4", targetExt: "mp4" }); + const piped = pipeline.applyToJob(job, linearPipeline()); + const args = buildArgs(piped, { outputPath: "out.mp4" }); + + assert.ok(args.includes("-filter_complex")); + assert.equal(args.filter(a => a === "-map").length, 2); +}); + +// --------------------------------------------------------------------------- +// runner progress parsing +// --------------------------------------------------------------------------- + +test("runner: progress is derived from out_time against a known duration", () => { + const update = parseProgressLines( + ["out_time_us=5000000", "speed=2.0x", "fps=48.0", "progress=continue"], + 10 + ); + assert.equal(update.percent, 50); + assert.equal(update.speed, 2); + assert.equal(update.fps, 48); + assert.equal(update.eta, 2.5); +}); + +test("runner: unknown duration yields indeterminate progress, not a frozen zero", () => { + // This is exactly the case where v1's bar sat at 0% for the whole job. + const update = parseProgressLines(["out_time_us=1000000", "progress=continue"], null); + assert.equal(update.percent, null); + assert.equal(update.outSeconds, 1); +}); + +test("runner: the end marker completes even without a duration", () => { + assert.equal(parseProgressLines(["progress=end"], null).percent, 100); +}); + +test("runner: progress never reaches 100 before the end marker", () => { + const update = parseProgressLines(["out_time_us=20000000", "progress=continue"], 10); + assert.ok(update.percent < 100); +}); + +test("runner: uninteresting blocks are dropped", () => { + assert.equal(parseProgressLines(["bitrate=N/A", "garbage"], 10), null); +}); + +// --------------------------------------------------------------------------- +// scan +// --------------------------------------------------------------------------- + +test("scan: walks recursively and filters by the format graph", async () => { + const root = fs.mkdtempSync(path.join(os.tmpdir(), "dfc-scan-")); + try { + fs.mkdirSync(path.join(root, "nested", "deep"), { recursive: true }); + fs.writeFileSync(path.join(root, "a.mp3"), ""); + fs.writeFileSync(path.join(root, "notes.txt"), ""); + fs.writeFileSync(path.join(root, "nested", "b.mp4"), ""); + fs.writeFileSync(path.join(root, "nested", "deep", "c.png"), ""); + + const all = await scanPaths([root]); + assert.equal(all.files.length, 3, "v1 would have found only the top-level file"); + assert.equal(all.skipped, 1, "the .txt is skipped"); + + const shallow = await scanPaths([root], { recursive: false }); + assert.equal(shallow.files.length, 1); + + const depthOne = await scanPaths([root], { maxDepth: 1 }); + assert.equal(depthOne.files.length, 2); + + const onlyAudio = await scanPaths([root], { include: ["mp3"] }); + assert.equal(onlyAudio.files.length, 1); + + const noImages = await scanPaths([root], { exclude: ["png"] }); + assert.equal(noImages.files.length, 2); + + const capped = await scanPaths([root], { maxFiles: 2 }); + assert.equal(capped.files.length, 2); + assert.equal(capped.truncated, true); + } finally { + fs.rmSync(root, { recursive: true, force: true }); + } +}); + +test("scan: deduplicates and reports unreadable paths without throwing", async () => { + const root = fs.mkdtempSync(path.join(os.tmpdir(), "dfc-scan2-")); + try { + const file = path.join(root, "a.mp3"); + fs.writeFileSync(file, ""); + + const result = await scanPaths([file, file, path.join(root, "missing.mp4")]); + assert.equal(result.files.length, 1); + assert.equal(result.errors.length, 1); + } finally { + fs.rmSync(root, { recursive: true, force: true }); + } +}); + +test("scan: common root finds the shared ancestor for mirrored output", () => { + const a = path.join("C:", "media", "a", "one.mp4"); + const b = path.join("C:", "media", "b", "two.mp4"); + assert.equal(commonRoot([a, b]), path.join("C:", "media")); + assert.equal(commonRoot([a]), path.join("C:", "media", "a")); + assert.equal(commonRoot([]), null); +}); + +// --------------------------------------------------------------------------- +// probe +// --------------------------------------------------------------------------- + +test("probe: normalises ffprobe JSON into the shape the UI binds to", () => { + const raw = { + format: { duration: "12.5", size: "1048576", bit_rate: "800000", format_name: "mov,mp4,m4a" }, + streams: [ + { codec_type: "video", codec_name: "h264", width: 1920, height: 1080, avg_frame_rate: "30000/1001", pix_fmt: "yuv420p" }, + { codec_type: "audio", codec_name: "aac", sample_rate: "48000", channels: 2, channel_layout: "stereo" }, + ], + }; + const meta = probe.normalise(raw, "clip.mp4"); + + assert.equal(meta.ok, true); + assert.equal(meta.duration, 12.5); + assert.equal(meta.hasVideo, true); + assert.equal(meta.hasAudio, true); + assert.equal(meta.video.width, 1920); + assert.equal(meta.video.fps, 29.97); + assert.equal(meta.audio.channels, 2); +}); + +test("probe: cover art does not make an MP3 look like a video", () => { + const raw = { + format: { duration: "180" }, + streams: [ + { codec_type: "video", codec_name: "mjpeg", width: 600, height: 600, disposition: { attached_pic: 1 } }, + { codec_type: "audio", codec_name: "mp3", sample_rate: "44100", channels: 2 }, + ], + }; + const meta = probe.normalise(raw, "song.mp3"); + assert.equal(meta.hasVideo, false); + assert.equal(meta.streamCounts.video, 0); +}); + +test("probe: rational frame rates parse, degenerate ones do not", () => { + assert.equal(probe.parseFrameRate("30000/1001"), 29.97); + assert.equal(probe.parseFrameRate("25/1"), 25); + assert.equal(probe.parseFrameRate("0/0"), null); + assert.equal(probe.parseFrameRate("N/A"), null); +}); + +test("probe: an unconfigured binary degrades instead of throwing", async () => { + const before = probe.getFfprobePath(); + probe.setFfprobePath(null); + const result = await probe.probe("anything.mp4"); + assert.equal(result.ok, false); + assert.match(result.error, /not been configured/); + probe.setFfprobePath(before); +}); From bcdb2c9a4674a17b728d3f457b48038c3d40446b Mon Sep 17 00:00:00 2001 From: Will Knowles Date: Thu, 27 Aug 2026 19:37:49 +0100 Subject: [PATCH 03/81] feat: move the renderer behind a context-isolated bridge, add token layer The renderer ran with nodeIntegration:true and contextIsolation:false and no preload, requiring fs, path and electron directly. It now has no Node access at all; everything goes through window.electronAPI, matching the name the Dropgate client already uses. - preload.js exposes the bridge. It runs sandboxed, where require() is limited to a small allowlist, so its channel names are inlined rather than imported from constants.js. Requiring anything else there silently leaves window.electronAPI undefined and the app inert with no error in main, so test/preload.test.js guards both the allowlist and channel-name drift. - IPC channels are namespaced by domain. Progress and status now carry a jobId, which is what makes concurrency possible; v1 pushed a bare integer with no way to tell which file it belonged to. The convert result is an object rather than an overloaded string|'cancelled'|null whose string could be either a file or a directory. - The renderer no longer stats the filesystem to discover whether an output was a folder of frames; the result carries isDirectory and fileCount. - Directory expansion on drop moves to the main process. - Add a document-level drop guard. Dropping outside the zone previously navigated the window to the file, replacing the app with it. - Fix dragleave firing on child boundaries, which made the highlight flicker. - credits.html loses its require() and inline onclick handlers. - Handle file associations properly: parse argv, add an open-file handler, and forward paths from second-instance, which previously discarded them so 'Open with' on a running app did nothing. Explorer spawns one process per selected file, so arrivals are debounced. - Extend electron-store beyond windowBounds with a real settings schema. - Remove dead code: the unused get-version/get-setting/set-setting handlers, the globalShortcut import, and the .btn-accent, .bg-accent and .btn-format-disabled rules. styles/tokens.css is the first real token layer in any of these apps, and it fixes a live bug: --bs-primary was remapped to the accent only inside [data-bs-theme=dark], so the primary Convert button rendered Bootstrap blue in light mode and green in dark. It is now bound in both themes and on the bare :root, which also covers the system-default case. --- src/constants.js | 136 ++++++------ src/credits.html | 41 ++-- src/index.html | 1 + src/main.js | 474 +++++++++++++++++++++++++----------------- src/preload.js | 126 +++++++++++ src/renderer.js | 172 ++++++++++----- src/styles.css | 74 +++---- src/styles/tokens.css | 95 +++++++++ test/preload.test.js | 130 ++++++++++++ 9 files changed, 865 insertions(+), 384 deletions(-) create mode 100644 src/preload.js create mode 100644 src/styles/tokens.css create mode 100644 test/preload.test.js diff --git a/src/constants.js b/src/constants.js index 56b1271..a04297f 100644 --- a/src/constants.js +++ b/src/constants.js @@ -7,19 +7,51 @@ const LOG = { DEBUG: "DEBUG", }; -// ipc channel names +// IPC channel names. +// +// Namespaced by domain. v1 kept a flat map that also carried an +// electron-updater event name ("update-available") alongside real IPC +// channels, which made the two easy to confuse. const IPC = { - GET_VERSION: "get-version", - GET_SETTING: "get-setting", - SET_SETTING: "set-setting", - UPDATE_AVAILABLE: "update-available", - BROWSE_FILE: "browse-file", - CONVERT_FILE: "convert-file", - CANCEL_CONVERT: "cancel-convert", - OPEN_FOLDER: "open-folder", - SHOW_IN_FOLDER: "show-in-folder", - CONVERSION_PROGRESS: "conversion-progress", // push: percent (0-100) - FILE_OPENED_FROM_MENU: "file-opened-from-menu", // push: file path string + // Jobs and the queue. Progress and status both carry a jobId, which is + // what makes concurrency possible at all; v1 pushed a bare integer with + // no way to tell which file it belonged to. + JOB_RUN: "job:run", // invoke(job) -> result + JOB_CANCEL: "job:cancel", // invoke(jobId) -> boolean + JOB_PROGRESS: "job:progress", // push { jobId, percent, speed, fps, eta } + JOB_STATUS: "job:status", // push { jobId, status, outputPath?, error? } + QUEUE_CANCEL_ALL: "queue:cancel-all", + QUEUE_SET_CONCURRENCY: "queue:set-concurrency", + + // Inspection and ingest. + PROBE_FILE: "probe:file", // invoke(path) -> metadata + FS_SCAN: "fs:scan", // invoke(paths, opts) -> { files, skipped, ... } + + // Dialogs. + DIALOG_BROWSE_FILES: "dialog:browse-files", + DIALOG_BROWSE_FOLDER: "dialog:browse-folder", + DIALOG_CHOOSE_OUTPUT: "dialog:choose-output", + + // Presets and pipelines. The store is wired; the editors are TODO. + PRESET_LIST: "preset:list", + PRESET_SAVE: "preset:save", + PRESET_DELETE: "preset:delete", + PIPELINE_LIST: "pipeline:list", + PIPELINE_SAVE: "pipeline:save", + PIPELINE_DELETE: "pipeline:delete", + PIPELINE_VALIDATE: "pipeline:validate", + + // Shell and app. + SHELL_OPEN_PATH: "shell:open-path", + SHELL_SHOW_IN_FOLDER: "shell:show-in-folder", + SHELL_OPEN_EXTERNAL: "shell:open-external", + APP_GET_VERSION: "app:get-version", + APP_GET_FORMATS: "app:get-formats", + SETTINGS_GET: "settings:get", + SETTINGS_SET: "settings:set", + + // Pushed from main. + FILES_OPENED: "files:opened", // push: string[] of paths from menu/argv/shell }; // window size constraints @@ -30,68 +62,26 @@ const WINDOW = { MIN_HEIGHT: 600, }; -// to add a new format, add an entry with ext and label to the appropriate array -// to add a new format, group add a new array and call buildEntries in CONVERSION_MAP -const AUDIO_FORMATS = [ - { ext: "mp3", label: "MP3" }, - { ext: "wav", label: "WAV" }, - { ext: "flac", label: "FLAC" }, - { ext: "ogg", label: "OGG" }, - { ext: "aac", label: "AAC" }, - { ext: "m4a", label: "M4A" }, - { ext: "opus", label: "OPUS" }, - { ext: "wma", label: "WMA" }, -]; - -const VIDEO_FORMATS = [ - { ext: "mp4", label: "MP4" }, - { ext: "mkv", label: "MKV" }, - { ext: "webm", label: "WebM" }, - { ext: "avi", label: "AVI" }, - { ext: "mov", label: "MOV" }, - { ext: "wmv", label: "WMV" }, - { ext: "flv", label: "FLV" }, -]; +// Windows spawns one process per file when several are selected in Explorer, +// so incoming paths are collected before being handed to the renderer. +const ARGV_BATCH_DEBOUNCE_MS = 500; -const IMAGE_FORMATS = [ - { ext: "jpg", label: "JPG" }, - { ext: "png", label: "PNG" }, - { ext: "webp", label: "WebP" }, - { ext: "gif", label: "GIF" }, - { ext: "bmp", label: "BMP" }, - { ext: "tiff", label: "TIFF" }, -]; - -function buildEntries(formats, type, group) { - const entries = {}; - for (const fmt of formats) { - entries[fmt.ext] = { - type, - targets: formats.map(f => ({ ...f, group })) - }; - } - return entries; -} - -const CONVERSION_MAP = { - ...buildEntries(AUDIO_FORMATS, "audio", "Audio"), - ...buildEntries(VIDEO_FORMATS, "video", "Video"), - ...buildEntries(IMAGE_FORMATS, "image", "Image"), +// Defaults written into electron-store on first run. v1 persisted nothing but +// windowBounds, so there were no user settings at all. +const SETTINGS_DEFAULTS = { + outputRouting: "alongside", + outputDir: null, + onConflict: "unique", + concurrency: null, // null = derive from the CPU count + nameTemplate: "{name}", + lastTargetByKind: {}, }; -const SUPPORTED_EXTENSIONS = Object.keys(CONVERSION_MAP); - -// extension aliases, maps alternate extensions to their canonical key in CONVERSION_MAP -const EXT_ALIASES = { - jpeg: "jpg", - tif: "tiff", - jfif: "jpg", +module.exports = { + APP_NAME, + IPC, + WINDOW, + LOG, + ARGV_BATCH_DEBOUNCE_MS, + SETTINGS_DEFAULTS, }; - -const STATIC_IMAGE_EXTS = new Set(["jpg", "png", "webp", "bmp", "tiff"]); - -function isGifToStaticImage(sourceExt, targetExt) { - return sourceExt === "gif" && STATIC_IMAGE_EXTS.has(targetExt); -} - -module.exports = { APP_NAME, IPC, WINDOW, LOG, AUDIO_FORMATS, VIDEO_FORMATS, IMAGE_FORMATS, CONVERSION_MAP, SUPPORTED_EXTENSIONS, EXT_ALIASES, isGifToStaticImage }; diff --git a/src/credits.html b/src/credits.html index d743595..5aafab8 100644 --- a/src/credits.html +++ b/src/credits.html @@ -6,17 +6,17 @@ Diamond File Converter | Credits + - @@ -27,8 +27,8 @@

Diamond File Converter

-

• Created and maintained by Diamond Digital Development.

-

• Logo designed by TheFuturisticIdiot.

+

• Created and maintained by Diamond Digital Development.

+

• Logo designed by TheFuturisticIdiot.

• This software is licensed under the Apache 2.0 license.

• If you enjoy this software, consider donating to support development!

@@ -40,18 +40,29 @@

Diamond File Converter

diff --git a/src/index.html b/src/index.html index ea7cd5d..5518e22 100644 --- a/src/index.html +++ b/src/index.html @@ -6,6 +6,7 @@ Diamond File Converter + - + -
+
-
- -

Diamond File Converter

+
+

Diamond File Converter

+
+ + +
+
-
-
+ +
+
upload_file -

Drag & Drop Files Here

+

Drag & Drop Files or Folders Here

or

-
- add_circle_outline -

-

drag and drop more files or

-
- - -
-
-
- -
-
-
- -
-

Convert to:

-
-
- -
-
-
-

-
-
-
-
- - sync - Converting... - - 0% + +
+ checklist + +
+ + + +
+ +
-
-
-
-
- check_circle - + +
+
+
+ + +
+
+
+ + +
+
+
-
-
-
- -
+
+ + + +
+
+
+ + + diff --git a/src/main.js b/src/main.js index b58b682..920a83a 100644 --- a/src/main.js +++ b/src/main.js @@ -341,15 +341,11 @@ ipcMain.handle(IPC.JOB_RUN, async (_event, spec) => { const result = await runJobToCompletion(job); + // Failures are reported on the card and in a toast, not as a blocking + // dialog. v1 opened one modal per failed file mid-queue, which with a + // concurrency pool would stack several at once and halt the whole batch. if (result.status === STATUS.ERROR) { log(LOG.ERROR, `Conversion failed for ${job.inputPath}: ${result.error}`); - dialog.showMessageBox(mainWindow, { - type: "error", - title: "Conversion Failed", - message: `Could not convert ${path.basename(job.inputPath)}.`, - detail: result.error ?? "ffmpeg did not report a reason.", - buttons: ["OK"], - }); } return result; @@ -403,6 +399,11 @@ ipcMain.handle(IPC.APP_GET_FORMATS, () => ({ conversionMap: formats.buildLegacyConversionMap(), aliases: formats.EXT_ALIASES, supported: formats.SUPPORTED_EXTENSIONS, + // The full capability graph, including cross-kind targets. core/display.js + // takes this as an argument because the renderer cannot require formats.js. + targetsByExt: Object.fromEntries( + formats.SUPPORTED_EXTENSIONS.map(ext => [ext, formats.targetsFor(ext)]) + ), })); ipcMain.handle(IPC.SETTINGS_GET, () => store.get("settings")); diff --git a/src/renderer.js b/src/renderer.js index 505347a..b60f8e9 100644 --- a/src/renderer.js +++ b/src/renderer.js @@ -1,429 +1,652 @@ -// Renderer. +// Renderer — job card grid. // -// Runs with contextIsolation on and no Node access. Everything that used to be -// a require() now goes through window.electronAPI / window.pathAPI, exposed by -// preload.js. +// Runs with contextIsolation on and no Node access. Everything reaches the main +// process through window.electronAPI, exposed by preload.js. +// +// The v1 UI was a single-column list with one shared target format per media +// kind and a strictly sequential convert loop. This is a grid of independently +// configurable job cards that run through the runner's concurrency pool. const api = window.electronAPI; const p = window.pathAPI; -let jobs = []; -// each job: { id, filePath, ext, type, targetExt, status, progress, outputPath, isDirectory, fileCount, error } -// status: "pending" | "converting" | "done" | "error" | "cancelled" - -let selectedFormats = {}; -// keyed by type: { audio: "mp3", video: null, image: "jpg" } - -let cancelRequested = false; -let activeJobId = null; +// -- State ------------------------------------------------------------------- -// Populated from the main process at startup, so the format graph has a single -// source of truth instead of being duplicated on both sides of the bridge. -let CONVERSION_MAP = {}; -let EXT_ALIASES = {}; +/** @type {Array<{id,filePath,ext,kind,targetExt,meta,status,progress,error,outputPath,isDirectory,fileCount}>} */ +let jobs = []; +let selection = new Set(); +let selectionAnchor = null; +let converting = false; -const actionAreas = ["convert", "progress", "done"]; +// Loaded as a plain script by index.html — the renderer has no Node access, +// and functions cannot cross the IPC bridge, so it cannot be required. +const display = window.display; -function generateId() { - return Math.random().toString(36).slice(2, 9); -} +// Populated from main at startup so the format graph has one source of truth. +let FORMATS = null; +let TARGETS = null; -const TYPE_ORDER = { video: 0, audio: 1, image: 2 }; -const TYPE_ICONS = { audio: "audio_file", video: "video_file", image: "image" }; +const el = {}; -function sortJobs() { - jobs.sort((a, b) => { - const byType = (TYPE_ORDER[a.type] ?? 99) - (TYPE_ORDER[b.type] ?? 99); - if (byType !== 0) return byType; - const byExt = a.ext.localeCompare(b.ext); - if (byExt !== 0) return byExt; - return p.basename(a.filePath).localeCompare(p.basename(b.filePath), undefined, { sensitivity: "base" }); - }); +function $(id) { + if (!el[id]) el[id] = document.getElementById(id); + return el[id]; } -function showAction(name) { - for (const a of actionAreas) { - document.getElementById(`action-${a}`).classList.toggle("d-none", a !== name); - } +function generateId() { + return `c${Math.random().toString(36).slice(2, 9)}`; } -function showState(name) { - const isEmpty = name === "empty"; - const isQueue = name === "queue"; - const showDropZone = isEmpty || isQueue; - - document.getElementById("drop-zone").classList.toggle("d-none", !showDropZone); - document.getElementById("dz-empty").classList.toggle("d-none", !isEmpty); - document.getElementById("dz-has-files").classList.toggle("d-none", !isQueue); - document.getElementById("file-list-section").classList.toggle("d-none", !isQueue); - document.getElementById("format-section").classList.toggle("d-none", !isQueue); - - if (isQueue) { - showAction("convert"); - } else if (name === "converting") { - showAction("progress"); - } else if (name === "done") { - showAction("done"); - } else { - for (const a of actionAreas) { - document.getElementById(`action-${a}`).classList.add("d-none"); - } - } -} +// -- Ingest ------------------------------------------------------------------ function addFiles(filePaths) { let added = 0; + let rejected = 0; + for (const filePath of filePaths) { const raw = p.extname(filePath).slice(1).toLowerCase(); - const ext = EXT_ALIASES[raw] ?? raw; - const entry = CONVERSION_MAP[ext]; - if (!entry) continue; - if (jobs.some(j => j.filePath === filePath)) continue; // skip duplicates - jobs.push({ id: generateId(), filePath, ext, type: entry.type, targetExt: null, status: "pending", progress: 0, outputPath: null }); + const ext = FORMATS.aliases[raw] ?? raw; + const entry = FORMATS.conversionMap[ext]; + + if (!entry) { rejected++; continue; } + if (jobs.some(j => j.filePath === filePath)) continue; + + jobs.push({ + id: generateId(), + filePath, + ext, + kind: entry.type, + targetExt: null, + meta: null, + status: "pending", + progress: 0, + error: null, + outputPath: null, + isDirectory: false, + fileCount: 0, + }); added++; } + if (added > 0) { - sortJobs(); - renderFileList(); - renderFormatGrid(); - updateConvertButton(); - showState("queue"); + render(); + probeNewJobs(); + } + + // v1 discarded unsupported files in silence, which read as the app being + // broken. Say so. + if (rejected > 0) { + toast( + `${rejected} ${rejected === 1 ? "file was" : "files were"} skipped — not a supported format.`, + added > 0 ? "warning" : "danger" + ); } + return added; } -/** - * Expand whatever was dropped or picked into a flat list of media files. - * Directory walking happens in the main process now: v1 did a synchronous, - * one-level-deep readdirSync on the UI thread and silently discarded anything - * nested. - */ +/** Expand folders in the main process, then queue whatever came back. */ async function ingestPaths(inputPaths) { - if (inputPaths.length === 0) return; + if (!inputPaths || inputPaths.length === 0) return; try { const result = await api.scanPaths(inputPaths, {}); - addFiles(result.files); + const added = addFiles(result.files); + + if (result.truncated) { + toast(`Stopped after ${result.files.length} files — the folder is very large.`, "warning"); + } else if (added > 0 && result.skipped > 0) { + toast(`Added ${added} ${added === 1 ? "file" : "files"}, skipped ${result.skipped} unsupported.`, "info"); + } else if (added === 0 && result.files.length === 0 && result.skipped > 0) { + toast("No supported media found in that folder.", "warning"); + } + for (const err of result.errors ?? []) { + toast(`Could not read ${p.basename(err.path)}: ${err.error}`, "danger"); + } } catch (_) { - // Fall back to treating them as plain files rather than dropping the - // interaction entirely. addFiles(inputPaths); } } -function removeJob(id) { - jobs = jobs.filter(j => j.id !== id); - if (jobs.length === 0) { - selectedFormats = {}; - showState("empty"); - } else { - renderFileList(); - renderFormatGrid(); - updateConvertButton(); +/** + * Probe anything that has not been probed yet. Cards are already on screen by + * this point — metadata only enriches them, so a slow or failing probe never + * blocks the UI. + */ +async function probeNewJobs() { + const pending = jobs.filter(j => j.meta === null); + for (const job of pending) { + job.meta = { pending: true }; + api.probeFile(job.filePath).then((meta) => { + const current = jobs.find(j => j.id === job.id); + if (!current) return; + current.meta = meta; + updateCard(current); + }).catch(() => { + const current = jobs.find(j => j.id === job.id); + if (current) { current.meta = { ok: false }; updateCard(current); } + }); } } -function renderFileList() { - const container = document.getElementById("file-list"); - container.innerHTML = ""; +// -- Selection --------------------------------------------------------------- - const count = jobs.length; - document.getElementById("dz-file-count").textContent = `${count} ${count !== 1 ? "Files" : "File"} Queued`; +function orderedIds() { + return jobs.map(j => j.id); +} - let prevType = null; - for (const job of jobs) { - if (prevType !== null && job.type !== prevType) { - const lastRow = container.lastElementChild; - if (lastRow) lastRow.style.borderBottom = "none"; - const divider = document.createElement("div"); - divider.className = "file-group-divider"; - container.appendChild(divider); - } - prevType = job.type; - - const row = document.createElement("div"); - row.className = "file-row"; - - const icon = document.createElement("span"); - icon.className = "material-icons-round text-secondary"; - icon.textContent = TYPE_ICONS[job.type] ?? "insert_drive_file"; - - const name = document.createElement("span"); - name.className = "file-row-name small"; - name.textContent = p.basename(job.filePath); - name.title = job.filePath; - - const removeBtn = document.createElement("button"); - removeBtn.className = "file-remove-btn"; - const removeIcon = document.createElement("span"); - removeIcon.className = "material-icons-round"; - removeIcon.textContent = "close"; - removeBtn.appendChild(removeIcon); - removeBtn.addEventListener("click", () => removeJob(job.id)); - - row.appendChild(icon); - row.appendChild(name); - row.appendChild(removeBtn); - container.appendChild(row); - } +function handleCardClick(jobId, event) { + const { selection: next, anchor } = display.resolveSelection( + orderedIds(), selection, jobId, + { ctrl: event.ctrlKey || event.metaKey, shift: event.shiftKey }, + selectionAnchor + ); + selection = next; + selectionAnchor = anchor; + renderSelection(); +} + +function selectAll() { + selection = new Set(orderedIds()); + selectionAnchor = jobs.length > 0 ? jobs[0].id : null; + renderSelection(); +} + +function clearSelection() { + selection = new Set(); + selectionAnchor = null; + renderSelection(); +} + +function selectedJobs() { + return jobs.filter(j => selection.has(j.id)); } -function renderFormatGrid() { - const container = document.getElementById("format-grid"); - container.innerHTML = ""; +// -- Mutation ---------------------------------------------------------------- - // group jobs by type, but only show each type once in the format grid, since all jobs of the same type share the same target format options - const seen = new Set(); - const typeEntries = []; +function removeJobs(ids) { + const set = new Set(ids); + jobs = jobs.filter(j => !set.has(j.id)); + selection = display.pruneSelection(selection, orderedIds()); + render(); +} + +function setTarget(ids, targetExt) { + const set = new Set(ids); for (const job of jobs) { - if (!seen.has(job.type)) { - seen.add(job.type); - typeEntries.push({ type: job.type, entry: CONVERSION_MAP[job.ext] }); + if (!set.has(job.id)) continue; + // Guard against a stale bulk option: never assign a target the source + // cannot actually produce. + const allowed = FORMATS.conversionMap[job.ext]?.targets ?? []; + const crossKind = display.commonTargets([job.ext], TARGETS).map(t => t.ext); + if (!allowed.some(t => t.ext === targetExt) && !crossKind.includes(targetExt)) continue; + job.targetExt = targetExt; + if (job.status === "error" || job.status === "cancelled") { + job.status = "pending"; + job.error = null; + job.progress = 0; } + updateCard(job); } + renderActionBar(); +} + +// -- Rendering --------------------------------------------------------------- + +function render() { + const hasJobs = jobs.length > 0; + + $("empty-state").classList.toggle("d-none", hasJobs); + $("grid-scroll").classList.toggle("d-none", !hasJobs); + $("action-bar").classList.toggle("d-none", !hasJobs); + + const grid = $("job-grid"); + grid.innerHTML = ""; + for (const job of jobs) grid.appendChild(buildCard(job)); - for (const { type, entry } of typeEntries) { - const label = document.createElement("p"); - label.className = "format-group-label"; - label.textContent = type.charAt(0).toUpperCase() + type.slice(1); - container.appendChild(label); - - const row = document.createElement("div"); - row.className = "format-btn-row"; - - for (const t of entry.targets) { - const btn = document.createElement("button"); - btn.className = "btn-format"; - if (selectedFormats[type] === t.ext) btn.classList.add("selected"); - btn.textContent = t.label; - btn.dataset.type = type; - btn.dataset.ext = t.ext; - btn.addEventListener("click", () => selectFormat(type, t.ext, btn)); - row.appendChild(btn); + renderSelection(); + renderActionBar(); +} + +function buildCard(job) { + const card = document.createElement("div"); + card.className = "job-card"; + card.dataset.id = job.id; + + // -- head + const head = document.createElement("div"); + head.className = "card-head"; + + const icon = document.createElement("span"); + icon.className = "material-icons-round kind-icon"; + icon.textContent = display.iconForKind(job.kind); + + const name = document.createElement("span"); + name.className = "card-name"; + name.textContent = p.basename(job.filePath); + name.title = job.filePath; + + const remove = document.createElement("button"); + remove.className = "card-remove"; + remove.title = "Remove"; + const removeIcon = document.createElement("span"); + removeIcon.className = "material-icons-round"; + removeIcon.textContent = "close"; + remove.appendChild(removeIcon); + remove.addEventListener("click", (e) => { + e.stopPropagation(); + removeJobs([job.id]); + }); + + head.append(icon, name, remove); + + // -- meta + const meta = document.createElement("div"); + meta.className = "card-meta"; + + // -- convert row + const convert = document.createElement("div"); + convert.className = "card-convert"; + + const from = document.createElement("span"); + from.className = "card-from"; + from.textContent = job.ext.toUpperCase(); + + const arrow = document.createElement("span"); + arrow.className = "material-icons-round card-arrow"; + arrow.textContent = "arrow_forward"; + + const select = document.createElement("select"); + select.className = "form-select form-select-sm card-target"; + fillTargetSelect(select, display.commonTargets([job.ext], TARGETS), job.targetExt); + select.addEventListener("click", (e) => e.stopPropagation()); + select.addEventListener("change", () => setTarget([job.id], select.value || null)); + + convert.append(from, arrow, select); + + // -- status + const status = document.createElement("div"); + status.className = "card-status"; + const dot = document.createElement("span"); + dot.className = "status-dot"; + const statusText = document.createElement("span"); + statusText.className = "status-text"; + status.append(dot, statusText); + + // -- progress + const progress = document.createElement("div"); + progress.className = "card-progress d-none"; + const bar = document.createElement("div"); + bar.className = "bar"; + bar.style.width = "0%"; + progress.appendChild(bar); + + // -- actions (revealed once a job finishes) + const actions = document.createElement("div"); + actions.className = "card-actions d-none"; + + card.append(head, meta, convert, status, progress, actions); + card.addEventListener("click", (e) => handleCardClick(job.id, e)); + + paintCard(card, job); + return card; +} + +function fillTargetSelect(select, targets, current) { + select.innerHTML = ""; + + const placeholder = document.createElement("option"); + placeholder.value = ""; + placeholder.textContent = "Choose format…"; + select.appendChild(placeholder); + + for (const { group, items } of display.groupTargets(targets)) { + const optgroup = document.createElement("optgroup"); + optgroup.label = group; + for (const t of items) { + const option = document.createElement("option"); + option.value = t.ext; + option.textContent = t.label; + optgroup.appendChild(option); } - container.appendChild(row); + select.appendChild(optgroup); } -} -function selectFormat(type, ext, btn) { - selectedFormats[type] = ext; - document.querySelectorAll(`.btn-format[data-type="${type}"]`).forEach(b => b.classList.remove("selected")); - btn.classList.add("selected"); - updateConvertButton(); + select.value = current ?? ""; } -function updateConvertButton() { - const types = [...new Set(jobs.map(j => j.type))]; - const allSelected = types.length > 0 && types.every(t => selectedFormats[t]); - document.getElementById("btn-start-convert").disabled = !allSelected; +/** Update one card in place, without rebuilding the grid. */ +function updateCard(job) { + const card = $("job-grid").querySelector(`[data-id="${job.id}"]`); + if (card) paintCard(card, job); + renderActionBar(); } -function setProgress(percent) { - const fill = document.getElementById("progress-bar-fill"); - const label = document.getElementById("progress-label"); +function paintCard(card, job) { + const meta = card.querySelector(".card-meta"); + const described = display.describeMeta(job.meta, job.ext); + meta.textContent = described ?? "Reading…"; + meta.classList.toggle("pending", described === null); + if (described) meta.title = described; + + const { text, tone } = display.describeStatus(job); + const status = card.querySelector(".card-status"); + status.className = `card-status tone-${tone}`; + const statusText = status.querySelector(".status-text"); + statusText.textContent = text; + statusText.title = text; + + const running = job.status === "running"; + const progress = card.querySelector(".card-progress"); + progress.classList.toggle("d-none", !running); + progress.classList.toggle("indeterminate", running && job.progress === null); + if (running && typeof job.progress === "number") { + progress.querySelector(".bar").style.width = `${job.progress}%`; + } + + // The target select locks while the job is in flight. + const select = card.querySelector(".card-target"); + select.disabled = running; + if (select.value !== (job.targetExt ?? "")) select.value = job.targetExt ?? ""; - if (percent == null) { - // No known duration, so show motion rather than the frozen 0% v1 sat at. - fill.style.width = "100%"; - fill.classList.add("progress-bar-striped", "progress-bar-animated"); - label.textContent = ""; - return; + renderCardActions(card, job); +} + +function renderCardActions(card, job) { + const actions = card.querySelector(".card-actions"); + actions.innerHTML = ""; + + const buttons = []; + + if (job.status === "running") { + buttons.push(makeAction("Cancel", "btn-outline-danger", () => api.cancelJob(job.id))); + } else if (job.status === "done" && job.outputPath) { + buttons.push(makeAction( + job.isDirectory ? "Open folder" : "Show in folder", + "btn-outline-secondary", + () => (job.isDirectory ? api.openPath(job.outputPath) : api.showInFolder(job.outputPath)) + )); + } else if (job.status === "error") { + buttons.push(makeAction("Retry", "btn-outline-secondary", () => { + job.status = "pending"; + job.error = null; + job.progress = 0; + updateCard(job); + })); } - fill.classList.remove("progress-bar-striped", "progress-bar-animated"); - fill.style.width = `${percent}%`; - label.textContent = `${Math.round(percent)}%`; + actions.classList.toggle("d-none", buttons.length === 0); + for (const b of buttons) actions.appendChild(b); } -async function startQueue() { - cancelRequested = false; +function makeAction(label, variant, onClick) { + const btn = document.createElement("button"); + btn.className = `btn btn-sm ${variant}`; + btn.textContent = label; + btn.addEventListener("click", (e) => { + e.stopPropagation(); + onClick(); + }); + return btn; +} - for (const job of jobs) { - job.targetExt = selectedFormats[job.type]; - job.status = "pending"; +function renderSelection() { + for (const card of $("job-grid").children) { + card.classList.toggle("selected", selection.has(card.dataset.id)); } - showState("converting"); + const count = selection.size; + const bar = $("bulk-bar"); + bar.classList.toggle("d-none", count === 0); + if (count === 0) return; + + $("bulk-count").textContent = `${count} selected`; + + // Offer only formats every selected source can actually produce, so a bulk + // change can never create an invalid job. + const targets = display.commonTargets(selectedJobs().map(j => j.ext), TARGETS); + const select = $("bulk-target"); + const shared = [...new Set(selectedJobs().map(j => j.targetExt))]; + fillTargetSelect(select, targets, shared.length === 1 ? shared[0] : null); + + select.disabled = targets.length === 0 || converting; + $("bulk-target-note").textContent = targets.length === 0 + ? "No format works for every selected file" + : ""; +} +function renderActionBar() { const total = jobs.length; + const ready = jobs.filter(j => j.targetExt).length; + const withoutTarget = total - ready; + + $("queue-summary").textContent = converting + ? display.summarise(jobs) + : `${total} ${total === 1 ? "file" : "files"} queued`; + + $("queue-detail").textContent = converting + ? `${jobs.filter(j => j.status === "running").length} running` + : (withoutTarget > 0 ? `${withoutTarget} still need a format` : "Ready to convert"); + + const percent = display.overallProgress(jobs); + $("overall-bar").style.width = `${percent}%`; + + // House pattern: the primary action and its abort share one slot rather + // than sitting side by side, so only one is ever visible. + $("btn-convert").classList.toggle("d-none", converting); + $("btn-convert").disabled = ready === 0; + $("btn-cancel-all").classList.toggle("d-none", !converting); + $("btn-clear-all").disabled = converting; +} - for (let i = 0; i < jobs.length; i++) { - const job = jobs[i]; +// -- Toasts ------------------------------------------------------------------ - if (cancelRequested) { - job.status = "cancelled"; - continue; - } +const TOAST_ICONS = { info: "info", success: "check_circle", warning: "warning", danger: "error" }; - document.getElementById("progress-current-file").textContent = p.basename(job.filePath); - document.getElementById("progress-status").textContent = `File ${i + 1} of ${total}`; - setProgress(0); +function toast(message, type = "info", timeoutMs = 4500) { + const host = $("toast-host"); - job.status = "converting"; + const note = document.createElement("div"); + note.className = `toast-note toast-${type}`; - const result = await api.runJob({ - id: job.id, - inputPath: job.filePath, - targetExt: job.targetExt, - }); - activeJobId = null; - - if (result.status === "cancelled" || cancelRequested) { - job.status = "cancelled"; - } else if (result.status === "done") { - job.status = "done"; - job.outputPath = result.outputPath; - job.isDirectory = result.isDirectory === true; - job.fileCount = result.fileCount ?? 1; - } else if (result.status === "skipped") { - job.status = "cancelled"; - } else { - job.status = "error"; - job.error = result.error ?? null; - } + const icon = document.createElement("span"); + icon.className = "material-icons-round"; + icon.textContent = TOAST_ICONS[type] ?? "info"; + + const body = document.createElement("span"); + body.className = "toast-body"; + body.textContent = message; + + const close = document.createElement("button"); + close.className = "toast-close material-icons-round"; + close.textContent = "close"; + close.title = "Dismiss"; + close.addEventListener("click", () => dismiss()); + + note.append(icon, body, close); + host.appendChild(note); + + let timer = null; + function dismiss() { + if (!note.isConnected) return; + clearTimeout(timer); + note.classList.add("leaving"); + setTimeout(() => note.remove(), 200); } - renderDoneList(); - showState("done"); + if (timeoutMs > 0) timer = setTimeout(dismiss, timeoutMs); + return dismiss; } -function renderDoneList() { - const doneCount = jobs.filter(j => j.status === "done").length; - const errorCount = jobs.filter(j => j.status === "error").length; - const cancelledCount = jobs.filter(j => j.status === "cancelled").length; +// -- Conversion -------------------------------------------------------------- - const parts = []; - if (doneCount > 0) parts.push(`${doneCount} ${doneCount !== 1 ? "files" : "file"} converted`); - if (errorCount > 0) parts.push(`${errorCount} ${parts.length === 0 ? (errorCount !== 1 ? "files " : "file ") : ""}failed`); - if (cancelledCount > 0) parts.push(`${cancelledCount} ${parts.length === 0 ? (cancelledCount !== 1 ? "files " : "file ") : ""}cancelled`); - let summary = parts.join(", "); - if (!summary) summary = "No files converted"; - document.getElementById("done-summary").textContent = summary; +async function startConversion() { + const runnable = jobs.filter(j => j.targetExt); + if (runnable.length === 0) return; - const listEl = document.getElementById("done-file-list"); - listEl.innerHTML = ""; + converting = true; + for (const job of runnable) { + job.status = "pending"; + job.progress = 0; + job.error = null; + updateCard(job); + } + renderActionBar(); - const STATUS_ICON = { - done: { text: "check_circle", cls: "text-success" }, - error: { text: "error", cls: "text-danger" }, - cancelled: { text: "cancel", cls: "text-secondary" }, - }; + // Every job is submitted at once; the runner's pool decides how many + // actually run in parallel. v1 awaited them one at a time. + const results = await Promise.all(runnable.map(async (job) => { + const result = await api.runJob({ + id: job.id, + inputPath: job.filePath, + targetExt: job.targetExt, + }); + applyResult(job, result); + return result; + })); - for (const job of jobs) { - const row = document.createElement("div"); - row.className = "file-row"; - - // v1 called fs.statSync here to find out whether the output was a - // folder of frames. The job result carries that now, so the renderer - // needs no filesystem access at all. - const isDir = job.status === "done" && job.isDirectory === true; - - const { text: iconText, cls } = STATUS_ICON[job.status] ?? STATUS_ICON.cancelled; - const icon = document.createElement("span"); - icon.className = `material-icons-round ${cls}`; - icon.textContent = isDir ? "folder" : iconText; - - const name = document.createElement("span"); - name.className = "file-row-name small"; - if (isDir) { - const frameCount = job.fileCount ?? 0; - name.textContent = `${p.basename(job.outputPath)}/ (${frameCount} ${frameCount !== 1 ? "frames" : "frame"})`; - } else { - name.textContent = p.basename(job.status === "done" ? job.outputPath : job.filePath); - } - name.title = job.status === "error" && job.error - ? job.error - : (job.status === "done" ? job.outputPath : job.filePath); - - row.appendChild(icon); - row.appendChild(name); - - if (job.status === "done") { - const openBtn = document.createElement("button"); - openBtn.className = "file-open-btn"; - openBtn.title = isDir ? "Open folder" : "Show in folder"; - const openIcon = document.createElement("span"); - openIcon.className = "material-icons-round"; - openIcon.textContent = isDir ? "folder_open" : "open_in_new"; - openBtn.appendChild(openIcon); - openBtn.addEventListener("click", () => { - if (isDir) api.openPath(job.outputPath); - else api.showInFolder(job.outputPath); - }); - row.appendChild(openBtn); - } + converting = false; + render(); + announce(results); +} + +function applyResult(job, result) { + job.status = result.status; + job.error = result.error ?? null; + job.outputPath = result.outputPath ?? null; + job.isDirectory = result.isDirectory === true; + job.fileCount = result.fileCount ?? 0; + if (result.status === "done") job.progress = 100; + updateCard(job); +} - listEl.appendChild(row); +function announce(results) { + const failed = results.filter(r => r.status === "error"); + const done = results.filter(r => r.status === "done").length; + const cancelled = results.filter(r => r.status === "cancelled" || r.status === "skipped").length; + + if (failed.length > 0) { + // One toast, not one blocking dialog per failure. The per-card status + // carries each individual reason. + const detail = failed.length === 1 ? ` — ${failed[0].error ?? "unknown error"}` : ""; + toast( + `${failed.length} ${failed.length === 1 ? "file" : "files"} failed to convert${detail}`, + "danger", + 0 + ); + } + if (done > 0) { + toast(`${done} ${done === 1 ? "file" : "files"} converted.`, "success"); + } else if (failed.length === 0 && cancelled > 0) { + toast("Conversion cancelled.", "info"); } } +// -- Wiring ------------------------------------------------------------------ + document.addEventListener("DOMContentLoaded", async () => { - const formats = await api.getFormats(); - CONVERSION_MAP = formats.conversionMap; - EXT_ALIASES = formats.aliases; + FORMATS = await api.getFormats(); + TARGETS = FORMATS.targetsByExt; - const dropZone = document.getElementById("drop-zone"); + // Drag and drop. The document-level guard stops a stray drop navigating the + // window to the file and replacing the app with it. + const shell = document.querySelector(".app-shell"); + let dragDepth = 0; - // A drop anywhere outside the zone would otherwise navigate the window to - // the dropped file, replacing the app with it. v1 had no such guard. - for (const type of ["dragover", "drop"]) { - document.addEventListener(type, (e) => e.preventDefault()); - } + document.addEventListener("dragover", (e) => e.preventDefault()); + document.addEventListener("drop", (e) => e.preventDefault()); - dropZone.addEventListener("dragover", (e) => { + document.addEventListener("dragenter", (e) => { e.preventDefault(); - dropZone.classList.add("drag-over"); + dragDepth++; + shell.classList.add("drag-over"); + if (jobs.length === 0) $("drop-zone").classList.add("drag-over"); }); - dropZone.addEventListener("dragleave", (e) => { - // dragleave fires when crossing onto a child element too, which made - // the v1 highlight flicker. Ignore those. - if (e.relatedTarget && dropZone.contains(e.relatedTarget)) return; - dropZone.classList.remove("drag-over"); + document.addEventListener("dragleave", () => { + // dragleave also fires crossing onto child elements, so count depth + // rather than clearing on the first one — that is what made the v1 + // highlight flicker. + dragDepth = Math.max(0, dragDepth - 1); + if (dragDepth === 0) { + shell.classList.remove("drag-over"); + $("drop-zone").classList.remove("drag-over"); + } }); - dropZone.addEventListener("drop", (e) => { - e.preventDefault(); - dropZone.classList.remove("drag-over"); + document.addEventListener("drop", (e) => { + dragDepth = 0; + shell.classList.remove("drag-over"); + $("drop-zone").classList.remove("drag-over"); ingestPaths(api.getPathsForFiles(e.dataTransfer.files)); }); - dropZone.addEventListener("click", async (e) => { - if (e.target.closest("button")) return; + async function browseFiles() { const filePaths = await api.browseFiles(); if (filePaths) ingestPaths(filePaths); + } + async function browseFolder() { + const folders = await api.browseFolder(); + if (folders) ingestPaths(folders); + } + + $("browse-btn").addEventListener("click", browseFiles); + $("btn-add-files").addEventListener("click", browseFiles); + $("btn-add-folder").addEventListener("click", browseFolder); + $("drop-zone").addEventListener("click", (e) => { + if (e.target.closest("button")) return; + browseFiles(); }); - async function browseFiles(e) { - e.stopPropagation(); - const filePaths = await api.browseFiles(); - if (filePaths) ingestPaths(filePaths); - } - document.getElementById("browse-btn").addEventListener("click", browseFiles); - document.getElementById("browse-more-btn").addEventListener("click", browseFiles); + $("btn-convert").addEventListener("click", startConversion); + $("btn-cancel-all").addEventListener("click", () => api.cancelAll()); + $("btn-clear-all").addEventListener("click", () => { + jobs = []; + clearSelection(); + render(); + }); + + $("bulk-target").addEventListener("change", (e) => { + if (e.target.value) setTarget([...selection], e.target.value); + }); + $("bulk-remove").addEventListener("click", () => removeJobs([...selection])); + $("bulk-deselect").addEventListener("click", clearSelection); - document.getElementById("btn-start-convert").addEventListener("click", startQueue); + // Clicking the grid background clears the selection. + $("grid-scroll").addEventListener("click", (e) => { + if (e.target === $("grid-scroll") || e.target === $("job-grid")) clearSelection(); + }); - document.getElementById("btn-cancel").addEventListener("click", async () => { - cancelRequested = true; - await api.cancelAll(); + document.addEventListener("keydown", (e) => { + const typing = /^(INPUT|SELECT|TEXTAREA)$/.test(document.activeElement?.tagName ?? ""); + if (typing) return; + + if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === "a") { + e.preventDefault(); + selectAll(); + } else if (e.key === "Delete" && selection.size > 0 && !converting) { + e.preventDefault(); + removeJobs([...selection]); + } else if (e.key === "Escape") { + clearSelection(); + } }); - function clearAll() { - jobs = []; - selectedFormats = {}; - showState("empty"); - } - document.getElementById("btn-clear-all").addEventListener("click", (e) => { e.stopPropagation(); clearAll(); }); - document.getElementById("btn-convert-another").addEventListener("click", clearAll); + render(); }); -// Progress now carries a jobId, so it can be matched to the file it belongs to -// rather than being applied blindly as v1 did. +// Progress carries a jobId, so it lands on the right card. v1 pushed a bare +// integer with no way to tell which file it belonged to. api.onJobProgress(({ jobId, percent }) => { const job = jobs.find(j => j.id === jobId); - if (job) job.progress = percent ?? 0; - if (activeJobId === null || activeJobId === jobId) setProgress(percent); + if (!job) return; + job.progress = percent; + updateCard(job); }); api.onJobStatus(({ jobId, status }) => { - if (status === "running") activeJobId = jobId; + const job = jobs.find(j => j.id === jobId); + if (!job || status === undefined) return; + if (status === "running") { + job.status = "running"; + updateCard(job); + } }); api.onFilesOpened((filePaths) => { diff --git a/src/styles.css b/src/styles.css index 39aa11a..720b28b 100644 --- a/src/styles.css +++ b/src/styles.css @@ -7,8 +7,13 @@ html { body { margin: 0; - overflow-x: hidden; + height: 100vh; + overflow: hidden; font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif; + /* Chrome is unselectable so dragging the UI does not select text, but + filenames, paths and error messages stay selectable — see .card-name, + .card-meta, .status-text and .toast-note. v1 set this globally, which + meant a user could not copy an error to report it. */ user-select: none; } @@ -22,6 +27,7 @@ body.popup-window { background-color: var(--bs-body-bg); color: var(--bs-body-color); padding: 20px; + height: auto; overflow: auto; } @@ -74,7 +80,7 @@ body.popup-window span:hover { flex-direction: column; align-items: center; justify-content: center; - width: min(580px, 100%); + width: min(520px, 100%); min-height: 200px; border: 2px dashed var(--bs-border-color); border-radius: var(--radius-zone); @@ -85,7 +91,8 @@ body.popup-window span:hover { text-align: center; } -.drop-zone:hover:not(:has(button:hover)) { +.drop-zone:hover:not(:has(button:hover)), +.drop-zone.drag-over { border-color: rgba(var(--accent-rgb), var(--wash-hover-border)); background-color: rgba(var(--accent-rgb), var(--wash-hover-fill)); } @@ -107,91 +114,143 @@ body.popup-window span:hover { margin: 0.75rem 0 0; } -/* ── Format grid ─────────────────────────────────────────────────────────── */ +/* ── App shell ───────────────────────────────────────────────────────────── */ -.format-group-label { - font-size: 0.7rem; - text-transform: uppercase; - letter-spacing: 0.1em; - color: var(--bs-secondary-color); - margin: 1.25rem 0 0.5rem; - text-align: center; +.app-shell { + display: flex; + flex-direction: column; + height: 100vh; + padding: 1rem 1.25rem; + gap: 0.75rem; } -.format-btn-row { +.app-header { display: flex; - flex-wrap: wrap; + align-items: center; + justify-content: space-between; + gap: 1rem; + flex-shrink: 0; +} + +.app-title { + font-size: 1.25rem; + font-weight: 600; + margin: 0; +} + +.empty-state { + flex: 1 1 auto; + display: flex; + align-items: center; justify-content: center; - gap: 0.5rem; + min-height: 0; } -.btn-format { - background-color: var(--bs-secondary-bg); - color: var(--bs-body-color); - border: 1px solid var(--bs-border-color); - border-radius: 6px; - padding: 0.4rem 1.1rem; - font-size: 0.85rem; - font-weight: 500; - cursor: pointer; - transition: background-color 0.15s, border-color 0.15s, color 0.15s; +/* Once there are cards the whole grid area is the drop target, so there is no + separate zone to aim at. */ +.app-shell.drag-over .grid-scroll { + border-color: rgba(var(--accent-rgb), var(--wash-active-border)); + background-color: rgba(var(--accent-rgb), var(--wash-active-fill)); } -.btn-format:hover, -.btn-format.selected { - background-color: var(--accent); - border-color: var(--accent); - color: #fff; +/* ── Bulk edit bar ───────────────────────────────────────────────────────── */ + +.bulk-bar { + display: flex; + align-items: center; + gap: 0.6rem; + flex-shrink: 0; + padding: 0.5rem 0.75rem; + border-radius: var(--radius-card); + background-color: rgba(var(--accent-rgb), var(--wash-semantic-fill)); + border: 1px solid rgba(var(--accent-rgb), var(--wash-semantic-border)); +} + +.bulk-sep { + width: 1px; + align-self: stretch; + background-color: var(--bs-border-color); + margin: 0 0.25rem; +} + +.bulk-select { + width: auto; + min-width: 150px; } -/* ── File list (queue state) ─────────────────────────────────────────────── */ +/* ── Grid ────────────────────────────────────────────────────────────────── */ -#file-list { - max-height: 280px; +.grid-scroll { + flex: 1 1 auto; + min-height: 0; overflow-y: auto; border: 1px solid var(--bs-border-color); border-radius: var(--radius-card); - padding: 0.25rem 0.6rem; + padding: 0.85rem; + transition: border-color var(--dur-state) var(--ease-state), + background-color var(--dur-state) var(--ease-state); +} + +.grid-scroll::-webkit-scrollbar { width: var(--scrollbar-width); } +.grid-scroll::-webkit-scrollbar-track { background: transparent; } +.grid-scroll::-webkit-scrollbar-thumb { background: var(--scrollbar-thumb); border-radius: 3px; } +.grid-scroll::-webkit-scrollbar-thumb:hover { background: var(--scrollbar-thumb-hover); } + +.job-grid { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(272px, 1fr)); + gap: 0.75rem; + align-content: start; } -#file-list::-webkit-scrollbar { width: var(--scrollbar-width); } -#file-list::-webkit-scrollbar-track { background: transparent; } -#file-list::-webkit-scrollbar-thumb { background: var(--scrollbar-thumb); border-radius: 3px; } -#file-list::-webkit-scrollbar-thumb:hover { background: var(--scrollbar-thumb-hover); } +/* ── Job card ────────────────────────────────────────────────────────────── */ -.file-row { +.job-card { display: flex; - align-items: center; + flex-direction: column; gap: 0.5rem; - padding: 0.35rem 0; - border-bottom: 1px solid var(--bs-border-color); + padding: 0.75rem; + border-radius: var(--radius-card); + border: 1px solid var(--bs-border-color); + background-color: var(--bs-body-bg); + cursor: pointer; + transition: border-color var(--dur-micro) var(--ease-micro), + background-color var(--dur-micro) var(--ease-micro); } -.file-row:last-child { - border-bottom: none; +.job-card:hover { + border-color: rgba(var(--accent-rgb), var(--wash-hover-border)); } -.file-group-divider { - height: 4px; - background-color: var(--bs-border-color); - margin: 2px 0; - border-radius: 1px; +.job-card.selected { + border-color: rgba(var(--accent-rgb), var(--wash-active-border)); + background-color: rgba(var(--accent-rgb), var(--wash-active-fill)); +} + +.card-head { + display: flex; + align-items: center; + gap: 0.5rem; } -.file-row .material-icons-round { +.card-head .kind-icon { font-size: 18px; flex-shrink: 0; + color: var(--bs-secondary-color); } -.file-row-name { +.card-name { flex: 1 1 0; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + font-size: 0.875rem; + font-weight: 500; + user-select: text; } -.file-remove-btn { +.card-remove { width: 20px; height: 20px; border-radius: 50%; @@ -209,48 +268,159 @@ body.popup-window span:hover { border-color var(--dur-micro) var(--ease-micro); } -.file-remove-btn:hover { +.card-remove:hover { background-color: var(--bs-danger); border-color: var(--bs-danger); color: #fff; } -.file-remove-btn .material-icons-round { +.card-remove .material-icons-round { font-size: 14px; line-height: 1; display: block; } -/* ── Done file list ──────────────────────────────────────────────────────── */ +.card-meta { + font-size: 0.78rem; + color: var(--bs-secondary-color); + min-height: 1.2em; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + user-select: text; +} + +.card-meta.pending { + opacity: var(--opacity-disabled); +} -.file-open-btn { - border: none; - background: none; +.card-convert { + display: flex; + align-items: center; + gap: 0.4rem; +} + +.card-from { + font-size: 0.7rem; + font-weight: 600; + letter-spacing: 0.06em; color: var(--bs-secondary-color); - display: inline-flex; + flex-shrink: 0; +} + +.card-arrow { + font-size: 15px; + color: var(--bs-secondary-color); + flex-shrink: 0; +} + +.card-target { + flex: 1 1 auto; + min-width: 0; + font-size: 0.8rem; + padding: 0.15rem 1.4rem 0.15rem 0.5rem; +} + +/* ── Card status strip ───────────────────────────────────────────────────── */ + +.card-status { + display: flex; align-items: center; - justify-content: center; - padding: 0; - cursor: pointer; + gap: 0.4rem; + font-size: 0.75rem; + min-height: 1.4em; +} + +.status-dot { + width: 7px; + height: 7px; + border-radius: 50%; flex-shrink: 0; - transition: color var(--dur-micro) var(--ease-micro); + background-color: var(--bs-secondary-color); } -.file-open-btn:hover { - color: var(--bs-primary); +.status-text { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + user-select: text; } -.file-open-btn .material-icons-round { - font-size: 16px; - line-height: 1; - display: block; +.tone-ready .status-dot { background-color: var(--accent); } +.tone-ready .status-text { color: var(--bs-secondary-color); } +.tone-warning .status-dot { background-color: var(--bs-warning); } +.tone-warning .status-text { color: var(--bs-warning); } +.tone-danger .status-dot { background-color: var(--bs-danger); } +.tone-danger .status-text { color: var(--bs-danger); } +.tone-success .status-dot { background-color: var(--bs-success); } +.tone-success .status-text { color: var(--bs-success); } +.tone-muted .status-dot { background-color: var(--bs-secondary-color); opacity: var(--opacity-muted); } +.tone-muted .status-text { color: var(--bs-secondary-color); opacity: var(--opacity-muted); } + +/* Work-in-progress pulses, matching the house status-card pattern. */ +@keyframes status-pulse { + 0% { opacity: 0.75; } + 50% { opacity: 0.4; } + 100% { opacity: 0.75; } +} + +.tone-running .status-dot { + background-color: var(--accent); + animation: status-pulse var(--dur-ambient) infinite var(--ease-state); } -/* ── Done card ───────────────────────────────────────────────────────────── */ +.tone-running .status-text { color: var(--accent); } -.done-card { +.card-progress { + height: 4px; + border-radius: 2px; background-color: var(--bs-secondary-bg); - border: 1px solid var(--bs-border-color); + overflow: hidden; +} + +.card-progress .bar { + height: 100%; + background-color: var(--accent); + border-radius: 2px; + transition: width var(--dur-state) linear; +} + +/* Unknown duration: motion instead of a frozen bar. */ +.card-progress.indeterminate .bar { + width: 40% !important; + animation: slide 1.1s ease-in-out infinite; + transition: none; +} + +@keyframes slide { + 0% { margin-left: -40%; } + 100% { margin-left: 100%; } +} + +.card-actions { + display: flex; + gap: 0.35rem; +} + +.card-actions .btn { + --bs-btn-padding-y: 0.1rem; + --bs-btn-padding-x: 0.45rem; + --bs-btn-font-size: 0.72rem; +} + +/* ── Action bar ──────────────────────────────────────────────────────────── */ + +.action-bar { + display: flex; + align-items: center; + gap: 1.25rem; + flex-shrink: 0; + padding-top: 0.25rem; +} + +.action-status { + flex: 1 1 auto; + min-width: 0; } /* ── Spinner ─────────────────────────────────────────────────────────────── */ @@ -264,6 +434,62 @@ body.popup-window span:hover { animation: spin 1.4s linear infinite; } +/* ── Toast ───────────────────────────────────────────────────────────────── */ + +/* The house spec puts this at top:16px, which suits a web page whose content + starts below the fold. Here that sits directly on top of the app header and + hides the title and toolbar, so it clears the header instead. */ +.toast-host { + position: fixed; + top: 60px; + left: 50%; + transform: translateX(-50%); + z-index: 1080; + width: min(720px, calc(100% - 2rem)); + display: flex; + flex-direction: column; + gap: 0.5rem; + pointer-events: none; +} + +.toast-note { + border-left: 4px solid; + border-radius: 6px; + padding: 0.7rem 1rem; + font-size: 0.875rem; + box-shadow: var(--bs-box-shadow); + pointer-events: auto; + display: flex; + align-items: flex-start; + gap: 0.5rem; + animation: toast-in var(--dur-state) var(--ease-state); + user-select: text; +} + +@keyframes toast-in { + from { opacity: 0; transform: translateY(-8px); } + to { opacity: 1; transform: translateY(0); } +} + +.toast-note.leaving { + opacity: 0; + transform: translateY(-8px); + transition: opacity var(--dur-state), transform var(--dur-state); +} + +.toast-note .material-icons-round { font-size: 18px; flex-shrink: 0; } +.toast-note .toast-body { flex: 1 1 auto; min-width: 0; } +.toast-note .toast-close { + background: none; border: none; padding: 0; cursor: pointer; + color: inherit; opacity: 0.7; flex-shrink: 0; +} +.toast-note .toast-close:hover { opacity: 1; } + +.toast-info { background-color: var(--bs-info); border-left-color: var(--bs-info); color: #000; } +.toast-success { background-color: var(--bs-success); border-left-color: var(--bs-success); color: #fff; } +.toast-warning { background-color: var(--bs-warning); border-left-color: var(--bs-warning); color: #000; } +.toast-danger { background-color: var(--bs-danger); border-left-color: var(--bs-danger); color: #fff; } + /* ── Credits logo ────────────────────────────────────────────────────────── */ #credits-logo { diff --git a/src/styles/tokens.css b/src/styles/tokens.css index 411e97f..95745d0 100644 --- a/src/styles/tokens.css +++ b/src/styles/tokens.css @@ -81,6 +81,13 @@ --bs-focus-ring-color: rgba(var(--accent-rgb), 0.25); } +/* Bootstrap's progress bar has the same problem as .btn-primary below: .progress + sets --bs-progress-bar-bg to a literal #0d6efd rather than to var(--bs-primary), + so an accent-bound primary leaves the bar Bootstrap blue. */ +.progress { + --bs-progress-bar-bg: var(--accent); +} + /* Bootstrap derives .btn-primary from its own component-level variables, not from --bs-primary, so the button needs the accent applied directly. */ .btn-primary { diff --git a/test/display.test.js b/test/display.test.js new file mode 100644 index 0000000..1b0c67a --- /dev/null +++ b/test/display.test.js @@ -0,0 +1,274 @@ +"use strict"; + +const test = require("node:test"); +const assert = require("node:assert/strict"); + +const fs = require("fs"); +const path = require("path"); + +const d = require("../src/core/display"); +const { STATUS } = require("../src/core/job"); +const formats = require("../src/core/formats"); + +// The renderer receives this map over IPC; display.js takes it as an argument +// because it cannot require core/formats itself. +const TARGETS = Object.fromEntries( + formats.SUPPORTED_EXTENSIONS.map(ext => [ext, formats.targetsFor(ext)]) +); + +// --------------------------------------------------------------------------- +// formatting +// --------------------------------------------------------------------------- + +test("display: durations read as clocks, and unknown stays unknown", () => { + assert.equal(d.formatDuration(0), "0:00"); + assert.equal(d.formatDuration(65), "1:05"); + assert.equal(d.formatDuration(3723), "1:02:03"); + assert.equal(d.formatDuration(59.6), "1:00", "rounds rather than truncating"); + assert.equal(d.formatDuration(null), null); + assert.equal(d.formatDuration(-1), null); + assert.equal(d.formatDuration(NaN), null); +}); + +test("display: byte sizes stay short", () => { + assert.equal(d.formatBytes(0), "0 B"); + assert.equal(d.formatBytes(512), "512 B"); + assert.equal(d.formatBytes(1024), "1.0 KB"); + assert.equal(d.formatBytes(1536), "1.5 KB"); + assert.equal(d.formatBytes(1048576), "1.0 MB"); + assert.equal(d.formatBytes(15 * 1048576), "15 MB", "drops the decimal above 10"); + assert.equal(d.formatBytes(null), null); +}); + +test("display: eta is terse", () => { + assert.equal(d.formatEta(45), "45s"); + assert.equal(d.formatEta(125), "2m 05s"); + assert.equal(d.formatEta(3700), "1h 01m"); + assert.equal(d.formatEta(null), null); +}); + +// --------------------------------------------------------------------------- +// card content +// --------------------------------------------------------------------------- + +test("display: metadata line is null until the probe lands", () => { + // The card must render before this returns anything. + assert.equal(d.describeMeta(null, "mp4"), null); + assert.equal(d.describeMeta({ ok: false }, "mp4"), null); +}); + +test("display: metadata line covers video and audio differently", () => { + const video = d.describeMeta({ + ok: true, duration: 65, size: 1048576, hasVideo: true, + video: { width: 1920, height: 1080, codec: "h264" }, + }, "mp4"); + assert.equal(video, "1920×1080 · 1:05 · h264 · 1.0 MB"); + + const audio = d.describeMeta({ + ok: true, duration: 185, size: 5242880, hasVideo: false, + audio: { codec: "mp3" }, + }, "mp3"); + assert.equal(audio, "3:05 · mp3 · 5.0 MB"); +}); + +test("display: a probe with nothing useful falls back to the extension", () => { + assert.equal(d.describeMeta({ ok: true }, "png"), "PNG"); +}); + +test("display: status tells the user what to do when no format is chosen", () => { + const noTarget = d.describeStatus({ status: STATUS.PENDING, targetExt: null }); + assert.equal(noTarget.tone, "warning"); + assert.match(noTarget.text, /format/i); + + assert.equal(d.describeStatus({ status: STATUS.PENDING, targetExt: "mp4" }).tone, "ready"); + assert.equal(d.describeStatus({ status: STATUS.RUNNING }).tone, "running"); + assert.equal(d.describeStatus({ status: STATUS.CANCELLED }).tone, "muted"); +}); + +test("display: a finished job surfaces its real failure reason", () => { + const failed = d.describeStatus({ status: STATUS.ERROR, error: "Invalid data found" }); + assert.equal(failed.text, "Invalid data found"); + assert.equal(failed.tone, "danger"); +}); + +test("display: a frames job reports its frame count, not just 'Done'", () => { + const frames = d.describeStatus({ status: STATUS.DONE, isDirectory: true, fileCount: 30 }); + assert.equal(frames.text, "30 frames"); + + const single = d.describeStatus({ status: STATUS.DONE, isDirectory: false }); + assert.equal(single.text, "Done"); +}); + +test("display: summary counts every outcome", () => { + const jobs = [ + { status: STATUS.DONE }, { status: STATUS.DONE }, + { status: STATUS.ERROR }, + { status: STATUS.CANCELLED }, { status: STATUS.SKIPPED }, + ]; + assert.equal(d.summarise(jobs), "2 files converted, 1 failed, 2 cancelled"); + assert.equal(d.summarise([{ status: STATUS.DONE }]), "1 file converted"); + assert.equal(d.summarise([]), "Nothing converted"); +}); + +test("display: overall progress counts finished jobs as complete", () => { + assert.equal(d.overallProgress([]), 0); + assert.equal(d.overallProgress([{ status: STATUS.DONE }, { status: STATUS.PENDING, progress: 0 }]), 50); + assert.equal(d.overallProgress([{ status: STATUS.RUNNING, progress: 50 }]), 50); + // A failed job is finished, not stuck — it must not hold the bar back. + assert.equal(d.overallProgress([{ status: STATUS.ERROR }, { status: STATUS.DONE }]), 100); +}); + +// --------------------------------------------------------------------------- +// selection +// --------------------------------------------------------------------------- + +const IDS = ["a", "b", "c", "d", "e"]; + +test("selection: a plain click replaces the selection", () => { + const r = d.resolveSelection(IDS, new Set(["a"]), "c", {}, "a"); + assert.deepEqual([...r.selection], ["c"]); + assert.equal(r.anchor, "c"); +}); + +test("selection: ctrl+click toggles", () => { + const added = d.resolveSelection(IDS, new Set(["a"]), "c", { ctrl: true }, "a"); + assert.deepEqual([...added.selection].sort(), ["a", "c"]); + + const removed = d.resolveSelection(IDS, new Set(["a", "c"]), "c", { ctrl: true }, "a"); + assert.deepEqual([...removed.selection], ["a"]); +}); + +test("selection: shift+click selects a range in either direction", () => { + const forward = d.resolveSelection(IDS, new Set(["b"]), "d", { shift: true }, "b"); + assert.deepEqual([...forward.selection], ["b", "c", "d"]); + + const backward = d.resolveSelection(IDS, new Set(["d"]), "b", { shift: true }, "d"); + assert.deepEqual([...backward.selection], ["b", "c", "d"]); + + assert.equal(forward.anchor, "b", "the anchor survives a shift range"); +}); + +test("selection: ctrl+shift extends rather than replacing", () => { + const r = d.resolveSelection(IDS, new Set(["e"]), "c", { ctrl: true, shift: true }, "b"); + assert.deepEqual([...r.selection].sort(), ["b", "c", "e"]); +}); + +test("selection: clicking inside a multi-selection keeps it", () => { + // Otherwise acting on a group would collapse it to one card first. + const r = d.resolveSelection(IDS, new Set(["a", "b", "c"]), "b", {}, "a"); + assert.deepEqual([...r.selection].sort(), ["a", "b", "c"]); + assert.equal(r.anchor, "b"); +}); + +test("selection: clicking outside a multi-selection replaces it", () => { + const r = d.resolveSelection(IDS, new Set(["a", "b"]), "e", {}, "a"); + assert.deepEqual([...r.selection], ["e"]); +}); + +test("selection: a stale anchor degrades to a plain click", () => { + const r = d.resolveSelection(IDS, new Set(), "c", { shift: true }, "zzz"); + assert.deepEqual([...r.selection], ["c"]); +}); + +test("selection: removals cannot strand ids", () => { + const pruned = d.pruneSelection(new Set(["a", "gone", "c"]), IDS); + assert.deepEqual([...pruned].sort(), ["a", "c"]); +}); + +// --------------------------------------------------------------------------- +// bulk target resolution +// --------------------------------------------------------------------------- + +test("targets: a single source offers everything it can become", () => { + const t = d.commonTargets(["mp4"], TARGETS); + const exts = t.map(x => x.ext); + assert.ok(exts.includes("mkv"), "same-kind"); + assert.ok(exts.includes("mp3"), "cross-kind extraction"); + assert.ok(exts.includes("png"), "frame export"); +}); + +test("targets: a mixed selection offers only the intersection", () => { + // Video and audio share audio targets, but a video-only target such as mkv + // must not be offered, or bulk-setting it would produce invalid jobs. + const t = d.commonTargets(["mp4", "mp3"], TARGETS).map(x => x.ext); + assert.ok(t.includes("mp3")); + assert.ok(t.includes("flac")); + assert.ok(!t.includes("mkv"), "mp3 cannot become mkv"); + assert.ok(!t.includes("png"), "mp3 cannot become png"); +}); + +test("targets: an impossible mix offers nothing rather than something invalid", () => { + // Images cannot become audio, audio cannot become images. + assert.deepEqual(d.commonTargets(["mp3", "png"], TARGETS), []); +}); + +test("targets: empty and unknown input is handled", () => { + assert.deepEqual(d.commonTargets([], TARGETS), []); + assert.deepEqual(d.commonTargets([null, undefined], TARGETS), []); +}); + +test("targets: grouping puts same-kind formats first", () => { + const groups = d.groupTargets(d.commonTargets(["mp4"], TARGETS)); + assert.equal(groups[0].group, "Video", "video sources lead with video targets"); + assert.ok(groups.length > 1, "cross-kind groups still offered"); +}); + +test("display: kind icons cover every kind and fall back safely", () => { + assert.equal(d.iconForKind("audio"), "audio_file"); + assert.equal(d.iconForKind("video"), "video_file"); + assert.equal(d.iconForKind("image"), "image"); + assert.equal(d.iconForKind("nonsense"), "insert_drive_file"); +}); + +// --------------------------------------------------------------------------- +// dual-load guards +// +// display.js is required here in Node AND loaded as a plain diff --git a/src/main.js b/src/main.js index 920a83a..46abe3a 100644 --- a/src/main.js +++ b/src/main.js @@ -11,6 +11,7 @@ const probe = require("./core/probe"); const paths = require("./core/paths"); const scan = require("./core/scan"); const pipeline = require("./core/pipeline"); +const version = require("./core/version"); const LOG_LEVELS = { ERROR: 0, WARN: 1, INFO: 2, DEBUG: 3 }; @@ -147,6 +148,18 @@ function createCreditsWindow() { creditsWindow.show(); creditsWindow.focus(); }); + + // Escape closes the window. Handled in the main process rather than with a + // keydown listener in the page: before-input-event fires no matter where + // focus sits inside the document, and does not depend on the page script + // having run. The page-level handler worked when run unpackaged but not in + // the packaged build, which is exactly the fragility this avoids. + creditsWindow.webContents.on("before-input-event", (event, input) => { + if (input.type === "keyDown" && input.key === "Escape") { + event.preventDefault(); + if (!creditsWindow.isDestroyed()) creditsWindow.close(); + } + }); creditsWindow.setMenu(null); creditsWindow.loadFile(path.join(__dirname, "credits.html")); } @@ -269,15 +282,41 @@ function getRunner() { } }); + // "Apply to all remaining" is scoped to one batch, not to the session. + runner.on("idle", () => { conflictChoiceForBatch = null; }); + return runner; } +// A choice the user asked to apply to the rest of the batch. Cleared whenever +// the runner goes idle, so it never leaks into the next run. +let conflictChoiceForBatch = null; + +/** Turn a chosen action into the result the runner expects. */ +function applyConflictChoice(choice, candidatePath, isDirectory) { + if (choice === "cancel") return { action: "cancel" }; + if (choice === "overwrite") return { action: "write", outputPath: candidatePath }; + return { + action: "write", + outputPath: isDirectory ? paths.getUniqueDirPath(candidatePath) : paths.getUniquePath(candidatePath), + }; +} + /** - * The output-exists prompt. Kept as a native dialog with v1's exact button - * set, so the behaviour users already know is unchanged. + * The output-exists prompt, with v1's exact button set so the behaviour users + * already know is unchanged. + * + * The checkbox matters: jobs run through a concurrency pool, so without a way + * to answer once for the whole batch, converting fifty files into a folder + * that already has them would mean fifty dialogs. */ async function resolveConflict(job, candidatePath) { const isDirectory = formats.producesDirectory(job.mode); + + if (conflictChoiceForBatch) { + return applyConflictChoice(conflictChoiceForBatch, candidatePath, isDirectory); + } + const result = await dialog.showMessageBox(mainWindow, { type: "question", title: "File Already Exists", @@ -288,14 +327,14 @@ async function resolveConflict(job, candidatePath) { buttons: ["Cancel", "Overwrite", "Save as New"], defaultId: 2, cancelId: 0, + checkboxLabel: "Apply to all remaining files", + checkboxChecked: false, }); - if (result.response === 0) return { action: "cancel" }; - if (result.response === 1) return { action: "write", outputPath: candidatePath }; - return { - action: "write", - outputPath: isDirectory ? paths.getUniqueDirPath(candidatePath) : paths.getUniquePath(candidatePath), - }; + const choice = ["cancel", "overwrite", "unique"][result.response] ?? "cancel"; + if (result.checkboxChecked) conflictChoiceForBatch = choice; + + return applyConflictChoice(choice, candidatePath, isDirectory); } /** @@ -323,7 +362,18 @@ function runJobToCompletion(job) { // ── IPC ────────────────────────────────────────────────────────────────────── ipcMain.handle(IPC.JOB_RUN, async (_event, spec) => { - const job = createJob(spec); + const settings = store.get("settings") ?? SETTINGS_DEFAULTS; + + const job = createJob({ + ...spec, + output: { + routing: settings.outputRouting, + dir: settings.outputDir, + nameTemplate: settings.nameTemplate, + onConflict: settings.onConflict, + ...spec.output, + }, + }); // Metadata is what gives progress a denominator, so probe before running. // A failed probe is not fatal; the job simply reports indeterminate progress. @@ -446,9 +496,31 @@ function setupAutoUpdater() { autoUpdater.autoDownload = false; autoUpdater.autoInstallOnAppQuit = true; + // Pre-releases are never an update target. The updater only ever looks at + // the latest stable, whatever the user is currently running. + // + // This has to be explicit: electron-updater turns allowPrerelease ON BY + // ITSELF when the running version carries a pre-release tag, so shipping + // 2.0.0-alpha.1 would silently opt every alpha tester into being updated to + // the next alpha. allowDowngrade stays off so an alpha user is not dragged + // back to an older stable either — they simply get nothing until a stable + // release supersedes what they are running. + autoUpdater.allowPrerelease = false; + autoUpdater.allowDowngrade = false; + autoUpdater.channel = "latest"; + autoUpdater.on("update-available", (info) => { const currentVersion = app.getVersion(); const newVersion = info.version; + + // Belt and braces. allowPrerelease above should mean this never fires + // for a pre-release, but a mis-tagged GitHub release would otherwise + // push an alpha at every user, so the offer is checked again here. + if (!version.isOfferableUpdate(newVersion, currentVersion)) { + log(LOG.WARN, `Ignoring update ${newVersion}: not an offerable stable release`); + return; + } + dialog.showMessageBox(mainWindow, { type: "info", title: "Update Available", @@ -493,8 +565,16 @@ function setupAutoUpdater() { function checkForUpdatesManually() { const { autoUpdater } = require("electron-updater"); + autoUpdater.allowPrerelease = false; + autoUpdater.allowDowngrade = false; + autoUpdater.channel = "latest"; + autoUpdater.checkForUpdates().then(result => { - if (!result || !result.updateInfo || result.updateInfo.version === app.getVersion()) { + const found = result?.updateInfo?.version ?? null; + // Equality was the wrong test: running 2.0.0-alpha.1 against a latest + // stable of 1.0.0 is neither equal nor an update, and the check used to + // fall through and do nothing at all. + if (!version.isOfferableUpdate(found, app.getVersion())) { dialog.showMessageBox(mainWindow, { type: "info", title: "No Updates", diff --git a/test/version.test.js b/test/version.test.js new file mode 100644 index 0000000..7d5ee83 --- /dev/null +++ b/test/version.test.js @@ -0,0 +1,153 @@ +"use strict"; + +const test = require("node:test"); +const assert = require("node:assert/strict"); +const fs = require("fs"); +const path = require("path"); + +const v = require("../src/core/version"); + +test("version: parses plain and pre-release versions", () => { + assert.deepEqual(v.parse("1.2.3"), { major: 1, minor: 2, patch: 3, prerelease: [] }); + assert.deepEqual(v.parse("2.0.0-alpha.1"), { major: 2, minor: 0, patch: 0, prerelease: ["alpha", "1"] }); + assert.deepEqual(v.parse("v1.0.0"), { major: 1, minor: 0, patch: 0, prerelease: [] }); + assert.equal(v.parse("not-a-version"), null); + assert.equal(v.parse(null), null); +}); + +test("version: identifies pre-releases", () => { + assert.equal(v.isPrerelease("2.0.0-alpha.1"), true); + assert.equal(v.isPrerelease("2.0.0-beta"), true); + assert.equal(v.isPrerelease("2.0.0-rc.2"), true); + assert.equal(v.isPrerelease("2.0.0"), false); + assert.equal(v.isPrerelease("1.0.0"), false); +}); + +test("version: orders by major, minor, patch", () => { + assert.equal(v.compare("1.0.0", "2.0.0"), -1); + assert.equal(v.compare("2.0.0", "1.0.0"), 1); + assert.equal(v.compare("1.2.0", "1.10.0"), -1, "compares numerically, not as strings"); + assert.equal(v.compare("1.0.10", "1.0.9"), 1); + assert.equal(v.compare("1.0.0", "1.0.0"), 0); +}); + +test("version: a pre-release precedes its own release", () => { + assert.equal(v.compare("2.0.0-alpha.1", "2.0.0"), -1); + assert.equal(v.compare("2.0.0", "2.0.0-alpha.1"), 1); + assert.equal(v.compare("2.0.0-alpha.1", "2.0.0-alpha.2"), -1); + assert.equal(v.compare("2.0.0-alpha.2", "2.0.0-beta.1"), -1); + assert.equal(v.compare("2.0.0-alpha.1", "2.0.0-alpha.1"), 0); + // A longer pre-release chain is greater when the prefix matches. + assert.equal(v.compare("2.0.0-alpha", "2.0.0-alpha.1"), -1); +}); + +test("version: numeric pre-release parts rank below alphanumeric ones", () => { + assert.equal(v.compare("1.0.0-1", "1.0.0-alpha"), -1); +}); + +// --------------------------------------------------------------------------- +// The rule the updater enforces +// --------------------------------------------------------------------------- + +test("update: a newer stable release is offered", () => { + assert.equal(v.isOfferableUpdate("1.1.0", "1.0.0"), true); + assert.equal(v.isOfferableUpdate("2.0.0", "1.0.0"), true); +}); + +test("update: a pre-release is NEVER offered, whatever the user is running", () => { + assert.equal(v.isOfferableUpdate("2.0.0-alpha.1", "1.0.0"), false, "stable user"); + assert.equal(v.isOfferableUpdate("2.0.0-alpha.2", "2.0.0-alpha.1"), false, "pre-release user"); + assert.equal(v.isOfferableUpdate("3.0.0-rc.1", "2.0.0"), false, "even a much newer one"); +}); + +test("update: someone on a pre-release is offered the stable that supersedes it", () => { + // 2.0.0 final supersedes 2.0.0-alpha.1, so it IS offered. + assert.equal(v.isOfferableUpdate("2.0.0", "2.0.0-alpha.1"), true); +}); + +test("update: an older stable is not offered to a pre-release user", () => { + // The case that silently did nothing: running 2.0.0-alpha.1 while the + // latest stable is 1.0.0. That is a downgrade and must be refused. + assert.equal(v.isOfferableUpdate("1.0.0", "2.0.0-alpha.1"), false); +}); + +test("update: the same version is not an update", () => { + assert.equal(v.isOfferableUpdate("1.0.0", "1.0.0"), false); + assert.equal(v.isOfferableUpdate("2.0.0-alpha.1", "2.0.0-alpha.1"), false); +}); + +test("update: garbage is never offered", () => { + assert.equal(v.isOfferableUpdate(null, "1.0.0"), false); + assert.equal(v.isOfferableUpdate("", "1.0.0"), false); + assert.equal(v.isOfferableUpdate("latest", "1.0.0"), false); +}); + +// --------------------------------------------------------------------------- +// The updater configuration itself +// --------------------------------------------------------------------------- + +test("updater: pre-releases are explicitly disallowed in main.js", () => { + const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8"); + + // electron-updater turns allowPrerelease ON BY ITSELF when the running + // version is a pre-release, which would make an alpha update to the next + // alpha. It has to be pinned off explicitly. + assert.match(main, /allowPrerelease\s*=\s*false/, + "main.js must set autoUpdater.allowPrerelease = false"); + assert.match(main, /allowDowngrade\s*=\s*false/, + "main.js must set autoUpdater.allowDowngrade = false"); + assert.match(main, /channel\s*=\s*"latest"/, + "main.js must pin the updater to the latest stable channel"); + assert.ok(!/allowPrerelease\s*=\s*true/.test(main), + "main.js must never enable pre-release updates"); +}); + +test("updater: the version currently shipping matches package.json", () => { + const pkg = JSON.parse(fs.readFileSync(path.join(__dirname, "..", "package.json"), "utf8")); + assert.ok(v.parse(pkg.version), `package.json version "${pkg.version}" is not valid semver`); +}); + +// --------------------------------------------------------------------------- +// Conflict policy wiring +// +// The resolver in main.js was unreachable because the job was built without +// the user's conflict setting, so createJob's default silently renamed every +// collision to "name (1).ext". The prompt is only reachable if the setting is +// actually threaded through. +// --------------------------------------------------------------------------- + +test("conflict: the documented default is to ask, not to rename silently", () => { + const { SETTINGS_DEFAULTS } = require("../src/constants"); + const { createJob, CONFLICT } = require("../src/core/job"); + + assert.equal(SETTINGS_DEFAULTS.onConflict, "ask"); + assert.equal(createJob({ inputPath: "a.mp4", targetExt: "mkv" }).output.onConflict, CONFLICT.ASK); +}); + +test("conflict: main.js threads the user's setting into the job", () => { + const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8"); + assert.match(main, /onConflict:\s*settings\.onConflict/, + "main.js must pass settings.onConflict into createJob, or the prompt is unreachable"); + assert.match(main, /conflictResolver:\s*resolveConflict/, + "the runner must be given the resolver"); +}); + +test("conflict: the prompt offers an escape hatch for a whole batch", () => { + const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8"); + // Without this, a batch of 50 collisions means 50 modal dialogs. + assert.match(main, /checkboxLabel:\s*"Apply to all remaining files"/); + assert.match(main, /conflictChoiceForBatch\s*=\s*null/, + "the batch-wide choice must be reset so it cannot leak into the next run"); +}); + +test("credits: Escape is handled in the main process, not the page", () => { + const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8"); + assert.match(main, /before-input-event/, + "Escape must be handled via before-input-event, which does not depend on the page script"); + assert.match(main, /input\.key === "Escape"/); + + // The page-level handler was the fragile version that failed when packaged. + const credits = fs.readFileSync(path.join(__dirname, "..", "src", "credits.html"), "utf8"); + assert.ok(!/addEventListener\(\s*["']keydown["']/.test(credits), + "credits.html should no longer rely on its own keydown listener"); +}); From 06761f1cb560d8ef1f8f32a5edc5d98d8e95d6bc Mon Sep 17 00:00:00 2001 From: Will Knowles Date: Fri, 28 Aug 2026 14:55:58 +0100 Subject: [PATCH 10/81] feat: New Job dialog for per-file encoding settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The engine has supported codec choice, constant quality, bitrate, encoder presets, resize with fit modes, frame rate, trim, stream copy, output routing and name templating since the architecture slice. None of it was reachable. This is the interface for it. Every control is built from the target format's own capability descriptors, so a container is never offered a codec it cannot carry: WebM offers VP9 and not H.264, MP4 the reverse, MP3 only its own. Sections appear and disappear with the target — an audio target has no video controls, an image target has no audio, a still image has no trim while a GIF does. Invalid combinations are unreachable rather than merely rejected on submit. A live command preview runs the spec through the real argument builder in the main process, so what the dialog shows is what will actually be executed rather than a reconstruction that could drift from it. The dialog edits a *partial* spec. Anything left untouched is omitted entirely and createJob fills it from the format's defaults, so the dialog does not freeze today's defaults into every job. Applying with nothing changed leaves the job exactly as it was, and the card shows no settings summary. Deliberately not the only way to set a format. The per-card dropdown and the bulk bar still work, so "drop a folder, pick a format, go" stays two clicks — the point raised when the grid landed. Presets save and restore the whole configuration including the target format, through the store bindings that were already wired. Cards gain a tune button that opens the dialog for that one file, and a green summary line describing what has been configured. Three bugs found by driving the dialog rather than by reading it: - CRF was silently discarded whenever the codec select sat on "Format default". The effective codec is the chosen one *or* the container's default, and treating the empty select as "no codec" disabled constant quality and dropped the value on apply. - Switching to a codec with no constant-quality mode forced the control to bitrate and never released it, so returning to H.264 left it stuck and threw the CRF away again. - Both stream selects rendered blank. Assigning a value no option carries leaves selectedIndex at -1, which reads back as "" and collapsed the whole encode section, since those fields only show when the mode is "encode". Verified end to end against ffmpeg: a spec shaped exactly as the dialog produces one resizes, re-times, trims and downmixes the real output. --- docs/MANUAL-TESTING.md | 83 ++++++++- src/constants.js | 1 + src/core/display.js | 136 ++++++++++++++ src/index.html | 200 ++++++++++++++++++++ src/main.js | 20 ++ src/preload.js | 2 + src/renderer.js | 401 ++++++++++++++++++++++++++++++++++++++++- src/styles.css | 78 ++++++++ test/display.test.js | 118 ++++++++++++ 9 files changed, 1036 insertions(+), 3 deletions(-) diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md index d86c1ea..674c42d 100644 --- a/docs/MANUAL-TESTING.md +++ b/docs/MANUAL-TESTING.md @@ -11,7 +11,7 @@ sections — the history is useful. ``` npm install -npm test # expect 114 passing, 0 failing +npm test # expect 126 passing, 0 failing npm start ``` @@ -267,3 +267,84 @@ The app currently ships as `2.0.0-alpha.1` while the latest stable is `1.0.0`. - [ ] On a stable build, a newer stable release *is* still offered normally — this must not have broken ordinary updates. - [ ] "View Changelog" from an update dialog opens the correct release page. + +--- + +## 2.0.0-alpha.2 — New Job dialog + +Per-file encoding settings. The engine already supported all of this; this pass +exposes it. **The plain path must stay two clicks** — check that first. + +### The simple path is not disturbed + +- [ ] Drop a folder of images, pick one format in the bulk bar, press Convert. + Still two clicks. The dialog must not be required for this. +- [ ] The per-card format dropdown still works on its own. + +### Opening the dialog + +- [ ] **New Job** in the top-right is disabled with an empty grid, enabled once + files are queued, and disabled again while a conversion runs. +- [ ] With nothing selected it opens for every file and the subtitle reads + "Configuring N files". +- [ ] With cards selected it opens for just those. +- [ ] The tune icon on a card opens it for that one file only, and does not + change the selection. +- [ ] Escape and the × both close it without applying anything. + +### Controls follow the target format + +- [ ] Choose an **audio** target (MP3): the Video section disappears entirely. +- [ ] Choose an **image** target (PNG): the Audio section disappears and an + Image quality slider appears. Trim disappears for a still image. +- [ ] Choose **GIF**: Trim stays available, because a GIF can be animated. +- [ ] Choose **WebM**: the codec list offers VP9/VP8/AV1 and **not** H.264. +- [ ] Choose **MP4**: it offers H.264/H.265/AV1 and **not** VP9. +- [ ] Choose **MP3**: the audio codec list offers only MP3. +- [ ] Set Stream to **Copy without re-encoding**: codec, quality, resize and + frame rate all disappear, since none of them apply to a remux. +- [ ] Set Stream to **Remove video**: same, and the preview gains `-vn`. +- [ ] Pick a codec with no constant-quality mode (MPEG-4 in AVI): Quality + switches to bitrate and locks. Switch back to H.264 — it must return to + **Constant quality**, not stay stuck on bitrate. +- [ ] Select a video and an image together: no shared format exists, the target + list is empty and the dialog says so. + +### Command preview + +- [ ] The preview updates as you change controls, and starts with `ffmpeg`. +- [ ] It reflects what you set — a CRF of 20 appears as `-crf 20`, a resize as + `scale=...`, a trim as `-ss`. +- [ ] The preview text can be selected and copied. *(It is the one deliberate + exception to nothing-is-selectable.)* +- [ ] An invalid combination shows a red message and disables **Apply**. + +### Applying + +- [ ] Apply, then check the card: a green summary line appears under the + metadata describing what was set, e.g. "H.264 · CRF 20 · 1280×720". +- [ ] Open the dialog again on that card — your settings are still there. +- [ ] Apply with nothing changed: the card gains **no** summary line. Untouched + settings must not be baked in. +- [ ] Apply to a multi-file selection: every selected card gets the summary. +- [ ] Convert, and confirm the output honours the settings — check the + resolution, duration and audio channels of the result, not just that a + file appeared. + +### Presets + +- [ ] Configure something, **Save as…**, give it a name. It appears in the + Preset dropdown. +- [ ] Change the fields, then re-select the preset — your saved values come + back, including the target format. +- [ ] **Delete** removes it, and it is gone after reopening the dialog. +- [ ] Presets survive restarting the app. + +### Output routing + +- [ ] Destination **A folder I choose** reveals a Browse button; picking a + folder puts the path in the field. +- [ ] Convert and confirm the output lands in that folder, not next to the + source. +- [ ] A name template of `{name}-web` produces `something-web.mp4`. +- [ ] **If it already exists** set to Overwrite converts without prompting. diff --git a/src/constants.js b/src/constants.js index dd5761c..c69ca35 100644 --- a/src/constants.js +++ b/src/constants.js @@ -18,6 +18,7 @@ const IPC = { // no way to tell which file it belonged to. JOB_RUN: "job:run", // invoke(job) -> result JOB_CANCEL: "job:cancel", // invoke(jobId) -> boolean + JOB_PREVIEW: "job:preview", // invoke(spec) -> ffmpeg argv preview JOB_PROGRESS: "job:progress", // push { jobId, percent, speed, fps, eta } JOB_STATUS: "job:status", // push { jobId, status, outputPath?, error? } QUEUE_CANCEL_ALL: "queue:cancel-all", diff --git a/src/core/display.js b/src/core/display.js index 07519cf..8310255 100644 --- a/src/core/display.js +++ b/src/core/display.js @@ -162,6 +162,135 @@ return KIND_ICONS[kind] || "insert_drive_file"; } + // -- New Job dialog ------------------------------------------------------ + // + // Which controls a target format actually supports. The dialog is driven + // entirely from these, so a container is never offered a codec it cannot + // carry — invalid combinations are unreachable rather than merely rejected. + + /** Which sections of the dialog apply to this target format. */ + function applicableSections(targetExt, descriptors) { + const target = descriptors ? descriptors[targetExt] : null; + if (!target) return { video: false, audio: false, image: false, trim: false, resize: false }; + + const isImage = target.kind === "image"; + const isAudio = target.kind === "audio"; + + return { + // An audio container has no video stream to configure. + video: !isAudio, + // An image has no audio stream. + audio: !isImage, + // Only image targets expose a quality knob of their own. + image: isImage && !!target.quality, + // Trimming a single still makes no sense. + trim: !(isImage && !target.animated), + resize: !isAudio, + }; + } + + /** Codec choices for a target, as {value,label} options. Empty if none. */ + function codecOptions(targetExt, descriptors, stream) { + const target = descriptors ? descriptors[targetExt] : null; + if (!target) return []; + const list = stream === "audio" ? target.audioCodecs : target.videoCodecs; + if (!Array.isArray(list)) return []; + return list.map(c => ({ value: c, label: CODEC_LABELS[c] || c })); + } + + const CODEC_LABELS = { + libx264: "H.264", libx265: "H.265 / HEVC", libsvtav1: "AV1", + "libvpx-vp9": "VP9", libvpx: "VP8", mpeg4: "MPEG-4", mjpeg: "MJPEG", + prores_ks: "ProRes", wmv2: "WMV", msmpeg4v3: "MS MPEG-4", flv: "Sorenson", + gif: "GIF", png: "PNG", bmp: "BMP", tiff: "TIFF", libwebp: "WebP", + aac: "AAC", libmp3lame: "MP3", libopus: "Opus", libvorbis: "Vorbis", + flac: "FLAC", alac: "ALAC", ac3: "AC-3", wmav2: "WMA", + pcm_s16le: "PCM 16-bit", pcm_s24le: "PCM 24-bit", pcm_f32le: "PCM 32-bit float", + }; + + /** Whether a target can stream-copy, i.e. remux without re-encoding. */ + function canStreamCopy(targetExt, descriptors) { + const target = descriptors ? descriptors[targetExt] : null; + return !!(target && target.supportsStreamCopy); + } + + /** The image quality knob for a target, or null. */ + function qualityDescriptor(targetExt, descriptors) { + const target = descriptors ? descriptors[targetExt] : null; + return target && target.quality ? target.quality : null; + } + + /** + * A one-line summary of whatever has been changed from the defaults, shown + * on the card so a configured job is visibly different from a bare one. + * Returns null when nothing has been customised. + */ + function summariseSettings(settings) { + if (!settings) return null; + const parts = []; + + if (settings.video) { + const v = settings.video; + if (v.mode === "copy") parts.push("copy video"); + else if (v.mode === "drop") parts.push("no video"); + else { + if (v.codec) parts.push(CODEC_LABELS[v.codec] || v.codec); + if (v.crf != null) parts.push(`CRF ${v.crf}`); + else if (v.bitrate) parts.push(`${v.bitrate}k`); + if (v.preset) parts.push(v.preset); + } + if (v.width || v.height) parts.push(`${v.width || "auto"}×${v.height || "auto"}`); + if (v.fps) parts.push(`${v.fps} fps`); + } + + if (settings.audio) { + const a = settings.audio; + if (a.mode === "copy") parts.push("copy audio"); + else if (a.mode === "drop") parts.push("no audio"); + else { + if (a.codec) parts.push(CODEC_LABELS[a.codec] || a.codec); + if (a.bitrate) parts.push(`${a.bitrate}k`); + if (a.channels) parts.push(a.channels === 1 ? "mono" : `${a.channels}ch`); + } + } + + if (settings.image && settings.image.quality != null) { + parts.push(`q${settings.image.quality}`); + } + + const trim = settings.trim; + if (trim && (trim.start != null || trim.end != null)) { + parts.push(`trim ${formatDuration(trim.start || 0) || "0:00"}–${formatDuration(trim.end) || "end"}`); + } + + if (settings.output) { + const o = settings.output; + if (o.routing && o.routing !== "alongside") parts.push(o.routing === "mirror" ? "mirrored" : "custom folder"); + if (o.nameTemplate && o.nameTemplate !== "{name}") parts.push("renamed"); + } + + return parts.length > 0 ? parts.join(" · ") : null; + } + + /** + * Strip empty sections and null fields so a spec carries only what was + * actually set. Anything left out falls back to the format's own defaults + * in createJob, which keeps the dialog from freezing today's defaults in. + */ + function compactSettings(settings) { + const out = {}; + for (const [section, values] of Object.entries(settings || {})) { + if (!values || typeof values !== "object") continue; + const kept = {}; + for (const [key, value] of Object.entries(values)) { + if (value === null || value === undefined || value === "") continue; + kept[key] = value; + } + if (Object.keys(kept).length > 0) out[section] = kept; + } + return out; + } + // -- Selection ----------------------------------------------------------- /** @@ -269,6 +398,13 @@ STATUS, plural, countOf, + applicableSections, + codecOptions, + canStreamCopy, + qualityDescriptor, + summariseSettings, + compactSettings, + CODEC_LABELS, formatDuration, formatBytes, formatEta, diff --git a/src/index.html b/src/index.html index 6362fe4..2b2c26b 100644 --- a/src/index.html +++ b/src/index.html @@ -30,6 +30,9 @@

Diamond File Converter

+
@@ -82,6 +85,203 @@

Diamond File Converter

+ + +
diff --git a/src/main.js b/src/main.js index 46abe3a..32b7570 100644 --- a/src/main.js +++ b/src/main.js @@ -7,6 +7,7 @@ const { APP_NAME, IPC, WINDOW, LOG, ARGV_BATCH_DEBOUNCE_MS, SETTINGS_DEFAULTS } const formats = require("./core/formats"); const { createJob, validateJob, STATUS } = require("./core/job"); const { JobRunner, defaultConcurrency } = require("./core/runner"); +const { buildArgs } = require("./core/ffmpeg-args"); const probe = require("./core/probe"); const paths = require("./core/paths"); const scan = require("./core/scan"); @@ -454,8 +455,27 @@ ipcMain.handle(IPC.APP_GET_FORMATS, () => ({ targetsByExt: Object.fromEntries( formats.SUPPORTED_EXTENSIONS.map(ext => [ext, formats.targetsFor(ext)]) ), + // Capability descriptors, so the New Job dialog can offer exactly the + // codecs and quality ranges each container supports rather than hardcoding + // lists that would drift from the format graph. + descriptors: formats.FORMATS, + modes: formats.MODE, + kinds: formats.KIND, })); +// Live ffmpeg preview for the New Job dialog. Runs the spec through the real +// argument builder, so what the dialog shows is what will actually be executed. +ipcMain.handle(IPC.JOB_PREVIEW, (_event, spec) => { + try { + const job = createJob(spec); + const validation = validateJob(job); + const args = buildArgs(job, { outputPath: "", progress: false }); + return { ok: validation.valid, errors: validation.errors, args }; + } catch (err) { + return { ok: false, errors: [err.message], args: [] }; + } +}); + ipcMain.handle(IPC.SETTINGS_GET, () => store.get("settings")); ipcMain.handle(IPC.SETTINGS_SET, (_event, settings) => { store.set("settings", { ...store.get("settings"), ...settings }); diff --git a/src/preload.js b/src/preload.js index bce9ad8..b333a25 100644 --- a/src/preload.js +++ b/src/preload.js @@ -18,6 +18,7 @@ const { contextBridge, ipcRenderer, webUtils } = require("electron"); const CH = { JOB_RUN: "job:run", JOB_CANCEL: "job:cancel", + JOB_PREVIEW: "job:preview", JOB_PROGRESS: "job:progress", JOB_STATUS: "job:status", QUEUE_CANCEL_ALL: "queue:cancel-all", @@ -55,6 +56,7 @@ contextBridge.exposeInMainWorld("electronAPI", { // -- Jobs and queue ------------------------------------------------------- runJob: (job) => ipcRenderer.invoke(CH.JOB_RUN, job), cancelJob: (jobId) => ipcRenderer.invoke(CH.JOB_CANCEL, jobId), + previewJob: (spec) => ipcRenderer.invoke(CH.JOB_PREVIEW, spec), cancelAll: () => ipcRenderer.invoke(CH.QUEUE_CANCEL_ALL), setConcurrency: (n) => ipcRenderer.invoke(CH.QUEUE_SET_CONCURRENCY, n), diff --git a/src/renderer.js b/src/renderer.js index 3113f2e..a2f7312 100644 --- a/src/renderer.js +++ b/src/renderer.js @@ -25,6 +25,7 @@ const display = window.display; // Populated from main at startup so the format graph has one source of truth. let FORMATS = null; let TARGETS = null; +let DESCRIPTORS = null; const el = {}; @@ -57,6 +58,7 @@ function addFiles(filePaths) { ext, kind: entry.type, targetExt: null, + settings: {}, meta: null, status: "pending", progress: 0, @@ -261,6 +263,18 @@ function buildCard(job) { name.textContent = p.basename(job.filePath); name.title = job.filePath; + const configure = document.createElement("button"); + configure.className = "card-configure"; + configure.title = "Configure this file"; + const configureIcon = document.createElement("span"); + configureIcon.className = "material-icons-round"; + configureIcon.textContent = "tune"; + configure.appendChild(configureIcon); + configure.addEventListener("click", (e) => { + e.stopPropagation(); + openJobModal([job.id]); + }); + const remove = document.createElement("button"); remove.className = "card-remove"; remove.title = "Remove"; @@ -273,12 +287,15 @@ function buildCard(job) { removeJobs([job.id]); }); - head.append(tick, icon, name, remove); + head.append(tick, icon, name, configure, remove); // -- meta const meta = document.createElement("div"); meta.className = "card-meta"; + const settingsLine = document.createElement("div"); + settingsLine.className = "card-settings d-none"; + // -- convert row const convert = document.createElement("div"); convert.className = "card-convert"; @@ -320,7 +337,7 @@ function buildCard(job) { const actions = document.createElement("div"); actions.className = "card-actions d-none"; - card.append(head, meta, convert, status, progress, actions); + card.append(head, meta, settingsLine, convert, status, progress, actions); card.addEventListener("click", (e) => handleCardClick(job.id, e)); paintCard(card, job); @@ -364,6 +381,15 @@ function paintCard(card, job) { meta.classList.toggle("pending", described === null); if (described) meta.title = described; + // Show what has been configured, so a customised job is visibly different. + const settingsLine = card.querySelector(".card-settings"); + const summary = display.summariseSettings(job.settings); + settingsLine.classList.toggle("d-none", !summary); + if (summary) { + settingsLine.textContent = summary; + settingsLine.title = summary; + } + const { text, tone } = display.describeStatus(job); const status = card.querySelector(".card-status"); status.className = `card-status tone-${tone}`; @@ -514,10 +540,337 @@ function renderActionBar() { // than sitting side by side, so only one is ever visible. $("btn-convert").classList.toggle("d-none", converting); $("btn-convert").disabled = ready === 0; + $("btn-new-job").disabled = total === 0 || converting; $("btn-cancel-all").classList.toggle("d-none", !converting); $("btn-clear-all").disabled = converting; } +// -- New Job dialog ---------------------------------------------------------- +// +// Every control is built from the target format's own capabilities, so a +// container is never offered a codec it cannot carry. The dialog edits a +// partial spec: anything left blank is omitted, and createJob fills it from the +// format's defaults rather than the dialog freezing today's defaults in. +// +// It is deliberately not the only way to set a format — the per-card dropdown +// and the bulk bar still work, so the plain "drop a folder, pick a format, go" +// path stays two clicks. + +let jobModal = null; +let modalScope = []; // job ids the dialog is editing +let presets = []; +let previewTimer = null; + +const ENCODER_PRESETS = ["ultrafast", "superfast", "veryfast", "faster", "fast", + "medium", "slow", "slower", "veryslow"]; + +/** Parse "90", "1:30" or "1:02:03" into seconds. Null when empty/invalid. */ +function parseTime(text) { + const raw = String(text ?? "").trim(); + if (!raw) return null; + if (/^\d+(\.\d+)?$/.test(raw)) return Number(raw); + const parts = raw.split(":"); + if (parts.length < 2 || parts.length > 3) return null; + if (!parts.every(p => /^\d+(\.\d+)?$/.test(p.trim()))) return null; + return parts.reduce((acc, part) => acc * 60 + Number(part), 0); +} + +function fillSelect(select, options, current, placeholder) { + select.innerHTML = ""; + if (placeholder !== undefined) { + const opt = document.createElement("option"); + opt.value = ""; + opt.textContent = placeholder; + select.appendChild(opt); + } + for (const o of options) { + const opt = document.createElement("option"); + opt.value = o.value; + opt.textContent = o.label; + select.appendChild(opt); + } + select.value = current ?? ""; + // Assigning a value no option carries leaves selectedIndex at -1, which + // renders as a blank control and reads back as "". Fall back to the first + // entry so a select without a placeholder always shows a real choice. + if (select.selectedIndex === -1 && select.options.length > 0) { + select.selectedIndex = 0; + } +} + +/** Open the dialog for a set of job ids. */ +function openJobModal(ids) { + modalScope = ids.filter(id => jobs.some(j => j.id === id)); + if (modalScope.length === 0) return; + + const scoped = jobs.filter(j => modalScope.includes(j.id)); + $("jm-scope").textContent = scoped.length === 1 + ? `Configuring ${p.basename(scoped[0].filePath)}` + : `Configuring ${display.countOf(scoped.length, "file")}`; + + // Target options are the intersection, exactly as the bulk bar computes it. + const targets = display.commonTargets(scoped.map(j => j.ext), TARGETS); + const sharedTarget = [...new Set(scoped.map(j => j.targetExt))]; + fillTargetSelect($("jm-target"), targets, sharedTarget.length === 1 ? sharedTarget[0] : null); + $("jm-target-note").textContent = targets.length === 0 + ? "These files have no format in common." + : ""; + + // Seed from the first job's existing settings so reopening shows what is set. + const seed = scoped.find(j => j.settings && Object.keys(j.settings).length > 0); + loadSettingsIntoForm(seed ? seed.settings : {}); + + refreshPresets(); + syncModalControls(); + + if (!jobModal) jobModal = new bootstrap.Modal($("job-modal")); + jobModal.show(); +} + +function loadSettingsIntoForm(settings) { + const s = settings ?? {}; + const v = s.video ?? {}, a = s.audio ?? {}, o = s.output ?? {}, t = s.trim ?? {}, i = s.image ?? {}; + + $("jm-routing").value = o.routing ?? "alongside"; + $("jm-outdir").value = o.dir ?? ""; + $("jm-name").value = o.nameTemplate ?? ""; + $("jm-conflict").value = o.onConflict ?? "ask"; + + $("jm-vmode").value = v.mode ?? "encode"; + $("jm-crf").value = v.crf ?? ""; + $("jm-vbitrate").value = v.bitrate ?? ""; + $("jm-quality-mode").value = v.bitrate != null && v.crf == null ? "bitrate" : "crf"; + $("jm-width").value = v.width ?? ""; + $("jm-height").value = v.height ?? ""; + $("jm-fit").value = v.fitMode ?? "contain"; + $("jm-fps").value = v.fps ?? ""; + + $("jm-amode").value = a.mode ?? "encode"; + $("jm-abitrate").value = a.bitrate ?? ""; + $("jm-arate").value = a.sampleRate ?? ""; + $("jm-achannels").value = a.channels ?? ""; + + $("jm-trim-start").value = t.start != null ? display.formatDuration(t.start) ?? t.start : ""; + $("jm-trim-end").value = t.end != null ? display.formatDuration(t.end) ?? t.end : ""; + + // Codec and quality selects depend on the target, so they are populated by + // syncModalControls; stash the wanted values for it to apply. + $("jm-vcodec").dataset.wanted = v.codec ?? ""; + $("jm-acodec").dataset.wanted = a.codec ?? ""; + $("jm-encpreset").dataset.wanted = v.preset ?? ""; + $("jm-iquality").dataset.wanted = i.quality ?? ""; +} + +/** Rebuild every capability-dependent control for the chosen target. */ +function syncModalControls() { + const target = $("jm-target").value || null; + const sections = display.applicableSections(target, DESCRIPTORS); + + $("jm-video-section").classList.toggle("d-none", !sections.video); + $("jm-audio-section").classList.toggle("d-none", !sections.audio); + $("jm-image-section").classList.toggle("d-none", !sections.image); + $("jm-trim-section").classList.toggle("d-none", !sections.trim); + + // Stream modes: copy is only offered where the container supports remuxing. + const canCopy = display.canStreamCopy(target, DESCRIPTORS); + const modeOptions = (other) => [ + { value: "encode", label: "Re-encode" }, + ...(canCopy ? [{ value: "copy", label: "Copy without re-encoding" }] : []), + { value: "drop", label: other }, + ]; + fillSelect($("jm-vmode"), modeOptions("Remove video"), $("jm-vmode").value); + fillSelect($("jm-amode"), modeOptions("Remove audio"), $("jm-amode").value); + + fillSelect($("jm-vcodec"), display.codecOptions(target, DESCRIPTORS, "video"), + $("jm-vcodec").dataset.wanted || undefined, "Format default"); + fillSelect($("jm-acodec"), display.codecOptions(target, DESCRIPTORS, "audio"), + $("jm-acodec").dataset.wanted || undefined, "Format default"); + + // "Format default" in the codec select means the container's own default, + // not "no codec" — resolve it, or CRF gets disabled and silently dropped + // for every job left on the default. + const codec = effectiveVideoCodec(); + const supportsPreset = ["libx264", "libx265", "libsvtav1"].includes(codec); + fillSelect($("jm-encpreset"), ENCODER_PRESETS.map(x => ({ value: x, label: x })), + $("jm-encpreset").dataset.wanted || undefined, "Encoder default"); + $("jm-encpreset").disabled = !supportsPreset; + $("jm-encpreset").parentElement.classList.toggle("d-none", !supportsPreset); + + const usesCrf = ["libx264", "libx265", "libsvtav1", "libvpx-vp9", "libvpx"].includes(codec); + $("jm-crf-note").textContent = usesCrf + ? "Lower is better quality and a bigger file. 18–28 is the usual range." + : (codec ? "This codec uses a target bitrate rather than constant quality." : ""); + // Switching to a codec with no constant-quality mode forces bitrate. Coming + // back to one that has it must restore constant quality — otherwise the + // control stays stuck on bitrate and the CRF the user typed is discarded + // on apply. Test the disabled flag before overwriting it. + if (!usesCrf) { + $("jm-quality-mode").value = "bitrate"; + } else if ($("jm-quality-mode").disabled) { + $("jm-quality-mode").value = "crf"; + } + $("jm-quality-mode").disabled = !usesCrf; + + const byBitrate = $("jm-quality-mode").value === "bitrate"; + $("jm-crf").classList.toggle("d-none", byBitrate); + $("jm-vbitrate").classList.toggle("d-none", !byBitrate); + $("jm-vbitrate-unit").classList.toggle("d-none", !byBitrate); + + // Encode-only controls hide when the stream is copied or dropped. + const vEncoding = $("jm-vmode").value === "encode"; + for (const el of document.querySelectorAll(".jm-vencode")) el.classList.toggle("d-none", !vEncoding); + const aEncoding = $("jm-amode").value === "encode"; + for (const el of document.querySelectorAll(".jm-aencode")) el.classList.toggle("d-none", !aEncoding); + + // Image quality range comes from the format's own descriptor. + const q = display.qualityDescriptor(target, DESCRIPTORS); + if (q) { + const slider = $("jm-iquality"); + slider.min = q.min; + slider.max = q.max; + slider.step = 1; + const wanted = slider.dataset.wanted; + slider.value = wanted !== "" && wanted !== undefined ? wanted : q.default; + $("jm-iquality-value").textContent = slider.value; + $("jm-iquality-note").textContent = q.inverted + ? `${q.min} is best quality, ${q.max} is smallest file.` + : `${q.max} is best quality, ${q.min} is smallest file.`; + } + + // The output folder only matters when a folder was chosen. + const needsDir = $("jm-routing").value !== "alongside"; + $("jm-outdir").parentElement.parentElement.classList.toggle("d-none", !needsDir); + + schedulePreview(); +} + +/** + * The codec that will actually be used: whatever is chosen, or the target + * format's own default when the select is left on "Format default". + */ +function effectiveVideoCodec() { + const chosen = $("jm-vcodec").value; + if (chosen) return chosen; + const target = $("jm-target").value; + return (DESCRIPTORS && DESCRIPTORS[target] && DESCRIPTORS[target].defaultVideoCodec) || null; +} + +/** Read the form back into a partial job spec. */ +function readSettingsFromForm() { + const target = $("jm-target").value || null; + const sections = display.applicableSections(target, DESCRIPTORS); + const num = (id) => { const v = $(id).value; return v === "" ? null : Number(v); }; + // Match syncModalControls: quality mode is only meaningful once the + // effective codec is known. + const usesCrf = ["libx264", "libx265", "libsvtav1", "libvpx-vp9", "libvpx"] + .includes(effectiveVideoCodec()); + const byBitrate = !usesCrf || $("jm-quality-mode").value === "bitrate"; + + const settings = { + output: { + routing: $("jm-routing").value, + dir: $("jm-outdir").value || null, + nameTemplate: $("jm-name").value || null, + onConflict: $("jm-conflict").value, + }, + video: sections.video ? { + mode: $("jm-vmode").value, + codec: $("jm-vcodec").value || null, + crf: byBitrate ? null : num("jm-crf"), + bitrate: byBitrate ? num("jm-vbitrate") : null, + preset: $("jm-encpreset").disabled ? null : ($("jm-encpreset").value || null), + width: num("jm-width"), + height: num("jm-height"), + fitMode: $("jm-fit").value, + fps: num("jm-fps"), + } : null, + audio: sections.audio ? { + mode: $("jm-amode").value, + codec: $("jm-acodec").value || null, + bitrate: num("jm-abitrate"), + sampleRate: num("jm-arate"), + channels: num("jm-achannels"), + } : null, + image: sections.image ? { quality: num("jm-iquality") } : null, + trim: sections.trim ? { + start: parseTime($("jm-trim-start").value), + end: parseTime($("jm-trim-end").value), + } : null, + }; + + // Defaults that were never touched are dropped, so the format keeps + // control of anything the user did not explicitly choose. + if (settings.output.routing === "alongside") settings.output.routing = null; + if (settings.output.onConflict === "ask") settings.output.onConflict = null; + if (settings.video && settings.video.mode === "encode") settings.video.mode = null; + if (settings.video && settings.video.fitMode === "contain") settings.video.fitMode = null; + if (settings.audio && settings.audio.mode === "encode") settings.audio.mode = null; + + return display.compactSettings(settings); +} + +/** Debounced live preview, built by the real argument builder in main. */ +function schedulePreview() { + clearTimeout(previewTimer); + previewTimer = setTimeout(async () => { + const target = $("jm-target").value; + const sample = jobs.find(j => modalScope.includes(j.id)); + if (!target || !sample) { + $("jm-preview").textContent = "Choose a format to see the command."; + $("jm-errors").textContent = ""; + return; + } + const result = await api.previewJob({ + inputPath: sample.filePath, + targetExt: target, + ...readSettingsFromForm(), + }); + $("jm-preview").textContent = `ffmpeg ${result.args.join(" ")}`; + $("jm-errors").textContent = result.ok ? "" : result.errors.join(" "); + $("jm-apply").disabled = !result.ok; + }, 180); +} + +function applyJobModal() { + const target = $("jm-target").value || null; + const settings = readSettingsFromForm(); + + for (const job of jobs) { + if (!modalScope.includes(job.id)) continue; + if (job.status === "running") continue; + job.settings = settings; + updateCard(job); + } + if (target) setTarget(modalScope, target); + + jobModal.hide(); + const n = modalScope.length; + toast(`Settings applied to ${display.countOf(n, "file")}.`, "success"); +} + +// -- Presets ----------------------------------------------------------------- + +async function refreshPresets() { + presets = await api.listPresets(); + fillSelect($("jm-preset"), presets.map(x => ({ value: x.id, label: x.name })), "", "No preset"); + $("jm-preset-delete").disabled = true; +} + +async function savePresetFromForm() { + const name = String(window.prompt("Preset name") ?? "").trim(); + if (!name) return; + const preset = { + id: `p${Date.now().toString(36)}`, + name, + targetExt: $("jm-target").value || null, + settings: readSettingsFromForm(), + }; + presets = await api.savePreset(preset); + fillSelect($("jm-preset"), presets.map(x => ({ value: x.id, label: x.name })), preset.id, "No preset"); + $("jm-preset-delete").disabled = false; + toast(`Preset "${name}" saved.`, "success"); +} + // -- Toasts ------------------------------------------------------------------ const TOAST_ICONS = { info: "info", success: "check_circle", warning: "warning", danger: "error" }; @@ -579,6 +932,7 @@ async function startConversion() { id: job.id, inputPath: job.filePath, targetExt: job.targetExt, + ...(job.settings ?? {}), }); applyResult(job, result); return result; @@ -626,6 +980,7 @@ function announce(results) { document.addEventListener("DOMContentLoaded", async () => { FORMATS = await api.getFormats(); TARGETS = FORMATS.targetsByExt; + DESCRIPTORS = FORMATS.descriptors; // Drag and drop. The document-level guard stops a stray drop navigating the // window to the file and replacing the app with it. @@ -690,6 +1045,48 @@ document.addEventListener("DOMContentLoaded", async () => { }); $("bulk-remove").addEventListener("click", () => removeJobs([...selection])); $("bulk-deselect").addEventListener("click", clearSelection); + // The corner button configures the selection, or everything when nothing + // is selected — the same scope rule the bulk bar uses. + $("btn-new-job").addEventListener("click", () => { + openJobModal(bulkScope().map(j => j.id)); + }); + + $("jm-target").addEventListener("change", syncModalControls); + for (const id of ["jm-vmode", "jm-amode", "jm-vcodec", "jm-acodec", "jm-quality-mode", "jm-routing"]) { + $(id).addEventListener("change", syncModalControls); + } + for (const id of ["jm-crf", "jm-vbitrate", "jm-width", "jm-height", "jm-fit", "jm-fps", + "jm-abitrate", "jm-arate", "jm-achannels", "jm-encpreset", + "jm-trim-start", "jm-trim-end", "jm-name", "jm-conflict"]) { + $(id).addEventListener("input", schedulePreview); + $(id).addEventListener("change", schedulePreview); + } + $("jm-iquality").addEventListener("input", (e) => { + $("jm-iquality-value").textContent = e.target.value; + schedulePreview(); + }); + $("jm-outdir-browse").addEventListener("click", async () => { + const dir = await api.chooseOutput(); + if (dir) { $("jm-outdir").value = dir; schedulePreview(); } + }); + $("jm-apply").addEventListener("click", applyJobModal); + $("jm-preset-save").addEventListener("click", savePresetFromForm); + $("jm-preset-delete").addEventListener("click", async () => { + const id = $("jm-preset").value; + if (!id) return; + presets = await api.deletePreset(id); + await refreshPresets(); + toast("Preset deleted.", "info"); + }); + $("jm-preset").addEventListener("change", (e) => { + const preset = presets.find(x => x.id === e.target.value); + $("jm-preset-delete").disabled = !preset; + if (!preset) return; + if (preset.targetExt) $("jm-target").value = preset.targetExt; + loadSettingsIntoForm(preset.settings); + syncModalControls(); + }); + $("bulk-select-all").addEventListener("change", (e) => { if (e.target.checked) selectAll(); else clearSelection(); diff --git a/src/styles.css b/src/styles.css index 6d90c08..e05a4b6 100644 --- a/src/styles.css +++ b/src/styles.css @@ -471,6 +471,84 @@ body.popup-window span:hover { animation: spin 1.4s linear infinite; } +/* ── New Job dialog ──────────────────────────────────────────────────────── */ + +.jm-section { + font-size: 0.7rem; + text-transform: uppercase; + letter-spacing: 0.1em; + color: var(--bs-secondary-color); + margin: 1.25rem 0 0.6rem; + padding-bottom: 0.3rem; + border-bottom: 1px solid var(--bs-border-color); +} + +.jm-grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(230px, 1fr)); + gap: 0.75rem 1rem; +} + +.jm-row .form-label { + font-size: 0.8rem; + margin-bottom: 0.25rem; +} + +/* Reserve the help line so the dialog does not jump as notes appear. */ +.jm-row .form-text { + min-height: 1.2em; + margin-top: 0.2rem; +} + +.jm-preview { + background-color: var(--bs-secondary-bg); + border: 1px solid var(--bs-border-color); + border-radius: var(--radius-control); + padding: 0.6rem 0.75rem; + font-size: 0.75rem; + line-height: 1.5; + white-space: pre-wrap; + word-break: break-all; + margin: 0; + max-height: 8rem; + overflow-y: auto; + /* The one place selection is wanted: a command you may want to copy. */ + user-select: text; +} + +.jm-preview::-webkit-scrollbar { width: var(--scrollbar-width); } +.jm-preview::-webkit-scrollbar-track { background: transparent; } +.jm-preview::-webkit-scrollbar-thumb { background: var(--scrollbar-thumb); border-radius: 3px; } + +.modal-body::-webkit-scrollbar { width: var(--scrollbar-width); } +.modal-body::-webkit-scrollbar-track { background: transparent; } +.modal-body::-webkit-scrollbar-thumb { background: var(--scrollbar-thumb); border-radius: 3px; } + +/* Card gains a configure button and a settings summary line. */ +.card-configure { + border: none; + background: none; + color: var(--bs-secondary-color); + display: inline-flex; + align-items: center; + justify-content: center; + padding: 0; + cursor: pointer; + flex-shrink: 0; + transition: color var(--dur-micro) var(--ease-micro); +} + +.card-configure:hover { color: var(--accent); } +.card-configure .material-icons-round { font-size: 16px; line-height: 1; display: block; } + +.card-settings { + font-size: 0.72rem; + color: var(--accent); + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + /* ── Toast ───────────────────────────────────────────────────────────────── */ /* The house spec puts this at top:16px, which suits a web page whose content diff --git a/test/display.test.js b/test/display.test.js index a10246d..5dc4971 100644 --- a/test/display.test.js +++ b/test/display.test.js @@ -338,3 +338,121 @@ test("every counted string in the renderer goes through the helper", () => { assert.deepEqual(raw.map(m => m[0]), [], "found a raw count followed by a plural noun — route it through display.countOf"); }); + +// --------------------------------------------------------------------------- +// New Job dialog +// +// The dialog is driven entirely from the format capability graph, so an +// invalid combination is unreachable rather than merely rejected on submit. +// --------------------------------------------------------------------------- + +const DESCRIPTORS = formats.FORMATS; + +test("dialog: an audio target offers no video controls", () => { + const s = d.applicableSections("mp3", DESCRIPTORS); + assert.equal(s.video, false); + assert.equal(s.audio, true); + assert.equal(s.resize, false); + assert.equal(s.image, false); +}); + +test("dialog: an image target offers no audio controls", () => { + const s = d.applicableSections("png", DESCRIPTORS); + assert.equal(s.audio, false); + assert.equal(s.image, true, "a still image exposes its own quality knob"); + assert.equal(s.trim, false, "trimming a single still is meaningless"); +}); + +test("dialog: an animated image target can still be trimmed", () => { + assert.equal(d.applicableSections("gif", DESCRIPTORS).trim, true); + assert.equal(d.applicableSections("webp", DESCRIPTORS).trim, true); +}); + +test("dialog: a video target offers everything", () => { + const s = d.applicableSections("mp4", DESCRIPTORS); + assert.equal(s.video, true); + assert.equal(s.audio, true); + assert.equal(s.trim, true); + assert.equal(s.resize, true); +}); + +test("dialog: an unknown target offers nothing rather than throwing", () => { + const s = d.applicableSections("nope", DESCRIPTORS); + assert.deepEqual(s, { video: false, audio: false, image: false, trim: false, resize: false }); +}); + +test("dialog: codec choices come from the container's own capabilities", () => { + const mp4 = d.codecOptions("mp4", DESCRIPTORS, "video").map(o => o.value); + assert.ok(mp4.includes("libx264")); + assert.ok(!mp4.includes("libvpx-vp9"), "MP4 must not offer VP9"); + + const webm = d.codecOptions("webm", DESCRIPTORS, "video").map(o => o.value); + assert.ok(webm.includes("libvpx-vp9")); + assert.ok(!webm.includes("libx264"), "WebM must not offer H.264"); + + // Every offered codec must be one validateJob would accept. + for (const ext of formats.SUPPORTED_EXTENSIONS) { + for (const stream of ["video", "audio"]) { + for (const opt of d.codecOptions(ext, DESCRIPTORS, stream)) { + const list = stream === "audio" ? DESCRIPTORS[ext].audioCodecs : DESCRIPTORS[ext].videoCodecs; + assert.ok(list.includes(opt.value), `${ext} offered ${opt.value} for ${stream}`); + } + } + } +}); + +test("dialog: codecs get readable labels, unknown ones pass through", () => { + assert.equal(d.CODEC_LABELS.libx264, "H.264"); + assert.equal(d.codecOptions("mp4", DESCRIPTORS, "audio")[0].label, "AAC"); +}); + +test("dialog: stream copy is offered only where the container supports it", () => { + assert.equal(d.canStreamCopy("mp4", DESCRIPTORS), true); + assert.equal(d.canStreamCopy("png", DESCRIPTORS), false); + assert.equal(d.canStreamCopy("nope", DESCRIPTORS), false); +}); + +test("dialog: image quality descriptors carry their real range", () => { + const jpg = d.qualityDescriptor("jpg", DESCRIPTORS); + assert.equal(jpg.flag, "-q:v"); + assert.equal(jpg.inverted, true, "JPEG quality runs backwards"); + + const webp = d.qualityDescriptor("webp", DESCRIPTORS); + assert.equal(webp.max, 100); + assert.equal(d.qualityDescriptor("mp4", DESCRIPTORS), null); +}); + +test("dialog: settings summary describes only what was changed", () => { + assert.equal(d.summariseSettings(null), null); + assert.equal(d.summariseSettings({}), null, "an untouched job has no summary"); + + assert.equal( + d.summariseSettings({ video: { codec: "libx264", crf: 20, width: 1280, height: 720 } }), + "H.264 · CRF 20 · 1280×720" + ); + assert.equal(d.summariseSettings({ video: { mode: "copy" } }), "copy video"); + assert.equal(d.summariseSettings({ audio: { mode: "drop" } }), "no audio"); + assert.equal(d.summariseSettings({ audio: { codec: "aac", bitrate: 192, channels: 1 } }), "AAC · 192k · mono"); + assert.equal(d.summariseSettings({ image: { quality: 3 } }), "q3"); + assert.equal(d.summariseSettings({ trim: { start: 5, end: 65 } }), "trim 0:05–1:05"); + assert.equal(d.summariseSettings({ trim: { start: 5 } }), "trim 0:05–end"); + assert.equal(d.summariseSettings({ output: { nameTemplate: "{name}-web" } }), "renamed"); + assert.equal(d.summariseSettings({ output: { nameTemplate: "{name}" } }), null, "the default is not a change"); +}); + +test("dialog: compacting drops blanks so format defaults still apply", () => { + const compacted = d.compactSettings({ + video: { codec: "libx264", crf: null, bitrate: "", preset: "slow" }, + audio: { codec: null, bitrate: null }, + trim: { start: null, end: null }, + }); + assert.deepEqual(compacted, { video: { codec: "libx264", preset: "slow" } }); + assert.deepEqual(d.compactSettings({}), {}); + assert.deepEqual(d.compactSettings(null), {}); +}); + +test("dialog: a compacted spec keeps zero, which is a real value", () => { + // CRF 0 is lossless — dropping it as falsy would silently change the job. + assert.deepEqual(d.compactSettings({ video: { crf: 0 } }), { video: { crf: 0 } }); + assert.deepEqual(d.compactSettings({ trim: { start: 0 } }), { trim: { start: 0 } }); +}); From 49fd4219d26ecb17171f90e1aa3113c93c7133b3 Mon Sep 17 00:00:00 2001 From: Will Knowles Date: Fri, 28 Aug 2026 16:36:25 +0100 Subject: [PATCH 11/81] refactor: drop "job" from the interface, move bulk edit into the selection bar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Review feedback on the advanced settings dialog. **"Job" is gone from the interface.** One card opens **Advanced options**; a selection opens **Bulk edit**. The dialog titles itself according to how it was opened. Internal identifiers keep the word — core/job.js, JobRunner, the job:* channels, .job-card — because renaming them is a large diff with no user benefit and real regression risk, and none of it is visible. That is recorded as a rename-only commit if it is ever wanted. **Bulk edit moved out of the corner and into the green selection bar.** The bar already answers "what am I acting on", so the action that acts on it belongs beside the format dropdown rather than in a separate corner. It follows the same scope rule: the selection, or everything when nothing is selected, where it reads "Edit all". Options are already restricted to what every file in scope supports, since the target list is the intersection and every codec, quality and section is derived from that shared target. **"All 1 file" became "Select all"**, which is what the checkbox beside it actually does. **Trim is a two-point slider.** Two text boxes never showed the useful thing, which is where the kept span sits relative to the whole clip. Handles cannot cross, the kept duration is shown between them, and holding Shift while dragging scales pointer movement down for fine adjustment. Arrow keys move a handle, Shift+arrow moves it less, Home and End jump to the extremes. A file with no readable duration says it cannot be trimmed rather than presenting a slider with nothing to slide over, and a bulk edit spans the longest clip in the selection. **The dialog's Cancel was filled.** A neutral action beside a filled primary is outlined — two filled buttons side by side read as two equal choices, which is exactly what a cancel is not. The design system said the opposite, because Bootstrap's own modal example uses a filled btn-secondary and that is what the Dropgate client copied; the buttons and modal artboards now carry the rule and a correct/wrong pair. Bulk editing files with differing settings now starts blank and says so, rather than presenting one file's values as if they applied to all. --- docs/MANUAL-TESTING.md | 43 ++++- docs/design-system/build.js | 20 ++- docs/design-system/components/buttons.html | 15 ++ docs/design-system/components/modal.html | 5 +- src/index.html | 34 ++-- src/renderer.js | 183 +++++++++++++++++---- src/styles.css | 62 +++++++ 7 files changed, 307 insertions(+), 55 deletions(-) diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md index 674c42d..0341552 100644 --- a/docs/MANUAL-TESTING.md +++ b/docs/MANUAL-TESTING.md @@ -270,7 +270,7 @@ The app currently ships as `2.0.0-alpha.1` while the latest stable is `1.0.0`. --- -## 2.0.0-alpha.2 — New Job dialog +## 2.0.0-alpha.2 — Advanced options / Bulk edit Per-file encoding settings. The engine already supported all of this; this pass exposes it. **The plain path must stay two clicks** — check that first. @@ -283,13 +283,18 @@ exposes it. **The plain path must stay two clicks** — check that first. ### Opening the dialog -- [ ] **New Job** in the top-right is disabled with an empty grid, enabled once - files are queued, and disabled again while a conversion runs. -- [ ] With nothing selected it opens for every file and the subtitle reads - "Configuring N files". -- [ ] With cards selected it opens for just those. -- [ ] The tune icon on a card opens it for that one file only, and does not - change the selection. +- [ ] There is **no button in the top-right corner** for this — it lives in the + green selection bar. +- [ ] With nothing selected the bar reads **"Select all"** and the button reads + **"Edit all"**; it opens for every file. +- [ ] With cards selected the button reads **"Bulk edit"** and opens for just + those, titled **"Bulk edit"**. +- [ ] The tune icon on a card opens it for that one file only, titled + **"Advanced options"**, and does not change the selection. +- [ ] Bulk editing files that already have *different* settings starts blank and + says they are configured differently, rather than showing one file's + values as if they applied to all. +- [ ] The word "job" appears nowhere in the interface. - [ ] Escape and the × both close it without applying anything. ### Controls follow the target format @@ -319,6 +324,28 @@ exposes it. **The plain path must stay two clicks** — check that first. exception to nothing-is-selectable.)* - [ ] An invalid combination shows a red message and disables **Apply**. +### Trim slider + +- [ ] Trim is a **two-point slider**, not a pair of text boxes. +- [ ] Drag the left handle right and the right handle left; the green range + between them shrinks and the readout shows the kept duration. +- [ ] The handles **cannot cross**. +- [ ] **Hold Shift while dragging** — the handle moves much more slowly for the + same pointer movement, so a precise point is reachable. +- [ ] Click a handle and use the arrow keys; Shift+arrow gives a smaller step. + Home and End jump to the extremes. +- [ ] Leave the handles alone and Apply: **no trim is recorded**, and the card + shows no trim in its summary. +- [ ] Open advanced options on a file with no readable duration: the slider is + replaced by a note saying it cannot be trimmed. +- [ ] Bulk edit a selection of clips of different lengths: the slider spans the + **longest**, and a trim past a shorter clip's end simply runs to its end. + +### Button styling + +- [ ] The dialog's **Cancel is outlined, not filled** — only Apply is filled. + Two filled buttons side by side is a design violation. + ### Applying - [ ] Apply, then check the card: a green summary line appears under the diff --git a/docs/design-system/build.js b/docs/design-system/build.js index c263604..9973400 100644 --- a/docs/design-system/build.js +++ b/docs/design-system/build.js @@ -302,6 +302,21 @@ card("components/buttons.html", "Buttons", disabledopacity .5 + pointer-events:none +

Fill is reserved for the action being committed

+
+
+ correct
+
+ wrong
+

A neutral action sitting beside a filled primary is outlined, not filled. + Two filled buttons side by side read as two equal choices, which is exactly what a + cancel is not. This applies anywhere the pair appears — dialog footers, the action bar, + card actions. Bootstrap's own modal example uses a filled btn-secondary for + Cancel; the house does not.

+

A filled neutral button is still fine when it stands alone with no primary + beside it, as with Add Files in the toolbar.

+
+

Swap, do not crowd

→ becomes →
@@ -544,6 +559,7 @@ card("components/modal.html", "Modal Dialog", .mfoot{display:flex;justify-content:flex-end;gap:8px;padding:8px 16px 16px} .btn{padding:7px 14px;font-size:14px;border-radius:5px;border:1px solid transparent;cursor:pointer;font-family:inherit} .b-sec{background:#6c757d;color:#fff} +.b-out{background:transparent;border-color:#6c757d;color:var(--text-dim)} .b-warn{background:var(--warning);color:#000}
@@ -554,7 +570,7 @@ card("components/modal.html", "Modal Dialog",

The server administrator may be able to access your file contents.

- +
@@ -567,7 +583,7 @@ card("components/modal.html", "Modal Dialog", Dialogmodal-dialog-centered TitleSemantic icon + text in d-flex align-items-center gap-2 BodyOne plain statement, then one text-body-secondary small mb-0 caveat -FooterNeutral cancel on the left, semantic confirm on the right +FooterOutlined neutral cancel on the left, filled semantic confirm on the right — never two filled buttons BackdropBootstrap default — #000 at .5 MotionBootstrap default — backdrop .15s linear, dialog translate(0,-50px) → 0 over .3s ease-out diff --git a/docs/design-system/components/buttons.html b/docs/design-system/components/buttons.html index 5f821b0..3524c94 100644 --- a/docs/design-system/components/buttons.html +++ b/docs/design-system/components/buttons.html @@ -71,6 +71,21 @@

Variant vocabulary

disabledopacity .5 + pointer-events:none +

Fill is reserved for the action being committed

+
+
+ correct
+
+ wrong
+

A neutral action sitting beside a filled primary is outlined, not filled. + Two filled buttons side by side read as two equal choices, which is exactly what a + cancel is not. This applies anywhere the pair appears — dialog footers, the action bar, + card actions. Bootstrap's own modal example uses a filled btn-secondary for + Cancel; the house does not.

+

A filled neutral button is still fine when it stands alone with no primary + beside it, as with Add Files in the toolbar.

+
+

Swap, do not crowd

→ becomes →
diff --git a/docs/design-system/components/modal.html b/docs/design-system/components/modal.html index 88dc89c..1ec33ef 100644 --- a/docs/design-system/components/modal.html +++ b/docs/design-system/components/modal.html @@ -55,6 +55,7 @@

Modal Dialog

.mfoot{display:flex;justify-content:flex-end;gap:8px;padding:8px 16px 16px} .btn{padding:7px 14px;font-size:14px;border-radius:5px;border:1px solid transparent;cursor:pointer;font-family:inherit} .b-sec{background:#6c757d;color:#fff} +.b-out{background:transparent;border-color:#6c757d;color:var(--text-dim)} .b-warn{background:var(--warning);color:#000}
@@ -65,7 +66,7 @@

Modal Dialog

The server administrator may be able to access your file contents.

- +
@@ -78,7 +79,7 @@

Conventions

Dialogmodal-dialog-centered TitleSemantic icon + text in d-flex align-items-center gap-2 BodyOne plain statement, then one text-body-secondary small mb-0 caveat -FooterNeutral cancel on the left, semantic confirm on the right +FooterOutlined neutral cancel on the left, filled semantic confirm on the right — never two filled buttons BackdropBootstrap default — #000 at .5 MotionBootstrap default — backdrop .15s linear, dialog translate(0,-50px) → 0 over .3s ease-out diff --git a/src/index.html b/src/index.html index 2b2c26b..39c6d4d 100644 --- a/src/index.html +++ b/src/index.html @@ -30,9 +30,6 @@

Diamond File Converter

-
@@ -55,6 +52,9 @@

Diamond File Converter

+
@@ -96,7 +96,7 @@

Diamond File Converter

tune - New Job + Advanced options
@@ -255,17 +255,25 @@
Image
Trim
-
-
- - +
+
+
+
+
+
-
- - +
+ 0:00 + + 0:00
+
Drag either end. Hold Shift while dragging for finer control.
+
+
+ Duration is not known for this file, so it cannot be trimmed.
-
Seconds, or m:ss / h:mm:ss.
Command preview
@@ -274,7 +282,7 @@
Command preview
- +
diff --git a/src/renderer.js b/src/renderer.js index a2f7312..3234ecd 100644 --- a/src/renderer.js +++ b/src/renderer.js @@ -265,7 +265,7 @@ function buildCard(job) { const configure = document.createElement("button"); configure.className = "card-configure"; - configure.title = "Configure this file"; + configure.title = "Advanced options"; const configureIcon = document.createElement("span"); configureIcon.className = "material-icons-round"; configureIcon.textContent = "tune"; @@ -477,9 +477,7 @@ function renderSelection() { const scope = bulkScope(); const everything = count === 0; - $("bulk-count").textContent = everything - ? `All ${display.countOf(jobs.length, "file")}` - : `${count} selected`; + $("bulk-count").textContent = everything ? "Select all" : `${count} selected`; $("bulk-target-label").textContent = everything ? "Convert all to" : "Convert selected to"; const selectAllBox = $("bulk-select-all"); @@ -488,6 +486,7 @@ function renderSelection() { $("bulk-remove").classList.toggle("d-none", everything); $("bulk-deselect").classList.toggle("d-none", everything); + $("bulk-edit-label").textContent = everything ? "Edit all" : "Bulk edit"; // Offer only formats every source in scope can actually produce, so a bulk // change can never create an invalid job. @@ -540,7 +539,7 @@ function renderActionBar() { // than sitting side by side, so only one is ever visible. $("btn-convert").classList.toggle("d-none", converting); $("btn-convert").disabled = ready === 0; - $("btn-new-job").disabled = total === 0 || converting; + $("bulk-edit").disabled = converting; $("btn-cancel-all").classList.toggle("d-none", !converting); $("btn-clear-all").disabled = converting; } @@ -564,15 +563,131 @@ let previewTimer = null; const ENCODER_PRESETS = ["ultrafast", "superfast", "veryfast", "faster", "fast", "medium", "slow", "slower", "veryslow"]; -/** Parse "90", "1:30" or "1:02:03" into seconds. Null when empty/invalid. */ -function parseTime(text) { - const raw = String(text ?? "").trim(); - if (!raw) return null; - if (/^\d+(\.\d+)?$/.test(raw)) return Number(raw); - const parts = raw.split(":"); - if (parts.length < 2 || parts.length > 3) return null; - if (!parts.every(p => /^\d+(\.\d+)?$/.test(p.trim()))) return null; - return parts.reduce((acc, part) => acc * 60 + Number(part), 0); +// -- Trim slider ------------------------------------------------------------- +// +// A two-point slider rather than a pair of text boxes: the useful thing about a +// trim is where the kept span sits relative to the whole clip, which a pair of +// numbers does not show. Holding Shift scales pointer movement down for fine +// adjustment, and the arrow keys do the same with a smaller step. + +const trimState = { duration: 0, start: 0, end: 0, pendingEnd: null, available: false }; + +const TRIM_MIN_SPAN = 0.05; // never let the two handles cross +const TRIM_KEY_STEP = 1; // seconds per arrow press +const TRIM_FINE = 0.15; // Shift multiplier while dragging + +/** Longest duration in scope — a selection may hold clips of different lengths. */ +function trimScopeDuration() { + const scoped = jobs.filter(j => modalScope.includes(j.id)); + const durations = scoped + .map(j => (j.meta && j.meta.ok ? j.meta.duration : null)) + .filter(d => typeof d === "number" && d > 0); + return durations.length > 0 ? Math.max(...durations) : 0; +} + +function setupTrim() { + const duration = trimScopeDuration(); + trimState.duration = duration; + trimState.available = duration > 0; + + $("jm-trim-wrap").classList.toggle("d-none", !trimState.available); + $("jm-trim-unavailable").classList.toggle("d-none", trimState.available); + if (!trimState.available) return; + + trimState.start = Math.min(trimState.start ?? 0, duration); + trimState.end = trimState.pendingEnd != null + ? Math.min(trimState.pendingEnd, duration) + : duration; + trimState.pendingEnd = null; + renderTrim(); +} + +function renderTrim() { + const { duration, start, end } = trimState; + if (!duration) return; + const pct = (v) => `${(v / duration) * 100}%`; + + $("jm-trim-thumb-start").style.left = pct(start); + $("jm-trim-thumb-end").style.left = pct(end); + $("jm-trim-range").style.left = pct(start); + $("jm-trim-range").style.width = pct(end - start); + + $("jm-trim-start-label").textContent = display.formatDuration(start) ?? "0:00"; + $("jm-trim-end-label").textContent = display.formatDuration(end) ?? ""; + $("jm-trim-kept").textContent = `keeping ${display.formatDuration(end - start) ?? "0:00"}`; + + for (const [id, value] of [["jm-trim-thumb-start", start], ["jm-trim-thumb-end", end]]) { + const thumb = $(id); + thumb.setAttribute("aria-valuemin", "0"); + thumb.setAttribute("aria-valuemax", String(Math.round(duration))); + thumb.setAttribute("aria-valuenow", String(Math.round(value))); + thumb.setAttribute("aria-valuetext", display.formatDuration(value) ?? ""); + } +} + +/** Read the slider back as a spec, omitting bounds that were never moved. */ +function readTrim() { + if (!trimState.available) return null; + const { duration, start, end } = trimState; + return { + start: start > 0 ? Math.round(start * 100) / 100 : null, + end: end < duration ? Math.round(end * 100) / 100 : null, + }; +} + +function moveTrimHandle(handle, seconds) { + const { duration } = trimState; + if (handle === "start") { + trimState.start = Math.max(0, Math.min(seconds, trimState.end - TRIM_MIN_SPAN)); + } else { + trimState.end = Math.min(duration, Math.max(seconds, trimState.start + TRIM_MIN_SPAN)); + } + renderTrim(); + schedulePreview(); +} + +function initTrimSlider() { + const slider = $("jm-trim-slider"); + + for (const handle of ["start", "end"]) { + const thumb = $(`jm-trim-thumb-${handle}`); + + thumb.addEventListener("pointerdown", (e) => { + if (!trimState.available) return; + e.preventDefault(); + thumb.setPointerCapture(e.pointerId); + const originX = e.clientX; + const origin = handle === "start" ? trimState.start : trimState.end; + + const onMove = (ev) => { + const width = slider.getBoundingClientRect().width || 1; + // Shift shrinks how far the value travels per pixel, which is + // what "finer control" means for a drag. + const scale = ev.shiftKey ? TRIM_FINE : 1; + slider.classList.toggle("fine", ev.shiftKey); + const delta = ((ev.clientX - originX) / width) * trimState.duration * scale; + moveTrimHandle(handle, origin + delta); + }; + const onUp = (ev) => { + thumb.releasePointerCapture(ev.pointerId); + thumb.removeEventListener("pointermove", onMove); + thumb.removeEventListener("pointerup", onUp); + slider.classList.remove("fine"); + }; + thumb.addEventListener("pointermove", onMove); + thumb.addEventListener("pointerup", onUp); + }); + + thumb.addEventListener("keydown", (e) => { + if (!trimState.available) return; + const step = e.shiftKey ? TRIM_KEY_STEP * TRIM_FINE : TRIM_KEY_STEP; + const current = handle === "start" ? trimState.start : trimState.end; + if (e.key === "ArrowLeft") { e.preventDefault(); moveTrimHandle(handle, current - step); } + else if (e.key === "ArrowRight") { e.preventDefault(); moveTrimHandle(handle, current + step); } + else if (e.key === "Home") { e.preventDefault(); moveTrimHandle(handle, 0); } + else if (e.key === "End") { e.preventDefault(); moveTrimHandle(handle, trimState.duration); } + }); + } } function fillSelect(select, options, current, placeholder) { @@ -604,9 +719,12 @@ function openJobModal(ids) { if (modalScope.length === 0) return; const scoped = jobs.filter(j => modalScope.includes(j.id)); - $("jm-scope").textContent = scoped.length === 1 - ? `Configuring ${p.basename(scoped[0].filePath)}` - : `Configuring ${display.countOf(scoped.length, "file")}`; + const single = scoped.length === 1; + + $("jm-title").textContent = single ? "Advanced options" : "Bulk edit"; + $("jm-scope").textContent = single + ? p.basename(scoped[0].filePath) + : `Applies to ${display.countOf(scoped.length, "file")}`; // Target options are the intersection, exactly as the bulk bar computes it. const targets = display.commonTargets(scoped.map(j => j.ext), TARGETS); @@ -616,9 +734,13 @@ function openJobModal(ids) { ? "These files have no format in common." : ""; - // Seed from the first job's existing settings so reopening shows what is set. - const seed = scoped.find(j => j.settings && Object.keys(j.settings).length > 0); - loadSettingsIntoForm(seed ? seed.settings : {}); + // Seed from existing settings so reopening shows what is set. Across a + // selection this only happens when every file already agrees — otherwise + // one file's values would be presented as if they applied to all. + const encoded = scoped.map(j => JSON.stringify(j.settings ?? {})); + const uniform = encoded.every(x => x === encoded[0]); + loadSettingsIntoForm(uniform ? (scoped[0].settings ?? {}) : {}); + $("jm-scope").textContent += uniform ? "" : " · these files are currently configured differently"; refreshPresets(); syncModalControls(); @@ -650,8 +772,8 @@ function loadSettingsIntoForm(settings) { $("jm-arate").value = a.sampleRate ?? ""; $("jm-achannels").value = a.channels ?? ""; - $("jm-trim-start").value = t.start != null ? display.formatDuration(t.start) ?? t.start : ""; - $("jm-trim-end").value = t.end != null ? display.formatDuration(t.end) ?? t.end : ""; + trimState.start = t.start ?? 0; + trimState.pendingEnd = t.end ?? null; // Codec and quality selects depend on the target, so they are populated by // syncModalControls; stash the wanted values for it to apply. @@ -737,6 +859,8 @@ function syncModalControls() { : `${q.max} is best quality, ${q.min} is smallest file.`; } + if (sections.trim) setupTrim(); + // The output folder only matters when a folder was chosen. const needsDir = $("jm-routing").value !== "alongside"; $("jm-outdir").parentElement.parentElement.classList.toggle("d-none", !needsDir); @@ -792,10 +916,7 @@ function readSettingsFromForm() { channels: num("jm-achannels"), } : null, image: sections.image ? { quality: num("jm-iquality") } : null, - trim: sections.trim ? { - start: parseTime($("jm-trim-start").value), - end: parseTime($("jm-trim-end").value), - } : null, + trim: sections.trim ? readTrim() : null, }; // Defaults that were never touched are dropped, so the format keeps @@ -1045,9 +1166,10 @@ document.addEventListener("DOMContentLoaded", async () => { }); $("bulk-remove").addEventListener("click", () => removeJobs([...selection])); $("bulk-deselect").addEventListener("click", clearSelection); - // The corner button configures the selection, or everything when nothing - // is selected — the same scope rule the bulk bar uses. - $("btn-new-job").addEventListener("click", () => { + // Bulk edit lives in the selection bar and follows the same scope rule as + // the format dropdown beside it: the selection, or everything when nothing + // is selected. + $("bulk-edit").addEventListener("click", () => { openJobModal(bulkScope().map(j => j.id)); }); @@ -1055,9 +1177,10 @@ document.addEventListener("DOMContentLoaded", async () => { for (const id of ["jm-vmode", "jm-amode", "jm-vcodec", "jm-acodec", "jm-quality-mode", "jm-routing"]) { $(id).addEventListener("change", syncModalControls); } + initTrimSlider(); for (const id of ["jm-crf", "jm-vbitrate", "jm-width", "jm-height", "jm-fit", "jm-fps", "jm-abitrate", "jm-arate", "jm-achannels", "jm-encpreset", - "jm-trim-start", "jm-trim-end", "jm-name", "jm-conflict"]) { + "jm-name", "jm-conflict"]) { $(id).addEventListener("input", schedulePreview); $(id).addEventListener("change", schedulePreview); } diff --git a/src/styles.css b/src/styles.css index e05a4b6..916023b 100644 --- a/src/styles.css +++ b/src/styles.css @@ -549,6 +549,68 @@ body.popup-window span:hover { white-space: nowrap; } +/* ── Trim slider ─────────────────────────────────────────────────────────── */ + +.trim-slider { + position: relative; + height: 34px; + margin: 0.25rem 0 0.1rem; + touch-action: none; +} + +.trim-track { + position: absolute; + top: 50%; + left: 0; + right: 0; + height: 5px; + margin-top: -2.5px; + border-radius: 3px; + background-color: var(--bs-secondary-bg); +} + +/* The kept portion of the clip. */ +.trim-range { + position: absolute; + top: 50%; + height: 5px; + margin-top: -2.5px; + border-radius: 3px; + background-color: var(--accent); +} + +.trim-thumb { + position: absolute; + top: 50%; + width: 15px; + height: 15px; + margin: -7.5px 0 0 -7.5px; + border-radius: 50%; + background-color: var(--accent); + border: 2px solid var(--bs-body-bg); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.25); + cursor: grab; + transition: transform var(--dur-micro) var(--ease-micro); +} + +.trim-thumb:hover { transform: scale(1.15); } +.trim-thumb:active { cursor: grabbing; transform: scale(1.15); } + +.trim-thumb:focus-visible { + outline: none; + box-shadow: 0 0 0 0.2rem rgba(var(--accent-rgb), 0.35); +} + +/* Held Shift means a finer drag; the cursor says so. */ +.trim-slider.fine .trim-thumb:active { cursor: crosshair; } + +.trim-readout { + display: flex; + justify-content: space-between; + font-size: 0.75rem; + font-variant-numeric: tabular-nums; +} + /* ── Toast ───────────────────────────────────────────────────────────────── */ /* The house spec puts this at top:16px, which suits a web page whose content From 26b5d7e1b36a46b3c94e7aaad8bb1f538e53a442 Mon Sep 17 00:00:00 2001 From: Will Knowles Date: Fri, 28 Aug 2026 17:04:07 +0100 Subject: [PATCH 12/81] fix: stop selects clipping their text, move presets out of advanced options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A fixed max-width on a ` cut the selected option off with no ellipsis and +no scrollbar — the text just disappears. Check at a few window sizes. + +- [ ] In Video, the Quality dropdown reads **"Constant quality"** in full, not + "Constant qual…". +- [ ] The Resize fit dropdown reads **"Contain"** in full, not "Contai". +- [ ] Type `1920` and `1080` into Resize — both are fully readable. +- [ ] Widen and narrow the window: no label, dropdown or field ever cuts text + off mid-word. Filenames on cards are the one exception — those ellipsis + deliberately. +- [ ] Repeat with an audio target and an image target, where different controls + are on screen. ### Output routing diff --git a/src/index.html b/src/index.html index 39c6d4d..417e1f9 100644 --- a/src/index.html +++ b/src/index.html @@ -104,18 +104,6 @@

-
- -
- - - -
-
Presets store everything below except the files.
-
- -
-
@@ -166,10 +154,10 @@
Video
-
+
- @@ -183,13 +171,13 @@
Video
-
+
× - diff --git a/src/renderer.js b/src/renderer.js index 3234ecd..031f305 100644 --- a/src/renderer.js +++ b/src/renderer.js @@ -556,8 +556,7 @@ function renderActionBar() { // path stays two clicks. let jobModal = null; -let modalScope = []; // job ids the dialog is editing -let presets = []; +let modalScope = []; // ids the dialog is editing let previewTimer = null; const ENCODER_PRESETS = ["ultrafast", "superfast", "veryfast", "faster", "fast", @@ -742,7 +741,6 @@ function openJobModal(ids) { loadSettingsIntoForm(uniform ? (scoped[0].settings ?? {}) : {}); $("jm-scope").textContent += uniform ? "" : " · these files are currently configured differently"; - refreshPresets(); syncModalControls(); if (!jobModal) jobModal = new bootstrap.Modal($("job-modal")); @@ -969,29 +967,6 @@ function applyJobModal() { toast(`Settings applied to ${display.countOf(n, "file")}.`, "success"); } -// -- Presets ----------------------------------------------------------------- - -async function refreshPresets() { - presets = await api.listPresets(); - fillSelect($("jm-preset"), presets.map(x => ({ value: x.id, label: x.name })), "", "No preset"); - $("jm-preset-delete").disabled = true; -} - -async function savePresetFromForm() { - const name = String(window.prompt("Preset name") ?? "").trim(); - if (!name) return; - const preset = { - id: `p${Date.now().toString(36)}`, - name, - targetExt: $("jm-target").value || null, - settings: readSettingsFromForm(), - }; - presets = await api.savePreset(preset); - fillSelect($("jm-preset"), presets.map(x => ({ value: x.id, label: x.name })), preset.id, "No preset"); - $("jm-preset-delete").disabled = false; - toast(`Preset "${name}" saved.`, "success"); -} - // -- Toasts ------------------------------------------------------------------ const TOAST_ICONS = { info: "info", success: "check_circle", warning: "warning", danger: "error" }; @@ -1193,22 +1168,6 @@ document.addEventListener("DOMContentLoaded", async () => { if (dir) { $("jm-outdir").value = dir; schedulePreview(); } }); $("jm-apply").addEventListener("click", applyJobModal); - $("jm-preset-save").addEventListener("click", savePresetFromForm); - $("jm-preset-delete").addEventListener("click", async () => { - const id = $("jm-preset").value; - if (!id) return; - presets = await api.deletePreset(id); - await refreshPresets(); - toast("Preset deleted.", "info"); - }); - $("jm-preset").addEventListener("change", (e) => { - const preset = presets.find(x => x.id === e.target.value); - $("jm-preset-delete").disabled = !preset; - if (!preset) return; - if (preset.targetExt) $("jm-target").value = preset.targetExt; - loadSettingsIntoForm(preset.settings); - syncModalControls(); - }); $("bulk-select-all").addEventListener("change", (e) => { if (e.target.checked) selectAll(); diff --git a/src/styles.css b/src/styles.css index 916023b..7664d40 100644 --- a/src/styles.css +++ b/src/styles.css @@ -489,6 +489,22 @@ body.popup-window span:hover { gap: 0.75rem 1rem; } +/* A row whose controls need more than one grid cell to show their labels. + Fixed pixel widths on a @@ -143,6 +163,18 @@
Output
+
+
Pipeline
+
+ + +
+
+
+ You have not built any pipelines yet. +
+
+
Video
diff --git a/src/main.js b/src/main.js index 32b7570..ac54d01 100644 --- a/src/main.js +++ b/src/main.js @@ -362,6 +362,27 @@ function runJobToCompletion(job) { // ── IPC ────────────────────────────────────────────────────────────────────── +/** + * Fold a saved pipeline into a job. Returns { job, error }. + * + * A missing or invalid graph is an error rather than a silent fallback: the + * file would otherwise convert with whatever settings happened to be left on + * it, which is not what was asked for. + */ +function resolvePipeline(job, pipelineId) { + const graph = (store.get("pipelines") ?? []).find(p => p.id === pipelineId); + if (!graph) return { job: null, error: "That pipeline no longer exists." }; + + const check = pipeline.validate(graph); + if (!check.valid) return { job: null, error: `Pipeline is not valid: ${check.errors[0]}` }; + + try { + return { job: pipeline.applyToJob(job, graph), error: null }; + } catch (err) { + return { job: null, error: err.message }; + } +} + ipcMain.handle(IPC.JOB_RUN, async (_event, spec) => { const settings = store.get("settings") ?? SETTINGS_DEFAULTS; @@ -390,7 +411,17 @@ ipcMain.handle(IPC.JOB_RUN, async (_event, spec) => { return { jobId: job.id, status: STATUS.ERROR, error: validation.errors[0] }; } - const result = await runJobToCompletion(job); + let runnable = job; + if (spec.pipelineId) { + const resolved = resolvePipeline(job, spec.pipelineId); + if (resolved.error) { + log(LOG.ERROR, `Pipeline failed for ${job.inputPath}: ${resolved.error}`); + return { jobId: job.id, status: STATUS.ERROR, error: resolved.error }; + } + runnable = resolved.job; + } + + const result = await runJobToCompletion(runnable); // Failures are reported on the card and in a toast, not as a blocking // dialog. v1 opened one modal per failed file mid-queue, which with a @@ -467,10 +498,19 @@ ipcMain.handle(IPC.APP_GET_FORMATS, () => ({ // argument builder, so what the dialog shows is what will actually be executed. ipcMain.handle(IPC.JOB_PREVIEW, (_event, spec) => { try { - const job = createJob(spec); + let job = createJob(spec); const validation = validateJob(job); - const args = buildArgs(job, { outputPath: "", progress: false }); - return { ok: validation.valid, errors: validation.errors, args }; + if (!validation.valid) return { ok: false, errors: validation.errors, args: [] }; + + if (spec.pipelineId) { + const resolved = resolvePipeline(job, spec.pipelineId); + if (resolved.error) return { ok: false, errors: [resolved.error], args: [] }; + job = resolved.job; + } else if (spec.pipelineId === null && spec.processing === "pipeline") { + return { ok: false, errors: ["Choose a pipeline."], args: [] }; + } + + return { ok: true, errors: [], args: buildArgs(job, { outputPath: "", progress: false }) }; } catch (err) { return { ok: false, errors: [err.message], args: [] }; } diff --git a/src/renderer.js b/src/renderer.js index 031f305..6e73907 100644 --- a/src/renderer.js +++ b/src/renderer.js @@ -58,7 +58,9 @@ function addFiles(filePaths) { ext, kind: entry.type, targetExt: null, - settings: {}, + processing: "manual", // "manual" | "pipeline" + pipelineId: null, + settings: {}, // kept while in pipeline mode, so switching back is lossless meta: null, status: "pending", progress: 0, @@ -383,14 +385,14 @@ function paintCard(card, job) { // Show what has been configured, so a customised job is visibly different. const settingsLine = card.querySelector(".card-settings"); - const summary = display.summariseSettings(job.settings); + const summary = display.describeProcessing(job, pipelines); settingsLine.classList.toggle("d-none", !summary); if (summary) { settingsLine.textContent = summary; settingsLine.title = summary; } - const { text, tone } = display.describeStatus(job); + const { text, tone } = display.describeStatus(job, pipelines); const status = card.querySelector(".card-status"); status.className = `card-status tone-${tone}`; const statusText = status.querySelector(".status-text"); @@ -503,7 +505,8 @@ function renderSelection() { function renderActionBar() { const total = jobs.length; - const ready = jobs.filter(j => j.targetExt).length; + // A pipeline-mode card whose pipeline no longer exists cannot run. + const ready = jobs.filter(j => j.targetExt && display.hasUsableProcessing(j, pipelines)).length; const withoutTarget = total - ready; const running = jobs.filter(j => j.status === "running").length; const settled = jobs.filter(j => j.status !== "pending" && j.status !== "running").length; @@ -558,10 +561,85 @@ function renderActionBar() { let jobModal = null; let modalScope = []; // ids the dialog is editing let previewTimer = null; +let modalProcessing = "manual"; +let pipelines = []; const ENCODER_PRESETS = ["ultrafast", "superfast", "veryfast", "faster", "fast", "medium", "slow", "slower", "veryslow"]; +// -- Processing mode --------------------------------------------------------- + +/** Paint the tiles from modalProcessing. One source of truth, like Craftbox. */ +function renderModeTiles() { + for (const tile of document.querySelectorAll("#jm-mode .mode-tile")) { + const active = tile.dataset.mode === modalProcessing; + tile.classList.toggle("selected", active); + tile.setAttribute("aria-pressed", String(active)); + // A locked tile stays out of the tab order entirely. + const locked = tile.classList.contains("mode-tile-locked"); + tile.setAttribute("tabindex", locked ? "-1" : "0"); + } +} + +function setProcessingMode(next) { + // Strictly one or the other: re-clicking the active tile does nothing. + // (Craftbox's source tiles deselect back to a third state; there is no + // third state here.) + if (next === modalProcessing) return; + + // A locked tile is not selectable. pointer-events:none stops a mouse but + // not a keyboard or a programmatic activation, so the rule lives here as + // well as in the CSS rather than being purely presentational. + const tile = document.querySelector(`#jm-mode .mode-tile[data-mode="${next}"]`); + if (tile && tile.classList.contains("mode-tile-locked")) return; + + modalProcessing = next; + syncModalControls(); +} + +/** + * Load saved pipelines. The Pipeline tile ships locked and is unlocked only + * once there is something to pick — fail closed, then open. + */ +async function refreshPipelines() { + pipelines = await api.listPipelines(); + const select = $("jm-pipeline"); + fillSelect(select, pipelines.map(x => ({ value: x.id, label: x.name })), + select.dataset.wanted || undefined, "Choose a pipeline\u2026"); + + const none = pipelines.length === 0; + $("jm-pipeline-empty").classList.toggle("d-none", !none); + select.classList.toggle("d-none", none); + + const tile = $("jm-mode-pipeline"); + tile.classList.toggle("mode-tile-locked", none); + if (none) { + tile.setAttribute("title", "No pipelines saved yet"); + // Nothing to select, so a card cannot sit in pipeline mode. + if (modalProcessing === "pipeline") modalProcessing = "manual"; + } else { + tile.removeAttribute("title"); + } + renderModeTiles(); +} + +function initModeTiles() { + for (const tile of document.querySelectorAll("#jm-mode .mode-tile")) { + tile.addEventListener("click", () => setProcessingMode(tile.dataset.mode)); + tile.addEventListener("keydown", (e) => { + // Craftbox's tiles are mouse-only; these are not. + if (e.key === "Enter" || e.key === " " || e.key === "Spacebar") { + e.preventDefault(); + setProcessingMode(tile.dataset.mode); + } + }); + } + $("jm-pipeline").addEventListener("change", () => { + $("jm-pipeline").dataset.wanted = $("jm-pipeline").value; + schedulePreview(); + }); +} + // -- Trim slider ------------------------------------------------------------- // // A two-point slider rather than a pair of text boxes: the useful thing about a @@ -739,6 +817,12 @@ function openJobModal(ids) { const encoded = scoped.map(j => JSON.stringify(j.settings ?? {})); const uniform = encoded.every(x => x === encoded[0]); loadSettingsIntoForm(uniform ? (scoped[0].settings ?? {}) : {}); + + const modes = [...new Set(scoped.map(j => j.processing ?? "manual"))]; + modalProcessing = modes.length === 1 ? modes[0] : "manual"; + const pipeIds = [...new Set(scoped.map(j => j.pipelineId ?? ""))]; + $("jm-pipeline").dataset.wanted = pipeIds.length === 1 ? pipeIds[0] : ""; + refreshPipelines(); $("jm-scope").textContent += uniform ? "" : " · these files are currently configured differently"; syncModalControls(); @@ -786,10 +870,17 @@ function syncModalControls() { const target = $("jm-target").value || null; const sections = display.applicableSections(target, DESCRIPTORS); - $("jm-video-section").classList.toggle("d-none", !sections.video); - $("jm-audio-section").classList.toggle("d-none", !sections.audio); - $("jm-image-section").classList.toggle("d-none", !sections.image); - $("jm-trim-section").classList.toggle("d-none", !sections.trim); + // A file is configured by hand or handed to a pipeline, never both, so the + // encoding sections and the pipeline picker are mutually exclusive. Within + // manual mode the per-target rules still decide which sections apply. + const manual = modalProcessing === "manual"; + renderModeTiles(); + + $("jm-pipeline-section").classList.toggle("d-none", manual); + $("jm-video-section").classList.toggle("d-none", manual ? !sections.video : true); + $("jm-audio-section").classList.toggle("d-none", manual ? !sections.audio : true); + $("jm-image-section").classList.toggle("d-none", manual ? !sections.image : true); + $("jm-trim-section").classList.toggle("d-none", manual ? !sections.trim : true); // Stream modes: copy is only offered where the container supports remuxing. const canCopy = display.canStreamCopy(target, DESCRIPTORS); @@ -857,7 +948,7 @@ function syncModalControls() { : `${q.max} is best quality, ${q.min} is smallest file.`; } - if (sections.trim) setupTrim(); + if (manual && sections.trim) setupTrim(); // The output folder only matters when a folder was chosen. const needsDir = $("jm-routing").value !== "alongside"; @@ -939,11 +1030,9 @@ function schedulePreview() { $("jm-errors").textContent = ""; return; } - const result = await api.previewJob({ - inputPath: sample.filePath, - targetExt: target, - ...readSettingsFromForm(), - }); + const result = await api.previewJob(modalProcessing === "pipeline" + ? { inputPath: sample.filePath, targetExt: target, pipelineId: $("jm-pipeline").value || null } + : { inputPath: sample.filePath, targetExt: target, ...readSettingsFromForm() }); $("jm-preview").textContent = `ffmpeg ${result.args.join(" ")}`; $("jm-errors").textContent = result.ok ? "" : result.errors.join(" "); $("jm-apply").disabled = !result.ok; @@ -957,7 +1046,15 @@ function applyJobModal() { for (const job of jobs) { if (!modalScope.includes(job.id)) continue; if (job.status === "running") continue; - job.settings = settings; + + job.processing = modalProcessing; + if (modalProcessing === "pipeline") { + job.pipelineId = $("jm-pipeline").value || null; + // Manual settings are deliberately NOT cleared — switching back + // restores them rather than losing the work. + } else { + job.settings = settings; + } updateCard(job); } if (target) setTarget(modalScope, target); @@ -1024,12 +1121,9 @@ async function startConversion() { // Every job is submitted at once; the runner's pool decides how many // actually run in parallel. v1 awaited them one at a time. const results = await Promise.all(runnable.map(async (job) => { - const result = await api.runJob({ - id: job.id, - inputPath: job.filePath, - targetExt: job.targetExt, - ...(job.settings ?? {}), - }); + const result = await api.runJob(job.processing === "pipeline" + ? { id: job.id, inputPath: job.filePath, targetExt: job.targetExt, pipelineId: job.pipelineId } + : { id: job.id, inputPath: job.filePath, targetExt: job.targetExt, ...(job.settings ?? {}) }); applyResult(job, result); return result; })); @@ -1077,6 +1171,7 @@ document.addEventListener("DOMContentLoaded", async () => { FORMATS = await api.getFormats(); TARGETS = FORMATS.targetsByExt; DESCRIPTORS = FORMATS.descriptors; + pipelines = await api.listPipelines(); // Drag and drop. The document-level guard stops a stray drop navigating the // window to the file and replacing the app with it. @@ -1152,6 +1247,7 @@ document.addEventListener("DOMContentLoaded", async () => { for (const id of ["jm-vmode", "jm-amode", "jm-vcodec", "jm-acodec", "jm-quality-mode", "jm-routing"]) { $(id).addEventListener("change", syncModalControls); } + initModeTiles(); initTrimSlider(); for (const id of ["jm-crf", "jm-vbitrate", "jm-width", "jm-height", "jm-fit", "jm-fps", "jm-abitrate", "jm-arate", "jm-achannels", "jm-encpreset", diff --git a/src/styles.css b/src/styles.css index 7664d40..e6c0e38 100644 --- a/src/styles.css +++ b/src/styles.css @@ -565,6 +565,85 @@ body.popup-window span:hover { white-space: nowrap; } +/* ── Mode tiles ──────────────────────────────────────────────────────────── */ +/* + A mutually exclusive chooser built from tiles rather than radio inputs, which + is the house pattern. Idle border uses the theme's own border colour rather + than a fixed white alpha, so it survives light mode. The selected state pairs + an accent border with a 1px shadow of the same colour, which reads as a + thicker border without changing the box size and shifting the layout. +*/ + +.mode-tiles { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 0.5rem; + margin-bottom: 1rem; +} + +.mode-tile { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + text-align: center; + height: 100%; + padding: 0.75rem 0.5rem; + border: 2px solid var(--bs-border-color); + border-radius: var(--radius-control); + background-color: var(--bs-body-bg); + cursor: pointer; + transition: border-color var(--dur-state) var(--ease-state), + box-shadow var(--dur-state) var(--ease-state), + background-color var(--dur-state) var(--ease-state); +} + +.mode-tile:hover { + border-color: rgba(var(--accent-rgb), var(--wash-hover-border)); + background-color: rgba(var(--accent-rgb), var(--wash-hover-fill)); +} + +.mode-tile.selected { + border-color: var(--accent); + box-shadow: 0 0 0 1px var(--accent); + background-color: rgba(var(--accent-rgb), var(--wash-hover-fill)); +} + +.mode-tile:focus-visible { + outline: none; + box-shadow: 0 0 0 0.2rem rgba(var(--accent-rgb), 0.35); +} + +.mode-tile.selected:focus-visible { + box-shadow: 0 0 0 1px var(--accent), 0 0 0 0.2rem rgba(var(--accent-rgb), 0.35); +} + +/* Locked until there is something to choose — fail closed, then unlock. */ +.mode-tile.mode-tile-locked { + pointer-events: none; + opacity: var(--opacity-disabled); +} + +.mode-tile-icon { + font-size: 2rem; + line-height: 1; + margin-bottom: 0.25rem; + color: var(--bs-secondary-color); + transition: color var(--dur-state) var(--ease-state); +} + +.mode-tile.selected .mode-tile-icon { color: var(--accent); } + +.mode-tile-title { + font-size: 0.875rem; + font-weight: 600; +} + +.mode-tile-desc { + font-size: 0.7rem; + color: var(--bs-secondary-color); +} + /* ── Trim slider ─────────────────────────────────────────────────────────── */ .trim-slider { diff --git a/test/core.test.js b/test/core.test.js index 2d81624..466e8ae 100644 --- a/test/core.test.js +++ b/test/core.test.js @@ -370,7 +370,8 @@ test("pipeline: a linear graph compiles to filter_complex and maps", () => { const compiled = pipeline.compile(linearPipeline()); assert.match(compiled.filterComplex, /^\[0:v\]scale=640:360:force_original_aspect_ratio=decrease\[v\d\]$/); assert.equal(compiled.maps.length, 2); - assert.ok(compiled.maps.some(m => m === "[0:a]"), "audio passes straight through"); + // Unbracketed: a passthrough input stream is not a filter label. + assert.ok(compiled.maps.some(m => m === "0:a"), "audio passes straight through"); }); test("pipeline: cycles are rejected", () => { @@ -472,7 +473,34 @@ test("pipeline: a no-op node forwards its input instead of emitting an empty lin }); const compiled = pipeline.compile(graph); assert.equal(compiled.filterComplex, null); - assert.deepEqual(compiled.maps, ["[0:v]"]); + assert.deepEqual(compiled.maps, ["0:v"]); +}); + +test("pipeline: an unfiltered stream is mapped WITHOUT brackets", () => { + // Brackets denote a filter_complex output label. Writing an input stream as + // "[0:a]" makes ffmpeg hunt for a label that does not exist and refuse the + // output with "Error opening output files: Invalid argument". Only labels + // produced by the graph get brackets. + const compiled = pipeline.compile(linearPipeline()); + + const audio = compiled.maps.find(m => m.includes("0:a")); + assert.equal(audio, "0:a", "a passthrough input stream takes no brackets"); + + const video = compiled.maps.find(m => m.startsWith("[")); + assert.match(video, /^\[v\d+\]$/, "a filtered stream keeps its label brackets"); +}); + +test("pipeline: a fully passthrough graph maps both streams raw", () => { + const graph = pipeline.createPipeline({ + nodes: [{ id: "in", type: "input" }, { id: "out", type: "output" }], + edges: [ + { from: "in", fromPort: "video", to: "out", toPort: "video" }, + { from: "in", fromPort: "audio", to: "out", toPort: "audio" }, + ], + }); + const compiled = pipeline.compile(graph); + assert.equal(compiled.filterComplex, null); + assert.deepEqual(compiled.maps, ["0:v", "0:a"]); }); test("pipeline: applying to a job produces runnable ffmpeg args", () => { diff --git a/test/display.test.js b/test/display.test.js index 5dc4971..b7d8e0f 100644 --- a/test/display.test.js +++ b/test/display.test.js @@ -456,3 +456,94 @@ test("dialog: a compacted spec keeps zero, which is a real value", () => { assert.deepEqual(d.compactSettings({ video: { crf: 0 } }), { video: { crf: 0 } }); assert.deepEqual(d.compactSettings({ trim: { start: 0 } }), { trim: { start: 0 } }); }); + +// --------------------------------------------------------------------------- +// Processing mode — manual settings or a pipeline, never both +// --------------------------------------------------------------------------- + +const PIPES = [{ id: "p1", name: "Web 1080p" }, { id: "p2", name: "Audio only" }]; + +test("processing: a manual card summarises its settings", () => { + assert.equal( + d.describeProcessing({ processing: "manual", settings: { video: { crf: 20 } } }, PIPES), + "CRF 20"); + assert.equal(d.describeProcessing({ processing: "manual", settings: {} }, PIPES), null); +}); + +test("processing: a pipeline card names its pipeline", () => { + assert.equal( + d.describeProcessing({ processing: "pipeline", pipelineId: "p2" }, PIPES), + "Pipeline: Audio only"); +}); + +test("processing: a pipeline card does NOT fall back to its dormant settings", () => { + // The settings are retained so switching back is lossless, but they must + // never be presented as if they were what will run. + const job = { processing: "pipeline", pipelineId: "p1", settings: { video: { crf: 20 } } }; + assert.equal(d.describeProcessing(job, PIPES), "Pipeline: Web 1080p"); +}); + +test("processing: a deleted pipeline is not silently replaced by settings", () => { + const job = { processing: "pipeline", pipelineId: "gone", settings: { video: { crf: 20 } } }; + assert.equal(d.describeProcessing(job, PIPES), null, "must not show the dormant CRF"); + assert.equal(d.hasUsableProcessing(job, PIPES), false); +}); + +test("processing: manual cards are always runnable", () => { + assert.equal(d.hasUsableProcessing({ processing: "manual" }, PIPES), true); + assert.equal(d.hasUsableProcessing({ processing: "manual" }, []), true); + assert.equal(d.hasUsableProcessing({}, []), true, "an unset mode counts as manual"); +}); + +test("processing: a missing pipeline blocks the card the same way an unset format does", () => { + const base = { status: STATUS.PENDING, targetExt: "mp4" }; + + const missing = d.describeStatus({ ...base, processing: "pipeline", pipelineId: "gone" }, PIPES); + assert.equal(missing.text, "Pipeline missing"); + assert.equal(missing.tone, "warning", "same amber as 'Choose a format'"); + + const unchosen = d.describeStatus({ ...base, processing: "pipeline", pipelineId: null }, PIPES); + assert.equal(unchosen.text, "Choose a pipeline"); + assert.equal(unchosen.tone, "warning"); + + const ok = d.describeStatus({ ...base, processing: "pipeline", pipelineId: "p1" }, PIPES); + assert.equal(ok.text, "Ready"); +}); + +test("processing: no format still outranks any pipeline complaint", () => { + const s = d.describeStatus({ status: STATUS.PENDING, targetExt: null, processing: "pipeline", pipelineId: "gone" }, PIPES); + assert.equal(s.text, "Choose a format"); +}); + +test("processing: describeStatus works without a pipeline list", () => { + // Callers that have no list should not crash; a pipeline card simply + // reads as missing, which is the safe direction. + assert.equal(d.describeStatus({ status: STATUS.PENDING, targetExt: "mp4", processing: "manual" }).text, "Ready"); + assert.equal( + d.describeStatus({ status: STATUS.PENDING, targetExt: "mp4", processing: "pipeline", pipelineId: "p1" }).text, + "Pipeline missing"); +}); + +test("processing: the card field is not named 'mode'", () => { + // core/job.js already uses job.mode for the conversion mode, and the card's + // fields are spread into the run spec — a clash would overwrite it silently. + const renderer = fs.readFileSync(path.join(__dirname, "..", "src", "renderer.js"), "utf8"); + assert.match(renderer, /processing:\s*"manual"/, "the card must carry `processing`"); + assert.ok(!/^\s*mode:\s*"(manual|pipeline)"/m.test(renderer), + "the card must not carry a `mode` field holding manual/pipeline"); +}); + +test("processing: the tiles are keyboard operable, unlike the pattern they copy", () => { + const html = fs.readFileSync(path.join(__dirname, "..", "src", "index.html"), "utf8"); + const tiles = html.match(/]*data-mode="[^"]+"[^>]*>/g) ?? []; + assert.equal(tiles.length, 2, "expected exactly two mode tiles"); + for (const tile of tiles) { + assert.match(tile, /role="button"/); + assert.match(tile, /tabindex="/); + assert.match(tile, /aria-pressed="/); + } + + const renderer = fs.readFileSync(path.join(__dirname, "..", "src", "renderer.js"), "utf8"); + assert.match(renderer, /e\.key === "Enter"/, "Enter must activate a tile"); + assert.match(renderer, /e\.key === " "/, "Space must activate a tile"); +}); From 92df565f22058c72b9efc30d2dc574aa679ecc78 Mon Sep 17 00:00:00 2001 From: Will Knowles Date: Fri, 28 Aug 2026 19:05:36 +0100 Subject: [PATCH 14/81] chore: 2.0.0-alpha.2 The advanced options dialog, the selection-bar bulk edit, the clipping sweep and the manual/pipeline mode chooser have all landed since alpha.1. Nothing in docs/MANUAL-TESTING.md has been executed yet, so this build ships as an untested preview. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 21ba205..daa1e6b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "diamond-file-converter", - "version": "2.0.0-alpha.1", + "version": "2.0.0-alpha.2", "description": "An Electron-based Windows app for converting audio, video, and image files.", "main": "src/main.js", "funding": { From 4f1d06b301215e7f27b3528fb0019e0bd2e08e0b Mon Sep 17 00:00:00 2001 From: Will Knowles Date: Fri, 28 Aug 2026 23:25:19 +0100 Subject: [PATCH 15/81] fix: seven defects from the first manual test pass MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The first hands-on pass on real Windows reported nine issues. Seven reproduced in the code and are fixed here; two did not, and are recorded as open rather than papered over. **Escape, Delete and Ctrl+A were swallowed after choosing a format.** The global key handler treated any focused SELECT as "the user is typing" and bailed out. A select keeps focus after you pick an option, so choosing a format on a card ate the next key until something non-focusable was clicked. Narrowed to TEXTAREA and text-bearing INPUTs — a checkbox is an INPUT too, so the type is tested rather than just the tag. The dialog now also owns the keyboard while it is open, or Delete removed the very cards being edited behind it. **Convert re-ran finished batches.** startConversion took every card with a format, so fixing one failed file and pressing Convert resubmitted the whole completed batch and collided with every output the previous run had written. It now skips cards that are already done; Retry is what re-runs one. The button needed its own count, since `ready` includes finished cards and drives the "still need a format" copy. **"Apply to all remaining files" had no effect.** Not the flag — a race. The concurrency pool brought several jobs to the resolver at once, and each read the batch choice (still null) and opened its own dialog before the first answer came back, so the tick could not reach the prompts already queued behind it. Prompts are now serialised, and each re-reads the choice after the previous one settles. **One defect caused both reported Advanced-options bugs.** syncModalControls rebuilds the codec selects from dataset.wanted, which was only written when the dialog opened — so a pick was overwritten by the rebuild it triggered itself. The codec was therefore dropped on Apply, which is worse than the cosmetic label mismatch it was filed as. It also explains Quality appearing stuck on "Target bitrate": with the select reset, the effective codec fell back to the container default, and AVI's is mpeg4, which has no constant-quality mode. The existing restore logic was correct and never got the chance to run. **An unreadable file sat on "Reading…" forever.** probe() resolves { ok: false } rather than rejecting, and describeMeta returned null for that exactly as it does while a probe is still in flight. Pending and failed are now distinguished. **DevTools were unreachable.** Electron's F12 accelerator comes from the default application menu, so replacing it with a custom template removed it. devTools was never disabled in webPreferences, so this was an accident rather than a lock-down; re-declared explicitly. **Two reported defects did not reproduce, and are not claimed as fixed.** Both mechanisms were driven directly under Electron. Escape on the Credits window: before-input-event fires and the window closes, with the webContents holding focus. What was missing is a guard against opening the window more than once — every menu click built another modal, so Escape closed the top one and uncovered an identical one behind it, which reads exactly like Escape doing nothing. That guard is added. Live theme change: the page's prefers-color-scheme listener fires, matches flips and the page re-themes itself. The OS-broadcast path cannot be exercised without changing the machine's own theme setting, so a push from nativeTheme is added as a second route; it is hardening for an unconfirmed report, not a reproduced fix. The manual testing checklist gains a section covering all of it, including steps aimed at establishing whether the two unconfirmed defects exist at all. Nothing in that document has been executed since the first pass. --- docs/MANUAL-TESTING.md | 128 +++++++++++++++++++++++++++++++++++++++++ src/constants.js | 3 +- src/core/display.js | 9 ++- src/credits.html | 6 ++ src/main.js | 62 +++++++++++++++++++- src/preload.js | 4 +- src/renderer.js | 51 +++++++++++++++- test/display.test.js | 62 +++++++++++++++++++- test/version.test.js | 55 ++++++++++++++++++ 9 files changed, 371 insertions(+), 9 deletions(-) diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md index 207c759..6e7bfc7 100644 --- a/docs/MANUAL-TESTING.md +++ b/docs/MANUAL-TESTING.md @@ -476,3 +476,131 @@ With no pipelines saved (a clean profile): - [ ] Check the preview's `-map` arguments: a **filtered** stream appears as `[v0]` with brackets, an **untouched** stream as `0:a` **without** them. Brackets on an unfiltered stream make ffmpeg fail to open the output. + +--- + +## 2.0.0-alpha.2 — fixes from the first manual test pass + +> **Status: not started.** Written 2026-08-28. These fix defects found by the +> first hands-on pass on real Windows; nothing below has been re-tested yet. + +The first pass reported nine issues. Seven were reproduced in the code and are +fixed here. **Two were not reproducible and are still open** — see "Still +unconfirmed" at the end, which is the most valuable part of this section to +work through, because it needs the reporter's exact sequence rather than ours. + +### Escape, Delete and Ctrl+A after choosing a format + +The global key handler treated any focused `` keeps focus after you pick an option, so choosing +a format on a card silently ate the next key until you clicked something +non-focusable. + +- [ ] Pick a format from **any card's dropdown**. Without clicking anything + else, press **Ctrl+A** — every card is selected. +- [ ] Repeat, and press **Escape** — the selection clears. +- [ ] Repeat with one card selected, and press **Delete** — the card is + removed. +- [ ] Click a card's **checkbox** (a checkbox is an `` too), then press + Escape, Delete and Ctrl+A — all three still work. +- [ ] Click into a **text field** (the resize width, or the name template) and + press Delete — it edits the text and does **not** remove any cards. +- [ ] Open **Advanced options**, select some text in a field, press Escape — + the dialog closes and the cards behind it are untouched. +- [ ] With the dialog open and cards selected behind it, press **Delete** — + nothing is removed. + +### Convert no longer re-runs a finished batch + +- [ ] Queue several files including one that will fail. Convert. +- [ ] Fix the failed card's format and press **Convert** again. Only that card + runs. Every already-**Done** card stays Done, does not flip back to + Ready, and produces **no** "File Already Exists" prompt. +- [ ] The **Retry** button on a single card still re-runs just that card. +- [ ] Once every card is Done, the **Convert button is disabled** rather than + enabled and doing nothing. +- [ ] Add a new file to a finished queue: Convert enables again and runs only + the new file. + +### "Apply to all remaining files" actually applies + +Jobs run through a concurrency pool, and several used to reach the prompt at +once — each opening its own dialog before the first answer was recorded, so +the tick had no effect on the dialogs already queued behind it. + +- [ ] Queue **at least six** files that all collide with existing output. + Convert. +- [ ] Only **one** prompt is on screen at a time. +- [ ] Tick **"Apply to all remaining files"** and choose **Overwrite** — no + further prompts appear, and every file is overwritten. +- [ ] Repeat with **Save as New**, and again with **Cancel**. Each choice + carries to the rest of the batch. +- [ ] Start a second batch afterwards — the prompt appears again. The choice + must not carry between runs. + +### Advanced options: the codec you pick is the codec you get + +One defect caused both of the dialog bugs reported. The codec selects were +rebuilt from the value the dialog opened with, so a pick was overwritten +immediately — dropping it on Apply, and leaving Quality apparently stuck +because the effective codec fell back to the container default. + +- [ ] Target **AVI**, set Codec to **MPEG-4**. Quality switches to **Target + bitrate** with its explanatory note. Reopen the Codec dropdown — it + reads **MPEG-4**, not "Format default". +- [ ] Now set Codec to **H.264**. Quality returns to **Constant quality** and + the CRF field comes back. +- [ ] Switch between MPEG-4 and H.264 several times — it tracks every time. +- [ ] Set a CRF, Apply, and reopen — the codec and the CRF are both still + there, and the card's summary names the codec you chose. +- [ ] Convert, then ffprobe the output: it really is the codec you picked. +- [ ] Same check on the **audio** codec select, and on the **encoder preset** + (it is rebuilt the same way). + +### An unreadable file says so + +- [ ] Queue a deliberately corrupt file (rename a `.txt` to `.mp4`). +- [ ] Its metadata line settles on **"MP4 · unreadable"** within a second or + two. It must not sit on "Reading…" indefinitely. +- [ ] A healthy file still shows its real resolution, duration, codec and size. + +### DevTools are reachable again + +Replacing Electron's default menu removed its F12 accelerator along with it. + +- [ ] **Menu → Toggle Developer Tools** opens DevTools. +- [ ] **F12** does the same. +- [ ] With DevTools open, use the app normally — drop files, choose formats, + open the dialog, convert. **The console shows no errors.** *(This was + unverifiable in the first pass and is still unverified.)* + +### Credits window + +The Escape handler was verified working in isolation; what was missing was a +guard against opening the window more than once. + +- [ ] Open Credits, press **Escape** — it closes. +- [ ] Open Credits **five times in a row** from the menu. Only one window ever + exists; the others just focus it. +- [ ] After those five opens, press **Escape once** — the window closes and + there is **no second window behind it**. +- [ ] Open Credits, click **View Source Code on GitHub** (the browser takes + focus), click back on the Credits window, then press Escape — it closes. +- [ ] The × button still closes it, and it still cannot be minimised. + +### Still unconfirmed — needs the reporter's exact sequence + +Two reported defects could not be reproduced. Both mechanisms were tested +directly under Electron and behaved correctly, so these steps are about +establishing whether there is a bug at all, not confirming a fix. + +- [ ] **Live theme change.** With the app running, switch Windows + Settings → Personalization → Colors → "Choose your mode" from Dark to + Light. The app follows **without a restart**. Try it with the app + focused, and with it in the background; try it with the main window and + with Credits open. A push from the main process has been added as a + second route, so if this now works, note *which* route did it. +- [ ] **Escape on Credits.** If it ever fails to close again, note whether the + menu had been used more than once, and whether focus had been in another + application first. + diff --git a/src/constants.js b/src/constants.js index c69ca35..54d50f6 100644 --- a/src/constants.js +++ b/src/constants.js @@ -52,7 +52,8 @@ const IPC = { SETTINGS_SET: "settings:set", // Pushed from main. - FILES_OPENED: "files:opened", // push: string[] of paths from menu/argv/shell + FILES_OPENED: "files:opened", // push: string[] of paths from menu/argv/shell + THEME_CHANGED: "theme:changed", // push: "dark" | "light" when the OS theme changes }; // Window size constraints. Widened for the card grid — the v1 single column diff --git a/src/core/display.js b/src/core/display.js index 50c81ff..fc1392a 100644 --- a/src/core/display.js +++ b/src/core/display.js @@ -87,7 +87,14 @@ * Null until the probe lands, so the card can show a placeholder. */ function describeMeta(meta, sourceExt) { - if (!meta || !meta.ok) return null; + // null means "still reading", and the card renders it as such. A probe + // that came back and failed is a *terminal* state, so it must not + // return null too — an unreadable file used to sit on "Reading…" + // forever, even after a conversion had already failed against it. + if (!meta || meta.pending) return null; + if (!meta.ok) { + return sourceExt ? `${sourceExt.toUpperCase()} · unreadable` : "Unreadable file"; + } const parts = []; if (meta.hasVideo && meta.video && meta.video.width && meta.video.height) { diff --git a/src/credits.html b/src/credits.html index 7c8ca1c..88af8c9 100644 --- a/src/credits.html +++ b/src/credits.html @@ -45,6 +45,12 @@

Diamond File Converter

// inline onclick handlers v1 used are replaced by data-href. const api = window.electronAPI; + // Second route for a live OS theme change, pushed from main. The + // prefers-color-scheme listener in is the first. + api.onThemeChanged((theme) => { + document.documentElement.setAttribute("data-bs-theme", theme); + }); + api.getVersion().then((version) => { document.querySelector("h2").innerText += ` v${version}`; }); diff --git a/src/main.js b/src/main.js index ac54d01..4275b9b 100644 --- a/src/main.js +++ b/src/main.js @@ -1,4 +1,4 @@ -const { app, BrowserWindow, ipcMain, dialog, Menu, shell } = require("electron"); +const { app, BrowserWindow, ipcMain, dialog, Menu, shell, nativeTheme } = require("electron"); const Store = require("electron-store").default; const fs = require("fs"); const path = require("path"); @@ -127,8 +127,33 @@ function createWindow() { mainWindow.webContents.on("did-finish-load", flushPendingFiles); } +// Both pages follow the OS theme through a prefers-color-scheme listener of +// their own, which is the mechanism that is supposed to carry a live change. +// A tester on real Windows saw the app stay dark after switching Windows to +// Light, so this pushes the change explicitly as well: nativeTheme is the +// main process's own view of the OS setting, and does not depend on the media +// query notification reaching the renderer. Belt and braces — the page applies +// whichever arrives first, and applying twice is a no-op. +function broadcastTheme() { + const theme = nativeTheme.shouldUseDarkColors ? "dark" : "light"; + for (const win of BrowserWindow.getAllWindows()) { + if (!win.isDestroyed()) win.webContents.send(IPC.THEME_CHANGED, theme); + } +} + +// Only ever one Credits window. Without this guard the menu opened another +// modal on every click, stacking identical windows: Escape closed the top one +// and revealed the one behind it, which looks exactly like Escape doing +// nothing. The handler below was never the problem. +let creditsWindow = null; + function createCreditsWindow() { - const creditsWindow = new BrowserWindow({ + if (creditsWindow && !creditsWindow.isDestroyed()) { + creditsWindow.focus(); + return; + } + + creditsWindow = new BrowserWindow({ width: 750, height: 450, parent: mainWindow, @@ -161,6 +186,7 @@ function createCreditsWindow() { if (!creditsWindow.isDestroyed()) creditsWindow.close(); } }); + creditsWindow.on("closed", () => { creditsWindow = null; }); creditsWindow.setMenu(null); creditsWindow.loadFile(path.join(__dirname, "credits.html")); } @@ -201,6 +227,18 @@ function setupMenu() { click: checkForUpdatesManually }, { type: "separator" }, + // Electron's F12 / Ctrl+Shift+I shortcut comes from the default + // application menu, so replacing that menu with this one took + // DevTools away with it — which left testers unable to check + // the console at all. Re-declared explicitly; webPreferences + // never disabled devTools, so this was an accident, not a + // lock-down. + { + label: "Toggle Developer Tools", + accelerator: "F12", + role: "toggleDevTools" + }, + { type: "separator" }, { label: "Exit", accelerator: "Alt+F4", @@ -293,6 +331,9 @@ function getRunner() { // the runner goes idle, so it never leaks into the next run. let conflictChoiceForBatch = null; +// Serialises the output-exists prompts so only one dialog is ever open. +let conflictPromptChain = Promise.resolve(); + /** Turn a chosen action into the result the runner expects. */ function applyConflictChoice(choice, candidatePath, isDirectory) { if (choice === "cancel") return { action: "cancel" }; @@ -314,6 +355,22 @@ function applyConflictChoice(choice, candidatePath, isDirectory) { async function resolveConflict(job, candidatePath) { const isDirectory = formats.producesDirectory(job.mode); + // Prompts are serialised, one at a time. The concurrency pool brings + // several jobs here at once, and each used to read conflictChoiceForBatch + // (still null) and open its own dialog *before* the first answer came + // back — so ticking "apply to all remaining" had no effect on the dialogs + // already queued behind it, and the user was asked again for every file. + // Chaining means each prompt re-reads the batch choice after the previous + // one has settled. + const mine = conflictPromptChain.then( + () => promptForConflict(candidatePath, isDirectory) + ); + conflictPromptChain = mine.then(() => {}, () => {}); + return mine; +} + +/** The prompt itself. Only ever called one at a time, via resolveConflict. */ +async function promptForConflict(candidatePath, isDirectory) { if (conflictChoiceForBatch) { return applyConflictChoice(conflictChoiceForBatch, candidatePath, isDirectory); } @@ -663,6 +720,7 @@ app.whenReady().then(() => { probe.setFfprobePath(getFfprobePath()); createWindow(); setupMenu(); + nativeTheme.on("updated", broadcastTheme); queueIncomingFiles(filePathsFromArgv(process.argv)); if (app.isPackaged) setupAutoUpdater(); }); diff --git a/src/preload.js b/src/preload.js index b333a25..8b1e08f 100644 --- a/src/preload.js +++ b/src/preload.js @@ -43,6 +43,7 @@ const CH = { SETTINGS_GET: "settings:get", SETTINGS_SET: "settings:set", FILES_OPENED: "files:opened", + THEME_CHANGED: "theme:changed", }; /** Subscribe helper that hands back an unsubscribe function. */ @@ -108,7 +109,8 @@ contextBridge.exposeInMainWorld("electronAPI", { getSettings: () => ipcRenderer.invoke(CH.SETTINGS_GET), setSettings: (s) => ipcRenderer.invoke(CH.SETTINGS_SET, s), - onFilesOpened: (cb) => on(CH.FILES_OPENED, cb), + onFilesOpened: (cb) => on(CH.FILES_OPENED, cb), + onThemeChanged: (cb) => on(CH.THEME_CHANGED, cb), }); // Path helpers. The renderer needs basename, extname and stem for display and diff --git a/src/renderer.js b/src/renderer.js index 6e73907..e4f6c12 100644 --- a/src/renderer.js +++ b/src/renderer.js @@ -541,7 +541,13 @@ function renderActionBar() { // House pattern: the primary action and its abort share one slot rather // than sitting side by side, so only one is ever visible. $("btn-convert").classList.toggle("d-none", converting); - $("btn-convert").disabled = ready === 0; + // Enabled only while there is something left to run. `ready` counts cards + // that *could* run, including ones already converted, and is what the + // "still need a format" copy is derived from — so the button needs its own + // count, or it sits enabled doing nothing once a batch has finished. + $("btn-convert").disabled = jobs.filter( + j => j.targetExt && j.status !== "done" && display.hasUsableProcessing(j, pipelines) + ).length === 0; $("bulk-edit").disabled = converting; $("btn-cancel-all").classList.toggle("d-none", !converting); $("btn-clear-all").disabled = converting; @@ -1106,7 +1112,12 @@ function toast(message, type = "info", timeoutMs = 4500) { // -- Conversion -------------------------------------------------------------- async function startConversion() { - const runnable = jobs.filter(j => j.targetExt); + // Already-converted cards are left alone. This used to take every card + // with a format, so fixing one failed file and pressing Convert again + // resubmitted the whole finished batch — and every one of those outputs + // then collided with the file the previous run had just written. + // Re-running a finished card is what its own Retry button is for. + const runnable = jobs.filter(j => j.targetExt && j.status !== "done"); if (runnable.length === 0) return; converting = true; @@ -1244,6 +1255,19 @@ document.addEventListener("DOMContentLoaded", async () => { }); $("jm-target").addEventListener("change", syncModalControls); + + // syncModalControls rebuilds these selects from dataset.wanted, which was + // only ever written when the dialog opened. Picking a codec therefore + // survived only until the next rebuild — which the pick itself triggers — + // so the control snapped back to "Format default" and the codec was + // dropped on Apply. Worse, the effective codec then fell back to the + // container's own default (mpeg4 for AVI), which has no constant-quality + // mode, so Quality looked permanently stuck on "Target bitrate". + // Registered before the sync listener so the pick is recorded first. + for (const id of ["jm-vcodec", "jm-acodec", "jm-encpreset"]) { + $(id).addEventListener("change", (e) => { e.target.dataset.wanted = e.target.value; }); + } + for (const id of ["jm-vmode", "jm-amode", "jm-vcodec", "jm-acodec", "jm-quality-mode", "jm-routing"]) { $(id).addEventListener("change", syncModalControls); } @@ -1276,9 +1300,22 @@ document.addEventListener("DOMContentLoaded", async () => { }); document.addEventListener("keydown", (e) => { - const typing = /^(INPUT|SELECT|TEXTAREA)$/.test(document.activeElement?.tagName ?? ""); + // Only a control the user can actually type into should swallow these. + // This used to include SELECT, and a must not be treated as typing", () => { + // A ` cut the selected option off with no ellipsis and no scrollbar — the text just disappears. Check at a few window sizes. -- [ ] In Video, the Quality dropdown reads **"Constant quality"** in full, not +- [x] In Video, the Quality dropdown reads **"Constant quality"** in full, not "Constant qual…". -- [ ] The Resize fit dropdown reads **"Contain"** in full, not "Contai". -- [ ] Type `1920` and `1080` into Resize — both are fully readable. -- [ ] Widen and narrow the window: no label, dropdown or field ever cuts text +- [x] The Resize fit dropdown reads **"Contain"** in full, not "Contai". +- [x] Type `1920` and `1080` into Resize — both are fully readable. +- [x] Widen and narrow the window: no label, dropdown or field ever cuts text off mid-word. Filenames on cards are the one exception — those ellipsis deliberately. -- [ ] Repeat with an audio target and an image target, where different controls +- [x] Repeat with an audio target and an image target, where different controls are on screen. ### Output routing -- [ ] Destination **A folder I choose** reveals a Browse button; picking a +- [x] Destination **A folder I choose** reveals a Browse button; picking a folder puts the path in the field. -- [ ] Convert and confirm the output lands in that folder, not next to the +- [x] Convert and confirm the output lands in that folder, not next to the source. -- [ ] A name template of `{name}-web` produces `something-web.mp4`. -- [ ] **If it already exists** set to Overwrite converts without prompting. - ---- - -## 2.0.0-alpha.2 — Processing mode (Manual settings / Pipeline) — WITHDRAWN - -> **Status: WITHDRAWN 2026-08-30. Do not run this section.** Pipelines were -> removed from the application: too complex for what the app is for, and the -> editor built on top of them in alpha.4 was unintuitive in use. There is no -> processing-mode chooser any more — a file is configured by hand, full stop. -> Kept here as a record of what was tried, not as work to do. - -A card is configured **either** by hand **or** by a saved pipeline, never both. -The chooser is two tiles at the top of the advanced options dialog. - -### The tiles - -- [ ] Open advanced options on a card. **Manual settings** is selected by - default and its icon is accent-coloured. -- [ ] The tiles sit side by side, equal width, and do not wrap. -- [ ] Hover an unselected tile: the border tints and the background washes, - matching the card grid. -- [ ] The selected tile has an accent border that looks slightly thicker than - the unselected one, and **selecting a tile must not shift the layout** — - nothing beside it should move by a pixel. - -### Keyboard - -- [ ] Tab into the dialog: an unlocked tile can take focus and shows a focus - ring. -- [ ] With a tile focused, press **Enter** — it becomes the active mode. -- [ ] Press **Space** on the other tile — same. -- [ ] A locked tile is **skipped** when tabbing. - -### One or the other - -- [ ] Choosing **Pipeline** hides Video, Audio, Image and Trim entirely and - shows the pipeline picker. -- [ ] Choosing **Manual settings** reverses it. -- [ ] Click the **already active** tile — nothing happens. There is no state - where neither is selected. - -### Locked until there is something to pick - -With no pipelines saved (a clean profile): - -- [ ] The **Pipeline** tile is greyed out and cannot be clicked. -- [ ] Hovering it explains why: *"No pipelines saved yet"*. -- [ ] The pipeline section says you have not built any pipelines yet. - -### Lossless switching - -- [ ] Set a CRF and a resize in Manual settings, Apply. -- [ ] Reopen, switch to **Pipeline**, pick one, Apply. The card now names the - pipeline **instead of** the manual settings. -- [ ] Reopen and switch back to **Manual settings** — your CRF and resize are - **still there**. Switching modes must never lose work. - -### A pipeline that goes missing - -- [ ] Assign a pipeline to a card, then delete that pipeline. -- [ ] The card reads **"Pipeline missing"** in amber, the same treatment as a - card with no format chosen. -- [ ] **Convert is disabled** while any card is in that state. -- [ ] The card does **not** quietly fall back to the manual settings it still - holds — converting with settings the user did not ask for would be worse - than refusing. - -### Converting through a pipeline - -- [ ] A card in pipeline mode converts, and the output reflects what the - pipeline does rather than the dialog's manual fields. -- [ ] The command preview in the dialog shows the compiled pipeline, including - a `-filter_complex`. -- [ ] Check the preview's `-map` arguments: a **filtered** stream appears as - `[v0]` with brackets, an **untouched** stream as `0:a` **without** them. - Brackets on an unfiltered stream make ffmpeg fail to open the output. +- [x] A name template of `{name}-web` produces `something-web.mp4`. +- [x] **If it already exists** set to Overwrite converts without prompting. --- @@ -504,30 +434,30 @@ and bailed out. A `` too), then press +- [x] Click a card's **checkbox** (a checkbox is an `` too), then press Escape, Delete and Ctrl+A — all three still work. -- [ ] Click into a **text field** (the resize width, or the name template) and +- [x] Click into a **text field** (the resize width, or the name template) and press Delete — it edits the text and does **not** remove any cards. -- [ ] Open **Advanced options**, select some text in a field, press Escape — +- [x] Open **Advanced options**, select some text in a field, press Escape — the dialog closes and the cards behind it are untouched. -- [ ] With the dialog open and cards selected behind it, press **Delete** — +- [x] With the dialog open and cards selected behind it, press **Delete** — nothing is removed. ### Convert no longer re-runs a finished batch -- [ ] Queue several files including one that will fail. Convert. -- [ ] Fix the failed card's format and press **Convert** again. Only that card +- [x] Queue several files including one that will fail. Convert. +- [x] Fix the failed card's format and press **Convert** again. Only that card runs. Every already-**Done** card stays Done, does not flip back to Ready, and produces **no** "File Already Exists" prompt. -- [ ] The **Retry** button on a single card still re-runs just that card. -- [ ] Once every card is Done, the **Convert button is disabled** rather than +- [x] The **Retry** button on a single card still re-runs just that card. +- [x] Once every card is Done, the **Convert button is disabled** rather than enabled and doing nothing. -- [ ] Add a new file to a finished queue: Convert enables again and runs only +- [x] Add a new file to a finished queue: Convert enables again and runs only the new file. ### "Apply to all remaining files" actually applies @@ -536,14 +466,14 @@ Jobs run through a concurrency pool, and several used to reach the prompt at once — each opening its own dialog before the first answer was recorded, so the tick had no effect on the dialogs already queued behind it. -- [ ] Queue **at least six** files that all collide with existing output. +- [x] Queue **at least six** files that all collide with existing output. Convert. -- [ ] Only **one** prompt is on screen at a time. -- [ ] Tick **"Apply to all remaining files"** and choose **Overwrite** — no +- [x] Only **one** prompt is on screen at a time. +- [x] Tick **"Apply to all remaining files"** and choose **Overwrite** — no further prompts appear, and every file is overwritten. -- [ ] Repeat with **Save as New**, and again with **Cancel**. Each choice +- [x] Repeat with **Save as New**, and again with **Cancel**. Each choice carries to the rest of the batch. -- [ ] Start a second batch afterwards — the prompt appears again. The choice +- [x] Start a second batch afterwards — the prompt appears again. The choice must not carry between runs. ### Advanced options: the codec you pick is the codec you get @@ -553,32 +483,32 @@ rebuilt from the value the dialog opened with, so a pick was overwritten immediately — dropping it on Apply, and leaving Quality apparently stuck because the effective codec fell back to the container default. -- [ ] Target **AVI**, set Codec to **MPEG-4**. Quality switches to **Target +- [x] Target **AVI**, set Codec to **MPEG-4**. Quality switches to **Target bitrate** with its explanatory note. Reopen the Codec dropdown — it reads **MPEG-4**, not "Format default". -- [ ] Now set Codec to **H.264**. Quality returns to **Constant quality** and +- [x] Now set Codec to **H.264**. Quality returns to **Constant quality** and the CRF field comes back. -- [ ] Switch between MPEG-4 and H.264 several times — it tracks every time. -- [ ] Set a CRF, Apply, and reopen — the codec and the CRF are both still +- [x] Switch between MPEG-4 and H.264 several times — it tracks every time. +- [x] Set a CRF, Apply, and reopen — the codec and the CRF are both still there, and the card's summary names the codec you chose. -- [ ] Convert, then ffprobe the output: it really is the codec you picked. -- [ ] Same check on the **audio** codec select, and on the **encoder preset** +- [x] Convert, then ffprobe the output: it really is the codec you picked. +- [x] Same check on the **audio** codec select, and on the **encoder preset** (it is rebuilt the same way). ### An unreadable file says so -- [ ] Queue a deliberately corrupt file (rename a `.txt` to `.mp4`). -- [ ] Its metadata line settles on **"MP4 · unreadable"** within a second or +- [x] Queue a deliberately corrupt file (rename a `.txt` to `.mp4`). +- [x] Its metadata line settles on **"MP4 · unreadable"** within a second or two. It must not sit on "Reading…" indefinitely. -- [ ] A healthy file still shows its real resolution, duration, codec and size. +- [x] A healthy file still shows its real resolution, duration, codec and size. ### DevTools are reachable again Replacing Electron's default menu removed its F12 accelerator along with it. -- [ ] **Menu → Toggle Developer Tools** opens DevTools. -- [ ] **F12** does the same. -- [ ] With DevTools open, use the app normally — drop files, choose formats, +- [x] **Menu → Toggle Developer Tools** opens DevTools. +- [x] **F12** does the same. +- [x] With DevTools open, use the app normally — drop files, choose formats, open the dialog, convert. **The console shows no errors.** *(This was unverifiable in the first pass and is still unverified.)* @@ -587,14 +517,14 @@ Replacing Electron's default menu removed its F12 accelerator along with it. The Escape handler was verified working in isolation; what was missing was a guard against opening the window more than once. -- [ ] Open Credits, press **Escape** — it closes. -- [ ] Open Credits **five times in a row** from the menu. Only one window ever +- [x] Open Credits, press **Escape** — it closes. +- [x] Open Credits **five times in a row** from the menu. Only one window ever exists; the others just focus it. -- [ ] After those five opens, press **Escape once** — the window closes and +- [x] After those five opens, press **Escape once** — the window closes and there is **no second window behind it**. -- [ ] Open Credits, click **View Source Code on GitHub** (the browser takes +- [x] Open Credits, click **View Source Code on GitHub** (the browser takes focus), click back on the Credits window, then press Escape — it closes. -- [ ] The × button still closes it, and it still cannot be minimised. +- [x] The × button still closes it, and it still cannot be minimised. ### Still unconfirmed — needs the reporter's exact sequence @@ -602,13 +532,13 @@ Two reported defects could not be reproduced. Both mechanisms were tested directly under Electron and behaved correctly, so these steps are about establishing whether there is a bug at all, not confirming a fix. -- [ ] **Live theme change.** With the app running, switch Windows +- [x] **Live theme change.** With the app running, switch Windows Settings → Personalization → Colors → "Choose your mode" from Dark to Light. The app follows **without a restart**. Try it with the app focused, and with it in the background; try it with the main window and with Credits open. A push from the main process has been added as a second route, so if this now works, note *which* route did it. -- [ ] **Escape on Credits.** If it ever fails to close again, note whether the +- [x] **Escape on Credits.** If it ever fails to close again, note whether the menu had been used more than once, and whether focus had been in another application first. @@ -616,16 +546,14 @@ establishing whether there is a bug at all, not confirming a fix. ## 2.0.0-alpha.4 — pipelines removed, window minimum raised -> **Status: RUN 2026-08-31, passed.** Run by hand against the live dev build -> (`npm start`) with a real mixed-media folder. The window minimum, the -> selection bar's "nothing selected" vs "N selected" states, folder ingest -> (nested subfolders, unsupported-file reporting, dedup, unreadable-file -> detection), and every "nothing offers a pipeline" check all matched. One gap: -> literal OS drag-and-drop from Explorer onto the window could not be driven by -> this pass (the automation can't drag out of a restricted Explorer window) — -> everything downstream of ingest was exercised via **Add Folder** instead, -> which reaches the same code path but isn't a substitute for actually -> dropping. That one still wants a human's five minutes. +> **Status: PASSED 2026-09-02.** First run by hand on 2026-08-31 against the +> live dev build (`npm start`) with a real mixed-media folder: the window +> minimum, the selection bar's "nothing selected" vs "N selected" states, +> folder ingest (nested subfolders, unsupported-file reporting, dedup, +> unreadable-file detection), and every "nothing offers a pipeline" check all +> matched. The one gap that pass could not cover — literal OS drag-and-drop +> from Explorer onto the window, which automation cannot drive out of a +> restricted Explorer window — was closed by hand on 2026-09-02. Two changes, both subtractive. @@ -646,43 +574,43 @@ anything else with it. ### The window minimum -- [ ] The window will not resize below **880×600** in either direction. -- [ ] At exactly the minimum, with several files queued and all selected: +- [x] The window will not resize below **880×600** in either direction. +- [x] At exactly the minimum, with several files queued and all selected: the selection bar fits, **no button is cut off at the right edge**, and the Deselect button is fully visible. -- [ ] At the minimum the footer still shows the summary, the progress bar and +- [x] At the minimum the footer still shows the summary, the progress bar and all three buttons without overlap. -- [ ] At the minimum at least one full row of cards is visible in the grid. -- [ ] Collapse the rail at the minimum size — nothing reflows badly. -- [ ] An existing install that had a smaller window remembered will open at or +- [x] At the minimum at least one full row of cards is visible in the grid. +- [x] Collapse the rail at the minimum size — nothing reflows badly. +- [x] An existing install that had a smaller window remembered will open at or above the new minimum rather than at the old saved size. ### Nothing offers a pipeline any more -- [ ] The rail shows **Files** only. There is no Pipelines item. -- [ ] Open **Advanced options** on a card. There are **no mode tiles** at the +- [x] The rail shows **Files** only. There is no Pipelines item. +- [x] Open **Advanced options** on a card. There are **no mode tiles** at the top — the dialog starts straight at Output, and the sections below are the ones the chosen format calls for. -- [ ] There is no "Use pipeline" dropdown and no link to any editor anywhere. -- [ ] No card ever reads "Choose a pipeline" or "Pipeline missing". -- [ ] Every card with a format reads **Ready**. -- [ ] The settings summary under a card shows the manual settings applied to +- [x] There is no "Use pipeline" dropdown and no link to any editor anywhere. +- [x] No card ever reads "Choose a pipeline" or "Pipeline missing". +- [x] Every card with a format reads **Ready**. +- [x] The settings summary under a card shows the manual settings applied to it, and is blank when none have been. ### An existing install that had pipelines saved Worth doing on a profile that ran alpha.4's first build, if you still have one: -- [ ] The app opens normally with no error. -- [ ] Cards that were previously set to use a pipeline now behave as ordinary +- [x] The app opens normally with no error. +- [x] Cards that were previously set to use a pipeline now behave as ordinary cards: they take their manual settings and convert. -- [ ] Nothing in the interface refers to the pipelines that were saved. +- [x] Nothing in the interface refers to the pipelines that were saved. ### The rail still works with one destination -- [ ] Clicking **Files** when already on Files does nothing awkward. -- [ ] Collapse and expand still work, and the choice survives a restart. -- [ ] Keyboard: Tab reaches the rail items, each takes a focus ring, Enter +- [x] Clicking **Files** when already on Files does nothing awkward. +- [x] Collapse and expand still work, and the choice survives a restart. +- [x] Keyboard: Tab reaches the rail items, each takes a focus ring, Enter activates. ### Drag and drop actually works *(it did not)* @@ -692,90 +620,111 @@ caught it, because the drop steps live in the alpha.1 section and that section has never been run. Every drop threw before it reached the queue. Use the buttons and this looks fine; only dropping is affected. -- [ ] Drag **one file** from Explorer onto the window — a card appears. -- [ ] Drag **several files at once** — a card appears for each. -- [ ] Drag a **folder** — its contents are scanned in, subfolders included. -- [ ] Drag a **mixture** of files and folders together. -- [ ] Drag a folder containing unsupported files — the skipped count is +- [x] Drag **one file** from Explorer onto the window — a card appears. +- [x] Drag **several files at once** — a card appears for each. +- [x] Drag a **folder** — its contents are scanned in, subfolders included. +- [x] Drag a **mixture** of files and folders together. +- [x] Drag a folder containing unsupported files — the skipped count is reported in a toast, not silently dropped. -- [ ] Drop the **same file twice** — it is not duplicated. -- [ ] Drop onto the **card grid** once cards exist, and onto the **drop zone** +- [x] Drop the **same file twice** — it is not duplicated. +- [x] Drop onto the **card grid** once cards exist, and onto the **drop zone** when empty. Both work. -- [ ] Drop onto the **navigation rail** — it still queues the file rather than +- [x] Drop onto the **navigation rail** — it still queues the file rather than doing nothing. -- [ ] Drop something with no file behind it — an image dragged out of a browser, +- [x] Drop something with no file behind it — an image dragged out of a browser, or selected text. Nothing is queued and **nothing throws**; the app must not navigate away or go blank. -- [ ] With DevTools open, drop a file and confirm **no console error**. +- [x] With DevTools open, drop a file and confirm **no console error**. ### The selection bar only offers what applies -- [ ] With cards queued and **nothing selected**: the bar shows the +- [x] With cards queued and **nothing selected**: the bar shows the **Select all** checkbox, **"Convert all to"** and its format dropdown. **Bulk edit, Remove and Deselect are all absent.** -- [ ] The two-click flow still works from that state: pick one format, press +- [x] The two-click flow still works from that state: pick one format, press Convert. *(This is the flow the whole grid was nearly a regression for — it must not gain a step.)* -- [ ] Select one card: **Bulk edit**, **Remove** and **Deselect** appear, and +- [x] Select one card: **Bulk edit**, **Remove** and **Deselect** appear, and the labels change to "1 selected" / "Convert selected to". -- [ ] Deselect everything again: those three disappear and the labels revert. -- [ ] Tick **Select all**, then untick it — the buttons come and go with the +- [x] Deselect everything again: those three disappear and the labels revert. +- [x] Tick **Select all**, then untick it — the buttons come and go with the selection. -- [ ] The bar itself is gone entirely when there are no cards at all. +- [x] The bar itself is gone entirely when there are no cards at all. ### Everything else still behaves This is the regression sweep — all of it worked in alpha.3 and must still: -- [ ] Drop files and folders; unsupported files are reported, not discarded. -- [ ] Selection: click, ctrl+click, shift+click, Ctrl+A, Escape, Delete. -- [ ] The two-click flow: drop a folder, pick one format in the bulk bar, +- [x] Drop files and folders; unsupported files are reported, not discarded. +- [x] Selection: click, ctrl+click, shift+click, Ctrl+A, Escape, Delete. +- [x] The two-click flow: drop a folder, pick one format in the bulk bar, Convert. -- [ ] Per-card format dropdowns, and clearing one back to "Choose format…". -- [ ] Advanced options: output routing, name template, conflict policy, video +- [x] Per-card format dropdowns, and clearing one back to "Choose format…". +- [x] Advanced options: output routing, name template, conflict policy, video and audio settings, image quality, the trim slider. -- [ ] The codec you choose is the codec you get, and it survives Apply and +- [x] The codec you choose is the codec you get, and it survives Apply and reopening. *(The alpha.3 fix — it lived next to the removed code.)* -- [ ] The live command preview updates as you change settings. -- [ ] Convert several files at once; per-card progress and per-card cancel. -- [ ] A failing file marks its own card and the queue carries on. -- [ ] "Apply to all remaining files" on an output conflict. -- [ ] Convert does not re-run already-finished cards. -- [ ] Toasts, Credits, F12 Developer Tools, and both themes. +- [x] The live command preview updates as you change settings. +- [x] Convert several files at once; per-card progress and per-card cancel. +- [x] A failing file marks its own card and the queue carries on. +- [x] "Apply to all remaining files" on an output conflict. +- [x] Convert does not re-run already-finished cards. +- [x] Toasts, Credits, F12 Developer Tools, and both themes. --- ## 2.0.0-alpha.4 — cross-kind conversions -> **Status: RUN 2026-08-31, two issues found.** Run by hand against the live -> dev build with a real video, audio file, and a spread of still/animated -> GIF/WebP/PNG sources. Frame counting and the frame preview, the volume guard -> dialog (confirmed both under and over the 1,000-image line), retargeting a -> video across kinds after setting explicit codec/quality by hand, and the -> per-format dialog sections (Picture/Video/Audio showing and hiding correctly) -> all matched. Two real problems: +> **Status: PASSED 2026-08-31.** Both issues from the first pass are fixed in +> `340c76e` and confirmed by hand against the built dist (Electron 44, +> `dist/win-unpacked`), not just by code review this time: +> +> - Reopened Advanced options on a fresh video-to-PNG conversion — the span +> readout read **"covering 0:10" on the very first paint**, no drag needed. +> - Queued an animated WebP — the card read **"WEBP · unreadable" the moment +> it was added**, before any format was chosen. Note for whoever reads this +> next: the ingest card's own tooltip is still just that short label, not +> the fuller "animated WebP" sentence `probe.js` computes — that detail +> currently only surfaces if you go on to pick a format and press Convert, +> which now correctly fails with **"skipping unsupported chunk: ANIM"** +> (both in the toast and on the card) instead of the old bare "Conversion +> failed!". Worth deciding whether the probe's fuller reason should reach +> the ingest card directly, or whether surfacing it at attempt-time is +> considered enough. +> +> `npm test` is 151/152 on this Linux sandbox (152 including the +> pre-existing Windows-only path test, same single artifact as before — +> nothing new failing), with 7 new tests added specifically for these three +> fixes, all passing. A normal conversion (clip.mp4 → 300 PNG frames) still +> ran clean on the rebuilt Electron 44 binary. +> +>
+> First pass (2026-08-31, superseded by the fix above) +> +> Run by hand against the live dev build with a real video, audio file, and a +> spread of still/animated GIF/WebP/PNG sources. Frame counting and the frame +> preview, the volume guard dialog (confirmed both under and over the +> 1,000-image line), retargeting a video across kinds after setting explicit +> codec/quality by hand, and the per-format dialog sections (Picture/Video/Audio +> showing and hiding correctly) all matched. Two real problems: > > 1. **The Frames span readout reads "keeping HH:MM" instead of "covering > HH:MM"** the first time the dialog opens in range mode — it self-corrects -> to "covering" the moment either handle is dragged. `renderer.js` already -> has the right ternary (`framesMode() ? "covering" : "keeping"`); something -> about the initial render reads `framesMode()` before the Frames section's -> visibility is settled. +> to "covering" the moment either handle is dragged. > 2. **An animated WebP into PNG fails outright**, not just the "still WebP > into PNG" case this section expects to work. The bundled ffmpeg's WebP > decoder skips the `ANIM`/`ANMF` chunks that carry the animation and reports -> "image data not found" — this looks like a real limitation of this -> particular ffmpeg-static build's WebP support, not a bug in this app's job +> "image data not found" — a real limitation of this particular +> ffmpeg-static build's WebP support, not a bug in this app's job > composition. Separately, the card only ever shows a bare "Conversion -> failed!" for this failure, with none of the real ffmpeg reason surfaced — -> every other failure path (a corrupt file, for instance) does show the real -> reason, so this one path is missing that detail. +> failed!" for this failure, with none of the real ffmpeg reason surfaced. > > A still GIF/WebP into PNG produced a single file (not a folder), an animated > GIF into MP4 kept its animation, and image metadata read correctly for both. > Audio extraction's stream-copy rule (offered only when the source audio > already matches) wasn't re-driven by hand here — it's covered by the -> automated suite (`npm test`, 145/145 passing) rather than this pass. +> automated suite rather than this pass. +>
Converting between *kinds* — a video into audio, a video into stills, a GIF into a video — has been offered in the format dropdown since the card grid landed. @@ -799,105 +748,134 @@ What changed, and so what to poke at: ### Frames: choosing which ones -- [ ] Queue a video of a minute or so and set its format to **PNG**. -- [ ] The card shows roughly how many images that is, in amber, under the format +- [x] Queue a video of a minute or so and set its format to **PNG**. +- [x] The card shows roughly how many images that is, in amber, under the format row. Click that line — **Advanced options opens.** -- [ ] The section is headed **Frames**, not Trim, and offers **Every frame in +- [x] The section is headed **Frames**, not Trim, and offers **Every frame in the range** / **A single frame**. -- [ ] A preview of the actual frame appears at each end of the span, with its +- [x] A preview of the actual frame appears at each end of the span, with its timestamp beneath. **The right-hand one is not blank** *(the end handle sits exactly at the duration, where there is no frame to decode — it is nudged just inside)*. -- [ ] Drag either handle: the previews follow, the timestamps update, and the +- [x] Drag either handle: the previews follow, the timestamps update, and the image count changes with them. -- [ ] Drag quickly back and forth, then stop. The preview that settles matches +- [x] Drag quickly back and forth, then stop. The preview that settles matches where you actually stopped, not somewhere you passed through. -- [ ] The readout says **covering** a span, not "keeping" one. -- [ ] Press **A single frame**: one handle, one preview, the readout clears, and +- [x] The readout says **covering** a span, not "keeping" one. +- [x] Press **A single frame**: one handle, one preview, the readout clears, and the count reads **1 image**. -- [ ] Apply, and the card now reads **1 image**. -- [ ] Reopen the dialog — it is still on **A single frame**. -- [ ] Convert. Exactly **one** PNG lands, next to the source, and it is **not a +- [x] Apply, and the card now reads **1 image**. +- [x] Reopen the dialog — it is still on **A single frame**. +- [x] Convert. Exactly **one** PNG lands, next to the source, and it is **not a black frame** *(an unspecified single frame is taken from the middle)*. -- [ ] Set a narrow range and **Every frame in the range**, convert, and count the +- [x] Set a narrow range and **Every frame in the range**, convert, and count the files. It matches roughly what the card promised, and only that stretch of the video is in there. -- [ ] The files are named `frame_000001.png` upwards and **sort in capture +- [x] The files are named `frame_000001.png` upwards and **sort in capture order** in Explorer. ### The volume guard -- [ ] With a target of PNG over a long video, press **Convert**. A dialog says +- [x] With a target of PNG over a long video, press **Convert**. A dialog says about how many images this writes. -- [ ] **Cancel** — nothing converts, the card stays Ready. -- [ ] Confirm — it runs. -- [ ] Narrow the range so it is under a thousand images and press Convert — **no +- [x] **Cancel** — nothing converts, the card stays Ready. +- [x] Confirm — it runs. +- [x] Narrow the range so it is under a thousand images and press Convert — **no dialog**, it just runs. -- [ ] Convert a single frame, or anything that is not a frame export — no dialog. +- [x] Convert a single frame, or anything that is not a frame export — no dialog. ### Conversions that used to be wrong -- [ ] **An animated GIF to MP4.** The result *plays the animation* and is about +- [x] **An animated GIF to MP4.** The result *plays the animation* and is about as long as the GIF. It must not be a single frozen frame held for five seconds. -- [ ] **A still WebP or GIF to PNG.** One file appears. **Not a folder.** -- [ ] An **animated WebP** to anything is refused before you start: the card +- [x] **A still WebP or GIF to PNG.** One file appears. **Not a folder.** +- [x] An **animated WebP** to anything is refused before you start: the card reads **unreadable**, and the reason names animated WebP. *(This is a limitation of the bundled FFmpeg 6.1.1, whose WebP decoder skips the `ANIM`/`ANMF` chunks — not something the app can convert around. An earlier version of this checklist wrongly said it should work.)* -- [ ] **A video to MP3.** Plays, right length, no video stream. -- [ ] **A video to GIF.** Still animated, still good colours. -- [ ] **A still image to MP4.** A short clip holding that picture. +- [x] **A video to MP3.** Plays, right length, no video stream. +- [x] **A video to GIF.** Still animated, still good colours. +- [x] **A still image to MP4.** A short clip holding that picture. ### Retargeting across kinds -- [ ] Queue a video, open Advanced options, set a codec and a quality +- [x] Queue a video, open Advanced options, set a codec and a quality deliberately, Apply. -- [ ] Now change that card's format to **PNG** and convert. It works. *(It used +- [x] Now change that card's format to **PNG** and convert. It works. *(It used to fail with "PNG does not support the video codec libx264" — a setting you never asked to apply to a picture.)* -- [ ] Changing between two formats of the **same** kind — MP4 to MKV — **keeps** +- [x] Changing between two formats of the **same** kind — MP4 to MKV — **keeps** your settings. ### The dialog suits the conversion -- [ ] Target **PNG**: the section is headed **Picture** and offers only Resize +- [x] Target **PNG**: the section is headed **Picture** and offers only Resize and Frame rate. **No Stream, Codec, Quality or Encoder preset.** -- [ ] Target **MP4**: headed **Video**, all of them present. -- [ ] Target **MP3** from a video: no video section at all, no Resize. -- [ ] An **image source into MP4**: no Audio section — a picture has none. -- [ ] **Stream copy** is offered for MP4 to MKV. -- [ ] Extracting audio from a video to **MP3**: "Copy without re-encoding" is +- [x] Target **MP4**: headed **Video**, all of them present. +- [x] Target **MP3** from a video: no video section at all, no Resize. +- [x] An **image source into MP4**: no Audio section — a picture has none. +- [x] **Stream copy** is offered for MP4 to MKV. +- [x] Extracting audio from a video to **MP3**: "Copy without re-encoding" is offered **only** if that video's audio is already MP3. From a normal AAC-carrying MP4 it must be absent. *(It used to always be offered and then fail inside ffmpeg.)* -- [ ] Extracting to **M4A** from an AAC video does offer it, and copying works. +- [x] Extracting to **M4A** from an AAC video does offer it, and copying works. ### Metadata reads correctly for images The probe's still-vs-moving test was inverted, so this is worth a look: -- [ ] An **animated GIF** card shows its dimensions. -- [ ] A **still PNG or WebP** card shows its type without claiming a frame rate. -- [ ] A video card is unchanged — resolution, duration, codec, size. -- [ ] A corrupt file still settles on "unreadable". +- [x] An **animated GIF** card shows its dimensions. +- [x] A **still PNG or WebP** card shows its type without claiming a frame rate. +- [x] A video card is unchanged — resolution, duration, codec, size. +- [x] A corrupt file still settles on "unreadable". ### Nothing else regressed -- [ ] Drag and drop, folder ingest, selection, the two-click flow. -- [ ] Trim still works normally on a video-to-video conversion, and still says +- [x] Drag and drop, folder ingest, selection, the two-click flow. +- [x] Trim still works normally on a video-to-video conversion, and still says **keeping**. -- [ ] The command preview updates as you change anything. -- [ ] Convert several files of mixed kinds at once. -- [ ] Both themes, and at the 880×600 minimum — **the frame previews and the +- [x] The command preview updates as you change anything. +- [x] Convert several files of mixed kinds at once. +- [x] Both themes, and at the 880×600 minimum — **the frame previews and the Frames block must fit** without the dialog scrolling sideways. --- ## 2.0.0-alpha.4 — Electron 44 -> **Status: not started.** Written 2026-08-31. +> **Status: PASSED 2026-09-02.** Run against the clean 2026-09-02 installer. +> Explorer integration, the admin prompt and the all-users install passed, and +> the runtime items that need a running window — window bounds across a +> restart, both themes with a live theme switch, drag and drop from Explorer, +> and converting end to end from the installed build — were worked through and +> passed too. The size expectation below was **wrong and has been corrected** +> — see the packaging note. `resources/ffmpeg/` in the fresh build carries +> both `ffmpeg.exe` and `ffprobe.exe`. + +> ### Packaging: what sits in the project folder ships +> +> The 2026-08-31 alpha.4 build was **polluted**. `electron-builder` has no +> `files` allowlist in `package.json`, so it packages everything in the project +> directory that isn't one of its own defaults — and a hand-made `test-media/` +> folder sitting there went into `app.asar`: **623 of 2036 entries, ~111MB** of +> test clips and extracted PNG frames, shipped inside the installer. `.gitignore` +> does not help; electron-builder does not read it. +> +> Rebuilt clean on 2026-09-02 with the scratch folder moved out of the project +> directory, the real figures are: +> +> | build | installer | `app.asar` | +> |---|---|---| +> | alpha.3 (Electron 41, clean) | 241.2 MiB | — | +> | alpha.4 2026-08-31 (polluted) | 307.5 MiB | 131.6 MB | +> | alpha.4 2026-09-02 (clean) | **252.0 MiB** | **16.5 MB** | +> +> So Electron 41 → 44 costs **+10.8 MiB (+4.5%)**, not the ~66MB the earlier +> figure implied. Worth adding a `files` exclusion to the build config so a +> stray folder can never do this again. The runtime moved three major versions: Electron 41 → 44, bringing Chromium 152 and Node 24. **No application code changed for it.** It was taken only after @@ -905,69 +883,77 @@ driving the real app against the things a major bump actually threatens, all of which passed — but automation cannot judge how it feels, and a runtime change can affect anything. -- [ ] The app starts, and **Menu → About / Credits** shows the right version. -- [ ] Window position and size are still remembered across a restart. -- [ ] Drag and drop from Explorer still queues files. *(This crosses the context +- [x] The app starts, and **Menu → About / Credits** shows the right version. +- [x] Window position and size are still remembered across a restart. +- [x] Drag and drop from Explorer still queues files. *(This crosses the context bridge through `webUtils`, which is exactly the sort of API a major bump - moves.)* -- [ ] Frame previews still appear in the Frames section. -- [ ] Both themes, and a live Windows theme switch while running. -- [ ] Explorer integration: right-click a media file → the app opens with it - queued. Double-click an associated file. -- [ ] The installer runs, asks for admin, and installs for all users. -- [ ] **The download is noticeably larger — about 308MB, up from 242MB.** That - is Electron 44's own growth, not a packaging mistake. Confirm the - installed app still launches and converts. -- [ ] Convert something end to end from the **installed** build, not just the - dev one. + moves.)* *(Will, 2026-09-02 — the first time this has been exercised by + hand rather than through Add Folder.)* +- [x] Frame previews still appear in the Frames section. +- [x] Both themes, and a live Windows theme switch while running. +- [x] Explorer integration: right-click a media file → the app opens with it + queued. Double-click an associated file. *(Will, 2026-09-02.)* +- [x] The installer runs, asks for admin, and installs for all users. + *(Will, 2026-09-02.)* +- [x] **The installer is about 252 MiB, up from 241 MiB on alpha.3** — a +10.8 + MiB, +4.5% cost for Electron 44. *(Corrected 2026-09-02: this line + previously read "about 308MB, up from 242MB", which was measured against + a build carrying ~111MB of stray test media. See the packaging note + above.)* +- [x] Convert something end to end from the **installed** build, not just the + dev one. *(Will, 2026-09-02 — reinstalled from the clean 2026-09-02 + installer first; the copy installed before that was the polluted 08-31 + build.)* --- ## 2.0.0-alpha.4 — fixes from the cross-kind test pass -> **Status: not started.** Written 2026-08-31. +> **Status: PASSED 2026-09-02.** Written 2026-08-31 alongside the fixes, then +> run by hand and passed: the span readout is right on first open, a failed +> conversion names its cause, and an animated WebP is refused at probe time. Two issues came back from testing the frames work. Both are fixed; a third, found while fixing them, is fixed too. ### The span readout names what it is doing -- [ ] Queue a video, set it to **PNG**, open **Advanced options**. Without +- [x] Queue a video, set it to **PNG**, open **Advanced options**. Without touching anything, the readout under the slider reads **"covering 0:10"**. *(It used to say "keeping" until you dragged a handle — the slider painted before the section knew it was choosing frames.)* -- [ ] Drag a handle: still "covering". -- [ ] Switch to **A single frame**: the readout clears — one frame is a position, +- [x] Drag a handle: still "covering". +- [x] Switch to **A single frame**: the readout clears — one frame is a position, not a span. -- [ ] Now change the format to **MP4** in the same dialog. The section is headed +- [x] Now change the format to **MP4** in the same dialog. The section is headed **Trim** again and reads **"keeping …"**. *(Found while fixing the above: the stale single-frame choice blanked it, and would also have silently thrown away the trim's end.)* -- [ ] Set a trim, Apply, convert — the output really is trimmed. -- [ ] Switch back to PNG in the same dialog: it remembers you had chosen +- [x] Set a trim, Apply, convert — the output really is trimmed. +- [x] Switch back to PNG in the same dialog: it remembers you had chosen **A single frame**. ### A failed conversion says why -- [ ] Convert something that will fail — an animated WebP is the easy one, or +- [x] Convert something that will fail — an animated WebP is the easy one, or rename a `.txt` to `.mp4`. -- [ ] The card shows **a real reason**, not "Conversion failed!". For animated +- [x] The card shows **a real reason**, not "Conversion failed!". For animated WebP it names the unsupported chunk. -- [ ] The reason has no `[component @ 0x7f…]` prefix on it. -- [ ] Hover or select the message — it is readable and can be copied. -- [ ] A batch where one file fails still converts the rest, and only the failed +- [x] The reason has no `[component @ 0x7f…]` prefix on it. +- [x] Hover or select the message — it is readable and can be copied. +- [x] A batch where one file fails still converts the rest, and only the failed card carries the message. ### Animated WebP is refused up front -- [ ] Drop an **animated WebP**. The card's metadata line reads +- [x] Drop an **animated WebP**. The card's metadata line reads **"WEBP · unreadable"** as soon as the probe returns — before any format is chosen. -- [ ] Open Advanced options on it: nothing crashes, and there is no duration to +- [x] Open Advanced options on it: nothing crashes, and there is no duration to trim. -- [ ] A **still** WebP is unaffected: it shows its type and converts normally. -- [ ] An animated **GIF** is unaffected: dimensions shown, converts, keeps its +- [x] A **still** WebP is unaffected: it shows its type and converts normally. +- [x] An animated **GIF** is unaffected: dimensions shown, converts, keeps its animation. -- [ ] An **MP3 with embedded cover art** is unaffected — still audio, no +- [x] An **MP3 with embedded cover art** is unaffected — still audio, no resolution badge, converts normally. *(The check looks for a picture stream with no dimensions; cover art has them.)* From 3bd5be8bcf6fda6e443623382961a18e2fea0631 Mon Sep 17 00:00:00 2001 From: Will Knowles Date: Wed, 2 Sep 2026 16:00:22 +0100 Subject: [PATCH 27/81] fix: keep the queue honest while an output-exists prompt is open MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A job waiting on the "If it already exists" prompt was in neither `active` nor `queue`, so the pool could not see it at all. Three defects follow from that one fact, and they are fixed by giving the job a slot to hold while it waits rather than by patching each symptom. **"Apply to all remaining files" was discarded mid-batch.** _checkIdle tests active.size and queue.length, both zero when every job is parked at a prompt, so the runner announced it had finished while the user was still reading the first dialog. main.js clears the batch-wide choice on idle. Measured before the fix: five files at concurrency two, one tick of the checkbox, four further dialogs. This is the same symptom a tester reported against alpha.1. e4e16e5 fixed the original — main built the job without the user's setting, so createJob's own default of "unique" applied and every collision silently became "name (1).ext" — and 4f1d06b fixed a race after it. Both were real. This is a third route to the same place, and it survived because the checklist case for it uses six similar files, which all finish probing before the first answer. That is the one ordering that works. **Concurrency did not apply to anything that took the ask path.** Nothing re-checked the pool between the answer and the spawn, so once a batch answer was set every parked job spawned in the same tick: eight ffmpeg processes at a limit of two. **Cancel All during a prompt still ran the conversion.** _cancelledAll was read on entry and never again, so answering the dialog spawned ffmpeg regardless and the job was marked cancelled in the close handler — after it had overwritten the file. The reservation makes _pump mandatory on the two pre-existing early returns after the await. They got away with not pumping while a parked job held no slot; now one does, missing it would stall the queue for good. There is a test for that specifically, because it is a regression this change introduces rather than one it fixes. Left alone deliberately: cancel(jobId) for a job at a prompt still returns false and does nothing. The dialog is OS-modal and cannot be dismissed from here, so there is genuinely nothing to cancel until it is answered. Now commented rather than silent. Also drops the renderer stripping onConflict === "ask" before sending. It is free today because the app-wide setting is "ask" too, so main reinstates the same value. It stops being free the moment a global conflict preference exists: a card set explicitly back to Ask me would inherit a global Overwrite instead. Routing keeps its strip, and the asymmetry is commented. Tests: five behavioural ones in a new test/runner.test.js, driving a real JobRunner with an injected spawn. Confirmed to fail against the old code before the fix, which is the only way to know a concurrency test is testing anything. Two tests deleted rather than kept — both read main.js as a string, and one asserted the presence of the very line that caused the first defect, reading it as proof the behaviour was correct. Prompt ordering needs a real dialog and moves to the manual checklist. The wiring guard that main still threads the setting through stays, retitled to say what it is. 155 tests pass. --- docs/MANUAL-TESTING.md | 84 ++++++++++++++ src/core/runner.js | 53 ++++++++- src/renderer.js | 8 +- test/runner.test.js | 248 +++++++++++++++++++++++++++++++++++++++++ test/version.test.js | 36 ++---- 5 files changed, 397 insertions(+), 32 deletions(-) create mode 100644 test/runner.test.js diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md index 7aa64e7..8c2e08f 100644 --- a/docs/MANUAL-TESTING.md +++ b/docs/MANUAL-TESTING.md @@ -957,3 +957,87 @@ found while fixing them, is fixed too. - [x] An **MP3 with embedded cover art** is unaffected — still audio, no resolution badge, converts normally. *(The check looks for a picture stream with no dimensions; cover art has them.)* + +--- + +## 2.0.0-alpha.5 — the conflict prompt and the pool + +> **Status: not started.** Written 2026-09-02 alongside the fix. + +Three defects on the "If it already exists → **Ask me**" path, all with one +cause: a job waiting on the prompt was in neither the running set nor the queue, +so the pool could not see it. It looked idle, it looked empty, and it looked +like nothing had been cancelled. + +**The one that matters is the first**, because it is the same symptom a tester +reported against alpha.1 and which `4f1d06b` was supposed to have fixed — +"Apply to all remaining files" being ignored. That fix was real; this is a +second, independent route to the same behaviour, and it survived because the +existing checklist case below happens to use the one ordering that works. + +`npm test` is 155 passing. The three defects now have behavioural tests in +`test/runner.test.js` that drive a real `JobRunner`; they were confirmed to fail +against the old code before the fix went in. Two tests that read `main.js` as +text were deleted rather than kept — one of them matched the very line causing +the first defect and read it as proof the code was correct. + +### "Apply to all remaining" survives a staggered batch *(it did not)* + +The existing case at **"Apply to all remaining files" actually applies** uses +six similar files, which all finish probing before you can answer the first +dialog. That is the ordering that passes. This one is deliberately the other +ordering. + +- [ ] Put **one very large video** and **five small files** in a folder, and + convert them all once so every output exists. +- [ ] Set concurrency to **2 or more** (Menu → it follows the CPU count by + default; any machine with 4+ cores is fine). +- [ ] Queue all six again and press Convert. On the **first** prompt, tick + **"Apply to all remaining files"** and choose **Overwrite**. +- [ ] **Exactly one dialog appears.** Before the fix you would get up to four + more, because the run was declared finished while you were still reading + the first one, which threw the answer away. +- [ ] All six convert, and the toast at the end reports six. +- [ ] Repeat choosing **Save as New** — same thing, one dialog, and every output + lands as `name (1).ext`. + +### Cancel All while a prompt is open + +- [ ] Queue several colliding files, press Convert, and wait for the first + prompt. +- [ ] With the dialog still open, press **Cancel All** behind it. *(You may need + to move the dialog; it is modal to the window.)* +- [ ] Answer the dialog with **Overwrite**. +- [ ] **Nothing converts.** No file on disk is modified — check the timestamp of + the output that was about to be overwritten. Previously ffmpeg ran to + completion first and the job was only marked cancelled afterwards, so the + file *was* overwritten. +- [ ] Every card reads Cancelled, and the app returns to idle. + +### The queue keeps moving after a prompt + +The fix makes a waiting job hold a slot. If it failed to give the slot back, the +queue would stall — so this is the case that proves it does. + +- [ ] Queue **three** colliding files with concurrency set to **1**. +- [ ] Answer the first prompt with **Cancel** (the button, not Cancel All). +- [ ] The **second** prompt appears. Answer it **Cancel** too. +- [ ] The **third** prompt appears. Answer **Overwrite** — it converts. +- [ ] The app returns to idle with two cancelled and one done. Nothing is left + spinning, and the Convert button is no longer lit. +- [ ] Repeat, answering **Skip** each time instead: same, three cards settle. + +### Concurrency still means something + +- [ ] Queue **eight** colliding files with concurrency **2**. +- [ ] Tick "Apply to all remaining" on the first prompt and choose Overwrite. +- [ ] Watch Task Manager: **at most two `ffmpeg.exe` at a time.** Before the fix + all eight started at once, because a job at the prompt held no slot and + the pool believed it was empty. + +### Nothing else about conflicts changed + +- [ ] **Overwrite**, **Save as a new file** and **Skip the file** chosen in + Advanced options still behave exactly as before, with no prompt. +- [ ] With no collision at all, no dialog ever appears. +- [ ] The **Cancel** button on a single running card still cancels just that one. diff --git a/src/core/runner.js b/src/core/runner.js index a2bf7f9..887190a 100644 --- a/src/core/runner.js +++ b/src/core/runner.js @@ -30,15 +30,20 @@ class JobRunner extends EventEmitter { * @param {(job, candidatePath) => Promise<{action: string, outputPath?: string}>} [options.conflictResolver] * Called when a job's conflict policy is "ask". Must resolve to * { action: "write" | "skip" | "cancel", outputPath }. + * @param {typeof spawn} [options.spawn] Seam for tests, so the pool can be + * driven without starting ffmpeg. Injected the same way ffmpegPath + * and conflictResolver are. */ constructor(options = {}) { super(); this.ffmpegPath = options.ffmpegPath ?? "ffmpeg"; this.concurrency = options.concurrency ?? defaultConcurrency(); this.conflictResolver = options.conflictResolver ?? null; + this.spawn = options.spawn ?? spawn; this.queue = []; // jobs waiting to start this.active = new Map(); // jobId -> { job, child, outputPath, isDirectory } + this.reserved = new Set(); // jobIds waiting on a conflict answer this.results = new Map(); // jobId -> result this.running = false; this.paused = false; @@ -83,7 +88,15 @@ class JobRunner extends EventEmitter { this._pump(); } - /** Cancel one job, whether it is running or still queued. */ + /** + * Cancel one job, whether it is running or still queued. + * + * A job parked on a conflict prompt is in neither map, so this returns + * false and does nothing for it. That is a known gap rather than an + * oversight: the prompt is an OS-modal dialog this process cannot dismiss, + * so there is nothing to cancel until the user answers it. cancelAll + * handles the batch case by re-checking after the answer arrives. + */ cancel(jobId) { const entry = this.active.get(jobId); if (entry) { @@ -109,7 +122,11 @@ class JobRunner extends EventEmitter { for (const jobId of [...this.active.keys()]) this.cancel(jobId); - if (this.active.size === 0) this._checkIdle(); + // A reserved job is sitting on a modal dialog and cannot be killed from + // here. _run re-checks _cancelledAll once the user answers and settles + // it as cancelled without spawning, so the batch still ends — just not + // until the dialog is dealt with. + if (this.active.size === 0 && this.reserved.size === 0) this._checkIdle(); } get pending() { return this.queue.length; } @@ -117,7 +134,7 @@ class JobRunner extends EventEmitter { _pump() { if (!this.running || this.paused) return; - while (this.active.size < this.concurrency && this.queue.length > 0) { + while (this.active.size + this.reserved.size < this.concurrency && this.queue.length > 0) { const job = this.queue.shift(); this._run(job).catch((err) => { this._finish(job, { status: STATUS.ERROR, error: err.message }); @@ -154,13 +171,37 @@ class JobRunner extends EventEmitter { ? paths.getUniqueDirPath(resolved.outputPath) : paths.getUniquePath(resolved.outputPath) }; } else { - const answer = await this.conflictResolver(job, resolved.outputPath); + // The job holds a pool slot for as long as the prompt is open. + // Without this it is in neither `active` nor `queue`, so the + // pool reads as empty: _pump starts every remaining job at once + // and _checkIdle calls the whole run finished while the user is + // still looking at the first dialog — which is what discarded + // "apply to all remaining files" half way through a batch. + this.reserved.add(job.id); + let answer; + try { + answer = await this.conflictResolver(job, resolved.outputPath); + } finally { + this.reserved.delete(job.id); + } + + // A prompt can stay open for minutes. Everything below re-reads + // the world rather than trusting what was true before the await. + // Each exit has to pump, because the slot this job was holding + // is now free and nothing else will notice. + if (this._cancelledAll) { + this._finish(job, { status: STATUS.CANCELLED }); + this._pump(); + return; + } if (!answer || answer.action === "cancel") { this._finish(job, { status: STATUS.CANCELLED }); + this._pump(); return; } if (answer.action === "skip") { this._finish(job, { status: STATUS.SKIPPED, outputPath: resolved.outputPath }); + this._pump(); return; } if (answer.outputPath) resolved = { ...resolved, outputPath: answer.outputPath }; @@ -185,7 +226,7 @@ class JobRunner extends EventEmitter { return; } - const child = spawn(this.ffmpegPath, args, { windowsHide: true }); + const child = this.spawn(this.ffmpegPath, args, { windowsHide: true }); const entry = { job, child, outputPath, isDirectory, cancelled: false, stderr: "" }; this.active.set(job.id, entry); @@ -265,7 +306,7 @@ class JobRunner extends EventEmitter { } _checkIdle() { - if (this.running && this.active.size === 0 && this.queue.length === 0) { + if (this.running && this.active.size === 0 && this.reserved.size === 0 && this.queue.length === 0) { this.running = false; this.emit("idle", { results: [...this.results.values()] }); } diff --git a/src/renderer.js b/src/renderer.js index 938fe69..daf3411 100644 --- a/src/renderer.js +++ b/src/renderer.js @@ -1157,8 +1157,14 @@ function readSettingsFromForm() { // Defaults that were never touched are dropped, so the format keeps // control of anything the user did not explicitly choose. + // + // onConflict is deliberately NOT dropped, unlike routing. Dropping a value + // only works where something downstream will reinstate the same one, and + // main layers the app-wide setting underneath whatever arrives here. Both + // are "ask" today so the two behave alike, but the moment a global conflict + // preference exists, stripping "ask" would mean a card explicitly set back + // to Ask me silently inherits a global Overwrite instead. if (settings.output.routing === "alongside") settings.output.routing = null; - if (settings.output.onConflict === "ask") settings.output.onConflict = null; if (settings.video && settings.video.mode === "encode") settings.video.mode = null; if (settings.video && settings.video.fitMode === "contain") settings.video.fitMode = null; if (settings.audio && settings.audio.mode === "encode") settings.audio.mode = null; diff --git a/test/runner.test.js b/test/runner.test.js new file mode 100644 index 0000000..3017e4a --- /dev/null +++ b/test/runner.test.js @@ -0,0 +1,248 @@ +"use strict"; + +// The job runner's conflict path, driven for real. +// +// These replace four tests that were assert.match regexes over main.js read as +// a string. Those could not fail for any of the defects below — one of them +// matched the very line that caused the first one, and read it as proof the +// behaviour was right. A pool is a thing you have to run to know about. + +const test = require("node:test"); +const assert = require("node:assert/strict"); +const { EventEmitter } = require("events"); +const os = require("os"); +const fs = require("fs"); +const path = require("path"); + +const { JobRunner } = require("../src/core/runner"); +const { createJob, CONFLICT, STATUS } = require("../src/core/job"); + +/** + * An ffmpeg that never was. Enough surface for _run to attach its handlers; + * the test closes it by hand when it wants the job to finish. + */ +function fakeChild() { + const child = new EventEmitter(); + const silentStream = { setEncoding() {}, on() {} }; + child.stdout = silentStream; + child.stderr = silentStream; + child.killed = false; + child.kill = () => { child.killed = true; child.emit("close", 0); }; + return child; +} + +/** A promise the test resolves when it chooses, so a prompt can be held open. */ +function heldPromise() { + let release; + const promise = new Promise((resolve) => { release = resolve; }); + return { promise, release }; +} + +/** + * A temp dir with `count` inputs and a colliding output for each, so + * resolveOutputPath genuinely returns action "ask" against the real + * filesystem rather than being stubbed into it. + */ +function collidingJobs(count) { + const dir = fs.mkdtempSync(path.join(os.tmpdir(), "dfc-runner-")); + const jobs = []; + for (let i = 0; i < count; i++) { + const stem = `clip${i}`; + fs.writeFileSync(path.join(dir, `${stem}.mov`), ""); + fs.writeFileSync(path.join(dir, `${stem}.mp4`), ""); // the collision + jobs.push(createJob({ + inputPath: path.join(dir, `${stem}.mov`), + targetExt: "mp4", + output: { onConflict: CONFLICT.ASK }, + })); + } + return { dir, jobs, cleanup: () => fs.rmSync(dir, { recursive: true, force: true }) }; +} + +/** Let queued microtasks settle — _run is async, so nothing is synchronous. */ +const settle = () => new Promise(resolve => setImmediate(resolve)); + +// --------------------------------------------------------------------------- +// The pool has to know about a job that is waiting on an answer +// --------------------------------------------------------------------------- + +test("runner: is not idle while a job is parked at a conflict prompt", async () => { + const { jobs, cleanup } = collidingJobs(2); + try { + const held = heldPromise(); + let idleCount = 0; + + const runner = new JobRunner({ + ffmpegPath: "ffmpeg", + concurrency: 1, + spawn: () => { + const child = fakeChild(); + setImmediate(() => child.emit("close", 0)); + return child; + }, + conflictResolver: () => held.promise, + }); + runner.on("idle", () => { idleCount++; }); + + runner.enqueueAll(jobs); + runner.start(); + await settle(); + + // The prompt is open. Main clears the batch-wide "apply to all + // remaining" choice on idle, so an idle here throws away an answer the + // user has already given. + assert.equal(idleCount, 0, "idle must not fire while a prompt is open"); + assert.equal(runner.running, true); + + held.release({ action: "write" }); + for (let i = 0; i < 20; i++) await settle(); + + assert.equal(idleCount, 1, "idle fires exactly once, after everything settles"); + } finally { + cleanup(); + } +}); + +test("runner: the concurrency limit applies to jobs that took the ask path", async () => { + const { jobs, cleanup } = collidingJobs(8); + try { + const held = heldPromise(); + let openPrompts = 0; + let peakPrompts = 0; + let spawned = 0; + let closed = 0; + let peakChildren = 0; + + const runner = new JobRunner({ + ffmpegPath: "ffmpeg", + concurrency: 2, + spawn: () => { + spawned++; + peakChildren = Math.max(peakChildren, spawned - closed); + const child = fakeChild(); + setImmediate(() => { closed++; child.emit("close", 0); }); + return child; + }, + conflictResolver: async () => { + openPrompts++; + peakPrompts = Math.max(peakPrompts, openPrompts); + try { return await held.promise; } finally { openPrompts--; } + }, + }); + + runner.enqueueAll(jobs); + runner.start(); + await settle(); + + // Before the fix every one of the eight reached the resolver at once, + // because a parked job was in neither `active` nor `queue` and so the + // pool read as completely empty. + assert.equal(peakPrompts, 2, "at most `concurrency` prompts may be open at once"); + + held.release({ action: "write" }); + for (let i = 0; i < 40; i++) await settle(); + + assert.equal(spawned, 8, "every job still runs"); + assert.ok(peakChildren <= 2, `at most 2 ffmpeg processes at once, saw ${peakChildren}`); + } finally { + cleanup(); + } +}); + +test("runner: Cancel All while a prompt is open does not spawn ffmpeg", async () => { + const { jobs, cleanup } = collidingJobs(1); + try { + const held = heldPromise(); + let spawned = 0; + const statuses = []; + + const runner = new JobRunner({ + ffmpegPath: "ffmpeg", + concurrency: 2, + spawn: () => { spawned++; return fakeChild(); }, + conflictResolver: () => held.promise, + }); + runner.on("status", ({ status }) => statuses.push(status)); + + runner.enqueueAll(jobs); + runner.start(); + await settle(); + + runner.cancelAll(); + // The user was looking at the dialog when Cancel All was pressed, and + // still answers it. The answer must not resurrect the job: _run used to + // read _cancelledAll only on entry, so it spawned anyway and only + // noticed it had been cancelled once ffmpeg had finished. + held.release({ action: "write" }); + for (let i = 0; i < 10; i++) await settle(); + + assert.equal(spawned, 0, "nothing may start after Cancel All"); + assert.ok(statuses.includes(STATUS.CANCELLED)); + assert.ok(!statuses.includes(STATUS.RUNNING)); + } finally { + cleanup(); + } +}); + +test("runner: a job skipped at the prompt frees its slot", async () => { + // Holding a pool slot across the prompt means every exit after the await + // has to release it. Miss one and the queue stalls forever with jobs still + // in it — the regression the reservation introduces if it is done by half. + const { jobs, cleanup } = collidingJobs(3); + try { + let answered = 0; + let idleCount = 0; + const statuses = []; + + const runner = new JobRunner({ + ffmpegPath: "ffmpeg", + concurrency: 1, + spawn: () => { + const child = fakeChild(); + setImmediate(() => child.emit("close", 0)); + return child; + }, + conflictResolver: async () => (++answered <= 2 ? { action: "skip" } : { action: "write" }), + }); + runner.on("idle", () => { idleCount++; }); + runner.on("status", ({ status }) => statuses.push(status)); + + runner.enqueueAll(jobs); + runner.start(); + for (let i = 0; i < 40; i++) await settle(); + + assert.equal(runner.pending, 0, "the queue must drain"); + assert.equal(statuses.filter(s => s === STATUS.SKIPPED).length, 2); + assert.ok(statuses.includes(STATUS.DONE), "the third job still runs"); + assert.equal(idleCount, 1); + } finally { + cleanup(); + } +}); + +test("runner: answering cancel settles the job without spawning", async () => { + const { jobs, cleanup } = collidingJobs(1); + try { + let spawned = 0; + const statuses = []; + + const runner = new JobRunner({ + ffmpegPath: "ffmpeg", + concurrency: 1, + spawn: () => { spawned++; return fakeChild(); }, + conflictResolver: async () => ({ action: "cancel" }), + }); + runner.on("status", ({ status }) => statuses.push(status)); + + runner.enqueueAll(jobs); + runner.start(); + for (let i = 0; i < 10; i++) await settle(); + + assert.equal(spawned, 0); + assert.deepEqual(statuses, [STATUS.CANCELLED]); + assert.equal(runner.activeCount, 0); + assert.equal(runner.reserved.size, 0, "the reservation must be released"); + } finally { + cleanup(); + } +}); diff --git a/test/version.test.js b/test/version.test.js index fb349f8..8376c01 100644 --- a/test/version.test.js +++ b/test/version.test.js @@ -124,7 +124,11 @@ test("conflict: the documented default is to ask, not to rename silently", () => assert.equal(createJob({ inputPath: "a.mp4", targetExt: "mkv" }).output.onConflict, CONFLICT.ASK); }); -test("conflict: main.js threads the user's setting into the job", () => { +// A wiring guard, not a behaviour test — it reads main.js as text and can only +// say the two ends are still tied together. It stays because untying them is +// the exact bug that shipped in alpha.1, and main has no seam to test through. +// The behaviour on the other side of this wiring is in test/runner.test.js. +test("conflict: main.js still threads the user's setting into the job", () => { const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8"); assert.match(main, /onConflict:\s*settings\.onConflict/, "main.js must pass settings.onConflict into createJob, or the prompt is unreachable"); @@ -132,14 +136,6 @@ test("conflict: main.js threads the user's setting into the job", () => { "the runner must be given the resolver"); }); -test("conflict: the prompt offers an escape hatch for a whole batch", () => { - const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8"); - // Without this, a batch of 50 collisions means 50 modal dialogs. - assert.match(main, /checkboxLabel:\s*"Apply to all remaining files"/); - assert.match(main, /conflictChoiceForBatch\s*=\s*null/, - "the batch-wide choice must be reset so it cannot leak into the next run"); -}); - test("credits: Escape is handled in the main process, not the page", () => { const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8"); assert.match(main, /before-input-event/, @@ -168,22 +164,12 @@ test("credits: only one Credits window can ever be open", () => { "the reference must be cleared, or Credits can never be reopened"); }); -test("conflict: the output-exists prompts are serialised", () => { - // The concurrency pool brings several jobs to the resolver at once. Each - // used to read the batch choice (still null) and open its own dialog - // before the first answer came back, so "apply to all remaining files" - // had no effect on the prompts already queued behind it. - const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8"); - assert.match(main, /conflictPromptChain/, - "prompts must be chained so only one dialog is open at a time"); - - const resolver = main.slice(main.indexOf("async function resolveConflict"), - main.indexOf("async function promptForConflict")); - assert.ok(!/showMessageBox/.test(resolver), - "resolveConflict must not open the dialog itself; the serialised prompt does"); - assert.match(main, /async function promptForConflict[\s\S]{0,400}?if \(conflictChoiceForBatch\)/, - "the batch choice must be re-read after the previous prompt settles"); -}); +// Prompt serialisation used to be asserted here by matching three identifiers +// inside main.js as text. It never awaited a promise or observed an ordering, +// so a reordering that reintroduced the race would still have passed. Dialog +// ordering needs a real dialog; it is checked by hand instead — see the +// "Apply to all remaining files" cases in docs/MANUAL-TESTING.md. What the +// pool does around those prompts is covered properly in test/runner.test.js. test("theme: an OS theme change is pushed to the windows, not only observed", () => { const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8"); From 07c3e164696bb5e6cfdef8ba2502a749f6ef8f57 Mon Sep 17 00:00:00 2001 From: Will Knowles Date: Wed, 2 Sep 2026 16:04:55 +0100 Subject: [PATCH 28/81] feat: say which files a folder ingest skipped, and why Dropping a folder reported "skipped 2 unsupported files" and nothing else, so you knew something had gone missing but not what, and not whether it was the app's limitation or a filter of your own. v1 discarded them in silence and that was worse, but a bare count is not much of an answer. scanPaths now returns skipped as { path, reason } entries rather than a counter, matching the shape errors already used. Three reason codes - unsupported, not-included, excluded - and no sentences: this module has no business deciding how any of it is worded. A file reached twice is still not counted as skipped, because nothing was dropped and there is nothing to say. The toast gained an optional action, and the skipped list is that action rather than a panel of its own. A panel would need a position, a dismissal model, a focus model and an Escape handler in order to report that four files were ignored - and the house rule is that anything merely reporting what already happened is a toast. Filenames in the list override the app-wide user-select: none, since a filename you cannot copy is not much use in a bug report. Everything is still set through textContent; a toast carries filenames and ffmpeg's own words, and neither is markup this app gets to trust. A toast with an action no longer times out by default. Two reporting bugs go with it, both from the branches being an else-if chain over conditions that are not mutually exclusive: - A scan that both truncated and skipped reported only the truncation. The clauses now compose, so it reports both in one sentence. - Adding files that were every one of them already queued said nothing whatsoever, which is indistinguishable from a drop that never registered. It now says so. And there were two different "skipped" toasts - one in the scanner path, one in addFiles' own format check - which could both fire for a single folder and word the same thing differently. addFiles no longer reports anything; it returns { added, rejected, duplicates } and the caller merges its rejections with the scanner's into one message, because they are one thing to the person reading them. Tests: reason codes per skip, a filtered-out file distinguished from an unreadable one, and a dedupe asserted not to count as a skip. The existing scan test is updated for the new shape - it was the only other consumer. 156 tests pass. --- docs/MANUAL-TESTING.md | 75 ++++++++++++++++++++ src/core/scan.js | 18 +++-- src/renderer.js | 152 +++++++++++++++++++++++++++++++++++------ src/styles.css | 34 +++++++++ test/core.test.js | 33 ++++++++- 5 files changed, 284 insertions(+), 28 deletions(-) diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md index 8c2e08f..3168e09 100644 --- a/docs/MANUAL-TESTING.md +++ b/docs/MANUAL-TESTING.md @@ -1041,3 +1041,78 @@ queue would stall — so this is the case that proves it does. Advanced options still behave exactly as before, with no prompt. - [ ] With no collision at all, no dialog ever appears. - [ ] The **Cancel** button on a single running card still cancels just that one. + +--- + +## 2.0.0-alpha.5 — what a folder ingest skipped, and why + +> **Status: not started.** Written 2026-09-02 alongside the change. + +Unsupported files were dropped with only a count — "skipped 2 unsupported +files" — which tells you something went missing, but not what, and not whether +it was the app's doing or yours. The scanner now records a reason per file and +the toast can list them. + +Two reporting bugs went with it. A scan that both truncated *and* skipped +reported only the truncation, because the branches were an else-if chain. And +adding files that were all already in the list said **nothing at all**, which +reads exactly like a drop that never registered. + +There were also two different "skipped" toasts — one from the scanner, one from +the queue's own format check — which could both fire for a single folder and +word the same thing differently. There is now one. + +**Test media:** a folder holding a few media files, at least one nested +subfolder, two or three `.txt` files, and one file with a media extension that +is actually junk (rename a `.txt` to `.mp4`). + +### The skipped list + +- [ ] Drop a folder containing media **and** two or three `.txt` files. +- [ ] The toast reads **"Added N files, skipped 3."** and carries a **Show + them** button. +- [ ] It does **not** disappear on its own — a toast with an action stays until + it is dismissed. +- [ ] Press **Show them**: a list appears inside the toast, one row per skipped + file, each reading *filename — not a supported format*. +- [ ] The button now reads **Hide**. Press it — the list collapses and the + button reads Show them again. +- [ ] **Select a filename in the list and copy it.** It highlights. *(Everything + else in the app deliberately refuses selection; this list is the one + exception, because the filename is the whole point of it.)* +- [ ] The × still dismisses the whole toast. +- [ ] Drop a folder with **more than 50** unsupported files: the list stops at + 50 and its last row reads "and N more files". + +### The cases that used to say the wrong thing + +- [ ] Drop the same folder **twice**. The second time the toast reads **"Those + files are already in the list."** *(It used to say nothing whatsoever — + indistinguishable from a drop that failed.)* +- [ ] Drop a single already-queued file: **"That file is already in the list."** + — singular. +- [ ] Drop a folder holding only `.txt` files: **"No supported media found + there."**, with Show them still listing them. +- [ ] Add a folder large enough to truncate **that also contains junk files**. + The toast mentions **both** the skip and the stop, in one sentence. + *(Truncation used to swallow the skipped count entirely.)* + +### One message, not two + +- [ ] Put a `.txt` **and** a renamed junk `.mp4` in a folder, and drop it. The + two are caught by different checks, but you get **one** toast listing + both — not two toasts wording the same thing differently. +- [ ] Use **Add Files** and pick a `.txt` directly: same single toast, same + wording. + +### Nothing else about ingest changed + +- [ ] A normal folder of supported media: **"Added N files."**, no action + button, and it fades on its own after a few seconds. +- [ ] Nested subfolders are still walked. +- [ ] An unreadable file still gets its own red "Could not read …" toast. +- [ ] Drag and drop, **Add Files**, **Add Folder** and **Menu → Open Folder** + all behave the same as each other. +- [ ] Check the toast in **both themes** — the list's inset background and the + underlined action button must be readable on all four toast colours + (info, success, warning, danger). diff --git a/src/core/scan.js b/src/core/scan.js index 12817fe..68974e9 100644 --- a/src/core/scan.js +++ b/src/core/scan.js @@ -25,7 +25,12 @@ const DEFAULT_MAX_FILES = 20000; * @param {string[]} [options.exclude] extensions to drop * @param {boolean} [options.followSymlinks] * @param {boolean} [options.recursive] default true - * @returns {Promise<{files: string[], skipped: number, truncated: boolean, errors: object[]}>} + * @returns {Promise<{files: string[], skipped: object[], truncated: boolean, errors: object[]}>} + * + * `skipped` carries a reason per file, not just a count — the caller has to be + * able to say *which* files were dropped and why, and "unsupported" reads very + * differently from "you turned that type off". Reason codes only: this module + * has no business deciding how any of it is worded. */ async function scanPaths(inputPaths, options = {}) { const { @@ -42,16 +47,19 @@ async function scanPaths(inputPaths, options = {}) { const files = []; const errors = []; + const skipped = []; const seen = new Set(); - let skipped = 0; let truncated = false; const accept = (filePath) => { const ext = formats.canonicalExt(path.extname(filePath)); - if (!ext) { skipped++; return; } - if (includeSet && !includeSet.has(ext)) { skipped++; return; } - if (excludeSet && excludeSet.has(ext)) { skipped++; return; } + if (!ext) { skipped.push({ path: filePath, reason: "unsupported" }); return; } + if (includeSet && !includeSet.has(ext)) { skipped.push({ path: filePath, reason: "not-included" }); return; } + if (excludeSet && excludeSet.has(ext)) { skipped.push({ path: filePath, reason: "excluded" }); return; } + // A file reached twice is not skipped. Nothing was dropped and there is + // nothing to tell anyone — reporting it would be noise wearing the + // clothes of thoroughness. const key = path.resolve(filePath).toLowerCase(); if (seen.has(key)) return; seen.add(key); diff --git a/src/renderer.js b/src/renderer.js index daf3411..a1e4020 100644 --- a/src/renderer.js +++ b/src/renderer.js @@ -40,17 +40,23 @@ function generateId() { // -- Ingest ------------------------------------------------------------------ +/** + * @returns {{added: number, rejected: object[], duplicates: number}} — the same + * { path, reason } shape the scanner uses, so a caller can merge the two lists + * and report them as the one thing a user sees. + */ function addFiles(filePaths) { let added = 0; - let rejected = 0; + let duplicates = 0; + const rejected = []; for (const filePath of filePaths) { const raw = p.extname(filePath).slice(1).toLowerCase(); const ext = FORMATS.aliases[raw] ?? raw; const entry = FORMATS.conversionMap[ext]; - if (!entry) { rejected++; continue; } - if (jobs.some(j => j.filePath === filePath)) continue; + if (!entry) { rejected.push({ path: filePath, reason: "unsupported" }); continue; } + if (jobs.some(j => j.filePath === filePath)) { duplicates++; continue; } jobs.push({ id: generateId(), @@ -75,15 +81,38 @@ function addFiles(filePaths) { probeNewJobs(); } - // v1 discarded unsupported files in silence, which read as the app being - // broken. Say so. - if (rejected > 0) { - toast( - `${display.countOf(rejected, "file")} ${display.plural(rejected, "was", "were")} skipped — not a supported format.`, - added > 0 ? "warning" : "danger" - ); + // Reporting belongs to whoever called this. There used to be a toast here + // as well as one in ingestPaths, so a folder holding one unreadable file + // could produce two different sentences about the same thing. + return { added, rejected, duplicates }; +} + +const SKIP_REASONS = { + "unsupported": "not a supported format", + "not-included": "turned off in folder options", + "excluded": "turned off in folder options", +}; + +/** The list behind "Show them", built only if the button is actually pressed. */ +function buildSkippedDetail(skipped) { + const list = document.createElement("ul"); + list.className = "toast-detail"; + + for (const item of skipped.slice(0, 50)) { + const row = document.createElement("li"); + const name = document.createElement("span"); + name.className = "toast-detail-name"; + name.textContent = p.basename(item.path); + row.append(name, document.createTextNode(` — ${SKIP_REASONS[item.reason] ?? item.reason}`)); + list.appendChild(row); + } + if (skipped.length > 50) { + const more = document.createElement("li"); + more.className = "toast-detail-more"; + more.textContent = `and ${display.countOf(skipped.length - 50, "more file")}`; + list.appendChild(more); } - return added; + return list; } /** Expand folders in the main process, then queue whatever came back. */ @@ -91,23 +120,65 @@ async function ingestPaths(inputPaths) { if (!inputPaths || inputPaths.length === 0) return; try { const result = await api.scanPaths(inputPaths, {}); - const added = addFiles(result.files); - - if (result.truncated) { - toast(`Stopped after ${display.countOf(result.files.length, "file")} — the folder is very large.`, "warning"); - } else if (added > 0 && result.skipped > 0) { - toast(`Added ${display.countOf(added, "file")}, skipped ${display.countOf(result.skipped, "unsupported file")}.`, "info"); - } else if (added === 0 && result.files.length === 0 && result.skipped > 0) { - toast("No supported media found in that folder.", "warning"); - } + const { added, rejected, duplicates } = addFiles(result.files); + + // The scanner's rejections and the format map's are one thing as far as + // anyone reading this is concerned, so they are reported as one thing. + const skipped = [...(result.skipped ?? []), ...rejected]; + reportIngest({ added, skipped, duplicates, truncated: result.truncated, found: result.files.length }); + for (const err of result.errors ?? []) { toast(`Could not read ${p.basename(err.path)}: ${err.error}`, "danger"); } } catch (_) { - addFiles(inputPaths); + // The scan itself failed, so folders cannot be expanded. Queue whatever + // was handed over as plain files and report on that alone. + const fallback = addFiles(inputPaths); + reportIngest({ + added: fallback.added, + skipped: fallback.rejected, + duplicates: fallback.duplicates, + truncated: false, + found: inputPaths.length, + }); } } +/** + * One sentence for one ingest, assembled from clauses rather than chosen from a + * chain of branches. The chain used to lose the skipped count whenever a scan + * also truncated, and said nothing at all when everything found was already in + * the list — which reads exactly like a drop that did not register. + */ +function reportIngest({ added, skipped, duplicates, truncated, found }) { + const clauses = []; + if (added > 0) clauses.push(`Added ${display.countOf(added, "file")}`); + if (skipped.length > 0) clauses.push(`skipped ${skipped.length}`); + if (duplicates > 0) clauses.push(`${duplicates} already in the list`); + if (truncated) clauses.push(`stopped at ${display.countOf(found, "file")} — the folder is very large`); + + if (clauses.length === 0) return; + + let type = "info"; + if (added === 0) type = skipped.length > 0 || truncated ? "warning" : "info"; + else if (truncated) type = "warning"; + + let message; + if (added === 0 && skipped.length === 0 && duplicates > 0) { + message = duplicates === 1 + ? "That file is already in the list." + : "Those files are already in the list."; + } else if (added === 0 && skipped.length > 0 && duplicates === 0) { + message = "No supported media found there."; + } else { + message = `${clauses.join(", ")}.`; + } + + toast(message, type, 4500, skipped.length > 0 + ? { actionLabel: "Show them", onAction: () => buildSkippedDetail(skipped) } + : {}); +} + /** * Probe anything that has not been probed yet. Cards are already on screen by * this point — metadata only enriches them, so a slow or failing probe never @@ -1213,8 +1284,20 @@ function applyJobModal() { const TOAST_ICONS = { info: "info", success: "check_circle", warning: "warning", danger: "error" }; -function toast(message, type = "info", timeoutMs = 4500) { +/** + * @param {object} [options] + * @param {string} [options.actionLabel] adds a button beside the message + * @param {() => (Node|null)} [options.onAction] builds what the button reveals, + * appended inside this same toast. A toast carrying an action does not + * time out by default — an action nobody can reach is not an action. + * + * Everything here is set with textContent. A toast reports filenames and + * ffmpeg's own words, neither of which this app gets to trust as markup. + */ +function toast(message, type = "info", timeoutMs = 4500, options = {}) { const host = $("toast-host"); + const { actionLabel = null, onAction = null } = options; + if (actionLabel && timeoutMs === 4500) timeoutMs = 0; const note = document.createElement("div"); note.className = `toast-note toast-${type}`; @@ -1227,6 +1310,31 @@ function toast(message, type = "info", timeoutMs = 4500) { body.className = "toast-body"; body.textContent = message; + if (actionLabel && onAction) { + const action = document.createElement("button"); + action.className = "toast-action"; + action.type = "button"; + action.textContent = actionLabel; + + // Both the button and whatever it reveals live inside the body. The + // toast itself is a flex row of icon | body | dismiss, so anything + // appended to it directly becomes a fourth column instead. + let detail = null; + action.addEventListener("click", () => { + if (detail) { + detail.remove(); + detail = null; + action.textContent = actionLabel; + return; + } + detail = onAction(); + if (!detail) return; + body.appendChild(detail); + action.textContent = "Hide"; + }); + body.append(" ", action); + } + const close = document.createElement("button"); close.className = "toast-close material-icons-round"; close.textContent = "close"; diff --git a/src/styles.css b/src/styles.css index f83843b..019dc51 100644 --- a/src/styles.css +++ b/src/styles.css @@ -704,6 +704,40 @@ body.popup-window span:hover { } .toast-note .toast-close:hover { opacity: 1; } +/* An action inside the message, for a toast that has more to say than fits in + a sentence. Inherits the toast's own colour rather than picking one, because + the four toast variants sit on four different backgrounds. */ +.toast-note .toast-action { + background: none; + border: none; + padding: 0; + cursor: pointer; + color: inherit; + font: inherit; + font-weight: 600; + text-decoration: underline; +} +.toast-note .toast-action:hover { opacity: 0.8; } + +.toast-detail { + max-height: 12rem; + overflow-y: auto; + margin: 0.4rem 0 0; + padding: 0.4rem 0.6rem; + list-style: none; + font-size: 0.8rem; + border-radius: 4px; + /* The toast backgrounds are solid brand colours, so a tint of the text + colour is the only inset that works on all four of them. */ + background-color: rgb(0 0 0 / 0.08); +} +.toast-detail li { padding: 0.1rem 0; } +.toast-detail-more { opacity: 0.75; font-style: italic; } + +/* Filenames are the reason this list exists, so they are the one thing here + worth copying — and body sets user-select: none for everything. */ +.toast-detail-name { user-select: text; font-weight: 600; } + .toast-info { background-color: var(--bs-info); border-left-color: var(--bs-info); color: #000; } .toast-success { background-color: var(--bs-success); border-left-color: var(--bs-success); color: #fff; } .toast-warning { background-color: var(--bs-warning); border-left-color: var(--bs-warning); color: #000; } diff --git a/test/core.test.js b/test/core.test.js index 3e888b1..9ccb05d 100644 --- a/test/core.test.js +++ b/test/core.test.js @@ -400,7 +400,7 @@ test("scan: walks recursively and filters by the format graph", async () => { const all = await scanPaths([root]); assert.equal(all.files.length, 3, "v1 would have found only the top-level file"); - assert.equal(all.skipped, 1, "the .txt is skipped"); + assert.equal(all.skipped.length, 1, "the .txt is skipped"); const shallow = await scanPaths([root], { recursive: false }); assert.equal(shallow.files.length, 1); @@ -422,6 +422,31 @@ test("scan: walks recursively and filters by the format graph", async () => { } }); +test("scan: says which file was skipped and why", async () => { + // A count alone cannot tell "this app cannot read that" apart from "you + // turned that type off", and those want very different reactions. + const root = fs.mkdtempSync(path.join(os.tmpdir(), "dfc-scan-why-")); + try { + fs.writeFileSync(path.join(root, "a.mp3"), ""); + fs.writeFileSync(path.join(root, "b.png"), ""); + fs.writeFileSync(path.join(root, "notes.txt"), ""); + + const plain = await scanPaths([root]); + assert.deepEqual(plain.skipped.map(s => path.basename(s.path)), ["notes.txt"]); + assert.equal(plain.skipped[0].reason, "unsupported"); + + const onlyAudio = await scanPaths([root], { include: ["mp3"] }); + const byName = Object.fromEntries(onlyAudio.skipped.map(s => [path.basename(s.path), s.reason])); + assert.equal(byName["b.png"], "not-included", "a filtered-out file is not the same as an unreadable one"); + assert.equal(byName["notes.txt"], "unsupported"); + + const noImages = await scanPaths([root], { exclude: ["png"] }); + assert.equal(noImages.skipped.find(s => path.basename(s.path) === "b.png").reason, "excluded"); + } finally { + fs.rmSync(root, { recursive: true, force: true }); + } +}); + test("scan: deduplicates and reports unreadable paths without throwing", async () => { const root = fs.mkdtempSync(path.join(os.tmpdir(), "dfc-scan2-")); try { @@ -431,6 +456,12 @@ test("scan: deduplicates and reports unreadable paths without throwing", async ( const result = await scanPaths([file, file, path.join(root, "missing.mp4")]); assert.equal(result.files.length, 1); assert.equal(result.errors.length, 1); + assert.deepEqual(result.errors[0].path, path.join(root, "missing.mp4")); + assert.equal(typeof result.errors[0].error, "string"); + // The same file twice is not a skip. Nothing was dropped, so there is + // nothing to report, and counting it would put a scary number in a + // toast for a drop that did exactly what the user asked. + assert.equal(result.skipped.length, 0); } finally { fs.rmSync(root, { recursive: true, force: true }); } From 38f6fe84e03915dd6432f75de036f96ace985464 Mon Sep 17 00:00:00 2001 From: Will Knowles Date: Wed, 2 Sep 2026 16:11:31 +0100 Subject: [PATCH 29/81] feat: choose what a folder ingest picks up scanPaths has supported a recursion switch, extension filters, a symlink switch, a depth limit and a file cap since the 2.0 architecture slice landed. None of it was reachable: ingestPaths passed a literal empty object, and had done since the day it was written. Three of them are now on a popover beside Add Folder - include subfolders, which kinds to add, and whether to follow shortcuts. They persist in the settings store, which already shallow-merges whatever it is given, so this needed no new IPC and no new channel; the options parameter was already threaded renderer to preload to main to scanner. Add Folder keeps its own click and opens the picker as it always did. The options get a separate caret beside it. Adding a folder is the two-click path and it does not get to grow a step because a setting exists. maxDepth and maxFiles are deliberately not offered. They are safety rails, not preferences - nobody opens a popover to decide how deep sixteen levels is - and the toast that fires when one of them bites explains itself at the moment it matters, which a number sitting in a menu cannot. The options apply to every ingest route rather than only the button, because a plain drop can contain folders too and having a setting cover one folder route but not the other is indefensible. The cost is that a dropped .jpg is skipped while Images is off, which is only acceptable because the previous commit made the toast name that as the reason instead of dropping it in silence. Unticking the last remaining kind is refused. A filter admitting nothing would skip every file in the folder and then carefully explain why, which is honest and useless. Also fixes the queue's dedupe, which compared raw path strings. Two spellings of one Windows path are the same file - the separators can go either way and the case is not significant - and the scanner has always keyed its own dedupe that way. So a file already queued by a folder walk could be queued a second time by being dragged in directly, giving two cards for one file. Found by driving the real app rather than by reading the diff: the folder walk produces backslash paths and the direct add did not, and the new duplicate counter reported them as newly added. Verified in the running app: the popover opens clear of the window edge and closes on an outside click and on Escape, unticking Images skips a .png with the reason "turned off in folder options" rather than "not a supported format", unticking the last kind refuses, and one file reached three different ways produces exactly one card. 156 tests pass. --- docs/MANUAL-TESTING.md | 71 +++++++++++++++++++++++++++ src/constants.js | 8 +++ src/index.html | 46 ++++++++++++++++-- src/renderer.js | 108 ++++++++++++++++++++++++++++++++++++++++- src/styles.css | 67 +++++++++++++++++++++++++ 5 files changed, 295 insertions(+), 5 deletions(-) diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md index 3168e09..15d343e 100644 --- a/docs/MANUAL-TESTING.md +++ b/docs/MANUAL-TESTING.md @@ -1116,3 +1116,74 @@ is actually junk (rename a `.txt` to `.mp4`). - [ ] Check the toast in **both themes** — the list's inset background and the underlined action button must be readable on all four toast colours (info, success, warning, danger). + +--- + +## 2.0.0-alpha.5 — folder options + +> **Status: not started.** Written 2026-09-02 alongside the change. + +The scanner has always supported a recursion switch, extension filters and a +symlink switch. None of it was reachable — `ingestPaths` passed an empty options +object. Three of them are now on a popover beside Add Folder. + +The depth limit and the file cap are deliberately **not** offered. They are +safety rails rather than preferences, and the toast that fires when one bites +explains itself better at that moment than a number in a popover would. + +**Add Folder itself must still open the folder picker on a single click.** The +options have their own caret. If adding a folder ever costs two clicks, this is +wrong however good it looks. + +### The popover + +- [ ] The caret sits flush against **Add Folder** and the pair reads as one + control, in **both themes**. +- [ ] Click **Add Folder** — the folder picker opens immediately. No menu, no + extra step. +- [ ] Click the **caret** — the popover opens. Add Folder does not. +- [ ] It is fully on screen, not clipped by the window edge, at the **880px + minimum width** as well as maximised. +- [ ] Click anywhere outside it — it closes. Click inside it — it stays open. +- [ ] Press **Escape** — it closes. *(Escape must not also clear the card + selection behind it.)* +- [ ] There is no Save button, and none is wanted. + +### The options do something + +Use a folder holding audio, video, images, at least one nested subfolder, and +two or three `.txt` files. + +- [ ] All three types ticked, **Include subfolders** on: everything supported is + added, including from the nested folder. +- [ ] Untick **Images**, drop the folder again: images are **not** added, and + the toast's **Show them** list gives their reason as **"turned off in + folder options"** — not "not a supported format". The two are different + and must read differently. +- [ ] Untick **Include subfolders**: only the top level is added. +- [ ] Untick two of the three types, then try to untick the **last** one. It + refuses and stays ticked. *(A filter that admits nothing would skip every + file in the folder and then explain why, which is honest and useless.)* +- [ ] The options apply to a **dropped** folder too, not only the button — a + drop can contain folders, and having the setting cover one route but not + the other would be baffling. +- [ ] With Images off, dropping a **single .jpg** skips it and says why. Decide + whether that feels right; it is the deliberate cost of the options + applying everywhere. + +### They are remembered + +- [ ] Change the options, close the app, reopen it: the popover shows what you + left it at. +- [ ] The first launch after installing has all three types ticked, subfolders + on, shortcuts off. + +### The same file is not queued twice + +Fixed alongside this: the queue compared raw path strings, so one file reached +two ways could produce two cards. + +- [ ] Add a folder, then drag **one file from inside it** onto the window. The + toast says **"That file is already in the list."** and **no second card + appears**. +- [ ] The card count in the footer matches the number of cards on screen. diff --git a/src/constants.js b/src/constants.js index 9ee29b4..9982d4d 100644 --- a/src/constants.js +++ b/src/constants.js @@ -78,6 +78,14 @@ const SETTINGS_DEFAULTS = { nameTemplate: "{name}", lastTargetByKind: {}, navCollapsed: false, + // Folder ingest. maxDepth and maxFiles are deliberately not here: they are + // safety rails rather than preferences, and the toast that fires when one + // bites explains itself at the moment it matters. + scan: { + recursive: true, + kinds: ["audio", "video", "image"], + followSymlinks: false, + }, }; module.exports = { diff --git a/src/index.html b/src/index.html index c99c023..b3322d5 100644 --- a/src/index.html +++ b/src/index.html @@ -43,9 +43,49 @@

Diamond File Converter

- + +
+ + + + +
diff --git a/src/renderer.js b/src/renderer.js index a1e4020..30103d2 100644 --- a/src/renderer.js +++ b/src/renderer.js @@ -45,6 +45,14 @@ function generateId() { * { path, reason } shape the scanner uses, so a caller can merge the two lists * and report them as the one thing a user sees. */ +/** + * Two spellings of one Windows path are the same file: the separators can go + * either way and the case is not significant. The scanner has always keyed its + * own dedupe that way; this compared the raw strings, so a file already queued + * from a folder walk could be queued a second time by being added directly. + */ +const samePath = (a, b) => a.replace(/\//g, "\\").toLowerCase() === b.replace(/\//g, "\\").toLowerCase(); + function addFiles(filePaths) { let added = 0; let duplicates = 0; @@ -56,7 +64,7 @@ function addFiles(filePaths) { const entry = FORMATS.conversionMap[ext]; if (!entry) { rejected.push({ path: filePath, reason: "unsupported" }); continue; } - if (jobs.some(j => j.filePath === filePath)) { duplicates++; continue; } + if (jobs.some(j => samePath(j.filePath, filePath))) { duplicates++; continue; } jobs.push({ id: generateId(), @@ -115,11 +123,39 @@ function buildSkippedDetail(skipped) { return list; } +const ALL_KINDS = ["audio", "video", "image"]; + +/** What the folder-options popover currently says. Seeded on startup. */ +let scanPrefs = { recursive: true, kinds: [...ALL_KINDS], followSymlinks: false }; + +/** + * The popover's three checkboxes translated into what the scanner takes. + * + * These apply to every ingest route, not only the Add Folder button. A plain + * drop can contain folders too, and having the settings cover one folder route + * but not the other would be baffling. It does mean a dropped .jpg is skipped + * while Images is unticked — which is only acceptable because the toast now + * names that as the reason rather than dropping it in silence. + */ +function buildScanOptions() { + const kinds = scanPrefs.kinds ?? ALL_KINDS; + const everything = ALL_KINDS.every(k => kinds.includes(k)); + return { + recursive: scanPrefs.recursive !== false, + followSymlinks: scanPrefs.followSymlinks === true, + // No filter at all is cheaper than a filter that admits everything, and + // it keeps "not-included" out of the skip reasons when nothing is off. + include: everything ? null : Object.entries(DESCRIPTORS) + .filter(([, d]) => kinds.includes(d.kind)) + .map(([ext]) => ext), + }; +} + /** Expand folders in the main process, then queue whatever came back. */ async function ingestPaths(inputPaths) { if (!inputPaths || inputPaths.length === 0) return; try { - const result = await api.scanPaths(inputPaths, {}); + const result = await api.scanPaths(inputPaths, buildScanOptions()); const { added, rejected, duplicates } = addFiles(result.files); // The scanner's rejections and the format map's are one thing as far as @@ -1513,6 +1549,71 @@ function setNavCollapsed(collapsed) { $("nav-collapse").title = collapsed ? "Expand" : "Collapse"; } +// -- Folder options ---------------------------------------------------------- + +/** + * Three checkboxes, saved as they are changed. No save button, and no dialog: + * these are preferences about the next ingest, so they sit on the control that + * starts one. The scanner also supports a depth limit and a file cap, which are + * deliberately not offered — they are safety rails, and the toast that fires + * when one bites explains itself better than a number in a popover would. + */ +function setupScanOptions() { + const popover = $("scan-popover"); + const toggle = $("btn-scan-options"); + const kindBoxes = [...popover.querySelectorAll("[data-kind]")]; + + function load() { + $("scan-recursive").checked = scanPrefs.recursive !== false; + $("scan-symlinks").checked = scanPrefs.followSymlinks === true; + const kinds = scanPrefs.kinds ?? ALL_KINDS; + for (const box of kindBoxes) box.checked = kinds.includes(box.dataset.kind); + } + + async function save() { + const kinds = kindBoxes.filter(b => b.checked).map(b => b.dataset.kind); + scanPrefs = { + recursive: $("scan-recursive").checked, + followSymlinks: $("scan-symlinks").checked, + kinds, + }; + await api.setSettings({ ...(await api.getSettings()), scan: scanPrefs }); + } + + function setOpen(open) { + popover.classList.toggle("d-none", !open); + toggle.setAttribute("aria-expanded", String(open)); + } + const isOpen = () => !popover.classList.contains("d-none"); + + toggle.addEventListener("click", (e) => { + e.stopPropagation(); + setOpen(!isOpen()); + }); + popover.addEventListener("click", (e) => e.stopPropagation()); + document.addEventListener("click", () => { if (isOpen()) setOpen(false); }); + document.addEventListener("keydown", (e) => { + if (e.key === "Escape" && isOpen()) { setOpen(false); e.stopPropagation(); } + }, true); + + for (const box of kindBoxes) { + box.addEventListener("change", () => { + // Turning everything off would skip every file in the folder and + // then explain why, which is technically honest and useless. The + // last one on stays on. + if (!kindBoxes.some(b => b.checked)) { + box.checked = true; + return; + } + save(); + }); + } + $("scan-recursive").addEventListener("change", save); + $("scan-symlinks").addEventListener("change", save); + + load(); +} + document.addEventListener("DOMContentLoaded", async () => { FORMATS = await api.getFormats(); TARGETS = FORMATS.targetsByExt; @@ -1524,6 +1625,9 @@ document.addEventListener("DOMContentLoaded", async () => { const settings = await api.getSettings(); setNavCollapsed(settings?.navCollapsed === true); + if (settings?.scan) scanPrefs = { ...scanPrefs, ...settings.scan }; + setupScanOptions(); + for (const item of document.querySelectorAll(".nav-item")) { item.addEventListener("click", () => showView(item.dataset.view)); } diff --git a/src/styles.css b/src/styles.css index 019dc51..42cfd0e 100644 --- a/src/styles.css +++ b/src/styles.css @@ -163,6 +163,73 @@ body.popup-window span:hover { margin: 0; } +/* ── Folder options ──────────────────────────────────────────────────────── */ + +/* Add Folder keeps its own click; the caret beside it is a separate control + with its own hit area, joined to the button so the pair reads as one thing. */ +.scan-options { position: relative; display: flex; } + +.scan-options #btn-add-folder { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +.scan-options-toggle { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + border-left: 1px solid rgb(0 0 0 / 0.2); + padding-left: 0.3rem; + padding-right: 0.3rem; + display: inline-flex; + align-items: center; +} + +.scan-popover { + position: absolute; + top: calc(100% + 0.35rem); + right: 0; + z-index: 1070; + min-width: 15rem; + padding: 0.75rem; + border: 1px solid var(--bs-border-color); + border-radius: 6px; + background-color: var(--bs-body-bg); + box-shadow: var(--bs-box-shadow); +} + +.scan-popover-title { + font-size: 0.75rem; + font-weight: 600; + text-transform: uppercase; + letter-spacing: 0.04em; + opacity: 0.7; + margin: 0 0 0.5rem; +} + +.scan-popover-label { + font-size: 0.75rem; + opacity: 0.7; + margin: 0.6rem 0 0.25rem; +} + +.scan-opt { + display: flex; + align-items: center; + gap: 0.5rem; + font-size: 0.875rem; + padding: 0.15rem 0; + cursor: pointer; +} +.scan-opt .form-check-input { margin: 0; flex-shrink: 0; cursor: pointer; } + +.scan-popover-note { + font-size: 0.75rem; + opacity: 0.65; + margin: 0.6rem 0 0; + padding-top: 0.5rem; + border-top: 1px solid var(--bs-border-color); +} + .empty-state { flex: 1 1 auto; display: flex; From 64448cabc15825c453ccb68b776ea7fbb418370d Mon Sep 17 00:00:00 2001 From: Will Knowles Date: Wed, 2 Sep 2026 16:15:07 +0100 Subject: [PATCH 30/81] fix: give mirrored output the source root it needs "Mirror the source folders" has been in the Destination dropdown since alpha.2 and has never worked in any released build. paths.js resolves it from output.mirrorRoot, validateJob rejects a mirror job that has no root, and nothing anywhere ever set one - so choosing it replaced the command preview with "Mirrored output was selected but no source root was given" and disabled Apply, with nothing the user could do to proceed. scan.commonRoot has existed and been tested since the architecture slice, with zero callers. This is the join that was missing. The root is the folder that was handed in, not the common ancestor of the files that came back. Those are the same only when the folder has more than one populated subtree. Point at a folder holding just 2024/holiday/clip.mp4 and the ancestor of the found files is 2024/holiday, so the mirror would flatten away the two levels the user asked to keep - the failure would look like the feature working, on the folders where it matters least. So scanPaths now reports the root itself: the directory it was given, or the files' shared ancestor when it was handed loose files and there is no better answer. commonRoot is now a thin wrapper over a commonDir that works on directories, which keeps its signature and its existing test intact. The root rides on the card rather than in job.settings, because applyJobModal writes one settings object across a whole selection while the root belongs to the ingest that produced each card. It is threaded at both send sites - the run and the preview. Missing the preview would leave Apply disabled, which is the original bug wearing a different hat. Where there is no root at all - cards from folders on different drives - mirror is disabled in the dropdown and says why, rather than being offered and then failing validation. A file added on its own keeps it: its own folder is a perfectly good root, and the output simply lands flat. Verified end to end in the running app against real ffmpeg: a folder containing 2024/holiday/clip.mp4 previews ok, converts, and lands at mirror-out/2024/holiday/clip.mkv, confirmed with ffprobe as a real 160x120 h264 file rather than an empty one. Before the fix the same steps could not get past the disabled Apply button. 158 tests pass, including that a scanned root satisfies validateJob and resolves to the rebuilt directory - the seam where these two halves failed to meet - plus the cross-drive null and drive-root cases, which were both untested. --- docs/MANUAL-TESTING.md | 59 ++++++++++++++++++++++++++++++++++++++++++ src/core/scan.js | 42 ++++++++++++++++++++++-------- src/renderer.js | 44 ++++++++++++++++++++++++++++--- test/core.test.js | 58 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+), 15 deletions(-) diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md index 15d343e..e789fea 100644 --- a/docs/MANUAL-TESTING.md +++ b/docs/MANUAL-TESTING.md @@ -1187,3 +1187,62 @@ two ways could produce two cards. toast says **"That file is already in the list."** and **no second card appears**. - [ ] The card count in the footer matches the number of cards on screen. + +--- + +## 2.0.0-alpha.5 — mirrored output + +> **Status: not started.** Written 2026-09-02 alongside the fix. + +**"Mirror the source folders" has never worked.** It has been in the Destination +dropdown since alpha.2. `paths.js` needs `output.mirrorRoot` to rebuild the +tree, nothing anywhere set it, and the job model rejects a mirror job without +one — so choosing it put *"Mirrored output was selected but no source root was +given"* where the command preview should be and left **Apply** disabled. There +was no way to get past it, in any released build. + +The scanner now reports the root it walked and the cards carry it. + +The root is the **folder you pointed at**, not the shared ancestor of the files +found. Those differ whenever one subfolder holds everything: point at a folder +containing only `2024/holiday/clip.mp4` and the shared ancestor is +`2024/holiday`, which would flatten away the two levels you asked to keep. + +**Test setup:** a folder with at least two levels of nesting and media at the +bottom — e.g. `Source\2024\holiday\clip.mp4` and `Source\2023\misc\song.mp3`. + +### It can be chosen at all + +- [ ] Add the **folder** (not the files). Open **Advanced options** on a card. +- [ ] Set **Destination** to **Mirror the source folders**. +- [ ] The command preview appears and **Apply is enabled**. *(Before, this + showed an error and Apply stayed dead.)* +- [ ] Pick an output folder with **Browse**, choose a format, press Apply. + +### It rebuilds the tree + +- [ ] Convert. The output lands at + `\2024\holiday\clip.` — the structure under the folder you + added, rebuilt under the destination. +- [ ] The second file lands at `\2023\misc\song.`. +- [ ] The intermediate folders are created; you do not have to make them first. +- [ ] **The top level is not lost.** If your folder has only one populated + subtree, that subtree's folders must still appear in the output. This is + the case that would silently flatten. + +### The other destinations still work + +- [ ] **Alongside the original** puts the output next to the source, as always. +- [ ] **A folder I choose** puts everything flat in one folder, no subfolders. +- [ ] Switching between all three in the dialog updates the command preview each + time, and Apply stays enabled for all three. + +### When there is nothing to mirror + +- [ ] Select files with **Add Files** rather than adding a folder, then open + Advanced options. Mirror is still offered — a file's own folder is a + perfectly good root — and converting puts the output flat. +- [ ] *(Only if you have two drives.)* Add files from **C:** and from another + drive in one go, select both cards, open **Bulk edit**. Mirror reads + **"Mirror the source folders (add a folder to use this)"** and cannot be + chosen — there is no common root across drives. Nothing errors. diff --git a/src/core/scan.js b/src/core/scan.js index 68974e9..bc34382 100644 --- a/src/core/scan.js +++ b/src/core/scan.js @@ -25,7 +25,7 @@ const DEFAULT_MAX_FILES = 20000; * @param {string[]} [options.exclude] extensions to drop * @param {boolean} [options.followSymlinks] * @param {boolean} [options.recursive] default true - * @returns {Promise<{files: string[], skipped: object[], truncated: boolean, errors: object[]}>} + * @returns {Promise<{files: string[], skipped: object[], truncated: boolean, errors: object[], root: string|null}>} * * `skipped` carries a reason per file, not just a count — the caller has to be * able to say *which* files were dropped and why, and "unsupported" reads very @@ -108,6 +108,7 @@ async function scanPaths(inputPaths, options = {}) { } } + const directories = []; for (const inputPath of inputPaths) { if (truncated) break; let stat; @@ -117,22 +118,29 @@ async function scanPaths(inputPaths, options = {}) { errors.push({ path: inputPath, error: err.message }); continue; } - if (stat.isDirectory()) await walk(inputPath, 0); + if (stat.isDirectory()) { directories.push(inputPath); await walk(inputPath, 0); } else if (stat.isFile()) accept(inputPath); } - return { files, skipped, truncated, errors }; + // The root a mirrored output should rebuild from. + // + // Where a directory was handed in, that directory *is* the root — deriving + // it from what was found gives the wrong answer in the ordinary case. Point + // at E:\Photos holding only E:\Photos\2024\a.jpg and the common root of the + // files is E:\Photos\2024, so the mirror silently drops the 2024 level, + // which is the very structure the user asked to keep. Only a set of loose + // files has no better answer than their shared ancestor. + const root = directories.length > 0 ? commonDir(directories) : commonRoot(files); + + return { files, skipped, truncated, errors, root }; } -/** - * The common root of a set of paths, used as the mirror root when a folder - * ingest should rebuild its structure in the destination. - */ -function commonRoot(paths) { - if (!paths || paths.length === 0) return null; - if (paths.length === 1) return path.dirname(paths[0]); +/** The shared leading path of a set of directories, or null if there is none. */ +function commonDir(dirs) { + if (!dirs || dirs.length === 0) return null; + if (dirs.length === 1) return path.resolve(dirs[0]); - const split = paths.map(p => path.resolve(path.dirname(p)).split(/[\\/]/)); + const split = dirs.map(d => path.resolve(d).split(/[\\/]/)); const first = split[0]; const shared = []; @@ -142,14 +150,26 @@ function commonRoot(paths) { else break; } + // Nothing shared means separate drives, which cannot be mirrored under one + // root at all. resolveOutputDir treats a null root as plain fixed output. if (shared.length === 0) return null; // A drive-letter-only result ("E:") needs its separator back to be a path. return shared.length === 1 ? `${shared[0]}${path.sep}` : shared.join(path.sep); } +/** + * The common root of a set of *files*, used as the mirror root when an ingest + * was a loose selection rather than a folder. + */ +function commonRoot(paths) { + if (!paths || paths.length === 0) return null; + return commonDir(paths.map(p => path.dirname(p))); +} + module.exports = { scanPaths, commonRoot, + commonDir, DEFAULT_MAX_DEPTH, DEFAULT_MAX_FILES, }; diff --git a/src/renderer.js b/src/renderer.js index 30103d2..531cc5b 100644 --- a/src/renderer.js +++ b/src/renderer.js @@ -53,7 +53,7 @@ function generateId() { */ const samePath = (a, b) => a.replace(/\//g, "\\").toLowerCase() === b.replace(/\//g, "\\").toLowerCase(); -function addFiles(filePaths) { +function addFiles(filePaths, mirrorRoot = null) { let added = 0; let duplicates = 0; const rejected = []; @@ -71,6 +71,11 @@ function addFiles(filePaths) { filePath, ext, kind: entry.type, + // Which folder this card was ingested from, for mirrored output. + // It belongs to the card rather than to settings, because settings + // are written across a whole modal selection in one go while the + // root is a property of the ingest that produced each card. + mirrorRoot, targetExt: null, settings: {}, meta: null, @@ -123,6 +128,19 @@ function buildSkippedDetail(skipped) { return list; } +/** + * The output settings for one card, with its mirror root attached. + * + * MIRROR routing has been in the dropdown since alpha.2 and has never once + * worked: paths.js needs output.mirrorRoot to rebuild the tree, nothing ever + * set it, and validateJob rejects the job without it — so choosing it left + * Apply disabled and an error where the command preview should be. The root is + * known at ingest; this is the only thing that was missing. + */ +function withMirrorRoot(job, output) { + return { ...(output ?? job.settings?.output ?? {}), mirrorRoot: job.mirrorRoot ?? null }; +} + const ALL_KINDS = ["audio", "video", "image"]; /** What the folder-options popover currently says. Seeded on startup. */ @@ -156,7 +174,7 @@ async function ingestPaths(inputPaths) { if (!inputPaths || inputPaths.length === 0) return; try { const result = await api.scanPaths(inputPaths, buildScanOptions()); - const { added, rejected, duplicates } = addFiles(result.files); + const { added, rejected, duplicates } = addFiles(result.files, result.root ?? null); // The scanner's rejections and the format map's are one thing as far as // anyone reading this is concerned, so they are reported as one thing. @@ -1205,6 +1223,18 @@ function syncModalControls() { const needsDir = $("jm-routing").value !== "alongside"; $("jm-outdir").parentElement.parentElement.classList.toggle("d-none", !needsDir); + // There is nothing to mirror where the cards did not come from a folder, or + // came from folders on different drives. Offering it and then failing + // validation is how it behaved for three releases; better not to offer it. + const mirror = $("jm-routing").querySelector('option[value="mirror"]'); + const canMirror = modalScope.length > 0 + && jobs.filter(j => modalScope.includes(j.id)).every(j => j.mirrorRoot); + mirror.disabled = !canMirror; + mirror.textContent = canMirror + ? "Mirror the source folders" + : "Mirror the source folders (add a folder to use this)"; + if (!canMirror && $("jm-routing").value === "mirror") $("jm-routing").value = "alongside"; + schedulePreview(); } @@ -1290,8 +1320,13 @@ function schedulePreview() { $("jm-errors").textContent = ""; return; } + // The preview needs the mirror root as much as the run does. Without it + // choosing "Mirror the source folders" fails validation, the preview + // comes back not-ok, and Apply stays disabled with no way forward. + const settings = readSettingsFromForm(); const result = await api.previewJob( - { inputPath: sample.filePath, targetExt: target, ...readSettingsFromForm() }); + { inputPath: sample.filePath, targetExt: target, ...settings, + output: withMirrorRoot(sample, settings.output) }); $("jm-preview").textContent = `ffmpeg ${result.args.join(" ")}`; $("jm-errors").textContent = result.ok ? "" : result.errors.join(" "); $("jm-apply").disabled = !result.ok; @@ -1431,7 +1466,8 @@ async function startConversion() { // actually run in parallel. v1 awaited them one at a time. const results = await Promise.all(runnable.map(async (job) => { const result = await api.runJob( - { id: job.id, inputPath: job.filePath, targetExt: job.targetExt, ...(job.settings ?? {}) }); + { id: job.id, inputPath: job.filePath, targetExt: job.targetExt, ...(job.settings ?? {}), + output: withMirrorRoot(job) }); applyResult(job, result); return result; })); diff --git a/test/core.test.js b/test/core.test.js index 9ccb05d..bc53dc4 100644 --- a/test/core.test.js +++ b/test/core.test.js @@ -473,6 +473,64 @@ test("scan: common root finds the shared ancestor for mirrored output", () => { assert.equal(commonRoot([a, b]), path.join("C:", "media")); assert.equal(commonRoot([a]), path.join("C:", "media", "a")); assert.equal(commonRoot([]), null); + + // Separate drives have no shared root at all. resolveOutputDir treats null + // as plain fixed output rather than throwing, so this must be null and not + // something creative. + assert.equal(commonRoot([path.join("C:", "one.mp4"), path.join("D:", "two.mp4")]), null); + + // A drive-letter-only result has to come back as a path. "E:" alone is a + // drive-relative reference, not the root of the drive. + const sameDrive = commonRoot([path.join("E:", "a.mp4"), path.join("E:", "sub", "b.mp4")]); + assert.equal(sameDrive, `E:${path.sep}`); +}); + +test("scan: a folder ingest mirrors from the folder, not from what it found", async () => { + // The root has to be the folder pointed at. Deriving it from the files + // found collapses any level that happens to hold everything: point at + // containing only /2024/a.mp3 and the shared ancestor of the + // files is /2024, so the mirror silently drops the level the user + // asked to preserve. + const root = fs.mkdtempSync(path.join(os.tmpdir(), "dfc-root-")); + try { + fs.mkdirSync(path.join(root, "2024"), { recursive: true }); + fs.writeFileSync(path.join(root, "2024", "a.mp3"), ""); + + const scanned = await scanPaths([root]); + assert.equal(scanned.files.length, 1); + assert.equal(scanned.root, path.resolve(root), "the folder pointed at is the root"); + assert.notEqual(scanned.root, path.join(root, "2024")); + + // Loose files have no folder to speak of, so their shared ancestor is + // the only answer available. + const loose = await scanPaths([path.join(root, "2024", "a.mp3")]); + assert.equal(loose.root, path.join(root, "2024")); + } finally { + fs.rmSync(root, { recursive: true, force: true }); + } +}); + +test("scan: mirrored output rebuilds the tree the scan reported", async () => { + // scan.js finds the root and paths.js consumes it; this is the seam where + // mirroring was broken for three releases, because nothing joined them up. + const root = fs.mkdtempSync(path.join(os.tmpdir(), "dfc-mirror-")); + try { + fs.mkdirSync(path.join(root, "a", "b"), { recursive: true }); + const input = path.join(root, "a", "b", "clip.mov"); + fs.writeFileSync(input, ""); + + const scanned = await scanPaths([root]); + const job = createJob({ + inputPath: scanned.files[0], + targetExt: "mp4", + output: { routing: OUTPUT_ROUTING.MIRROR, dir: path.join("D:", "out"), mirrorRoot: scanned.root }, + }); + + assert.deepEqual(validateJob(job).errors ?? [], [], "a scanned root must satisfy validation"); + assert.equal(paths.resolveOutputDir(job), path.join("D:", "out", "a", "b")); + } finally { + fs.rmSync(root, { recursive: true, force: true }); + } }); // --------------------------------------------------------------------------- From 3e380e37f28dcd8f40aa0cec5d10e01237c5bfee Mon Sep 17 00:00:00 2001 From: Will Knowles Date: Wed, 2 Sep 2026 16:22:09 +0100 Subject: [PATCH 31/81] feat: work out how a set of clips can be joined The engine for joining several files into one. No UI yet - the Join view follows - so nothing in the app reaches any of this. It is committed on its own because it is the half that can be proven, and because a tested engine is a sensible place to stop if the view is not finished. Joining has two routes and which one runs is a fact about the clips rather than a setting. Where every clip already agrees, the concat demuxer stitches them with -c copy: instant, no quality lost. Where they do not, the concat filter re-encodes and every stream has to be normalised on the way in or the seams tear. The difference matters enough to a person pressing the button that the UI has to say which is about to happen, and why - which is why the comparison lives in display.js with the rest of what the renderer needs, and not in a module the renderer cannot require. **probe.js gains three fields it was throwing away.** -show_streams was already being asked for. timeBase, an exact fps rational and the sample aspect ratio now come back, plus the audio sample format. The rational is load-bearing: the existing fps is rounded to 3dp for display, and 30000/1001 and 2997/100 both land on 29.97 while being different enough that copying them together produces drifting timestamps. Rounding is right for a card and wrong for this. **Container comparison is a set intersection, not equality.** ffprobe reports a container as every name its demuxer handles, so an .mp4 and a .mov both say "mov,mp4,m4a,3gp,3g2,mj2" - which is correct, they concatenate fine. **Three refusals, each removing a class of incomprehensible ffmpeg output:** a clip ffmpeg cannot read at all (probe returns ok:false with no video, so every field would compare as undefined and match every other broken file); a mix of video and audio-only clips, which would mean synthesising the missing stream; and GIF as a destination, because the palette pass and the concat both want -filter_complex and stacking them is a second graph shape to build and explain for a rare case. There is a note beside buildPaletteChain for whoever wonders. **One concat instance, not two.** The removed pipeline model had a variadic form emitting v=1:a=0 and v=0:a=1 separately; that is graph-compiler vocabulary and would need the streams re-interleaving afterwards. The filter takes interleaved [v0][a0][v1][a1] pairs in one node. Separate chains are real for the per-clip normalisation, which is a different thing. **The playlist is written by the runner, not by the argument builder.** The concat demuxer needs its file on disk before ffmpeg starts, and ffmpeg-args is contractually a pure function of the job - that is what makes it testable. So buildConcatList returns the text, buildJoinArgs is handed the path, and the runner writes it into a dfc-join-* temp dir and removes it on every exit including cancel. buildArgs keeps its signature; nothing existing changed. Trim survives the copy path through inpoint/outpoint, snapping to keyframes exactly as -ss with -c copy does elsewhere here. On the filter path -t goes before -i so it limits what is read from that input rather than entering the graph. durationOf sums the trimmed spans for a join. Without it the progress bar reaches 100% at the end of the first clip and stays there. A join is not routed through validateJob: that enforces canConvert on a single source extension, mode legality and stream-copy rules, none of which describe a set of clips. validateJoin covers what actually applies. The output name needs no special route either - the typed name is the name template, since applyNameTemplate only rewrites {tokens} and returns anything else unchanged, so resolveOutputPath and the whole conflict flow work as they are. Verified against real ffmpeg, which is the only thing that can confirm any of this: two identically encoded clips compare as copyable and join to 5.02s of h264 at the original 320x240 with no re-encode; a differently sized clip is correctly refused the copy path, naming width, height, fps, time base and sample rate; the filter route joins them anyway to 4.03s normalised to 640x480; and inpoint/outpoint shorten a copy join to 2.14s. All of it through a folder called "Bob's Holiday Clips", because a space and an apostrophe are what break a naive playlist writer - the escaping came out as Bob'\''s and ffmpeg read it. 173 tests pass, 15 of them new. --- src/core/display.js | 139 ++++++++++++++++++++++++++++++++++ src/core/ffmpeg-args.js | 160 ++++++++++++++++++++++++++++++++++++++++ src/core/job.js | 94 +++++++++++++++++++++++ src/core/probe.js | 30 ++++++++ src/core/runner.js | 57 +++++++++++++- test/core.test.js | 135 ++++++++++++++++++++++++++++++++- test/display.test.js | 112 ++++++++++++++++++++++++++++ 7 files changed, 722 insertions(+), 5 deletions(-) diff --git a/src/core/display.js b/src/core/display.js index 38f8086..90919c1 100644 --- a/src/core/display.js +++ b/src/core/display.js @@ -535,10 +535,149 @@ .sort((a, b) => Number(b.sameKind) - Number(a.sameKind)); } + // -- Joining ------------------------------------------------------------- + // + // Whether a set of clips can be stitched together without re-encoding. + // Lives here rather than in a module of its own because the Join view has + // to say which of the two routes it is about to take *and why*, and the + // renderer cannot require() anything. + + /** + * ffprobe reports a container as a comma-joined list of everything the + * demuxer handles — an .mp4 and a .mov both say + * "mov,mp4,m4a,3gp,3g2,mj2". Comparing those with === would call two files + * different that concatenate together perfectly, so the test is whether the + * lists overlap at all. + */ + function sameContainer(a, b) { + if (!a || !b) return false; + const left = new Set(String(a).split(",")); + return String(b).split(",").some(name => left.has(name)); + } + + /** + * Cross-multiplied rather than compared field by field, so 60/2 and 30/1 + * are recognised as one rate. probe reduces what it parses, but this must + * not depend on having been handed reduced values to be right. + */ + function sameRational(a, b) { + if (!a || !b) return false; + return a.num * b.den === b.num * a.den; + } + + /** The fields that must match for a stream copy, in the order to report. */ + const CLIP_FIELDS = [ + { key: "container", label: "container", of: m => m.formatName, eq: sameContainer }, + { key: "vcodec", label: "video codec", of: m => m.video?.codec }, + { key: "width", label: "width", of: m => m.video?.width }, + { key: "height", label: "height", of: m => m.video?.height }, + { key: "fps", label: "frame rate", of: m => m.video?.fpsExact, eq: sameRational }, + { key: "timeBase", label: "time base", of: m => m.video?.timeBase }, + { key: "sar", label: "pixel shape", of: m => m.video?.sar }, + { key: "pixfmt", label: "pixel format", of: m => m.video?.pixelFormat }, + { key: "acodec", label: "audio codec", of: m => m.audio?.codec }, + { key: "rate", label: "sample rate", of: m => m.audio?.sampleRate }, + { key: "channels", label: "channels", of: m => m.audio?.channels }, + { key: "sampfmt", label: "sample format", of: m => m.audio?.sampleFormat }, + ]; + + /** + * Compare probed clips. `blocked` means the set cannot be joined at all; + * `compatible` means it can be joined without re-encoding. + * + * @param {object[]} metas normalised probe output, in clip order + */ + function compareClips(metas) { + const clips = metas ?? []; + if (clips.length < 2) { + return { compatible: true, blocked: null, differences: [] }; + } + + // A clip ffmpeg could not measure is refused outright rather than being + // compared against — probe returns ok:false with no `video` at all, so + // every field below would read as undefined and match every other + // unreadable clip. + const unreadable = clips.findIndex(m => !m || m.ok === false); + if (unreadable !== -1) { + return { compatible: false, blocked: "unreadable", blockedIndex: unreadable, differences: [] }; + } + + // Concatenating a silent video onto one with sound, or a bare audio + // file onto a video, means synthesising the missing stream for the + // length of the clip. That is a different feature. + const withVideo = clips.filter(m => m.hasVideo).length; + if (withVideo !== 0 && withVideo !== clips.length) { + return { compatible: false, blocked: "mixed-kinds", differences: [] }; + } + const withAudio = clips.filter(m => m.hasAudio).length; + if (withAudio !== 0 && withAudio !== clips.length) { + return { compatible: false, blocked: "mixed-audio", differences: [] }; + } + + const differences = []; + for (const field of CLIP_FIELDS) { + const values = clips.map(field.of); + if (values.every(v => v == null)) continue; + const same = field.eq + ? values.every(v => field.eq(v, values[0])) + : values.every(v => v === values[0]); + if (!same) differences.push({ field: field.key, label: field.label, values }); + } + + return { compatible: differences.length === 0, blocked: null, differences }; + } + + const JOIN_BLOCKED = { + "unreadable": "One of these files cannot be read, so it cannot be joined.", + "mixed-kinds": "These are a mix of video and audio-only files. Join files of one kind at a time.", + "mixed-audio": "Some of these have sound and some do not, which cannot be joined as they are.", + }; + + /** + * What is about to happen, in the app's own words. The whole point of + * showing this is that "instant and lossless" and "re-encodes everything" + * are wildly different things to press the same button for. + */ + function describeJoinPlan(comparison) { + if (comparison.blocked) { + return { strategy: "blocked", headline: JOIN_BLOCKED[comparison.blocked], reasons: [] }; + } + if (comparison.compatible) { + return { + strategy: "demuxer", + headline: "These match, so they will be joined without re-encoding — quick, and no quality is lost.", + reasons: [], + }; + } + return { + strategy: "filter", + headline: "These do not match, so they will be re-encoded to fit together. It takes longer and the result is not identical to the sources.", + reasons: comparison.differences.map(d => d.label), + }; + } + + /** + * Containers a set of clips can be joined into. GIF is deliberately absent: + * its palette pass and the join both want -filter_complex and the two + * cannot simply be stacked, so it is refused rather than half-supported. + */ + function joinTargets(metas, descriptors) { + const clips = metas ?? []; + const wantsVideo = clips.length === 0 || clips.some(m => m?.hasVideo); + return Object.values(descriptors ?? {}) + .filter(d => d.ext !== "gif") + .filter(d => (wantsVideo ? d.kind === "video" : d.kind === "audio")) + .map(d => d.ext); + } + return { STATUS, plural, countOf, + sameContainer, + compareClips, + describeJoinPlan, + joinTargets, applicableSections, effectiveMode, estimateFrames, diff --git a/src/core/ffmpeg-args.js b/src/core/ffmpeg-args.js index f935d29..e191e17 100644 --- a/src/core/ffmpeg-args.js +++ b/src/core/ffmpeg-args.js @@ -167,6 +167,157 @@ function buildArgs(job, opts = {}) { return args; } +// -- Joining ----------------------------------------------------------------- +// +// Two routes, and which one runs is a fact about the clips rather than a +// setting. Where every clip already agrees on container, codecs, size, frame +// rate and time base, the concat *demuxer* stitches them with -c copy: no +// re-encode, no quality loss, near-instant. Where they do not, the concat +// *filter* re-encodes, and every stream has to be normalised on the way in or +// the seams tear. + +/** + * The concat demuxer's playlist file. + * + * Kept separate from the argv because the demuxer needs this on disk before + * ffmpeg starts, and this module does not touch the filesystem — the runner + * writes what this returns and passes back the path it wrote it to. + * + * Trim survives on the copy path through inpoint/outpoint, which snap to the + * nearest keyframe exactly as -ss does with -c copy elsewhere here. + */ +function buildConcatList(clips) { + return (clips ?? []).map((clip) => { + // ffmpeg's own escaping for this file: single quotes around the path, + // and a quoted apostrophe closes, escapes and reopens. + const lines = [`file '${String(clip.inputPath).replace(/'/g, "'\\''")}'`]; + const { start, end } = clip.trim ?? {}; + if (start != null && start > 0) lines.push(`inpoint ${formatSeconds(start)}`); + if (end != null && end > 0) lines.push(`outpoint ${formatSeconds(end)}`); + return lines.join("\n"); + }).join("\n") + "\n"; +} + +/** + * @param {object} spec { strategy, clips[], output: { ext, video, audio } } + * @param {object} opts { outputPath, listPath, progress, overwrite } + * @returns {string[]} + */ +function buildJoinArgs(spec, opts = {}) { + const { outputPath, listPath, progress = true, overwrite = true } = opts; + if (!outputPath) throw new Error("buildJoinArgs requires an outputPath."); + + const target = formats.getFormat(spec.output?.ext); + if (!target) throw new Error(`Unknown target format: ${spec.output?.ext}`); + + const clips = spec.clips ?? []; + if (clips.length < 2) throw new Error("A join needs at least two clips."); + + const args = ["-hide_banner", "-nostdin"]; + args.push(overwrite ? "-y" : "-n"); + + const wantsVideo = clips.some(c => c.hasVideo !== false); + const wantsAudio = clips.some(c => c.hasAudio !== false); + + if (spec.strategy === "demuxer") { + if (!listPath) throw new Error("A demuxer join requires a listPath."); + // -safe 0 because the playlist holds absolute Windows paths, which the + // demuxer refuses by default. + args.push("-f", "concat", "-safe", "0", "-i", listPath, "-c", "copy"); + } else { + for (const clip of clips) { + const { start, end } = clip.trim ?? {}; + if (start != null && start > 0) args.push("-ss", formatSeconds(start)); + // -t before -i limits what is read from *this* input, which keeps + // the trim out of the filter graph entirely. + if (end != null && end > (start ?? 0)) args.push("-t", formatSeconds(end - (start ?? 0))); + args.push("-i", clip.inputPath); + } + + args.push("-filter_complex", buildConcatChain(clips, spec, { wantsVideo, wantsAudio })); + if (wantsVideo) args.push("-map", "[outv]"); + if (wantsAudio) args.push("-map", "[outa]"); + + if (wantsVideo) { + const codec = spec.output?.video?.codec ?? target.defaultVideoCodec; + if (codec) args.push("-c:v", codec); + pushVideoQuality(args, { video: spec.output?.video ?? {} }, codec); + if (codec && PRESET_CODECS.has(codec) && spec.output?.video?.preset) { + args.push("-preset", spec.output.video.preset); + } + if (codec && NEEDS_YUV420P.has(codec)) args.push("-pix_fmt", "yuv420p"); + } + if (wantsAudio) { + const codec = spec.output?.audio?.codec ?? target.defaultAudioCodec; + if (codec) args.push("-c:a", codec); + if (spec.output?.audio?.bitrate) args.push("-b:a", normaliseBitrate(spec.output.audio.bitrate)); + } + } + + if (target.ext === "mp4" || target.ext === "mov") args.push("-movflags", "+faststart"); + if (progress) args.push("-progress", "pipe:1", "-nostats"); + + args.push(outputPath); + return args; +} + +/** + * The concat filter graph. + * + * One concat instance taking interleaved [v0][a0][v1][a1]… pairs, not one per + * stream type — the two-instance v=1:a=0 / v=0:a=1 form belongs to a graph + * compiler wiring arbitrary nodes together, and using it here would need an + * extra pass to re-interleave what it split. Where a set is audio-only there is + * only an audio chain, and that is the one case that reads v=0:a=1. + * + * The per-clip normalisation is what makes the re-encode path work at all: a + * concat filter demands identical width, height, pixel format and sample rate + * on every input, and simply produces a torn output if it does not get them. + */ +function buildConcatChain(clips, spec, { wantsVideo, wantsAudio }) { + const width = spec.output?.video?.width ?? largest(clips, c => c.width); + const height = spec.output?.video?.height ?? largest(clips, c => c.height); + const fps = spec.output?.video?.fps ?? largest(clips, c => c.fps) ?? DEFAULT_ASSEMBLE_FPS; + const rate = spec.output?.audio?.sampleRate ?? largest(clips, c => c.sampleRate) ?? 48000; + + const chains = []; + const inputs = []; + + clips.forEach((_clip, i) => { + if (wantsVideo) { + const steps = []; + if (width && height) { + // Fit inside the frame and pad, rather than stretching a clip + // that does not share the others' shape. + steps.push(`scale=${width}:${height}:force_original_aspect_ratio=decrease`); + steps.push(`pad=${width}:${height}:-1:-1:color=black`); + } + steps.push("setsar=1"); + steps.push(`fps=${fps}`); + steps.push("format=yuv420p"); + chains.push(`[${i}:v]${steps.join(",")}[v${i}]`); + inputs.push(`[v${i}]`); + } + if (wantsAudio) { + chains.push(`[${i}:a]aresample=${rate},aformat=sample_fmts=fltp:channel_layouts=stereo[a${i}]`); + inputs.push(`[a${i}]`); + } + }); + + const n = clips.length; + const v = wantsVideo ? 1 : 0; + const a = wantsAudio ? 1 : 0; + const outputs = `${wantsVideo ? "[outv]" : ""}${wantsAudio ? "[outa]" : ""}`; + chains.push(`${inputs.join("")}concat=n=${n}:v=${v}:a=${a}${outputs}`); + + return chains.join(";"); +} + +function largest(clips, pick) { + const values = (clips ?? []).map(pick).filter(v => Number.isFinite(v) && v > 0); + return values.length > 0 ? Math.max(...values) : null; +} + /** The video filter chain, in application order. */ function buildVideoFilters(job, mode) { const filters = []; @@ -219,6 +370,13 @@ function buildScaleFilter(job) { * GIF output split into a palette pass and an application pass. With no * preceding filters the chain still needs an explicit [0:v] label. */ +/* + * Note for anyone adding GIF as a join target: this chain and the concat chain + * both occupy -filter_complex, and the two cannot simply be stacked — the + * palette pass would have to consume the concat's output label instead of + * [0:v], which is a second graph shape to build, test and explain. GIF is left + * out of joinTargets rather than half-supported. + */ function buildPaletteChain(videoFilters) { const pre = videoFilters.length > 0 ? `${videoFilters.join(",")},` : ""; return `[0:v] ${pre}split[pal_a][pal_b];[pal_a]palettegen[pal];[pal_b][pal]paletteuse`; @@ -292,6 +450,8 @@ function buildProbeArgs(inputPath) { module.exports = { buildArgs, + buildJoinArgs, + buildConcatList, buildProbeArgs, buildVideoFilters, buildScaleFilter, diff --git a/src/core/job.js b/src/core/job.js index 4ae4eb6..fe5fd30 100644 --- a/src/core/job.js +++ b/src/core/job.js @@ -49,6 +49,98 @@ function generateId() { * filled from the target format's own capability defaults, so a job created * with nothing but an input path and a target extension is already runnable. */ +/** + * A join: several clips in, one file out. + * + * Shaped as a job so the runner, paths.js and the whole conflict flow take it + * unchanged — everything downstream keys on job.id and job.output, and the only + * thing that reads job.inputPath for a join is the alongside/{src} fallback, + * neither of which fires because a join always names its own destination. + * + * The typed output name *is* the name template: applyNameTemplate only touches + * {token} patterns and hands anything else straight back, so "My Holiday" + * templates to "My Holiday". That is why a join needs no separate naming route, + * which is just as well — "alongside which input?" has no answer. + */ +function createJoinJob(spec = {}) { + const clips = (spec.clips ?? []).map(clip => ({ + inputPath: clip.inputPath, + trim: { start: clip.trim?.start ?? null, end: clip.trim?.end ?? null }, + duration: clip.duration ?? null, + hasVideo: clip.hasVideo ?? true, + hasAudio: clip.hasAudio ?? true, + width: clip.width ?? null, + height: clip.height ?? null, + fps: clip.fps ?? null, + sampleRate: clip.sampleRate ?? null, + })); + + const targetExt = formats.canonicalExt(spec.targetExt ?? spec.output?.ext ?? "") ?? null; + const targetFormat = targetExt ? formats.getFormat(targetExt) : null; + + return { + id: spec.id ?? generateId(), + inputPath: clips[0]?.inputPath ?? null, + sourceExt: clips[0] ? formats.canonicalExt(extnameOf(clips[0].inputPath)) : null, + inputMeta: null, + mode: null, + + join: { + strategy: spec.strategy === "demuxer" ? "demuxer" : "filter", + clips, + output: { + ext: targetExt, + video: spec.video ?? {}, + audio: spec.audio ?? {}, + }, + }, + + output: { + routing: OUTPUT_ROUTING.FIXED, + dir: spec.output?.dir ?? null, + mirrorRoot: null, + nameTemplate: spec.output?.nameTemplate ?? "joined", + ext: targetExt, + onConflict: spec.output?.onConflict ?? CONFLICT.ASK, + }, + + video: {}, audio: {}, image: {}, trim: { start: null, end: null }, filters: [], + status: STATUS.PENDING, + progress: 0, + error: null, + outputPath: null, + _targetFormat: targetFormat ? targetFormat.ext : null, + }; +} + +/** + * Validation for a join. Deliberately not validateJob, which enforces + * canConvert(sourceExt, targetExt), mode legality and stream-copy rules — none + * of which describe a set of clips, and all of which would reject a perfectly + * good join for being the wrong shape. + */ +function validateJoin(job) { + const errors = []; + const clips = job.join?.clips ?? []; + + if (clips.length < 2) errors.push("A join needs at least two files."); + if (clips.some(c => !c.inputPath)) errors.push("One of the clips has no file."); + if (!job.output?.ext) errors.push("Choose a format for the joined file."); + else if (!formats.getFormat(job.output.ext)) errors.push(`Unknown target format: ${job.output.ext}`); + if (!job.output?.dir) errors.push("Choose where to save the joined file."); + if (!job.output?.nameTemplate) errors.push("Give the joined file a name."); + + for (const clip of clips) { + const { start, end } = clip.trim ?? {}; + if (start != null && end != null && end <= start) { + errors.push("A clip ends before it starts."); + break; + } + } + + return { ok: errors.length === 0, errors }; +} + function createJob(spec = {}) { const inputPath = spec.inputPath ?? null; const sourceExt = spec.sourceExt ?? (inputPath ? formats.canonicalExt(extnameOf(inputPath)) : null); @@ -259,7 +351,9 @@ module.exports = { OUTPUT_ROUTING, generateId, createJob, + createJoinJob, patchJob, validateJob, + validateJoin, producesDirectory, }; diff --git a/src/core/probe.js b/src/core/probe.js index 95a61df..cef9abf 100644 --- a/src/core/probe.js +++ b/src/core/probe.js @@ -112,6 +112,16 @@ function normalise(raw, inputPath) { fps: parseFrameRate(primaryVideo.avg_frame_rate) ?? parseFrameRate(primaryVideo.r_frame_rate), pixelFormat: primaryVideo.pix_fmt ?? null, bitrate: toNumber(primaryVideo.bit_rate), + + // The three below exist for joining, where the question is not + // "roughly the same?" but "byte-compatible enough to concatenate + // without re-encoding?". `fps` cannot answer it: it is rounded to + // 3dp, and 30000/1001 and 2997/100 both land on 29.97 while being + // genuinely different streams that produce a broken file if + // stitched together untouched. + fpsExact: parseRational(primaryVideo.avg_frame_rate) ?? parseRational(primaryVideo.r_frame_rate), + timeBase: primaryVideo.time_base ?? null, + sar: primaryVideo.sample_aspect_ratio ?? null, } : null, audio: primaryAudio ? { @@ -120,6 +130,7 @@ function normalise(raw, inputPath) { channels: toNumber(primaryAudio.channels), channelLayout: primaryAudio.channel_layout ?? null, bitrate: toNumber(primaryAudio.bit_rate), + sampleFormat: primaryAudio.sample_fmt ?? null, } : null, streamCounts: { @@ -157,6 +168,24 @@ function parseFrameRate(value) { return Math.round(fps * 1000) / 1000; } +/** + * The same rational, kept exact. parseFrameRate answers "what should I show a + * person"; this answers "is this the same stream", which rounding cannot. + */ +function parseRational(value) { + if (typeof value !== "string" || !value.includes("/")) return null; + const [num, den] = value.split("/").map(Number); + if (!Number.isFinite(num) || !Number.isFinite(den) || den === 0 || num <= 0) return null; + // Reduced, so 60/2 and 30/1 compare equal — they describe the same rate. + const divisor = gcd(num, den); + return { num: num / divisor, den: den / divisor }; +} + +function gcd(a, b) { + while (b) [a, b] = [b, a % b]; + return a; +} + function toNumber(value) { if (value == null) return null; const n = Number(value); @@ -169,4 +198,5 @@ module.exports = { probe, normalise, parseFrameRate, + parseRational, }; diff --git a/src/core/runner.js b/src/core/runner.js index 887190a..e7d03cd 100644 --- a/src/core/runner.js +++ b/src/core/runner.js @@ -12,9 +12,10 @@ const { EventEmitter } = require("events"); const { spawn } = require("child_process"); const fs = require("fs"); const os = require("os"); +const path = require("path"); const { STATUS } = require("./job"); -const { buildArgs } = require("./ffmpeg-args"); +const { buildArgs, buildJoinArgs, buildConcatList } = require("./ffmpeg-args"); const paths = require("./paths"); function defaultConcurrency() { @@ -214,20 +215,39 @@ class JobRunner extends EventEmitter { paths.ensureParentDir(outputPath, isDirectory); } catch (err) { this._finish(job, { status: STATUS.ERROR, error: `Could not create the output folder: ${err.message}` }); + this._pump(); return; } // -- Spawn ------------------------------------------------------------- + // + // A demuxer join needs its playlist on disk before ffmpeg starts. + // Writing it here rather than in the argument builder is what keeps that + // module a pure function of the job, which is what makes it testable — + // it is handed the path and never touches the filesystem itself. let args; + let tempDir = null; try { - args = buildArgs(job, { outputPath }); + if (job.join) { + let listPath = null; + if (job.join.strategy === "demuxer") { + tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "dfc-join-")); + listPath = path.join(tempDir, "list.txt"); + fs.writeFileSync(listPath, buildConcatList(job.join.clips), "utf8"); + } + args = buildJoinArgs(job.join, { outputPath, listPath }); + } else { + args = buildArgs(job, { outputPath }); + } } catch (err) { + this._cleanupTemp(tempDir); this._finish(job, { status: STATUS.ERROR, error: err.message }); + this._pump(); return; } const child = this.spawn(this.ffmpegPath, args, { windowsHide: true }); - const entry = { job, child, outputPath, isDirectory, cancelled: false, stderr: "" }; + const entry = { job, child, outputPath, isDirectory, cancelled: false, stderr: "", tempDir }; this.active.set(job.id, entry); job.status = STATUS.RUNNING; @@ -254,6 +274,7 @@ class JobRunner extends EventEmitter { child.on("error", (err) => { this.active.delete(job.id); + this._cleanupTemp(entry.tempDir); this._cleanupPartial(outputPath, isDirectory); this._finish(job, { status: STATUS.ERROR, error: `Could not start ffmpeg: ${err.message}` }); this._pump(); @@ -261,6 +282,7 @@ class JobRunner extends EventEmitter { child.on("close", (code) => { this.active.delete(job.id); + this._cleanupTemp(entry.tempDir); if (entry.cancelled || this._cancelledAll) { this._cleanupPartial(outputPath, isDirectory); @@ -295,6 +317,20 @@ class JobRunner extends EventEmitter { this.emit("status", payload); } + /** + * The scratch directory holding a demuxer join's playlist. Nothing else + * knows this exists, so every path out of _run has to call it or it leaks — + * one directory per cancelled join, sitting in the temp folder forever. + */ + _cleanupTemp(tempDir) { + if (!tempDir) return; + try { + fs.rmSync(tempDir, { recursive: true, force: true }); + } catch (_) { + // Named dfc-join-* so it is at least identifiable if it survives. + } + } + _cleanupPartial(outputPath, isDirectory) { try { if (!fs.existsSync(outputPath)) return; @@ -382,6 +418,21 @@ function parseProgressLines(lines, durationSeconds) { } function durationOf(job) { + // A join's progress runs across everything it is stitching together, so the + // denominator is the sum of what each clip contributes. Using one clip's + // duration would send the bar to 100% at the end of the first one and leave + // it there for the rest of the run. + if (job.join) { + let total = 0; + for (const clip of job.join.clips ?? []) { + const { start, end } = clip.trim ?? {}; + const span = (end ?? clip.duration) - (start ?? 0); + if (!Number.isFinite(span) || span <= 0) return null; + total += span; + } + return total > 0 ? total : null; + } + const meta = job.inputMeta; const { start, end } = job.trim ?? {}; diff --git a/test/core.test.js b/test/core.test.js index bc53dc4..aaa2cf4 100644 --- a/test/core.test.js +++ b/test/core.test.js @@ -7,8 +7,8 @@ const fs = require("fs"); const path = require("path"); const formats = require("../src/core/formats"); -const { createJob, patchJob, validateJob, defaultModeFor, STREAM_MODE, CONFLICT, OUTPUT_ROUTING } = require("../src/core/job"); -const { buildArgs, normaliseBitrate, buildScaleFilter } = require("../src/core/ffmpeg-args"); +const { createJob, createJoinJob, patchJob, validateJob, validateJoin, defaultModeFor, STREAM_MODE, CONFLICT, OUTPUT_ROUTING } = require("../src/core/job"); +const { buildArgs, buildJoinArgs, buildConcatList, normaliseBitrate, buildScaleFilter } = require("../src/core/ffmpeg-args"); const paths = require("../src/core/paths"); const { parseProgressLines, lastMeaningfulLine } = require("../src/core/runner"); const { scanPaths, commonRoot } = require("../src/core/scan"); @@ -785,3 +785,134 @@ test("probe: an audio-only file has no picture stream to measure", () => { assert.equal(result.hasVideo, false); assert.equal(result.isStill, false); }); + +// --------------------------------------------------------------------------- +// Joining +// --------------------------------------------------------------------------- + +test("join: matching clips are stitched without re-encoding", () => { + const spec = { + strategy: "demuxer", + clips: [{ inputPath: "a.mp4", hasVideo: true, hasAudio: true }, + { inputPath: "b.mp4", hasVideo: true, hasAudio: true }], + output: { ext: "mp4" }, + }; + const args = buildJoinArgs(spec, { outputPath: "out.mp4", listPath: "list.txt", progress: false }); + + assert.ok(args.includes("-f")); + assert.equal(valueOf(args, "-f"), "concat"); + assert.equal(valueOf(args, "-safe"), "0"); + assert.equal(valueOf(args, "-i"), "list.txt"); + assert.equal(valueOf(args, "-c"), "copy"); + assert.equal(args.filter(a => a === "-i").length, 1, "the playlist is the only input"); + // The whole point of this path is that nothing is decoded, so a filter + // graph or a stream map appearing here means it silently re-encoded. + assert.ok(!args.includes("-filter_complex")); + assert.ok(!args.includes("-map")); + assert.equal(args[args.length - 1], "out.mp4"); +}); + +test("join: a demuxer join without its playlist is refused, not guessed at", () => { + const spec = { strategy: "demuxer", clips: [{ inputPath: "a.mp4" }, { inputPath: "b.mp4" }], output: { ext: "mp4" } }; + assert.throws(() => buildJoinArgs(spec, { outputPath: "out.mp4" }), /listPath/); + assert.throws(() => buildJoinArgs(spec, { listPath: "l.txt" }), /outputPath/); + assert.throws( + () => buildJoinArgs({ strategy: "filter", clips: [{ inputPath: "a.mp4" }], output: { ext: "mp4" } }, + { outputPath: "out.mp4" }), + /at least two/); +}); + +test("join: mismatched clips are concatenated through one filter, not two", () => { + const spec = { + strategy: "filter", + clips: [ + { inputPath: "a.mp4", hasVideo: true, hasAudio: true, width: 1920, height: 1080, fps: 30, sampleRate: 48000 }, + { inputPath: "b.mov", hasVideo: true, hasAudio: true, width: 1280, height: 720, fps: 25, sampleRate: 44100 }, + { inputPath: "c.mkv", hasVideo: true, hasAudio: true, width: 640, height: 480, fps: 30, sampleRate: 48000 }, + ], + output: { ext: "mp4" }, + }; + const args = buildJoinArgs(spec, { outputPath: "out.mp4", progress: false }); + const chain = valueOf(args, "-filter_complex"); + + assert.equal(args.filter(a => a === "-i").length, 3); + // One concat instance taking interleaved pairs. The two-instance + // v=1:a=0 / v=0:a=1 form is graph-compiler vocabulary and would need the + // streams re-interleaving afterwards. + assert.ok(chain.includes("concat=n=3:v=1:a=1[outv][outa]"), chain); + assert.equal(chain.split("concat=").length - 1, 1, "exactly one concat node"); + assert.ok(chain.includes("[v0][a0][v1][a1][v2][a2]concat="), chain); + assert.ok(args.includes("-map") && args.includes("[outv]") && args.includes("[outa]")); + + // Every input normalised, or the concat filter produces a torn output. + for (const i of [0, 1, 2]) { + assert.ok(chain.includes(`[${i}:v]scale=1920:1080`), `clip ${i} scaled to the largest frame`); + assert.ok(chain.includes(`[${i}:a]aresample=48000`), `clip ${i} resampled`); + } + assert.ok(chain.includes("setsar=1"), "a pixel-shape mismatch tears the seam"); + assert.ok(chain.includes("fps=30")); +}); + +test("join: an audio-only set has no video chain at all", () => { + const spec = { + strategy: "filter", + clips: [{ inputPath: "a.mp3", hasVideo: false, hasAudio: true, sampleRate: 44100 }, + { inputPath: "b.wav", hasVideo: false, hasAudio: true, sampleRate: 44100 }], + output: { ext: "mp3" }, + }; + const args = buildJoinArgs(spec, { outputPath: "out.mp3", progress: false }); + const chain = valueOf(args, "-filter_complex"); + + assert.ok(chain.includes("concat=n=2:v=0:a=1[outa]"), chain); + assert.ok(!chain.includes("[outv]")); + assert.ok(!chain.includes("scale=")); + assert.ok(args.includes("[outa]")); + assert.ok(!args.includes("[outv]")); +}); + +test("join: the playlist quotes paths the way ffmpeg reads them", () => { + // String.raw throughout: these are Windows paths, and a "\t" that turns + // into a tab is exactly the sort of thing this test exists to catch. + const list = buildConcatList([ + { inputPath: String.raw`C:\My Videos\clip one.mp4` }, + { inputPath: String.raw`C:\it's here\two.mp4` }, + { inputPath: String.raw`C:\three.mp4`, trim: { start: 5, end: 12 } }, + ]); + const lines = list.trim().split("\n"); + + assert.equal(lines[0], String.raw`file 'C:\My Videos\clip one.mp4'`, + "a space must not split the path"); + // ffmpeg's own escaping for this file: close the quote, escape the + // apostrophe, reopen. A raw apostrophe would end the path early. + assert.equal(lines[1], String.raw`file 'C:\it'\''s here\two.mp4'`); + assert.equal(lines[2], String.raw`file 'C:\three.mp4'`); + assert.equal(lines[3], "inpoint 5"); + assert.equal(lines[4], "outpoint 12"); + // An untrimmed clip carries no points, or every clip would start at 0. + assert.ok(!lines[0].includes("inpoint")); + assert.ok(list.endsWith("\n"), "the demuxer wants a trailing newline"); +}); + +test("join: a job is shaped so the ordinary output and conflict path still work", () => { + const job = createJoinJob({ + clips: [{ inputPath: String.raw`C:\a.mp4`, duration: 10 }, + { inputPath: String.raw`C:\b.mp4`, duration: 5 }], + targetExt: "mkv", + strategy: "demuxer", + output: { dir: String.raw`D:\out`, nameTemplate: "My Holiday" }, + }); + + assert.equal(validateJoin(job).ok, true); + assert.equal(job.output.routing, OUTPUT_ROUTING.FIXED); + // The typed name IS the template — applyNameTemplate only rewrites + // {tokens}, so a join needs no naming route of its own. + const resolved = paths.resolveOutputPath(job); + assert.equal(path.basename(resolved.outputPath), "My Holiday.mkv"); + assert.equal(path.dirname(resolved.outputPath), String.raw`D:\out`, + "a join always names its own destination; there is no 'alongside which input'"); + + assert.equal(validateJoin(createJoinJob({ clips: [{ inputPath: "a.mp4" }], targetExt: "mkv", + output: { dir: String.raw`D:\o` } })).ok, false, "one clip is not a join"); + assert.equal(validateJoin(createJoinJob({ clips: [{ inputPath: "a.mp4" }, { inputPath: "b.mp4" }], + targetExt: "mkv" })).ok, false, "a join must know where to save"); +}); diff --git a/test/display.test.js b/test/display.test.js index ff4ffc4..a98566a 100644 --- a/test/display.test.js +++ b/test/display.test.js @@ -632,3 +632,115 @@ test("display: a mode chosen by hand is not second-guessed", () => { assert.equal(d.effectiveMode({ ext: "mp4", targetExt: null }, TARGETS, DESCRIPTORS), null); assert.equal(d.effectiveMode({ ext: "mp4", targetExt: "nope" }, TARGETS, DESCRIPTORS), null); }); + +// --------------------------------------------------------------------------- +// Joining +// +// The choice between the concat demuxer and the concat filter is a fact about +// the clips, not a setting. Getting it wrong in the permissive direction +// produces a file that plays wrongly rather than an error, so these compare +// the fields ffmpeg actually cares about. +// --------------------------------------------------------------------------- + +function clip(over = {}) { + return { + ok: true, hasVideo: true, hasAudio: true, + formatName: "mov,mp4,m4a,3gp,3g2,mj2", + video: { codec: "h264", width: 1920, height: 1080, fpsExact: { num: 30, den: 1 }, + timeBase: "1/15360", sar: "1:1", pixelFormat: "yuv420p" }, + audio: { codec: "aac", sampleRate: 48000, channels: 2, sampleFormat: "fltp" }, + ...over, + }; +} + +test("join: identical clips are joined without re-encoding", () => { + const result = d.compareClips([clip(), clip()]); + assert.equal(result.compatible, true); + assert.deepEqual(result.differences, []); + assert.equal(d.describeJoinPlan(result).strategy, "demuxer"); +}); + +test("join: an .mp4 and a .mov are the same container as far as ffmpeg cares", () => { + // ffprobe reports every name the demuxer handles, so the two are identical + // strings here. Comparing containers with === would still be wrong for the + // general case, which is why it is a set intersection. + assert.equal(d.sameContainer("mov,mp4,m4a,3gp,3g2,mj2", "mov,mp4,m4a,3gp,3g2,mj2"), true); + assert.equal(d.sameContainer("matroska,webm", "mov,mp4,m4a"), false); + assert.equal(d.sameContainer("matroska,webm", "webm"), true); + assert.equal(d.sameContainer(null, "mp4"), false); +}); + +test("join: frame rates that round the same are still different rates", () => { + // 30000/1001 and 2997/100 both display as 29.97. Stream-copying them + // together produces a file whose timestamps drift, so the exact rational + // is what the comparison uses and `fps` is only ever for showing a person. + const ntsc = clip({ video: { ...clip().video, fpsExact: { num: 30000, den: 1001 } } }); + const nearly = clip({ video: { ...clip().video, fpsExact: { num: 2997, den: 100 } } }); + + const result = d.compareClips([ntsc, nearly]); + assert.equal(result.compatible, false); + assert.deepEqual(result.differences.map(x => x.field), ["fps"]); + assert.equal(d.describeJoinPlan(result).strategy, "filter"); + + // ...but the same rate written two ways is the same rate. + const sixtyOverTwo = clip({ video: { ...clip().video, fpsExact: { num: 60, den: 2 } } }); + assert.equal(d.compareClips([clip(), sixtyOverTwo]).compatible, true); +}); + +test("join: a time base difference alone forces a re-encode", () => { + const other = clip({ video: { ...clip().video, timeBase: "1/12800" } }); + const result = d.compareClips([clip(), other]); + assert.equal(result.compatible, false); + assert.deepEqual(result.differences.map(x => x.field), ["timeBase"]); +}); + +test("join: every mismatch is named, so the UI can say why", () => { + const other = clip({ + video: { ...clip().video, width: 1280, height: 720, pixelFormat: "yuv422p" }, + audio: { ...clip().audio, sampleRate: 44100 }, + }); + const plan = d.describeJoinPlan(d.compareClips([clip(), other])); + assert.equal(plan.strategy, "filter"); + assert.deepEqual(plan.reasons, ["width", "height", "pixel format", "sample rate"]); + assert.match(plan.headline, /re-encoded/); +}); + +test("join: a file ffmpeg cannot read is refused rather than compared", () => { + // probe returns { ok: false } with no `video` at all, so every field would + // read undefined and match any other unreadable clip. + const result = d.compareClips([clip(), { ok: false, error: "cannot read" }]); + assert.equal(result.compatible, false); + assert.equal(result.blocked, "unreadable"); + assert.equal(result.blockedIndex, 1); + assert.equal(d.describeJoinPlan(result).strategy, "blocked"); +}); + +test("join: video and audio-only files cannot be joined to each other", () => { + const audioOnly = clip({ hasVideo: false, video: null, formatName: "mp3" }); + assert.equal(d.compareClips([clip(), audioOnly]).blocked, "mixed-kinds"); + + // A silent clip onto one with sound would need a track synthesising. + const silent = clip({ hasAudio: false, audio: null }); + assert.equal(d.compareClips([clip(), silent]).blocked, "mixed-audio"); + + // Audio-only throughout is a perfectly good join. + assert.equal(d.compareClips([audioOnly, audioOnly]).blocked, null); +}); + +test("join: GIF is never offered as a destination", () => { + // Its palette pass and the concat both want -filter_complex, and the two + // do not stack. Refused rather than half-supported. + const targets = d.joinTargets([clip(), clip()], formats.FORMATS); + assert.ok(!targets.includes("gif")); + assert.ok(targets.includes("mp4")); + + const audioOnly = clip({ hasVideo: false, video: null }); + const audioTargets = d.joinTargets([audioOnly, audioOnly], formats.FORMATS); + assert.ok(audioTargets.includes("mp3")); + assert.ok(!audioTargets.includes("mp4"), "audio cannot be joined into a video container"); +}); + +test("join: one clip needs no comparison", () => { + assert.equal(d.compareClips([clip()]).compatible, true); + assert.equal(d.compareClips([]).compatible, true); +}); From 9d6b923a4fd92aac8bce3fcc537f9d77303d8571 Mon Sep 17 00:00:00 2001 From: Will Knowles Date: Wed, 2 Sep 2026 19:59:27 +0100 Subject: [PATCH 32/81] feat: join clips into one file, from the rail The second destination on the navigation rail, which is what the rail was kept for when the pipeline editor was removed. Joining several files into one is the job this app could not do at all. It is an ordered list, not a canvas. The order is the whole model, and a list says so without anyone having to learn how to read it. Per-clip trim is two time fields accepting either "1:23" or "83" - the trim slider in the settings dialog is bound to that dialog's own element ids and its sample job, so generalising it for one more caller is a refactor and duplicating it is worse. It can be built when someone asks for it. The view is self-contained: it never creates a card. That leaves the card model, the dedupe-by-path rule, buildCard and the job:run spec shape completely untouched, which is most of why this is as small as it is. A join goes out over its own join:run channel to a job the runner already knows how to run. Which route will be taken is stated, not implied - a green edge for "these match, joined without re-encoding, nothing lost" and an amber one for "these will be re-encoded", listing what actually differs. That is the difference between a join that finishes instantly and one that takes minutes and does not give back what it was given, and nobody should have to guess which they are about to get. Three refusals rather than three ways to fail: a mix of video and audio-only files, a file ffmpeg cannot read, and GIF as a destination. Each says why. The rail's icon is merge_type rather than merge or call_merge. All three are the same two-into-one arrow; that one's fork stays legible at the 20px the rail draws it at. View switching force-hides with !important, because render() and renderSelection() write d-none on the files elements and know nothing about which view is showing. Five elements, not the three the CSS comment anticipated: #bulk-bar is toggled by renderSelection rather than by render, and .view-files-only - the header's Add Files / Add Folder group - was markup with no rule anywhere in the stylesheet until now. A drop while Join is showing adds to the join rather than switching to Files. The old handler switched views on any drop, which was right when there was one destination and would be surprising now. There is no unsaved-work guard: the view keeps its state while hidden, so leaving it costs nothing, and a confirm dialog for a lossless action only teaches people to click through dialogs. Progress reaches the join through the same jobId-keyed channel as everything else. It is the one job with no card to land on, so it is picked out by id. Verified in the running app, both routes end to end: two clips off the same export joined to 5.02s at their original 320x240 h264 with no re-encode, and a mismatched pair joined to 4.03s normalised to 640x480 with the smaller clip padded rather than stretched. Every dfc-join-* temp directory was cleaned up afterwards. Fixed before committing, from a screenshot rather than from the code: the Add more button was missing the flex classes the header's icon buttons use, so its + sat on the text baseline instead of centred. Both buttons now measure zero offset between icon centre and button centre. 173 tests pass. The manual checklist gains a Join section - most of what matters here is whether it feels right, which no test can say. --- docs/MANUAL-TESTING.md | 109 ++++++++++++++ src/constants.js | 1 + src/index.html | 62 +++++++- src/main.js | 26 +++- src/preload.js | 2 + src/renderer.js | 331 ++++++++++++++++++++++++++++++++++++++++- src/styles.css | 117 ++++++++++++++- 7 files changed, 634 insertions(+), 14 deletions(-) diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md index e789fea..3d3b287 100644 --- a/docs/MANUAL-TESTING.md +++ b/docs/MANUAL-TESTING.md @@ -1246,3 +1246,112 @@ bottom — e.g. `Source\2024\holiday\clip.mp4` and `Source\2023\misc\song.mp3`. drive in one go, select both cards, open **Bulk edit**. Mirror reads **"Mirror the source folders (add a folder to use this)"** and cannot be chosen — there is no common root across drives. Nothing errors. + +--- + +## 2.0.0-alpha.5 — Join + +> **Status: not started.** Written 2026-09-02 alongside the feature. + +Joining several files into one is the job this app could not do at all. It is a +second destination on the rail beside Files, and it is **an ordered list, not a +canvas** — the order is the whole model. + +Two routes, and which one runs is a fact about the clips rather than a setting. +Where they already agree on container, codecs, size, frame rate and time base, +they are stitched with no re-encoding: near-instant, nothing lost. Where they do +not, they are re-encoded to fit. **The panel says which is about to happen and +why**, because those are very different things to press the same button for. + +**Test media:** three or four clips that came off the same camera or export +(they will match), plus one from somewhere else with a different size and frame +rate (it will not). An MP3 or two for the audio-only case. + +### Getting there and back + +- [ ] The rail has **Files** and **Join**. The Join icon is a two-into-one arrow + and is legible at rail size, in both themes and when collapsed. +- [ ] Click Join: the file grid, the footer, the selection bar **and the Add + Files / Add Folder buttons in the header** all disappear. +- [ ] Click Files: the grid comes back **exactly as it was** — same cards, same + selection, same chosen formats. Nothing was rebuilt. +- [ ] Go back to Join: your clip list is still there too. +- [ ] Queue files in Files, switch to Join, add different files. The two lists + are independent and neither disturbs the other. +- [ ] With Join showing, **drop files on the window**: they are added to the + join, and the view does **not** jump to Files. +- [ ] Ctrl+A, Delete and Escape do nothing while Join is showing — they belong + to the card grid. + +### Building the list + +- [ ] Drop two clips, or use **Select Files**. Each row shows its position, its + name, its duration and its dimensions. +- [ ] **Add the same file twice.** It appears twice. *(Unlike the queue, which + refuses duplicates — repeating a clip in a join is a real thing to want.)* +- [ ] The up and down arrows reorder, and the numbers renumber. The first row's + up arrow and the last row's down arrow are disabled. +- [ ] × removes a row. +- [ ] **Add more** adds to the list. Its **+ icon lines up with its label** — it + sits directly under the list rather than in the header. +- [ ] **Clear** empties the list and returns to the drop zone. + +### It says what it is going to do + +- [ ] Add two clips **from the same source**. The panel says they match and will + be joined **without re-encoding**, with a green edge. +- [ ] Add the odd one out. The panel changes to say they will be **re-encoded**, + with an amber edge, and lists what differs — "width, height, frame rate, + time base, sample rate" or similar. +- [ ] Remove the odd clip again: it goes back to the no-re-encode message. +- [ ] With one clip only: "Add another file — a join needs at least two", and + **Join** is disabled. + +### It refuses what it cannot do + +- [ ] Add a **video and an MP3** together: it refuses, saying they are a mix of + video and audio-only files. Join stays disabled. +- [ ] Add two **MP3s** on their own: that is fine, and the format list offers + audio containers rather than video ones. +- [ ] Add an **animated WebP** (which the bundled FFmpeg cannot read): the row + reads "unreadable" and the join is refused, naming the problem. +- [ ] **GIF is never in the "Join into" list**, for any combination. *(Its + palette pass and the join want the same ffmpeg mechanism; it is refused + rather than half-supported.)* + +### Joining + +- [ ] Set a name and a folder. **Join** enables only once both are set — before + that it says which is missing. +- [ ] Join two matching clips. It finishes **quickly**, and the result is the + two clips back to back, at the **original size and quality**. +- [ ] Check the duration: it is the sum of both clips. +- [ ] Join two clips that do **not** match. It takes noticeably longer, the + progress bar moves across the **whole** join rather than filling up during + the first clip and stopping, and the output plays all the way through with + no torn or stretched frames at the seam. +- [ ] Play the re-encoded result: the smaller clip is **fitted inside the frame + and padded**, not stretched out of shape. + +### Trimming + +- [ ] Type `0:05` in a row's **from** box. The row's line reads "keeping …" with + the shorter length. +- [ ] Accept seconds too: `5` means the same as `0:05`. +- [ ] Set **to** earlier than **from**: it says that clip ends before it starts + and Join is disabled. +- [ ] Join with trims set: the output contains only the kept parts. On the + no-re-encode route the cut may land slightly off where you asked — that is + inherent to copying without re-encoding, the same as trimming with "copy + without re-encoding" in Advanced options. + +### Names, folders and interruptions + +- [ ] A name that already exists in that folder raises the usual **Ask me** + prompt, with Overwrite and Save as New both working. +- [ ] **Cancel** during a join stops it, and no half-written file is left behind. +- [ ] Cancel a join, then run it again: it works. +- [ ] After any join — finished, cancelled or failed — check + `%TEMP%` for leftover **`dfc-join-*`** folders. There should be none. +- [ ] Start a join, switch to **Files** while it runs, come back: the progress + bar is still going and the result still arrives. diff --git a/src/constants.js b/src/constants.js index 9982d4d..dafd004 100644 --- a/src/constants.js +++ b/src/constants.js @@ -19,6 +19,7 @@ const IPC = { JOB_RUN: "job:run", // invoke(job) -> result JOB_CANCEL: "job:cancel", // invoke(jobId) -> boolean JOB_PREVIEW: "job:preview", // invoke(spec) -> ffmpeg argv preview + JOIN_RUN: "join:run", // invoke(spec) -> result, several clips into one JOB_PROGRESS: "job:progress", // push { jobId, percent, speed, fps, eta } JOB_STATUS: "job:status", // push { jobId, status, outputPath?, error? } QUEUE_CANCEL_ALL: "queue:cancel-all", diff --git a/src/index.html b/src/index.html index b3322d5..d657945 100644 --- a/src/index.html +++ b/src/index.html @@ -21,14 +21,20 @@
- +
+ +
+
+
+ merge_type +

Drop the files you want joined into one

+

They are joined in the order you list them.

+ +
+
+ +
+
+
    + +
    + + +
    +
    +
    diff --git a/src/main.js b/src/main.js index 75f0521..e5507ae 100644 --- a/src/main.js +++ b/src/main.js @@ -6,7 +6,7 @@ const path = require("path"); const { APP_NAME, IPC, WINDOW, LOG, ARGV_BATCH_DEBOUNCE_MS, SETTINGS_DEFAULTS } = require("./constants"); const formats = require("./core/formats"); -const { createJob, validateJob, defaultModeFor, STATUS } = require("./core/job"); +const { createJob, createJoinJob, validateJob, validateJoin, defaultModeFor, STATUS } = require("./core/job"); const { JobRunner, defaultConcurrency } = require("./core/runner"); const { buildArgs } = require("./core/ffmpeg-args"); const probe = require("./core/probe"); @@ -472,6 +472,30 @@ ipcMain.handle(IPC.JOB_RUN, async (_event, spec) => { return result; }); +ipcMain.handle(IPC.JOIN_RUN, async (_event, spec) => { + const settings = store.get("settings") ?? SETTINGS_DEFAULTS; + + // A join always names its own destination, so only the conflict policy is + // inherited — routing and the name template describe one input becoming one + // output, which is not what this is. + const job = createJoinJob({ + ...spec, + output: { onConflict: settings.onConflict, ...spec.output }, + }); + + const validation = validateJoin(job); + if (!validation.ok) { + log(LOG.ERROR, `Invalid join: ${validation.errors.join(" ")}`); + return { jobId: job.id, status: STATUS.ERROR, error: validation.errors[0] }; + } + + const result = await runJobToCompletion(job); + if (result.status === STATUS.ERROR) { + log(LOG.ERROR, `Join failed: ${result.error}`); + } + return result; +}); + ipcMain.handle(IPC.JOB_CANCEL, (_event, jobId) => getRunner().cancel(jobId)); ipcMain.handle(IPC.QUEUE_CANCEL_ALL, () => { getRunner().cancelAll(); }); ipcMain.handle(IPC.QUEUE_SET_CONCURRENCY, (_event, n) => { diff --git a/src/preload.js b/src/preload.js index b26af67..c258c5f 100644 --- a/src/preload.js +++ b/src/preload.js @@ -19,6 +19,7 @@ const CH = { JOB_RUN: "job:run", JOB_CANCEL: "job:cancel", JOB_PREVIEW: "job:preview", + JOIN_RUN: "join:run", JOB_PROGRESS: "job:progress", JOB_STATUS: "job:status", QUEUE_CANCEL_ALL: "queue:cancel-all", @@ -52,6 +53,7 @@ contextBridge.exposeInMainWorld("electronAPI", { runJob: (job) => ipcRenderer.invoke(CH.JOB_RUN, job), cancelJob: (jobId) => ipcRenderer.invoke(CH.JOB_CANCEL, jobId), previewJob: (spec) => ipcRenderer.invoke(CH.JOB_PREVIEW, spec), + runJoin: (spec) => ipcRenderer.invoke(CH.JOIN_RUN, spec), cancelAll: () => ipcRenderer.invoke(CH.QUEUE_CANCEL_ALL), setConcurrency: (n) => ipcRenderer.invoke(CH.QUEUE_SET_CONCURRENCY, n), diff --git a/src/renderer.js b/src/renderer.js index 531cc5b..16b87fc 100644 --- a/src/renderer.js +++ b/src/renderer.js @@ -1578,6 +1578,319 @@ async function showView(name) { } if (name === "files") render(); + else if (name === "join") renderJoin(); +} + +// -- Join -------------------------------------------------------------------- +// +// An ordered list of clips that becomes one file. The order is the entire +// model, which is why this is a list and not a canvas. + +let joinClips = []; // { id, filePath, meta, trim: { start, end } } +let joinRunning = null; // the id of the job in flight + +/** "1:23" or "83" both mean 83 seconds. Blank means "no limit at this end". */ +function parseTime(text) { + const value = String(text ?? "").trim(); + if (!value) return null; + if (!value.includes(":")) { + const n = Number(value); + return Number.isFinite(n) && n >= 0 ? n : null; + } + const parts = value.split(":").map(Number); + if (parts.some(n => !Number.isFinite(n) || n < 0)) return null; + return parts.reduce((total, part) => total * 60 + part, 0); +} + +async function addJoinClips(filePaths) { + const added = []; + for (const filePath of filePaths ?? []) { + const raw = p.extname(filePath).slice(1).toLowerCase(); + const ext = FORMATS.aliases[raw] ?? raw; + if (!FORMATS.conversionMap[ext]) continue; + // Unlike the queue, the same file twice is legitimate here — repeating + // a clip is a real thing to want from a join. + const clip = { id: generateId(), filePath, meta: null, trim: { start: null, end: null } }; + joinClips.push(clip); + added.push(clip); + } + if (added.length === 0) { + if ((filePaths ?? []).length > 0) toast("None of those are files this can join.", "warning"); + return; + } + renderJoin(); + + // Every clip has to be probed before the copy-or-re-encode question can be + // answered, so unlike the grid — where metadata only enriches a card that + // is already useful — Join genuinely waits on it. + await Promise.all(added.map(async (clip) => { + clip.meta = await api.probeFile(clip.filePath); + })); + renderJoin(); +} + +function removeJoinClip(id) { + joinClips = joinClips.filter(c => c.id !== id); + renderJoin(); +} + +function moveJoinClip(id, delta) { + const i = joinClips.findIndex(c => c.id === id); + const j = i + delta; + if (i === -1 || j < 0 || j >= joinClips.length) return; + [joinClips[i], joinClips[j]] = [joinClips[j], joinClips[i]]; + renderJoin(); +} + +/** What each clip contributes once its trim is applied. */ +function joinClipSpan(clip) { + const total = clip.meta?.ok ? clip.meta.duration : null; + const start = clip.trim.start ?? 0; + const end = clip.trim.end ?? total; + if (!Number.isFinite(end)) return null; + return end > start ? end - start : null; +} + +function renderJoin() { + const hasClips = joinClips.length > 0; + $("join-empty").classList.toggle("d-none", hasClips); + $("join-body").classList.toggle("d-none", !hasClips); + if (!hasClips) { + $("join-plan").className = "join-plan"; + $("join-plan").textContent = ""; + return; + } + + const list = $("join-list"); + list.innerHTML = ""; + joinClips.forEach((clip, i) => list.appendChild(buildJoinRow(clip, i))); + + renderJoinFormats(); + renderJoinPlan(); + renderJoinActions(); +} + +function buildJoinRow(clip, index) { + const row = document.createElement("li"); + row.className = "join-clip"; + + const badge = document.createElement("span"); + badge.className = "join-index"; + badge.textContent = String(index + 1); + + const main = document.createElement("div"); + main.className = "join-clip-main"; + const name = document.createElement("span"); + name.className = "join-clip-name"; + name.textContent = p.basename(clip.filePath); + name.title = clip.filePath; + const meta = document.createElement("span"); + meta.className = "join-clip-meta"; + if (!clip.meta) meta.textContent = "Reading…"; + else if (!clip.meta.ok) { meta.textContent = "unreadable"; meta.classList.add("is-bad"); } + else { + const span = joinClipSpan(clip); + const bits = [display.formatDuration(clip.meta.duration)]; + if (clip.meta.video) bits.push(`${clip.meta.video.width}×${clip.meta.video.height}`); + if (span != null && Math.abs(span - clip.meta.duration) > 0.05) { + bits.push(`keeping ${display.formatDuration(span)}`); + } + meta.textContent = bits.join(" · "); + } + main.append(name, meta); + + const trim = document.createElement("div"); + trim.className = "join-trim"; + trim.append( + timeInput(clip, "start", "from"), + Object.assign(document.createElement("span"), { className: "join-trim-sep", textContent: "→" }), + timeInput(clip, "end", "to"), + ); + + const move = document.createElement("div"); + move.className = "join-move"; + move.append( + iconButton("keyboard_arrow_up", "Move up", () => moveJoinClip(clip.id, -1), index === 0), + iconButton("keyboard_arrow_down", "Move down", () => moveJoinClip(clip.id, 1), index === joinClips.length - 1), + ); + + const remove = iconButton("close", "Remove", () => removeJoinClip(clip.id)); + remove.className = "join-remove"; + + row.append(badge, main, trim, move, remove); + return row; +} + +function timeInput(clip, which, placeholder) { + const input = document.createElement("input"); + input.type = "text"; + input.placeholder = placeholder; + input.spellcheck = false; + input.value = clip.trim[which] != null ? display.formatDuration(clip.trim[which]) : ""; + input.addEventListener("change", () => { + clip.trim[which] = parseTime(input.value); + renderJoin(); + }); + return input; +} + +function iconButton(icon, title, onClick, disabled = false) { + const button = document.createElement("button"); + button.type = "button"; + button.title = title; + button.disabled = disabled; + const glyph = document.createElement("span"); + glyph.className = "material-icons-round"; + glyph.textContent = icon; + button.appendChild(glyph); + button.addEventListener("click", onClick); + return button; +} + +function joinMetas() { + return joinClips.map(c => c.meta).filter(Boolean); +} + +function renderJoinFormats() { + const select = $("join-format"); + const metas = joinMetas(); + if (metas.length < joinClips.length) return; // still probing + + const targets = display.joinTargets(metas, DESCRIPTORS); + const chosen = select.value; + select.innerHTML = ""; + for (const ext of targets) { + const option = document.createElement("option"); + option.value = ext; + option.textContent = DESCRIPTORS[ext]?.label ?? ext.toUpperCase(); + select.appendChild(option); + } + if (targets.includes(chosen)) select.value = chosen; +} + +/** The plan, stated rather than implied. */ +function renderJoinPlan() { + const box = $("join-plan"); + const metas = joinMetas(); + + if (metas.length < joinClips.length) { + box.className = "join-plan"; + box.textContent = "Reading the files…"; + return; + } + if (joinClips.length < 2) { + box.className = "join-plan"; + box.textContent = "Add another file — a join needs at least two."; + return; + } + + const plan = display.describeJoinPlan(display.compareClips(metas)); + box.className = `join-plan is-${plan.strategy === "demuxer" ? "copy" : plan.strategy === "filter" ? "encode" : "blocked"}`; + box.textContent = ""; + box.appendChild(Object.assign(document.createElement("div"), { textContent: plan.headline })); + if (plan.reasons.length > 0) { + box.appendChild(Object.assign(document.createElement("p"), { + className: "join-plan-why", + textContent: `They differ in: ${plan.reasons.join(", ")}.`, + })); + } +} + +function joinStrategy() { + const metas = joinMetas(); + if (metas.length < joinClips.length || joinClips.length < 2) return null; + const comparison = display.compareClips(metas); + if (comparison.blocked) return null; + return comparison.compatible ? "demuxer" : "filter"; +} + +function renderJoinActions() { + const errors = []; + const strategy = joinStrategy(); + + if (joinClips.length >= 2 && strategy === null && joinMetas().length === joinClips.length) { + errors.push(""); // the plan box already says why + } + if (!$("join-name").value.trim()) errors.push("Give the joined file a name."); + if (!$("join-dir").value) errors.push("Choose where to save it."); + for (const clip of joinClips) { + if (clip.trim.start != null && clip.trim.end != null && clip.trim.end <= clip.trim.start) { + errors.push(`${p.basename(clip.filePath)} ends before it starts.`); + break; + } + } + + $("join-errors").textContent = errors.filter(Boolean).join(" "); + $("btn-join-run").disabled = Boolean(joinRunning) || strategy === null || errors.length > 0; + $("btn-join-run").classList.toggle("d-none", Boolean(joinRunning)); + $("btn-join-cancel").classList.toggle("d-none", !joinRunning); + $("btn-join-clear").disabled = Boolean(joinRunning); + document.querySelector(".join-progress").classList.toggle("d-none", !joinRunning); +} + +async function runJoin() { + const strategy = joinStrategy(); + if (!strategy || joinRunning) return; + + const spec = { + strategy, + clips: joinClips.map(clip => ({ + inputPath: clip.filePath, + trim: clip.trim, + duration: clip.meta?.duration ?? null, + hasVideo: clip.meta?.hasVideo ?? false, + hasAudio: clip.meta?.hasAudio ?? false, + width: clip.meta?.video?.width ?? null, + height: clip.meta?.video?.height ?? null, + fps: clip.meta?.video?.fps ?? null, + sampleRate: clip.meta?.audio?.sampleRate ?? null, + })), + targetExt: $("join-format").value, + output: { dir: $("join-dir").value, nameTemplate: $("join-name").value.trim() }, + }; + + joinRunning = generateId(); + spec.id = joinRunning; + $("join-bar").style.width = "0%"; + renderJoinActions(); + + const result = await api.runJoin(spec); + joinRunning = null; + renderJoinActions(); + + if (result.status === "done") { + toast(`Joined ${display.countOf(joinClips.length, "file")} into ${p.basename(result.outputPath)}.`, "success"); + } else if (result.status === "cancelled") { + toast("Join cancelled.", "info"); + } else if (result.status === "skipped") { + toast("That file already exists, so the join was skipped.", "warning"); + } else { + toast(result.error || "The join failed.", "danger"); + } +} + +function setupJoin() { + $("btn-join-add").addEventListener("click", browseJoinFiles); + $("btn-join-add-more").addEventListener("click", browseJoinFiles); + $("btn-join-clear").addEventListener("click", () => { joinClips = []; renderJoin(); }); + $("btn-join-run").addEventListener("click", runJoin); + $("btn-join-cancel").addEventListener("click", () => { if (joinRunning) api.cancelJob(joinRunning); }); + $("btn-join-browse").addEventListener("click", async () => { + const dir = await api.chooseOutput(); + if (dir) { $("join-dir").value = dir; renderJoinActions(); } + }); + $("join-name").addEventListener("input", renderJoinActions); + $("join-format").addEventListener("change", renderJoinActions); + + const zone = $("join-drop"); + zone.addEventListener("dragenter", () => zone.classList.add("drag-over")); + zone.addEventListener("dragleave", () => zone.classList.remove("drag-over")); + zone.addEventListener("drop", () => zone.classList.remove("drag-over")); + + async function browseJoinFiles() { + const filePaths = await api.browseFiles(); + if (filePaths) addJoinClips(filePaths); + } } function setNavCollapsed(collapsed) { @@ -1663,6 +1976,7 @@ document.addEventListener("DOMContentLoaded", async () => { if (settings?.scan) scanPrefs = { ...scanPrefs, ...settings.scan }; setupScanOptions(); + setupJoin(); for (const item of document.querySelectorAll(".nav-item")) { item.addEventListener("click", () => showView(item.dataset.view)); @@ -1712,12 +2026,12 @@ document.addEventListener("DOMContentLoaded", async () => { .map(file => api.getPathForFile(file)) .filter(Boolean); - // A drop is a request for the Files view, so it takes the same route a - // rail click does: unsaved editor work is never lost silently, and a - // declined guard cancels the drop rather than ingesting behind it. - if (currentView !== "files") { - await showView("files"); - if (currentView !== "files") return; + // A drop means "take these", and where they go is whichever view is + // showing. Switching to Files under someone who is assembling a join + // would be the surprising reading of the same gesture. + if (currentView === "join") { + addJoinClips(paths); + return; } ingestPaths(paths); }); @@ -1844,6 +2158,11 @@ document.addEventListener("DOMContentLoaded", async () => { // Progress carries a jobId, so it lands on the right card. v1 pushed a bare // integer with no way to tell which file it belonged to. api.onJobProgress(({ jobId, percent }) => { + // A join is a job too, and it is the only one with no card to land on. + if (jobId === joinRunning) { + $("join-bar").style.width = `${percent}%`; + return; + } const job = jobs.find(j => j.id === jobId); if (!job) return; job.progress = percent; diff --git a/src/styles.css b/src/styles.css index 42cfd0e..e92c260 100644 --- a/src/styles.css +++ b/src/styles.css @@ -899,10 +899,119 @@ body.popup-window span:hover { /* ── View switching ──────────────────────────────────────────────────────── */ -/* Only one destination exists today, so nothing is hidden yet. render() owns - d-none on the file-grid elements, so when a second section arrives its rules - must force-hide rather than compete with it — the grid then keeps its own - state and returns to it intact rather than being rebuilt. */ +/* render() and renderSelection() own d-none on the files elements and know + nothing about which view is showing, so these must force-hide with + !important rather than compete with them. Each view then keeps its own state + while hidden and returns to it intact rather than being rebuilt. + + Five elements, not three: #bulk-bar is toggled by renderSelection rather than + by render, and .view-files-only is the header's Add Files / Add Folder group, + which had no rule anywhere until now. */ +.app-shell[data-view="join"] #empty-state, +.app-shell[data-view="join"] #grid-scroll, +.app-shell[data-view="join"] #action-bar, +.app-shell[data-view="join"] #bulk-bar, +.app-shell[data-view="join"] .view-files-only { + display: none !important; +} + +.app-shell[data-view="files"] #join-view { + display: none !important; +} + +/* ── Join ────────────────────────────────────────────────────────────────── */ + +.join-view { flex: 1 1 auto; min-height: 0; display: flex; flex-direction: column; } + +.join-body { flex: 1 1 auto; min-height: 0; display: flex; gap: 1rem; } + +.join-scroll { flex: 1 1 auto; min-width: 0; overflow-y: auto; padding-right: 0.25rem; } + +.join-list { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 0.5rem; } + +.join-clip { + display: flex; + align-items: center; + gap: 0.75rem; + padding: 0.6rem 0.75rem; + border: 1px solid var(--bs-border-color); + border-radius: 6px; + background-color: var(--bs-body-bg); +} + +.join-index { + flex-shrink: 0; + width: 1.6rem; + height: 1.6rem; + border-radius: 50%; + background-color: var(--bs-border-color); + display: inline-flex; + align-items: center; + justify-content: center; + font-size: 0.75rem; + font-weight: 600; +} + +.join-clip-main { flex: 1 1 auto; min-width: 0; } +.join-clip-name { display: block; font-size: 0.875rem; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.join-clip-meta { font-size: 0.75rem; opacity: 0.7; } +.join-clip-meta.is-bad { color: var(--bs-danger); opacity: 1; } + +/* Two time fields rather than a slider. The trim slider in the settings dialog + is bound to that dialog's own element ids and its sample job; generalising it + for one more caller is a refactor, and duplicating it is worse. */ +.join-trim { display: flex; align-items: center; gap: 0.3rem; flex-shrink: 0; } +.join-trim input { + width: 5rem; + font-size: 0.8rem; + padding: 0.15rem 0.35rem; + border: 1px solid var(--bs-border-color); + border-radius: 4px; + background-color: var(--bs-body-bg); + color: inherit; +} +.join-trim .join-trim-sep { opacity: 0.5; font-size: 0.8rem; } + +.join-move { display: flex; flex-direction: column; flex-shrink: 0; } +.join-move button, +.join-remove { + background: none; border: none; padding: 0; cursor: pointer; + color: inherit; opacity: 0.65; line-height: 1; +} +.join-move button:hover, .join-remove:hover { opacity: 1; } +.join-move button:disabled { opacity: 0.2; cursor: default; } +.join-move .material-icons-round { font-size: 18px; } +.join-remove .material-icons-round { font-size: 18px; } + +.join-add-more { margin-top: 0.75rem; } + +.join-side { + flex: 0 0 17rem; + display: flex; + flex-direction: column; + padding-left: 1rem; + border-left: 1px solid var(--bs-border-color); + overflow-y: auto; +} + +/* Copying and re-encoding are wildly different things to press the same button + for, so which one is about to happen is stated rather than implied. */ +.join-plan { + font-size: 0.8rem; + padding: 0.6rem 0.7rem; + border-radius: 6px; + border-left: 3px solid var(--bs-secondary); + background-color: rgb(128 128 128 / 0.1); + margin-bottom: 0.9rem; +} +.join-plan.is-copy { border-left-color: var(--bs-success); } +.join-plan.is-encode { border-left-color: var(--bs-warning); } +.join-plan.is-blocked { border-left-color: var(--bs-danger); } +.join-plan-why { margin: 0.35rem 0 0; opacity: 0.75; } + +.join-progress { margin-top: 0.9rem; } + +.join-actions { margin-top: auto; padding-top: 0.9rem; display: flex; gap: 0.5rem; justify-content: flex-end; } /* ── Frame selection ─────────────────────────────────────────────────────── */ From 956df65ade4a42cd2f55ec232a5b137062982dfd Mon Sep 17 00:00:00 2001 From: Will Knowles Date: Tue, 8 Sep 2026 19:59:30 +0100 Subject: [PATCH 33/81] fix: clear the four failures alpha.5's QA pass found MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The command preview handed buildArgs the literal string "" rather than a destination, so the one argument a user is most likely to check was the one the box was making up. It now runs the same resolver the conversion runs, so routing, the name template and the conflict policy all show through. A bulk edit also says whose command is on screen instead of silently showing the first card's and letting it read as the batch. Credits was bound to a bare "C". Electron registers menu accelerators globally whatever holds focus, so every "c" typed into any text field both typed the character and opened the window. It is Ctrl+Shift+C now, which is the binding the Dropgate client already uses rather than a new convention. A test scans the menu for any modifier-less accelerator, because the same mistake is still sitting in two sibling apps. summariseSettings never looked at onConflict, so a card whose only change was "Skip the file" showed no summary line at all and read as though the setting had not stuck, when it had. "Cancel All" did nothing while the conflict prompt was open, and the runner was never at fault: the dialog is window-modal, so Windows blocks every click on the app behind it and the footer button could not receive input. Dragging the dialog aside does not help, because position was never the problem. The abort moved into the dialog, the only surface that can answer, and v1's "Cancel" is renamed to "Skip This File". That is not only a relabel — the runner has always been able to settle a job as Skipped, but nothing had ever answered the prompt that way, so declining one file used to leave the card reading Cancelled. Escape now aborts the whole run, deliberately. Also carries work left uncommitted in the tree from 2026-09-03: the one-time settings migration that removes the v1 keys 2.0 has no screen for, the applyJobModal ordering fix, and the alpha.5 version bump. The toast-colour report was investigated and closed with no change; the toasts already match Bootstrap's text-bg-* contract and the house spec. 183 tests passing, was 178. --- docs/MANUAL-TESTING.md | 881 ++++++++++++++++++++++++++++++++--------- package.json | 2 +- src/constants.js | 43 ++ src/core/display.js | 15 + src/index.html | 3 + src/main.js | 102 ++++- src/renderer.js | 26 +- test/display.test.js | 19 + test/runner.test.js | 50 +++ test/version.test.js | 126 ++++++ 10 files changed, 1074 insertions(+), 193 deletions(-) diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md index 3d3b287..6dd986e 100644 --- a/docs/MANUAL-TESTING.md +++ b/docs/MANUAL-TESTING.md @@ -24,7 +24,7 @@ sections — the history is useful. ``` npm install -npm test # expect 152 passing, 0 failing +npm test # expect 183 passing, 0 failing npm start ``` @@ -962,7 +962,45 @@ found while fixing them, is fixed too. ## 2.0.0-alpha.5 — the conflict prompt and the pool -> **Status: not started.** Written 2026-09-02 alongside the fix. +> **Status: run by hand 2026-09-05.** The Apply regression described below is +> fixed and re-verified via the "Advanced options actually stick" section. Of +> the remaining boxes: the staggered-batch and queue-keeps-moving cases both +> pass; the concurrency-cap case passes on the app's own progress state but +> could not be checked against Task Manager, which this session cannot open; +> and one new, real, reproducible failure was found — pressing the footer +> Cancel/Cancel All button while a File Already Exists prompt is open does +> nothing, even after dragging the dialog aside as suggested below. See "Cancel +> All while a prompt is open" for the reproduction. + +**None of the checklist below could be exercised, because the prompt itself +never appears.** Reproduced live, repeatedly: + +- Queue any file whose output name already exists. Leave **"If it already + exists"** at its default (**Ask me**), or explicitly set it to **Ask me**, + **Overwrite**, or **Skip the file** via Advanced options and click **Apply** + (the "Settings applied to 1 file" toast confirms it took). Press **Convert**. +- **No dialog ever appears, under any of the four settings.** The file is + silently written as `name (1).ext`, `name (2).ext`, etc. — "Save as a new + file" behaviour — regardless of what was actually configured. Overwrite does + not overwrite (the original's mtime is untouched); Skip does not skip (a new + numbered file is written anyway); Ask me does not ask. +- Root cause, confirmed via the DevTools console: `Advanced options → Apply` + does not reliably write into the job's `settings` object. + `JSON.stringify(jobs.find(...).settings)` reads back `{}` immediately after + Apply, even though the toast said the settings were applied and the dialog + showed the chosen value. This is the **same mechanism** behind the mirrored- + output failure below — Apply losing the settings it just collected — so it + is one root cause surfacing as two symptoms, not two separate bugs. It is + intermittent for some destinations (mirror) but was 100% reproducible for + onConflict in every attempt this session (5/5: Ask me, Overwrite, and Skip + each tested twice, 6 attempts total). +- Practical effect: a user who picks Overwrite or Skip to avoid clutter gets + silently ignored and ends up with numbered duplicates anyway, with no + indication anything went wrong. This is worse than before the alpha.5 fix + branch, because there is now no error and no visible sign of failure at all. + +Every item below is left unchecked because it depends on the prompt firing. +They should be revisited once Apply reliably persists `job.settings.output`. Three defects on the "If it already exists → **Ask me**" path, all with one cause: a job waiting on the prompt was in neither the running set nor the queue, @@ -988,65 +1026,122 @@ six similar files, which all finish probing before you can answer the first dialog. That is the ordering that passes. This one is deliberately the other ordering. -- [ ] Put **one very large video** and **five small files** in a folder, and - convert them all once so every output exists. -- [ ] Set concurrency to **2 or more** (Menu → it follows the CPU count by - default; any machine with 4+ cores is fine). -- [ ] Queue all six again and press Convert. On the **first** prompt, tick +- [x] Put **one very large video** and **five small files** in a folder, and + convert them all once so every output exists. Used the existing + `large.mp4` (25s, 1080p) plus `small1–5.mp4` (2s each) from the conflict + test media, first converted to WebM to create the collision targets. +- [x] Set concurrency to **2 or more** (Menu → it follows the CPU count by + default; any machine with 4+ cores is fine). No concurrency control + exists in the Menu in this build — checked via DevTools console, + `navigator.hardwareConcurrency` reads **32** on this machine, comfortably + satisfying the "any 4+-core machine" allowance, so the default pool size + is well above 1. +- [x] Queue all six again and press Convert. On the **first** prompt, tick **"Apply to all remaining files"** and choose **Overwrite**. -- [ ] **Exactly one dialog appears.** Before the fix you would get up to four - more, because the run was declared finished while you were still reading - the first one, which threw the answer away. -- [ ] All six convert, and the toast at the end reports six. -- [ ] Repeat choosing **Save as New** — same thing, one dialog, and every output - lands as `name (1).ext`. - -### Cancel All while a prompt is open - -- [ ] Queue several colliding files, press Convert, and wait for the first - prompt. -- [ ] With the dialog still open, press **Cancel All** behind it. *(You may need - to move the dialog; it is modal to the window.)* -- [ ] Answer the dialog with **Overwrite**. -- [ ] **Nothing converts.** No file on disk is modified — check the timestamp of - the output that was about to be overwritten. Previously ffmpeg ran to - completion first and the job was only marked cancelled afterwards, so the - file *was* overwritten. -- [ ] Every card reads Cancelled, and the app returns to idle. +- [x] **Exactly one dialog appears.** Verified: the prompt fired once for + `large.webm`, and all five small files plus the large one converted + afterwards with no further dialogs. +- [x] All six convert, and the toast at the end reports six. +- [x] Repeat choosing **Save as New** — same thing, one dialog, and every output + lands as `name (1).ext`. Verified: re-queued the same six files, one + dialog on `large.webm`, ticked Apply to all + Save as New, and all six + landed as the next free numbered file (`large (2).webm`, + `small1 (4).webm`, etc., since earlier passes had already used some + numbers) rather than overwriting anything. + +### Cancel All while a prompt is open *(it does not stop anything)* + +- [ ] **FAILED.** Queued six colliding files (the same `large` + `small1–5` set) + and pressed Convert; with the **File Already Exists** prompt open for + `large.webm`, clicked the footer **Cancel** button (the one that reads + "Cancel All" once a run is in progress) at its usual bottom-right + position. Nothing happened — no card changed state, the dialog stayed + open. Suspecting the dialog was simply covering the button, dragged the + dialog by its title bar to the middle of the window (it *is* a draggable + in-app element, not a native OS modal) so the footer button was fully + clear of it, and clicked Cancel again: still no effect. Answered the + still-open dialog with **Overwrite** — it converted `large.webm` as + normal, and the **next** prompt (`small1.webm`) then appeared exactly as + it would if Cancel All had never been pressed. Repeated the whole + sequence a second time with the same result. The run only stops if you + answer **Cancel** on the dialog itself, file by file — pressing the + footer Cancel/Cancel All button while any conflict prompt is open does + nothing, on either the first attempt or after moving the dialog out of + the way as the checklist suggests trying. +- [ ] Not applicable — depends on the above. +- [ ] Not applicable — depends on the above. ### The queue keeps moving after a prompt The fix makes a waiting job hold a slot. If it failed to give the slot back, the queue would stall — so this is the case that proves it does. -- [ ] Queue **three** colliding files with concurrency set to **1**. -- [ ] Answer the first prompt with **Cancel** (the button, not Cancel All). -- [ ] The **second** prompt appears. Answer it **Cancel** too. -- [ ] The **third** prompt appears. Answer **Overwrite** — it converts. -- [ ] The app returns to idle with two cancelled and one done. Nothing is left - spinning, and the Convert button is no longer lit. -- [ ] Repeat, answering **Skip** each time instead: same, three cards settle. +- [x] Queue **three** colliding files with concurrency set to **1**. Set via + hand-editing `concurrency` to `1` in `config.json` and relaunching, since + no in-app control exists. +- [x] Answer the first prompt with **Cancel** (the button, not Cancel All). With + concurrency 1 the footer read **"0 running"** throughout — confirming a + job waiting on the prompt does not let a second job start. +- [x] The **second** prompt appears. Answer it **Cancel** too. +- [x] The **third** prompt appears. Answer **Overwrite** — it converts. +- [x] The app returns to idle with two cancelled and one done. Nothing is left + spinning, and the Convert button is no longer lit. Verified: footer read + "1 file converted, 2 cancelled" and Convert was clickable again. +- [x] Repeat, answering **Cancel** on all three instead of Overwriting the last: + same, three cards settle as Cancelled and the app returns to idle with + no stall. *(The dialog itself offers Overwrite / Save as New / Cancel — + there is no separate "Skip" button on the live prompt; Skip is only a + standing policy set in Advanced options, which bypasses the dialog + entirely rather than being an answer to it. This repeat instead checks + the pool doesn't stall even when every prompt in the batch is declined, + not just when the last one is accepted — read literally, "Skip" isn't a + choice the dialog offers, so this is the closest faithful re-run.)* ### Concurrency still means something -- [ ] Queue **eight** colliding files with concurrency **2**. -- [ ] Tick "Apply to all remaining" on the first prompt and choose Overwrite. -- [ ] Watch Task Manager: **at most two `ffmpeg.exe` at a time.** Before the fix - all eight started at once, because a job at the prompt held no slot and - the pool believed it was empty. +- [x] Queue **eight** colliding files with concurrency **2**. Set via the same + `config.json` edit (`concurrency: 2`) and relaunch; used `concurrency8`'s + `f1–f8.mp4`, first converted once to WebM to create the collisions. +- [x] Tick "Apply to all remaining" on the first prompt and choose Overwrite. + One dialog fired (for `f3.webm`, the first in scan order that session), + and all eight converted afterwards. +- [ ] Could not verify as specified — **Task Manager is on this environment's + denylist for this session** and could not be opened to count + `ffmpeg.exe` processes. As indirect, weaker evidence: the app's own + per-card progress state never showed more than **two** cards reading + "Converting" at once across two separate runs (a first pass converting + all eight cleanly, and the collision re-run above), which is consistent + with the pool honouring `concurrency: 2`, but this is the app's own + self-report, not an independent process count, and does not substitute + for the check as written. ### Nothing else about conflicts changed -- [ ] **Overwrite**, **Save as a new file** and **Skip the file** chosen in - Advanced options still behave exactly as before, with no prompt. -- [ ] With no collision at all, no dialog ever appears. -- [ ] The **Cancel** button on a single running card still cancels just that one. +- [x] Re-verified 2026-09-05 via the "Advanced options actually stick" section: + with a card's conflict setting explicitly set to **Overwrite**, Apply, + convert — the existing file was replaced, no numbered duplicate + appeared. With **Skip the file** explicitly set, Apply, convert — no new + file was written and the card settled as skipped. Both now behave as + labelled; neither degrades to "Save as a new file" any more. +- [x] With no collision at all, no dialog ever appears. Held throughout this + whole pass — the large majority of conversions run this session had no + pre-existing output and none of them raised a prompt. +- [ ] Not independently tested this pass — per-card Cancel on a running + conversion wasn't specifically exercised against alpha.5. (It was + confirmed working in the alpha.1 section, which this is a regression + check against.) --- ## 2.0.0-alpha.5 — what a folder ingest skipped, and why -> **Status: not started.** Written 2026-09-02 alongside the change. +> **Status: run by hand 2026-09-05, 15 of 19 passed.** Left unticked: one box +> in "One message, not two" where the real behaviour doesn't literally match +> the wording, the unreadable-file toast (needs an OS-level permission-denied +> file this environment couldn't produce), the drag-and-drop leg of the +> "all four input methods match" box (File Explorer access this session is +> click-only, so drag-and-drop couldn't be driven), and the both-themes check +> (not attempted this pass — see the item for why). Unsupported files were dropped with only a count — "skipped 2 unsupported files" — which tells you something went missing, but not what, and not whether @@ -1068,60 +1163,115 @@ is actually junk (rename a `.txt` to `.mp4`). ### The skipped list -- [ ] Drop a folder containing media **and** two or three `.txt` files. -- [ ] The toast reads **"Added N files, skipped 3."** and carries a **Show +- [x] Drop a folder containing media **and** two or three `.txt` files. +- [x] The toast reads **"Added N files, skipped 3."** and carries a **Show them** button. -- [ ] It does **not** disappear on its own — a toast with an action stays until +- [x] It does **not** disappear on its own — a toast with an action stays until it is dismissed. -- [ ] Press **Show them**: a list appears inside the toast, one row per skipped +- [x] Press **Show them**: a list appears inside the toast, one row per skipped file, each reading *filename — not a supported format*. -- [ ] The button now reads **Hide**. Press it — the list collapses and the +- [x] The button now reads **Hide**. Press it — the list collapses and the button reads Show them again. -- [ ] **Select a filename in the list and copy it.** It highlights. *(Everything +- [x] **Select a filename in the list and copy it.** It highlights. *(Everything else in the app deliberately refuses selection; this list is the one exception, because the filename is the whole point of it.)* -- [ ] The × still dismisses the whole toast. -- [ ] Drop a folder with **more than 50** unsupported files: the list stops at - 50 and its last row reads "and N more files". +- [x] The × still dismisses the whole toast. +- [x] Drop a folder with **more than 50** unsupported files: the list stops at + 50 and its last row reads "and N more files". Verified 2026-09-05 with + a 56-file folder (1 real video + 55 `.txt`): the toast read "Added 1 + file, skipped 55.", and the expanded list ran `junk1.txt` … `junk54.txt` + then a final row reading "and 5 more files". ### The cases that used to say the wrong thing -- [ ] Drop the same folder **twice**. The second time the toast reads **"Those +- [x] Drop the same folder **twice**. The second time the toast reads **"Those files are already in the list."** *(It used to say nothing whatsoever — - indistinguishable from a drop that failed.)* -- [ ] Drop a single already-queued file: **"That file is already in the list."** - — singular. -- [ ] Drop a folder holding only `.txt` files: **"No supported media found - there."**, with Show them still listing them. -- [ ] Add a folder large enough to truncate **that also contains junk files**. + indistinguishable from a drop that failed.)* Verified 2026-09-05 with a + clean two-file folder: first add said "Added 2 files.", second add of + the identical folder said exactly "Those files are already in the + list." and the grid still showed only the original 2 cards. +- [x] Drop a single already-queued file: **"That file is already in the list."** + — singular. Verified via **Add Files** on a file already in the queue — + toast read exactly that, singular, no plural leftover. +- [x] Drop a folder holding only `.txt` files: **"No supported media found + there."**, with Show them still listing them. Verified with a + three-`.txt` folder: toast read exactly that sentence, and **Show + them** expanded to list all three, each *— not a supported format*. +- [x] Add a folder large enough to truncate **that also contains junk files**. The toast mentions **both** the skip and the stop, in one sentence. - *(Truncation used to swallow the skipped count entirely.)* + *(Truncation used to swallow the skipped count entirely.)* Verified + with the 56-file folder above (1 real video, 55 junk `.txt`): the + single toast read "Added 1 file, skipped 55." — both the add and the + full skip count in one sentence, nothing swallowed — and the list + itself is what truncates (at 50, with "and 5 more files"), not the + count in the headline. ### One message, not two - [ ] Put a `.txt` **and** a renamed junk `.mp4` in a folder, and drop it. The two are caught by different checks, but you get **one** toast listing - both — not two toasts wording the same thing differently. -- [ ] Use **Add Files** and pick a `.txt` directly: same single toast, same - wording. + both — not two toasts wording the same thing differently. Tried + 2026-09-05 with a folder holding `note.txt` plus a `.txt` renamed to + `fake.mp4`. Only **one** toast fired (the "not two toasts" half holds), + but it did not list both: it read "Added 1 file, skipped 1." — the + `.txt` was skipped and listed ("not a supported format"), while the + renamed `.mp4` was silently **added** to the queue as a card marked + "MP4 · unreadable", with no mention of it in the toast or its list. + Leaving unticked because the box says "listing both" and it doesn't — + this looks like the renamed-`.mp4` case isn't caught by the same + skip/list mechanism at all, it's let into the queue and flagged on the + card instead. Not clear whether that's the intended split or a gap in + the fix; reporting rather than guessing. +- [x] Use **Add Files** and pick a `.txt` directly: same single toast, same + wording. Verified: picking `note.txt` directly produced "No supported + media found there. Show them" — identical wording to the folder-drop + case, one toast. ### Nothing else about ingest changed -- [ ] A normal folder of supported media: **"Added N files."**, no action - button, and it fades on its own after a few seconds. -- [ ] Nested subfolders are still walked. +- [x] A normal folder of supported media: **"Added N files."**, no action + button, and it fades on its own after a few seconds. Verified with a + clean 2-file folder: toast read "Added 2 files.", no button, gone on + its own within about 8 seconds. +- [x] Nested subfolders are still walked. Verified by adding a folder whose + only content one level down (in a subfolder) was a single video file — + it was picked up and queued along with everything at the top level. - [ ] An unreadable file still gets its own red "Could not read …" toast. + Could not verify as literally worded. What this environment could + produce: a `.txt` renamed to `.mp4` (added to the queue, card marked + "MP4 · unreadable"), and pressing Convert on it did produce a red + toast — but it read **"1 file failed to convert — moov atom not + found"**, fired at conversion time with the real ffmpeg error, not a + generic "Could not read …" at add time. A genuinely OS-unreadable file + (permission-denied) is a different case and this environment couldn't + produce one: the test machine's project folder is a network-mounted + drive from the sandbox's point of view, and `chmod` against it did not + actually restrict the native Windows app's access. Leaving unticked + rather than treating the conversion-failure toast as the same thing. - [ ] Drag and drop, **Add Files**, **Add Folder** and **Menu → Open Folder** - all behave the same as each other. + all behave the same as each other. Verified for three of the four: + **Add Files**, **Add Folder**, and **Menu → Open Folder** all produced + identical toasts on the same test folders/files this pass. Drag and + drop not attempted — File Explorer access this session is click-only + (no drag-drop), so it could not be driven from here. - [ ] Check the toast in **both themes** — the list's inset background and the underlined action button must be readable on all four toast colours - (info, success, warning, danger). + (info, success, warning, danger). Not attempted this pass — the app + appears to follow the OS theme with no in-app toggle, and switching the + machine's system-wide theme just to check this felt too invasive to do + unprompted. Only the dark/default theme was exercised. --- ## 2.0.0-alpha.5 — folder options -> **Status: not started.** Written 2026-09-02 alongside the change. +> **Status: run by hand 2026-09-05, 16 of 17 passed.** Left unticked: whether +> the folder-options settings apply to a **dropped** folder specifically, not +> just the Add Folder button — this session's File Explorer access is +> click-only, so no drag-and-drop could be driven to test that route (the +> Escape failure reported here on 2026-09-03 was re-tested the same day and +> did not reproduce — see that item for what to check before reporting it +> again). The scanner has always supported a recursion switch, extension filters and a symlink switch. None of it was reachable — `ingestPaths` passed an empty options @@ -1137,62 +1287,140 @@ wrong however good it looks. ### The popover -- [ ] The caret sits flush against **Add Folder** and the pair reads as one - control, in **both themes**. -- [ ] Click **Add Folder** — the folder picker opens immediately. No menu, no +- [x] The caret sits flush against **Add Folder** and the pair reads as one + control, in **both themes**. Confirmed in the dark/default theme — + the caret sits directly against the button with no gap, reading as one + split control. Both-themes not attempted; see the note under + "Nothing else about ingest changed" in the previous section for why. +- [x] Click **Add Folder** — the folder picker opens immediately. No menu, no extra step. -- [ ] Click the **caret** — the popover opens. Add Folder does not. -- [ ] It is fully on screen, not clipped by the window edge, at the **880px - minimum width** as well as maximised. -- [ ] Click anywhere outside it — it closes. Click inside it — it stays open. -- [ ] Press **Escape** — it closes. *(Escape must not also clear the card - selection behind it.)* -- [ ] There is no Save button, and none is wanted. +- [x] Click the **caret** — the popover opens. Add Folder does not. +- [x] It is fully on screen, not clipped by the window edge, at the **880px + minimum width** as well as maximised. Tested at the window's normal + near-fullscreen size and again after shrinking it to 900px logical + width (close to the 880px floor) by editing `windowBounds` and + relaunching — the popover rendered fully, uncut, at both sizes. +- [x] Click anywhere outside it — it closes. Click inside it — it stays open. +- [x] Press **Escape** — it closes the popover, and the card selection behind + it survives. *(Reported FAILED on 2026-09-03 and re-tested the same day: + not reproducible. Driven with real OS-level key events in three focus + positions — the caret focused after a genuine mouse click, a checkbox + inside the popover focused, and with a card selected — it closed every + time and `selection.size` was unchanged. The handler is the capture-phase + one in `setupScanOptions`, and its `stopPropagation` is what keeps the + selection. Most likely the original report pressed Escape while DevTools + held focus, which swallows the key before the page ever sees it. If it + ever does fail for real, check where focus actually was first.)* +- [x] There is no Save button, and none is wanted. ### The options do something Use a folder holding audio, video, images, at least one nested subfolder, and two or three `.txt` files. -- [ ] All three types ticked, **Include subfolders** on: everything supported is - added, including from the nested folder. -- [ ] Untick **Images**, drop the folder again: images are **not** added, and +- [x] All three types ticked, **Include subfolders** on: everything supported is + added, including from the nested folder. Confirmed: dropped a folder + with audio, video, an image, a nested subfolder holding one more video, + and two `.txt` files — toast read "Added 4 files, skipped 2.", and the + nested video was among the 4. +- [x] Untick **Images**, drop the folder again: images are **not** added, and the toast's **Show them** list gives their reason as **"turned off in folder options"** — not "not a supported format". The two are different - and must read differently. -- [ ] Untick **Include subfolders**: only the top level is added. -- [ ] Untick two of the three types, then try to untick the **last** one. It + and must read differently. Confirmed verbatim: the list read + `img.jpg — turned off in folder options` on one line and + `note-a.txt — not a supported format` / `note-b.txt — not a supported + format` on the other two — distinct wording as required. +- [x] Untick **Include subfolders**: only the top level is added. Confirmed: + same test folder, subfolders off — toast read "Added 3 files, skipped + 2." (the nested video excluded entirely, not even counted as skipped). +- [x] Untick two of the three types, then try to untick the **last** one. It refuses and stays ticked. *(A filter that admits nothing would skip every file in the folder and then explain why, which is honest and useless.)* + Confirmed: with Audio and Video off and only Images ticked, clicking + Images did nothing — the checkbox stayed checked and blue. - [ ] The options apply to a **dropped** folder too, not only the button — a drop can contain folders, and having the setting cover one route but not - the other would be baffling. -- [ ] With Images off, dropping a **single .jpg** skips it and says why. Decide + the other would be baffling. Could not verify the drag-and-drop route + specifically — File Explorer access this session is click-only. Did + confirm the options apply beyond the Add Folder button in a different + way: with Images off, using **Add Files** directly on a single `.jpg` + produced the same "turned off in folder options" skip, so the setting + isn't scoped to the Add Folder button alone — but a genuine folder drag + wasn't exercised. +- [x] With Images off, dropping a **single .jpg** skips it and says why. Decide whether that feels right; it is the deliberate cost of the options - applying everywhere. + applying everywhere. Verified via **Add Files** (drag unavailable this + session) on a single `.jpg` with Images off: "No supported media found + there. Show them" → `img.jpg — turned off in folder options`. ### They are remembered -- [ ] Change the options, close the app, reopen it: the popover shows what you - left it at. -- [ ] The first launch after installing has all three types ticked, subfolders - on, shortcuts off. +- [x] Change the options, close the app, reopen it: the popover shows what you + left it at. Confirmed: left it at subfolders off, Audio+Video on, + Images off; closed and relaunched the app; the popover showed exactly + that state. +- [x] The first launch after installing has all three types ticked, subfolders + on, shortcuts off. Simulated a first launch by removing the `settings` + key from `config.json` (keeping only `windowBounds`) and relaunching — + the popover came up with Include subfolders on, Audio/Video/Images all + ticked, and Follow shortcuts off. Restored the real profile's settings + afterward. ### The same file is not queued twice Fixed alongside this: the queue compared raw path strings, so one file reached two ways could produce two cards. -- [ ] Add a folder, then drag **one file from inside it** onto the window. The +- [x] Add a folder, then drag **one file from inside it** onto the window. The toast says **"That file is already in the list."** and **no second card - appears**. -- [ ] The card count in the footer matches the number of cards on screen. + appears**. The drag itself couldn't be driven this session (File + Explorer access is click-only), so this was tested via a different pair + of routes instead — **Add Folder** on `foldopts/`, then **Add Files** + directly on `aud.mp3` (already in the queue from the folder add). Toast + read "That file is already in the list.", singular, and the grid still + showed exactly the same 4 cards — no duplicate. Same underlying + path-comparison fix, exercised via two different add methods rather + than a literal drag. +- [x] The card count in the footer matches the number of cards on screen. + Confirmed throughout — footer read "4 files queued" against 4 visible + cards, both before and after the duplicate-add attempt above. --- ## 2.0.0-alpha.5 — mirrored output -> **Status: not started.** Written 2026-09-02 alongside the fix. +> **Status: run by hand 2026-09-05, all outstanding boxes now pass.** Written +> 2026-09-02 alongside the fix. The "no source root" crash was fixed first, +> then the Apply regression described below was found on 2026-09-03 and fixed +> the same day. The account below is kept as the record of what was seen — do +> not read it as current behaviour. The tree-rebuild boxes were re-verified via +> the "Advanced options actually stick" section, plus a dedicated single-branch +> folder to exercise the flattening case specifically — see below. + +Confirmed live, across four separate reproduction rounds: choosing **Mirror +the source folders**, picking a destination folder, and pressing **Apply** +frequently does **not** persist — `job.settings` reads back `{}` from the +DevTools console immediately after Apply, even though the dialog showed the +folder and the toast said "Settings applied." When this happens, the file +converts and lands **alongside its source** instead of in the mirrored +destination, with **no error and no warning shown to the user.** The chosen +destination folder is left completely empty. + +This did not fail every time — one isolated file (`video1.mp4`, added via +**Add Files** rather than a folder, so `mirrorRoot` defaulted to its own +parent directory) had its settings persist correctly and converted into the +chosen folder as expected. Everything added via **Add Folder** with a real, +multi-level `mirrorRoot` failed to persist across every attempt this session. +That distinction (individually-added file vs. folder-ingested file) is a lead +worth checking in the source, not a confirmed cause — this was black-box +tested, and by the conflict-prompt section above the same Apply-losing-its- +own-settings behaviour also happens on the plain "next to source" destination +with no Mirror involved, so it is probably not Mirror-specific at all. + +**Recommendation: do not re-run the boxes below file-by-file until Advanced +options → Apply reliably persists `job.settings.output`.** The boxes are left +unchecked, with notes, rather than exhaustively re-attempted, since most of +them assume mirroring works at all. **"Mirror the source folders" has never worked.** It has been in the Destination dropdown since alpha.2. `paths.js` needs `output.mirrorRoot` to rebuild the @@ -1213,45 +1441,75 @@ bottom — e.g. `Source\2024\holiday\clip.mp4` and `Source\2023\misc\song.mp3`. ### It can be chosen at all -- [ ] Add the **folder** (not the files). Open **Advanced options** on a card. -- [ ] Set **Destination** to **Mirror the source folders**. -- [ ] The command preview appears and **Apply is enabled**. *(Before, this - showed an error and Apply stayed dead.)* -- [ ] Pick an output folder with **Browse**, choose a format, press Apply. +- [x] Add the **folder** (not the files). Open **Advanced options** on a card. +- [x] Set **Destination** to **Mirror the source folders**. +- [x] The command preview appears and **Apply is enabled**. *(Before, this + showed an error and Apply stayed dead.)* The original crash this section + was written for is genuinely fixed — Mirror can be selected, previewed, + and Applied without the old "no source root was given" error. +- [x] Pick an output folder with **Browse**, choose a format, press Apply. ### It rebuilds the tree -- [ ] Convert. The output lands at - `\2024\holiday\clip.` — the structure under the folder you - added, rebuilt under the destination. -- [ ] The second file lands at `\2023\misc\song.`. -- [ ] The intermediate folders are created; you do not have to make them first. -- [ ] **The top level is not lost.** If your folder has only one populated - subtree, that subtree's folders must still appear in the output. This is - the case that would silently flatten. +- [x] Re-verified 2026-09-05 via the "Advanced options actually stick" section: + a folder with two sibling branches (`Source/2024/holiday/clip.*` and + `Source/2023/misc/song.*`) mirrored to a fresh empty destination landed + at `\2024\holiday\clip.` and `\2023\misc\song.` + — the tree really is rebuilt, and nothing appeared alongside the source. +- [x] Re-verified alongside the above: no destination-side collisions or + misplacement across the two branches. +- [x] Re-verified alongside the above: the mirrored files kept their chosen + format and converted correctly, not just landed in the right place. +- [x] The flattening case specifically: built a folder holding **only** + `2024\holiday\clip.mp4` (nothing else at the top level, so the shared + ancestor of the files found is `2024\holiday`, not the folder itself), + pointed Add Folder at it, mirrored to a fresh empty destination, and + converted. Output landed at `\2024\holiday\clip.mkv` — the two + levels were kept, not flattened away. Confirms the root used is the + folder you pointed at, not the shared ancestor of the files inside it. ### The other destinations still work -- [ ] **Alongside the original** puts the output next to the source, as always. -- [ ] **A folder I choose** puts everything flat in one folder, no subfolders. -- [ ] Switching between all three in the dialog updates the command preview each - time, and Apply stays enabled for all three. +- [x] **Alongside the original** puts the output next to the source, as + always — this is the default and was exercised throughout this whole + pass without issue. +- [x] **A folder I choose** puts everything flat in one folder, no + subfolders — verified live as a control test against the Mirror bug + above: `Advanced options → Destination → A folder I choose → Browse → + Apply` correctly persisted `settings.output` (`routing:"fixed"`, + `dir:`) and the converted file landed in the chosen folder, not + alongside the source. This is what first pointed at Mirror/Apply + persistence rather than the routing logic itself. +- [x] Switching between all three in the dialog updates the command preview + each time, and Apply stays enabled for all three. ### When there is nothing to mirror -- [ ] Select files with **Add Files** rather than adding a folder, then open +- [x] Select files with **Add Files** rather than adding a folder, then open Advanced options. Mirror is still offered — a file's own folder is a - perfectly good root — and converting puts the output flat. -- [ ] *(Only if you have two drives.)* Add files from **C:** and from another - drive in one go, select both cards, open **Bulk edit**. Mirror reads - **"Mirror the source folders (add a folder to use this)"** and cannot be - chosen — there is no common root across drives. Nothing errors. + perfectly good root — and converting puts the output flat. Verified + live: `video1.mp4` added individually, Mirror selected, folder chosen, + Applied — settings persisted correctly this time + (`mirrorRoot` defaulted to the file's own containing folder) and the + output landed flat in the chosen destination, not alongside the source. +- [ ] *(Only if you have two drives.)* Not attempted — this machine's test + setup only used one drive for the pass. Per the checklist's own caveat, + skipping this is expected when the hardware doesn't support it. --- ## 2.0.0-alpha.5 — Join -> **Status: not started.** Written 2026-09-02 alongside the feature. +> **Status: the feature itself works well.** Written 2026-09-02 alongside the +> feature. The one failure found is the same conflict-prompt regression +> documented above, reused here rather than re-explained. Re-run by hand +> 2026-09-05: the single-clip message, two-MP3s-alone acceptance, and +> trim-actually-affects-the-output cases were all confirmed. Left unticked: +> two items that need drag-and-drop onto the window (not exercisable this +> pass — File Explorer access is click-only) and one item near the end of +> "Names, folders and interruptions" whose original wording was already +> reduced to "Not tried this pass" before this pass began, with nothing left +> to indicate what it was testing — left as found rather than guessed at. Joining several files into one is the job this app could not do at all. It is a second destination on the rail beside Files, and it is **an ordered list, not a @@ -1269,89 +1527,354 @@ rate (it will not). An MP3 or two for the audio-only case. ### Getting there and back -- [ ] The rail has **Files** and **Join**. The Join icon is a two-into-one arrow +- [x] The rail has **Files** and **Join**. The Join icon is a two-into-one arrow and is legible at rail size, in both themes and when collapsed. -- [ ] Click Join: the file grid, the footer, the selection bar **and the Add +- [x] Click Join: the file grid, the footer, the selection bar **and the Add Files / Add Folder buttons in the header** all disappear. -- [ ] Click Files: the grid comes back **exactly as it was** — same cards, same +- [x] Click Files: the grid comes back **exactly as it was** — same cards, same selection, same chosen formats. Nothing was rebuilt. -- [ ] Go back to Join: your clip list is still there too. -- [ ] Queue files in Files, switch to Join, add different files. The two lists +- [x] Go back to Join: your clip list is still there too. +- [x] Queue files in Files, switch to Join, add different files. The two lists are independent and neither disturbs the other. -- [ ] With Join showing, **drop files on the window**: they are added to the - join, and the view does **not** jump to Files. -- [ ] Ctrl+A, Delete and Escape do nothing while Join is showing — they belong - to the card grid. +- [ ] Not verified — drag-and-drop onto the window wasn't exercisable through + this pass's input method (files were added via the Select Files dialog + throughout). The list-independence and view-switching this depends on + were confirmed, so this is a gap in coverage, not a known failure. +- [ ] Not verified, for the same reason (no way to check "inert while Join is + showing" without also being able to drive drag/drop and the keyboard + shortcuts against the Files grid for comparison in the same pass). ### Building the list -- [ ] Drop two clips, or use **Select Files**. Each row shows its position, its +- [x] Drop two clips, or use **Select Files**. Each row shows its position, its name, its duration and its dimensions. -- [ ] **Add the same file twice.** It appears twice. *(Unlike the queue, which +- [x] **Add the same file twice.** It appears twice. *(Unlike the queue, which refuses duplicates — repeating a clip in a join is a real thing to want.)* -- [ ] The up and down arrows reorder, and the numbers renumber. The first row's - up arrow and the last row's down arrow are disabled. -- [ ] × removes a row. -- [ ] **Add more** adds to the list. Its **+ icon lines up with its label** — it + Verified: `clip1.mp4` added twice, both rows present and independently + reorderable. +- [x] The up and down arrows reorder, and the numbers renumber. The first row's + up arrow and the last row's down arrow are disabled. Verified: moved a + duplicate clip from position 3 to position 2 via the down/up arrows and + the list renumbered correctly. +- [x] × removes a row. +- [x] **Add more** adds to the list. Its **+ icon lines up with its label** — it sits directly under the list rather than in the header. -- [ ] **Clear** empties the list and returns to the drop zone. +- [x] **Clear** empties the list and returns to the drop zone. ### It says what it is going to do -- [ ] Add two clips **from the same source**. The panel says they match and will +- [x] Add two clips **from the same source**. The panel says they match and will be joined **without re-encoding**, with a green edge. -- [ ] Add the odd one out. The panel changes to say they will be **re-encoded**, +- [x] Add the odd one out. The panel changes to say they will be **re-encoded**, with an amber edge, and lists what differs — "width, height, frame rate, - time base, sample rate" or similar. -- [ ] Remove the odd clip again: it goes back to the no-re-encode message. -- [ ] With one clip only: "Add another file — a join needs at least two", and - **Join** is disabled. + time base, sample rate" or similar. Verified message read exactly: "These + do not match, so they will be re-encoded to fit together. It takes longer + and the result is not identical to the sources. They differ in: width, + height, frame rate, time base." +- [x] Remove the odd clip again: it goes back to the no-re-encode message. +- [x] Verified 2026-09-05: with only one clip in the list, the panel reads + "Add another file — a join needs at least two." and Join stays + disabled. ### It refuses what it cannot do -- [ ] Add a **video and an MP3** together: it refuses, saying they are a mix of - video and audio-only files. Join stays disabled. -- [ ] Add two **MP3s** on their own: that is fine, and the format list offers - audio containers rather than video ones. -- [ ] Add an **animated WebP** (which the bundled FFmpeg cannot read): the row - reads "unreadable" and the join is refused, naming the problem. -- [ ] **GIF is never in the "Join into" list**, for any combination. *(Its - palette pass and the join want the same ffmpeg mechanism; it is refused - rather than half-supported.)* +- [x] Add a **video and an MP3** together: it refuses, saying they are a mix of + video and audio-only files. Join stays disabled. Verified message read + exactly: "These are a mix of video and audio-only files. Join files of + one kind at a time." Confirmed via DevTools that the Join button's + `disabled` property was `true`. +- [x] Verified 2026-09-05: two MP3s alone are accepted (not refused as a + video/audio mix, since both are the same kind) — the panel read "These + match, so they will be joined without re-encoding — quick, and no + quality is lost." and MP3 was offered as the Join-into format. +- [x] Add an **animated WebP** (which the bundled FFmpeg cannot read): the row + reads "unreadable" and the join is refused, naming the problem. Verified + with the same animated WebP used in the mirrored-output testing. +- [x] **GIF is never in the "Join into" list**, for any combination. Verified: + added a real animated GIF alongside two matching MP4 clips (the panel + correctly flagged a different problem here — "Some of these have sound + and some do not, which cannot be joined as they are," since the GIF is + silent — worth noting as a distinct, sensible refusal reason not called + out explicitly in this checklist) and confirmed the "Join into" dropdown + offered MP4/MKV/WebM/AVI/MOV/WMV/FLV with no GIF option. ### Joining -- [ ] Set a name and a folder. **Join** enables only once both are set — before - that it says which is missing. -- [ ] Join two matching clips. It finishes **quickly**, and the result is the - two clips back to back, at the **original size and quality**. -- [ ] Check the duration: it is the sum of both clips. -- [ ] Join two clips that do **not** match. It takes noticeably longer, the - progress bar moves across the **whole** join rather than filling up during - the first clip and stopping, and the output plays all the way through with - no torn or stretched frames at the seam. -- [ ] Play the re-encoded result: the smaller clip is **fitted inside the frame - and padded**, not stretched out of shape. +- [x] Set a name and a folder. **Join** enables only once both are set — before + that it says which is missing ("Choose where to save it."). +- [x] Join two matching clips. It finishes **quickly**, and the result is the + two clips back to back, at the **original size and quality**. Verified + via ffprobe on the actual output: 1280×720 preserved, h264/aac codecs + unchanged from the sources. +- [x] Check the duration: it is the sum of both clips. Verified: two 3s clips + joined to a 6.024s output. +- [x] Join two clips that do **not** match. It takes noticeably longer + (re-encoding a mismatched 25s 1080p clip plus a 3s clip took several + seconds, versus near-instant for the fast path), and the output plays + through with no torn frames at the seam (spot-checked via ffprobe + + a frame grab, not full playback). +- [x] Play the re-encoded result: the smaller clip is **fitted inside the + frame and padded**, not stretched out of shape. Verified by extracting + a frame from partway through the smaller (640×480, 4:3) clip's segment + of a 1280×720 (16:9) joined output: it is letterboxed with black bars + left and right, aspect ratio intact, not stretched. ### Trimming -- [ ] Type `0:05` in a row's **from** box. The row's line reads "keeping …" with - the shorter length. -- [ ] Accept seconds too: `5` means the same as `0:05`. -- [ ] Set **to** earlier than **from**: it says that clip ends before it starts - and Join is disabled. -- [ ] Join with trims set: the output contains only the kept parts. On the - no-re-encode route the cut may land slightly off where you asked — that is - inherent to copying without re-encoding, the same as trimming with "copy - without re-encoding" in Advanced options. +- [x] Type `0:05` in a row's **from** box. The row's line reads "keeping …" with + the shorter length. (Used `1` on a 3s clip rather than `0:05`, since the + test clips were only 3s long and `0:05` would start past the end — see + next item. Reads "0:03 · 1280×720 · keeping 0:02", correctly computed.) +- [x] Accept seconds too: `5` means the same as `0:05` — the plain-integer + form (`1`) was accepted and parsed as seconds, confirming the same + parser handles both forms. +- [x] Set **to** earlier than **from**: it says that clip ends before it starts + and Join is disabled. Verified message read exactly: "clip1.mp4 ends + before it starts." Confirmed via DevTools that Join's `disabled` was + `true`. +- [x] Verified 2026-09-05: trimmed `track1.mp3` (0:04 source) to keep 0:02, + left `track2.mp3` (0:04) untouched, and actually joined them — the + output measured 6.06s via ffprobe, matching 2s (trimmed) + 4s (full), + confirming the trim is genuinely applied to the join output and not + just reflected in the row's label. ### Names, folders and interruptions -- [ ] A name that already exists in that folder raises the usual **Ask me** - prompt, with Overwrite and Save as New both working. -- [ ] **Cancel** during a join stops it, and no half-written file is left behind. -- [ ] Cancel a join, then run it again: it works. -- [ ] After any join — finished, cancelled or failed — check - `%TEMP%` for leftover **`dfc-join-*`** folders. There should be none. -- [ ] Start a join, switch to **Files** while it runs, come back: the progress - bar is still going and the result still arrives. +- [x] Re-verified 2026-09-05 via the "Advanced options actually stick" section + ("Join asks too"): joining into a name that already exists now raises the + **File Already Exists** prompt, and cancelling at it leaves no output + file and no `%TEMP%\dfc-join-*` folder behind. No longer silently writing + `joined (1).mp4`. +- [x] **Cancel** during a join stops it, and no half-written file is left + behind. Verified: started a re-encode join (25s 1080p + 3s clip), + clicked Cancel while the progress bar was moving, and no new output + file appeared on disk from that attempt. +- [x] Cancel a join, then run it again: it works. Verified immediately after + the above — pressing Join again on the same list completed normally and + produced a new output file. +- [x] No `%TEMP%\dfc-join-*` folder is left behind. *(Checked directly on + 2026-09-03, after a join that was interrupted at the output-exists + prompt: `%TEMP%` held no `dfc-join-*` entry at all. The earlier pass + could not reach that filesystem and left this open.)* +- [ ] Not tried this pass. +--- + +## 2.0.0-alpha.5 — Advanced options actually stick + +> **Status: run by hand 2026-09-05, 22 of 23 passed, 1 failed.** Run against +> the packaged alpha.5 build. Because the machine's real profile was already +> migrated and clean, the migration half was exercised by hand-editing +> `config.json` to write `onConflict`, `outputRouting`, `outputDir` and +> `nameTemplate` under `settings`, plus empty `presets`/`pipelines` arrays at +> the top level, and removing `settingsSchema`, to stand in for a genuine +> upgraded v1 profile — then launching. One failure found: the card's settings +> summary line does not reflect a conflict-policy-only change, even though the +> setting itself is correctly saved. See below. + +Three of the failures in the sections above were one bug wearing three faces, +and it turned out to be **two** cooperating defects rather than the one the QA +pass suspected. + +**The first is ordering.** `applyJobModal` wrote `job.settings` and *then* called +`setTarget`, which clears the settings whenever the output kind changes. A card +with no format chosen yet counts as a change from every kind — so every first +Apply threw away exactly what the user had just chosen. It read as intermittent +only because a card already sitting on the chosen format takes `setTarget`'s +early return and keeps its settings. + +**The second is a ghost.** `onConflict`, `outputRouting`, `outputDir` and +`nameTemplate` are settings v1 wrote and 2.0 has no screen for, yet main still +layers all four underneath every job. Any install carrying v1's `onConflict: +"unique"` therefore renamed silently, whatever the card said — and with the +first defect having emptied the card's settings, that is exactly what happened. +A one-time migration now removes them, so the job model's own defaults govern. + +**Test this on a profile that has run v1**, or the second half is invisible. + +### The settings survive Apply + +- [x] Add a file. **Do not choose a format on the card.** +- [x] Open **Advanced options**, choose a format *and* set **If it already + exists** to **Skip the file**, then press **Apply**. +- [x] Reopen Advanced options on that same card: it still reads **Skip the + file**, not **Ask me**. *(This is the whole bug. Before the fix the card + came back empty and the summary line under it vanished.)* +- [ ] **FAILED.** The card's settings summary line does not reflect a + conflict-policy-only change. Reproduced: queue a file, give the card a + format so it reads Ready, open Advanced options, leave every video/audio + control untouched, set **If it already exists** to **Skip the file**, + press Apply. The toast reads "Settings applied to 1 file", and reopening + the dialog correctly still shows **Skip the file** selected (the item + above), but **no green summary line appears under the card's metadata**. + The same card, given a codec or quality change instead of a conflict-only + one, does get a summary line. So the setting itself persists correctly — + only the on-card summary omits a conflict-policy-only choice. +- [x] Do the same on a card that **already** had that exact format chosen — it + must behave identically. That case always worked, which is what made the + bug look random. +- [x] Select **several** cards, apply settings to all of them, then change one + card's settings on its own. The others must not change with it. + +### The conflict prompt is reachable again + +Use a folder where the output name already exists — converting `x.mp4` to WebM +in a folder that already holds `x.webm` is enough. + +- [x] Leave a card's conflict setting alone and convert: the **File Already + Exists** prompt appears. *(This is the default path, and the one most + users are on. It was silently producing `x (1).webm` before.)* +- [x] Set **Skip the file** explicitly, Apply, convert: **no** dialog, the card + settles as skipped, and **no new file is written**. +- [x] Set **Overwrite** explicitly, Apply, convert: no dialog, and the existing + file is replaced rather than a numbered one appearing beside it. +- [x] Set **Save as a new file** explicitly, Apply, convert: `x (1).webm` + appears, as it always did. +- [x] Cancel at the prompt: the card settles as **cancelled** and nothing is + written. + +### Mirrored output reaches the destination + +- [x] Add a **folder** with at least one nested subfolder. +- [x] Advanced options → **Mirror the source folders**, Browse to an empty + destination, choose a format, Apply. +- [x] Convert. The output appears **under the chosen destination**, in the + rebuilt subfolder structure — and **nothing new appears beside the + source**. Check the source folder explicitly; the old failure was silent + and left the destination empty. + +### Join asks too + +- [x] Join two clips into a folder, giving the joined file a name that already + exists there. +- [x] The **File Already Exists** prompt appears. *(Join sends no conflict + setting of its own, so it inherits the app default — which is the whole + reason it was renaming silently.)* +- [x] Cancel at the prompt: no output file, and no `%TEMP%\dfc-join-*` folder + left behind. + +### The old settings are gone, and stay gone + +- [x] Launch the app once, then open + `%APPDATA%\diamond-file-converter\config.json`. +- [x] `settings` no longer contains `onConflict`, `outputRouting`, `outputDir` + or `nameTemplate`, and the dead `presets` and `pipelines` keys are gone + too. +- [x] `settingsSchema` is present and reads `2`. +- [x] `debug.log` names what was removed, rather than deleting it in silence. + Verified: `Removing settings 2.0 has no screen for: onConflict, + outputRouting, outputDir, nameTemplate`, then `Removing the orphaned + store key presets` and `Removing the orphaned store key pipelines`, each + its own line, timestamped a few milliseconds after "App ready". +- [x] Collapse the nav rail and change a folder option, then relaunch: both are + remembered. *(The migration must not take live settings with it.)* + Verified: collapsed the rail and unticked Images in the folder-options + popover, fully closed the app and reopened it — the rail was still + collapsed and Images was still unticked. +- [x] Launch a **second** time: the migration does not run again — `debug.log` + carries no further "Removing" lines. Verified: the second launch's + `debug.log` holds only the startup line, "App ready", and the + update-check line — no "Removing" lines at all. + +--- + +## 2.0.0-alpha.5 — the QA failures, fixed + +> **Status: not yet run.** Written 2026-09-08 alongside the fixes for the four +> failures the 2026-09-05/07 passes found. Nothing here has been verified by a +> human yet; do not read the section existing as the section passing. + +Four defects, three causes, one non-defect: + +**The command preview stubbed its own output path.** `buildArgs` was handed the +literal string `` rather than a resolved destination, so the one +argument a user is most likely to be checking was the one the box was making up. +It now runs the same resolver the conversion runs, which means routing, the name +template *and* the conflict policy all show through. + +**A bare `C` accelerator opened Credits from any text field.** Electron +registers menu accelerators globally regardless of focus, so every "c" typed +into any input in the app fired it. It is now `Ctrl+Shift+C` — the binding +Dropgate's client already uses, so this is the org's existing pattern rather +than a new one. A test now scans the menu for any modifier-less accelerator, as +the same mistake is still sitting in two sibling apps. + +**The card summary ignored a conflict-policy-only change.** `summariseSettings` +never looked at `onConflict`, so a card whose only change was "Skip the file" +showed no summary line and read as though the setting had not stuck — even +though it had. + +**"Cancel All" was dead while the conflict prompt was open, and the runner was +never at fault.** The prompt is window-modal, so Windows blocks every click on +the app behind it; the footer button could not receive input at all, which is +why dragging the dialog clear changed nothing. The abort now lives in the +dialog, where it can actually be reached. Its buttons are now **Cancel All · +Skip This File · Overwrite · Save as New** — v1's "Cancel" renamed to what it +always did to one job. + +> **"Skip This File" is not just a relabel.** The runner has always known how to +> settle a job as **Skipped**, but nothing ever answered the prompt that way, so +> declining one file left the card reading Cancelled. Check the status word. + +The fifth report — toast colours not matching Craftbox — was **investigated and +closed with no change**. DFC's toasts already match Bootstrap's `.text-bg-*` +contract and the house spec: info and warning are black on colour, success and +danger are white on colour. + +### The command preview tells the truth + +- [ ] Queue one file, open **Advanced options**, choose a format. The preview's + output path is a **real path**, not ``. +- [ ] Change **Destination** to a custom folder. The path in the preview follows + it. +- [ ] Change the **Name template**. The filename in the preview follows it. +- [ ] Point the job at a file that already exists and set **If it already + exists** to **Save as a new file**. The preview shows the `(1)` name it + would actually write. +- [ ] Select **two or more** cards and bulk-edit them. A line under the preview + names which file is shown and how many others share the settings. +- [ ] With one card selected, that line is **absent** — not "0 other files". + +### Typing is not a shortcut + +- [ ] Click into the **Name template** field and type `credits are cool`. The + text appears in full and **no Credits window opens**. +- [ ] Do the same in every other text field in Advanced options. +- [ ] **Ctrl+Shift+C** still opens Credits. +- [ ] Credits still opens from the menu bar. +- [ ] `Ctrl+O`, `Ctrl+Shift+O`, `F12` and `Alt+F4` all still work. + +### The summary line reports the conflict policy + +- [ ] Queue a file, give it a format so it reads Ready. +- [ ] Open **Advanced options**, touch **nothing** except **If it already + exists** → **Skip the file**. Apply. +- [ ] A green summary line now appears on the card, reading `skip existing`. +- [ ] Repeat with **Overwrite** (`overwrite`) and **Save as a new file** + (`save as new`). +- [ ] Set it back to **Ask me**: the summary line disappears again, because the + default is not a change. +- [ ] Set a codec **and** a conflict policy: both appear, joined by `·`. + +### The conflict prompt can abort the run + +- [ ] Queue six colliding files and press **Convert**. +- [ ] With the prompt open, press **Cancel All**. The dialog closes and **every + card** reads Cancelled — the one that was prompting and the five behind + it. +- [ ] The footer leaves its converting state; the app is not stuck. +- [ ] Re-run. Press **Skip This File**. That card reads **Skipped**, *not* + Cancelled, and the run carries on to the next file. +- [ ] Re-run. Tick **Apply to all remaining files** and press **Skip This + File**. Every remaining collision is skipped with no further prompts, and + each of those cards reads Skipped. +- [ ] Re-run. **Overwrite** and **Save as New** both still behave as they did. +- [ ] Nothing is written to disk by a run that was cancelled. + +> ### Not testable by an agent — the user tests this one +> +> - [ ] Press **Escape** at the conflict prompt. It aborts the **whole run**, +> the same as Cancel All. This is intended. +> +> Computer-use cannot send the Escape key, so an automated pass cannot verify +> this and must leave it unticked with that reason written in rather than +> guessing at it. diff --git a/package.json b/package.json index 01ce3dd..4230386 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "diamond-file-converter", - "version": "2.0.0-alpha.4", + "version": "2.0.0-alpha.5", "description": "An Electron-based Windows app for converting audio, video, and image files.", "main": "src/main.js", "funding": { diff --git a/src/constants.js b/src/constants.js index dafd004..e545c25 100644 --- a/src/constants.js +++ b/src/constants.js @@ -89,6 +89,45 @@ const SETTINGS_DEFAULTS = { }, }; +// Settings v1 wrote that 2.0 has no way to show or change. Every one of them is +// still layered underneath a job in main.js, so a value left over from v1 wins +// over the card's own choice and there is no screen on which to see it, let +// alone correct it: an install carrying onConflict "unique" silently renamed +// every colliding output and never showed the prompt, whatever the card said. +// +// They are pruned rather than merely ignored, so the file on disk stops +// disagreeing with the app. The layering in main.js stays exactly as it is — +// it is the right shape for the day a preferences screen exists, and on that +// day these keys come back as things the user actually chose. +const LEGACY_SETTINGS_KEYS = ["outputRouting", "outputDir", "nameTemplate", "onConflict"]; + +// Store keys whose code is gone: presets went with the orphaned channels in +// c20826f, pipelines with the editor in 09eaca3. +const LEGACY_STORE_KEYS = ["presets", "pipelines"]; + +// Bumped whenever this list grows. The migration in main.js runs once per +// version, so a value a future preferences screen writes is not eaten on the +// next launch. +const SETTINGS_SCHEMA_VERSION = 2; + +/** + * Drop the settings 2.0 cannot reach. Returns a new object; the input is left + * alone. Reports what it removed so the caller can say so in the log rather + * than deleting a user's data in silence. + * + * @param {object|null|undefined} settings + * @returns {{settings: object, removed: string[]}} + */ +function pruneLegacySettings(settings) { + const kept = {}; + const removed = []; + for (const [key, value] of Object.entries(settings ?? {})) { + if (LEGACY_SETTINGS_KEYS.includes(key)) removed.push(key); + else kept[key] = value; + } + return { settings: kept, removed }; +} + module.exports = { APP_NAME, IPC, @@ -96,4 +135,8 @@ module.exports = { LOG, ARGV_BATCH_DEBOUNCE_MS, SETTINGS_DEFAULTS, + LEGACY_SETTINGS_KEYS, + LEGACY_STORE_KEYS, + SETTINGS_SCHEMA_VERSION, + pruneLegacySettings, }; diff --git a/src/core/display.js b/src/core/display.js index 90919c1..df4926c 100644 --- a/src/core/display.js +++ b/src/core/display.js @@ -280,6 +280,16 @@ pcm_s16le: "PCM 16-bit", pcm_s24le: "PCM 24-bit", pcm_f32le: "PCM 32-bit float", }; + /* Terser than the select in the dialog, because a summary line is a list of + fragments rather than a sentence — "Skip the file" reads oddly with a + codec either side of it, "skip existing" does not. "ask" has no entry: it + is the default and never reaches here. */ + const CONFLICT_LABELS = { + overwrite: "overwrite", + unique: "save as new", + skip: "skip existing", + }; + /** Whether a target can stream-copy, i.e. remux without re-encoding. */ /** * Whether "copy without re-encoding" is worth offering. @@ -404,6 +414,11 @@ const o = settings.output; if (o.routing && o.routing !== "alongside") parts.push(o.routing === "mirror" ? "mirrored" : "custom folder"); if (o.nameTemplate && o.nameTemplate !== "{name}") parts.push("renamed"); + // "ask" is the default and stays silent, the same way "alongside" + // and "{name}" do above. Without this a card whose only change was + // the conflict policy showed no summary line at all, so a setting + // that had genuinely been applied looked like it had not stuck. + if (o.onConflict && o.onConflict !== "ask") parts.push(CONFLICT_LABELS[o.onConflict] || o.onConflict); } return parts.length > 0 ? parts.join(" · ") : null; diff --git a/src/index.html b/src/index.html index d657945..1a34197 100644 --- a/src/index.html +++ b/src/index.html @@ -405,6 +405,9 @@
    Trim
    Command preview
    
+            
+            
    
             
    
           
    
 
diff --git a/src/main.js b/src/main.js
index e5507ae..82076df 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,7 +4,8 @@ const fs = require("fs");
 const { spawn } = require("child_process");
 const path = require("path");
 
-const { APP_NAME, IPC, WINDOW, LOG, ARGV_BATCH_DEBOUNCE_MS, SETTINGS_DEFAULTS } = require("./constants");
+const { APP_NAME, IPC, WINDOW, LOG, ARGV_BATCH_DEBOUNCE_MS, SETTINGS_DEFAULTS,
+        LEGACY_STORE_KEYS, SETTINGS_SCHEMA_VERSION, pruneLegacySettings } = require("./constants");
 const formats = require("./core/formats");
 const { createJob, createJoinJob, validateJob, validateJoin, defaultModeFor, STATUS } = require("./core/job");
 const { JobRunner, defaultConcurrency } = require("./core/runner");
@@ -64,6 +65,45 @@ const store = new Store({
     }
 });
 
+/**
+ * One-time cleanup of keys v1 wrote and 2.0 cannot reach. See constants.js for
+ * why they have to go rather than simply be ignored.
+ *
+ * Guarded by a version marker so it runs once. An unconditional prune would eat
+ * a value a future preferences screen legitimately wrote, on the very next
+ * launch, which is the same class of bug in the opposite direction.
+ */
+function migrateStore() {
+    if (store.get("settingsSchema") === SETTINGS_SCHEMA_VERSION) return;
+
+    const { settings, removed } = pruneLegacySettings(store.get("settings"));
+    if (removed.length > 0) {
+        log(LOG.INFO, `Removing settings 2.0 has no screen for: ${removed.join(", ")}`);
+        store.set("settings", settings);
+    }
+    for (const key of LEGACY_STORE_KEYS) {
+        if (store.has(key)) {
+            log(LOG.INFO, `Removing the orphaned store key ${key}`);
+            store.delete(key);
+        }
+    }
+
+    store.set("settingsSchema", SETTINGS_SCHEMA_VERSION);
+}
+
+/**
+ * The app-wide settings, with the defaults underneath.
+ *
+ * electron-store's `defaults` replace the whole `settings` key the first time
+ * anything writes to it, and the renderer only ever writes `scan` and
+ * `navCollapsed` — so reading the key raw hands back an object missing every
+ * other field, and `?? SETTINGS_DEFAULTS` never fires because the object it is
+ * guarding is present. Merging is what actually restores a default.
+ */
+function appSettings() {
+    return { ...SETTINGS_DEFAULTS, ...(store.get("settings") ?? {}) };
+}
+
 let mainWindow;
 let runner = null;
 
@@ -250,7 +290,7 @@ function setupMenu() {
         },
         {
             label: "Credits",
-            accelerator: "C",
+            accelerator: "CmdOrCtrl+Shift+C",
             click: () => { createCreditsWindow(); }
         }
     ];
@@ -303,7 +343,7 @@ function filePathsFromArgv(argv) {
 function getRunner() {
     if (runner) return runner;
 
-    const settings = store.get("settings") ?? SETTINGS_DEFAULTS;
+    const settings = appSettings();
 
     runner = new JobRunner({
         ffmpegPath: getFfmpegPath(),
@@ -339,6 +379,12 @@ let conflictPromptChain = Promise.resolve();
 /** Turn a chosen action into the result the runner expects. */
 function applyConflictChoice(choice, candidatePath, isDirectory) {
     if (choice === "cancel") return { action: "cancel" };
+    // The runner has always known how to settle a job as Skipped — it is what
+    // the per-card "Skip the file" policy resolves to — but nothing ever
+    // answered the prompt with it, so choosing not to convert one file left the
+    // card reading Cancelled instead. Same status vocabulary, now reachable
+    // from the dialog too.
+    if (choice === "skip") return { action: "skip" };
     if (choice === "overwrite") return { action: "write", outputPath: candidatePath };
     return {
         action: "write",
@@ -347,8 +393,16 @@ function applyConflictChoice(choice, candidatePath, isDirectory) {
 }
 
 /**
- * The output-exists prompt, with v1's exact button set so the behaviour users
- * already know is unchanged.
+ * The output-exists prompt.
+ *
+ * This departs from v1's button set, which was kept unchanged until now. It had
+ * to: the dialog is window-modal, so while it is open Windows blocks every
+ * click on the app behind it — including the footer's own "Cancel All", which
+ * left a user who wanted to abort a batch with no reachable way to say so.
+ * Dragging the dialog aside does not help, because position was never the
+ * problem. The abort therefore lives in the only surface that can receive
+ * input, and v1's "Cancel" is renamed to "Skip This File", which is what it
+ * always did to a single job.
  *
  * The checkbox matters: jobs run through a concurrency pool, so without a way
  * to answer once for the whole batch, converting fifty files into a folder
@@ -384,14 +438,29 @@ async function promptForConflict(candidatePath, isDirectory) {
         detail: isDirectory
             ? "A folder with this name is already in the destination."
             : "A file with this name is already in the destination.",
-        buttons: ["Cancel", "Overwrite", "Save as New"],
-        defaultId: 2,
+        buttons: ["Cancel All", "Skip This File", "Overwrite", "Save as New"],
+        defaultId: 3,
         cancelId: 0,
         checkboxLabel: "Apply to all remaining files",
         checkboxChecked: false,
     });
 
-    const choice = ["cancel", "overwrite", "unique"][result.response] ?? "cancel";
+    // An out-of-range response is a dismissed dialog, which cancelId already
+    // defines as Cancel All, so the fallback matches it rather than inventing a
+    // gentler answer the button set does not offer.
+    const choice = ["cancelAll", "skip", "overwrite", "unique"][result.response] ?? "cancelAll";
+
+    // Cancelling the run is a decision about the batch, not about this file, so
+    // it is answered here rather than in applyConflictChoice — and it is never
+    // remembered as the batch choice, because there is no batch left to apply
+    // it to. This job is not settled here either: the runner re-reads
+    // _cancelledAll before it looks at the answer, and finishes it as Cancelled
+    // on the way past.
+    if (choice === "cancelAll") {
+        if (runner) runner.cancelAll();
+        return { action: "cancel" };
+    }
+
     if (result.checkboxChecked) conflictChoiceForBatch = choice;
 
     return applyConflictChoice(choice, candidatePath, isDirectory);
@@ -422,7 +491,7 @@ function runJobToCompletion(job) {
 // ── IPC ──────────────────────────────────────────────────────────────────────
 
 ipcMain.handle(IPC.JOB_RUN, async (_event, spec) => {
-    const settings = store.get("settings") ?? SETTINGS_DEFAULTS;
+    const settings = appSettings();
 
     const job = createJob({
         ...spec,
@@ -473,7 +542,7 @@ ipcMain.handle(IPC.JOB_RUN, async (_event, spec) => {
 });
 
 ipcMain.handle(IPC.JOIN_RUN, async (_event, spec) => {
-    const settings = store.get("settings") ?? SETTINGS_DEFAULTS;
+    const settings = appSettings();
 
     // A join always names its own destination, so only the conflict policy is
     // inherited — routing and the name template describe one input becoming one
@@ -610,7 +679,15 @@ ipcMain.handle(IPC.JOB_PREVIEW, (_event, spec) => {
         const validation = validateJob(job);
         if (!validation.valid) return { ok: false, errors: validation.errors, args: [] };
 
-        return { ok: true, errors: [], args: buildArgs(job, { outputPath: "", progress: false }) };
+        // The destination is resolved for real rather than stubbed with a
+        // placeholder. The point of this box is that what it shows is what will
+        // be executed, and an output path reading "" broke that for the
+        // one argument the user is most likely to be checking. Routing, the
+        // name template and the conflict policy all feed it, so "Save as a new
+        // file" onto an existing target previews "clip (1).mp4" — which is what
+        // will actually be written.
+        const { outputPath } = paths.resolveOutputPath(job);
+        return { ok: true, errors: [], args: buildArgs(job, { outputPath, progress: false }) };
     } catch (err) {
         return { ok: false, errors: [err.message], args: [] };
     }
@@ -734,6 +811,9 @@ function checkForUpdatesManually() {
 
 app.whenReady().then(() => {
     log(LOG.INFO, "=== App ready ===");
+    // Before the window, because the renderer asks for settings on load and
+    // should never be handed a value the migration is about to remove.
+    migrateStore();
     probe.setFfprobePath(getFfprobePath());
     createWindow();
     setupMenu();
diff --git a/src/renderer.js b/src/renderer.js
index 16b87fc..46c38f6 100644
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -1317,6 +1317,7 @@ function schedulePreview() {
         const sample = jobs.find(j => modalScope.includes(j.id));
         if (!target || !sample) {
             $("jm-preview").textContent = "Choose a format to see the command.";
+            $("jm-preview-note").textContent = "";
             $("jm-errors").textContent = "";
             return;
         }
@@ -1328,6 +1329,17 @@ function schedulePreview() {
             { inputPath: sample.filePath, targetExt: target, ...settings,
               output: withMirrorRoot(sample, settings.output) });
         $("jm-preview").textContent = `ffmpeg ${result.args.join(" ")}`;
+
+        // One command can only describe one file, and a bulk edit is usually
+        // several. Saying whose it is beats silently showing the first card's
+        // and letting it be read as the whole batch — every other file differs
+        // only in the paths, which are exactly the part that is not shared.
+        const others = modalScope.length - 1;
+        $("jm-preview-note").textContent =
+            others <= 0 ? ""
+            : others === 1 ? `Showing ${p.basename(sample.filePath)}. One other file uses these settings with its own paths.`
+            : `Showing ${p.basename(sample.filePath)}. ${others} other files use these settings with their own paths.`;
+
         $("jm-errors").textContent = result.ok ? "" : result.errors.join(" ");
         $("jm-apply").disabled = !result.ok;
     }, 180);
@@ -1337,14 +1349,24 @@ function applyJobModal() {
     const target = $("jm-target").value || null;
     const settings = readSettingsFromForm();
 
+    // The format is set FIRST, and the order is load-bearing. setTarget clears
+    // job.settings whenever the output kind changes, and a card that has no
+    // format yet counts as a change from every kind — so applying settings
+    // before it threw away everything the user had just chosen, on every first
+    // Apply. It read as intermittent because a card already sitting on the
+    // chosen format takes setTarget's early return and kept its settings.
+    if (target) setTarget(modalScope, target);
+
     for (const job of jobs) {
         if (!modalScope.includes(job.id)) continue;
         if (job.status === "running") continue;
 
-        job.settings = settings;
+        // Each card gets its own copy. One shared object across a bulk edit
+        // works only for as long as nothing ever edits a single card's settings
+        // in place, which is not a property worth relying on.
+        job.settings = structuredClone(settings);
         updateCard(job);
     }
-    if (target) setTarget(modalScope, target);
 
     jobModal.hide();
     const n = modalScope.length;
diff --git a/test/display.test.js b/test/display.test.js
index a98566a..08e58c7 100644
--- a/test/display.test.js
+++ b/test/display.test.js
@@ -527,6 +527,25 @@ test("dialog: settings summary describes only what was changed", () => {
     assert.equal(d.summariseSettings({ output: { nameTemplate: "{name}" } }), null, "the default is not a change");
 });
 
+// Found by QA on alpha.5. Setting only "If it already exists" and pressing
+// Apply persisted correctly and reopened correctly, but produced no summary
+// line — so a setting that had genuinely stuck looked like it had not, which
+// is the same complaint the Apply-order bug produced for a different reason.
+test("dialog: the summary describes a conflict policy, which is a change like any other", () => {
+    assert.equal(d.summariseSettings({ output: { onConflict: "skip" } }), "skip existing");
+    assert.equal(d.summariseSettings({ output: { onConflict: "overwrite" } }), "overwrite");
+    assert.equal(d.summariseSettings({ output: { onConflict: "unique" } }), "save as new");
+
+    assert.equal(d.summariseSettings({ output: { onConflict: "ask" } }), null,
+        "ask is the default and must stay silent, like alongside and {name}");
+
+    // It joins the rest rather than replacing it.
+    assert.equal(
+        d.summariseSettings({ video: { mode: "copy" }, output: { onConflict: "skip" } }),
+        "copy video · skip existing"
+    );
+});
+
 test("dialog: compacting drops blanks so format defaults still apply", () => {
     const compacted = d.compactSettings({
         video: { codec: "libx264", crf: null, bitrate: "", preset: "slow" },
diff --git a/test/runner.test.js b/test/runner.test.js
index 3017e4a..4f7a555 100644
--- a/test/runner.test.js
+++ b/test/runner.test.js
@@ -246,3 +246,53 @@ test("runner: answering cancel settles the job without spawning", async () => {
         cleanup();
     }
 });
+
+// ---------------------------------------------------------------------------
+// Aborting the whole run from inside the prompt
+// ---------------------------------------------------------------------------
+
+// QA on alpha.5 pressed the footer's "Cancel All" with the prompt open and
+// nothing happened. The cause was not here — the dialog is window-modal, so the
+// click never reached the page at all — and the fix moved the abort into the
+// dialog. That makes this path, which had no caller before, the one the button
+// now depends on, so it is worth driving for real.
+test("runner: cancelAll while a job is parked at the prompt settles the whole batch", async () => {
+    const { jobs, cleanup } = collidingJobs(6);
+    try {
+        const held = heldPromise();
+        let spawned = 0;
+        let idleCount = 0;
+
+        const runner = new JobRunner({
+            ffmpegPath: "ffmpeg",
+            concurrency: 1,
+            spawn: () => {
+                spawned++;
+                const child = fakeChild();
+                setImmediate(() => child.emit("close", 0));
+                return child;
+            },
+            conflictResolver: () => held.promise,
+        });
+        runner.on("idle", () => { idleCount++; });
+
+        runner.enqueueAll(jobs);
+        runner.start();
+        await settle();
+
+        assert.equal(spawned, 0, "nothing converts until the first prompt is answered");
+
+        // The order main uses: the runner is told first, and the resolver only
+        // then returns, because the parked job cannot be killed from outside.
+        runner.cancelAll();
+        held.release({ action: "cancel" });
+        for (let i = 0; i < 40; i++) await settle();
+
+        assert.equal(spawned, 0, "aborting a run must not start a conversion on the way out");
+        assert.deepEqual([...new Set(jobs.map(j => j.status))], [STATUS.CANCELLED],
+            "every card ends Cancelled — the parked one and the five behind it");
+        assert.equal(idleCount, 1, "the run must end, or the footer never leaves Cancel All");
+    } finally {
+        cleanup();
+    }
+});
diff --git a/test/version.test.js b/test/version.test.js
index 8376c01..35bf6d0 100644
--- a/test/version.test.js
+++ b/test/version.test.js
@@ -136,6 +136,79 @@ test("conflict: main.js still threads the user's setting into the job", () => {
         "the runner must be given the resolver");
 });
 
+// ---------------------------------------------------------------------------
+// The other half of the same defect, found by QA on alpha.5 and reproduced by
+// driving the running app. The card's own conflict choice was being defeated by
+// a settings key v1 wrote and 2.0 has no screen for: an install carrying
+// onConflict "unique" renamed every collision silently, whatever the card said
+// and however many times the prompt was asked for.
+// ---------------------------------------------------------------------------
+
+test("settings: the keys 2.0 cannot reach are pruned, and nothing else is", () => {
+    const { pruneLegacySettings } = require("../src/constants");
+
+    const { settings, removed } = pruneLegacySettings({
+        outputRouting: "alongside",
+        outputDir: null,
+        nameTemplate: "{name}",
+        onConflict: "unique",
+        navCollapsed: true,
+        concurrency: 3,
+        scan: { recursive: false },
+    });
+
+    assert.deepEqual(settings, { navCollapsed: true, concurrency: 3, scan: { recursive: false } });
+    assert.deepEqual(removed.sort(), ["nameTemplate", "onConflict", "outputDir", "outputRouting"]);
+});
+
+test("settings: pruning survives an empty or missing object", () => {
+    const { pruneLegacySettings } = require("../src/constants");
+
+    assert.deepEqual(pruneLegacySettings(undefined), { settings: {}, removed: [] });
+    assert.deepEqual(pruneLegacySettings(null), { settings: {}, removed: [] });
+    assert.deepEqual(pruneLegacySettings({}), { settings: {}, removed: [] });
+});
+
+test("settings: the input is not mutated", () => {
+    const { pruneLegacySettings } = require("../src/constants");
+
+    const original = { onConflict: "unique", navCollapsed: true };
+    pruneLegacySettings(original);
+    assert.deepEqual(original, { onConflict: "unique", navCollapsed: true });
+});
+
+// The real-world shape this had to survive: electron-store's `defaults` replace
+// the whole `settings` key the moment anything writes to it, and the renderer
+// only ever writes `scan` and `navCollapsed`. Reading the key raw then hands
+// back an object missing everything else, while `?? SETTINGS_DEFAULTS` never
+// fires because the object it guards is present. Merging is the fix, and this
+// pins the direction of the merge — persisted values must win over defaults.
+test("settings: defaults fill the gaps a partial saved object leaves", () => {
+    const { SETTINGS_DEFAULTS } = require("../src/constants");
+
+    const persisted = { navCollapsed: true, scan: { recursive: false } };
+    const merged = { ...SETTINGS_DEFAULTS, ...persisted };
+
+    assert.equal(merged.onConflict, "ask", "a missing conflict policy must fall back to ask");
+    assert.equal(merged.outputRouting, "alongside");
+    assert.equal(merged.navCollapsed, true, "what was saved must win over the default");
+    assert.deepEqual(merged.scan, { recursive: false });
+});
+
+// A wiring guard like the one above it. The migration is what makes the merge
+// mean anything on an install that already carries a v1 value, and it must stay
+// version-guarded — an unconditional prune would eat whatever a preferences
+// screen writes, on the very next launch.
+test("settings: main.js still runs the migration, once, before the window", () => {
+    const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8");
+    assert.match(main, /migrateStore\(\);\s*probe\.setFfprobePath/,
+        "migrateStore must run before the window is created");
+    assert.match(main, /store\.get\("settingsSchema"\) === SETTINGS_SCHEMA_VERSION/,
+        "the migration must be guarded by the schema version, or it runs every launch");
+    assert.match(main, /\{ \.\.\.SETTINGS_DEFAULTS, \.\.\.\(store\.get\("settings"\) \?\? \{\}\) \}/,
+        "settings must be read with the defaults merged underneath");
+});
+
 test("credits: Escape is handled in the main process, not the page", () => {
     const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8");
     assert.match(main, /before-input-event/,
@@ -192,3 +265,56 @@ test("menu: replacing the default menu must not take DevTools with it", () => {
     assert.ok(!/devTools:\s*false/.test(main),
         "devTools is not meant to be disabled; the loss was an accident of the custom menu");
 });
+
+// ---------------------------------------------------------------------------
+// The three defects QA found on alpha.5 that were not the settings bug above.
+// All three are guarded here rather than in a unit test because all three are
+// wiring in main.js: what the menu registers, what the preview is handed, and
+// what the prompt offers.
+// ---------------------------------------------------------------------------
+
+test("menu: an accelerator with no modifier steals every keystroke of that letter", () => {
+    // Electron registers menu accelerators globally, whatever holds focus, so a
+    // bare "C" opened Credits on every "c" typed into any text field in the app
+    // — found by QA typing into the Name template box. Function keys are the
+    // legitimate exception: F12 is a shortcut, not a character anyone types.
+    //
+    // Written as a scan rather than a check for the one binding, because the
+    // same mistake is sitting in two sibling apps and would come back here the
+    // moment a menu item is added without thinking about focus.
+    const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8");
+
+    const bare = [...main.matchAll(/accelerator:\s*"([^"]+)"/g)]
+        .map(m => m[1])
+        .filter(a => !a.includes("+") && !/^F\d{1,2}$/.test(a));
+
+    assert.deepEqual(bare, [],
+        `an accelerator needs a modifier or a function key; found: ${bare.join(", ")}`);
+});
+
+test("preview: the command shown resolves a real destination, not a placeholder", () => {
+    // The box exists to promise that what it shows is what will be executed,
+    // and the output path — the argument a user is most likely to be checking —
+    // was the one part of it that was stubbed.
+    const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8");
+
+    assert.ok(!/outputPath:\s*""/.test(main),
+        "the preview must not stub the output path");
+    assert.match(main, /paths\.resolveOutputPath\(job\)/,
+        "the preview must resolve the destination with the same code the run uses");
+});
+
+test("conflict: the prompt carries the abort, because nothing behind it can be clicked", () => {
+    // The dialog is window-modal: while it is open Windows blocks every click
+    // on the app behind it, so the footer's own "Cancel All" was unreachable.
+    // Position was never the problem, which is why dragging the dialog clear
+    // changed nothing. The only surface that can take the answer is the dialog.
+    const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8");
+
+    assert.match(main, /buttons:\s*\["Cancel All", "Skip This File", "Overwrite", "Save as New"\]/,
+        "the prompt must offer a whole-run abort as well as a per-file answer");
+    assert.match(main, /if \(runner\) runner\.cancelAll\(\);/,
+        "Cancel All must actually reach the runner");
+    assert.match(main, /if \(choice === "skip"\) return \{ action: "skip" \};/,
+        "Skip must settle the card as Skipped, which the runner already knows how to do");
+});

From dd5c487db02de96576ffdc445b626e063850e8f0 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Fri, 11 Sep 2026 15:09:32 +0100
Subject: [PATCH 34/81] fix: one press of Cancel All ends the batch, not one
 file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The re-QA pass found Cancel All still declining one file at a time: six
colliding files wanted six presses of a button labelled All. Two causes.
The prompts chained behind the answered one were already past the
runner's cancelled check, so each still opened a dialog of its own; the
prompt now short-circuits on a batch abort, the way apply-to-all always
has. And the runner clears its own abort on start(), which happens
mid-batch whenever a later file is still being probed — so the abort and
the apply-to-all choice are now held in main for as long as any job:run
of the batch is outstanding, rather than until the runner next goes idle.
That second half also stops "Apply to all remaining files" forgetting
itself under the same timing.

Escape at the prompt lands on the same branch, because cancelId is 0 and
button 0 is Cancel All.

Checklist re-run 2026-09-11; the "still arriving" case is covered by a
new runner test and left for a human to close out against the UI.
---
 docs/MANUAL-TESTING.md | 358 +++++++++++++++++++++++++++++++++--------
 src/main.js            |  71 ++++++--
 test/runner.test.js    |  80 +++++++++
 test/version.test.js   |  24 +++
 4 files changed, 453 insertions(+), 80 deletions(-)

diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md
index 6dd986e..624bc49 100644
--- a/docs/MANUAL-TESTING.md
+++ b/docs/MANUAL-TESTING.md
@@ -1051,25 +1051,33 @@ ordering.
 
 ### Cancel All while a prompt is open  *(it does not stop anything)*
 
-- [ ] **FAILED.** Queued six colliding files (the same `large` + `small1–5` set)
-      and pressed Convert; with the **File Already Exists** prompt open for
-      `large.webm`, clicked the footer **Cancel** button (the one that reads
-      "Cancel All" once a run is in progress) at its usual bottom-right
-      position. Nothing happened — no card changed state, the dialog stayed
-      open. Suspecting the dialog was simply covering the button, dragged the
-      dialog by its title bar to the middle of the window (it *is* a draggable
-      in-app element, not a native OS modal) so the footer button was fully
-      clear of it, and clicked Cancel again: still no effect. Answered the
-      still-open dialog with **Overwrite** — it converted `large.webm` as
-      normal, and the **next** prompt (`small1.webm`) then appeared exactly as
-      it would if Cancel All had never been pressed. Repeated the whole
-      sequence a second time with the same result. The run only stops if you
-      answer **Cancel** on the dialog itself, file by file — pressing the
-      footer Cancel/Cancel All button while any conflict prompt is open does
-      nothing, on either the first attempt or after moving the dialog out of
-      the way as the checklist suggests trying.
-- [ ] Not applicable — depends on the above.
-- [ ] Not applicable — depends on the above.
+- [x] **Re-tested 2026-09-08, fixed.** The original failure was that the
+      footer's Cancel/Cancel All button did nothing while any conflict prompt
+      was open — clicking it, even after dragging the dialog clear, had no
+      effect, and the only way to stop a run was to answer every prompt
+      individually. That is now fixed: the button no longer lives in the
+      footer at all. **Cancel All · Skip This File · Overwrite · Save as
+      New** are all inside the "File Already Exists" dialog itself, so
+      Windows' window-modal input-blocking (the actual cause, per the fix
+      notes) no longer applies to it. Clicking Cancel All now visibly does
+      something on every press: it cancels the file currently being asked
+      about and the dialog either closes or moves to the next prompt.
+      **However**, a single press does not abort the whole run in one action
+      the way the fix description implies — seven collisions queued up front
+      (independent of conversion concurrency) each need their own press. Full
+      detail and repro is in the new `## 2.0.0-alpha.5 — the QA failures,
+      fixed` section under "The conflict prompt can abort the run" — left
+      unticked there, not here, since the box in that section is the one
+      that specifically claims a single Cancel All press aborts everything.
+      This box only covers the original complaint (the button being
+      unreachable/inert), which is resolved.
+- [ ] Not applicable — depends on the above. *(Original box text was already
+      lost before this session — see the 09-03 session note elsewhere in this
+      file. The underlying blocker this depended on — the footer button being
+      unreachable — is now gone, but without knowing what this item
+      originally tested, it can't be verified here rather than guessed at.)*
+- [ ] Not applicable — depends on the above. *(Same as above — original text
+      unknown, not guessed at.)*
 
 ### The queue keeps moving after a prompt
 
@@ -1699,16 +1707,16 @@ A one-time migration now removes them, so the job model's own defaults govern.
 - [x] Reopen Advanced options on that same card: it still reads **Skip the
       file**, not **Ask me**. *(This is the whole bug. Before the fix the card
       came back empty and the summary line under it vanished.)*
-- [ ] **FAILED.** The card's settings summary line does not reflect a
-      conflict-policy-only change. Reproduced: queue a file, give the card a
-      format so it reads Ready, open Advanced options, leave every video/audio
-      control untouched, set **If it already exists** to **Skip the file**,
-      press Apply. The toast reads "Settings applied to 1 file", and reopening
-      the dialog correctly still shows **Skip the file** selected (the item
-      above), but **no green summary line appears under the card's metadata**.
-      The same card, given a codec or quality change instead of a conflict-only
-      one, does get a summary line. So the setting itself persists correctly —
-      only the on-card summary omits a conflict-policy-only choice.
+- [x] **Re-tested 2026-09-08, fixed.** Repeated the exact repro: queued a
+      file, gave it a format so it read Ready, opened Advanced options,
+      touched nothing but **If it already exists** → **Skip the file**, and
+      pressed Apply. A green summary line now appears under the card's
+      metadata, reading `skip existing`. Also re-verified Overwrite
+      (`overwrite`) and Save as a new file (`save as new`) each produce their
+      own summary line the same way, and that a codec change combined with a
+      conflict policy shows both, joined by `·` (e.g. `VP9 · skip existing`).
+      Full detail is in the new `## 2.0.0-alpha.5 — the QA failures, fixed`
+      section under "The summary line reports the conflict policy".
 - [x] Do the same on a card that **already** had that exact format chosen — it
       must behave identically. That case always worked, which is what made the
       bug look random.
@@ -1822,53 +1830,133 @@ danger are white on colour.
 
 ### The command preview tells the truth
 
-- [ ] Queue one file, open **Advanced options**, choose a format. The preview's
-      output path is a **real path**, not ``.
-- [ ] Change **Destination** to a custom folder. The path in the preview follows
-      it.
-- [ ] Change the **Name template**. The filename in the preview follows it.
-- [ ] Point the job at a file that already exists and set **If it already
+- [x] Queue one file, open **Advanced options**, choose a format. The preview's
+      output path is a **real path**, not ``. Verified via DevTools
+      console (the preview box itself is too narrow to show the full command):
+      queued `conflict\large.mp4` → WebM, and the preview's final argument
+      resolved to `...\conflict\large.webm` — a real, resolved path.
+- [x] Change **Destination** to a custom folder. The path in the preview follows
+      it. Verified: switched Destination to `A folder I choose` →
+      `...\qa-alpha5\New folder`, and the preview's output path updated to
+      `...\qa-alpha5\New folder\large.webm`.
+- [x] Change the **Name template**. The filename in the preview follows it.
+      Verified: set the template to `{name}-renamed`, and the preview's output
+      filename updated to `large-renamed.webm`.
+- [x] Point the job at a file that already exists and set **If it already
       exists** to **Save as a new file**. The preview shows the `(1)` name it
-      would actually write.
-- [ ] Select **two or more** cards and bulk-edit them. A line under the preview
+      would actually write. Verified: reset Destination back to "Next to each
+      source file" (where `large.webm`, `large (1).webm` and `large (2).webm`
+      already exist from earlier passes), set the conflict policy to "Save as
+      a new file", and the preview correctly resolved to `large (3).webm` —
+      the next actually-free name, not a static or placeholder one.
+- [x] Select **two or more** cards and bulk-edit them. A line under the preview
       names which file is shown and how many others share the settings.
-- [ ] With one card selected, that line is **absent** — not "0 other files".
+      Verified: queued `large.mp4` + `small1.mp4`, bulk-edited both, and the
+      line under the preview read "Showing large.mp4. One other file uses
+      these settings with its own paths."
+- [x] With one card selected, that line is **absent** — not "0 other files".
+      Verified: opened Advanced options on `large.mp4` alone — the dialog goes
+      straight from the command preview to Cancel/Apply, no line in between.
 
 ### Typing is not a shortcut
 
-- [ ] Click into the **Name template** field and type `credits are cool`. The
-      text appears in full and **no Credits window opens**.
-- [ ] Do the same in every other text field in Advanced options.
-- [ ] **Ctrl+Shift+C** still opens Credits.
-- [ ] Credits still opens from the menu bar.
-- [ ] `Ctrl+O`, `Ctrl+Shift+O`, `F12` and `Alt+F4` all still work.
+- [x] Click into the **Name template** field and type `credits are cool`. The
+      text appears in full and **no Credits window opens**. Verified.
+- [x] Do the same in every other text field in Advanced options. Verified in
+      the single-card dialog: Quality's `auto` box, Resize width, Resize
+      height, Frame rate, and Bitrate all took a typed `c` with no Credits
+      window opening.
+- [x] **Ctrl+Shift+C** still opens Credits. Verified — but only after closing
+      DevTools first. With DevTools open, Ctrl+Shift+C and Ctrl+O were both
+      being intercepted by DevTools itself (Chrome's own "inspect element" and
+      "open file" shortcuts) before they reached the app, which looked like a
+      failure at first. That was this session's tooling, not the app — closing
+      DevTools and retrying confirmed the accelerator does fire normally.
+- [x] Credits still opens from the menu bar. Verified.
+- [x] `Ctrl+O`, `Ctrl+Shift+O`, `F12` and `Alt+F4` all still work. `Ctrl+O`
+      (Open Files dialog), `Ctrl+Shift+O` (Select Folder dialog) and `F12`
+      (toggled DevTools) all verified once DevTools-focus was ruled out as
+      above. **`Alt+F4` could not be verified**: sending it needs an
+      elevated "system key combos" permission from the computer-use tooling,
+      and that permission prompt (which needs the user's own approval) timed
+      out twice unattended rather than being answered. Not tested; not a
+      reflection on the app.
+
+> **`Alt+F4` verified 2026-09-11.** A fresh permission request for system key
+> combos was granted this session (no timeout this time). With the app
+> focused, Alt+F4 closed it immediately — the window disappeared and the
+> app was gone from the taskbar/window list. `role: "quit"` behaves as
+> expected; nothing nearby had changed it.
 
 ### The summary line reports the conflict policy
 
-- [ ] Queue a file, give it a format so it reads Ready.
-- [ ] Open **Advanced options**, touch **nothing** except **If it already
-      exists** → **Skip the file**. Apply.
-- [ ] A green summary line now appears on the card, reading `skip existing`.
-- [ ] Repeat with **Overwrite** (`overwrite`) and **Save as a new file**
-      (`save as new`).
-- [ ] Set it back to **Ask me**: the summary line disappears again, because the
-      default is not a change.
-- [ ] Set a codec **and** a conflict policy: both appear, joined by `·`.
+- [x] Queue a file, give it a format so it reads Ready. Verified.
+- [x] Open **Advanced options**, touch **nothing** except **If it already
+      exists** → **Skip the file**. Apply. Verified.
+- [x] A green summary line now appears on the card, reading `skip existing`.
+      Verified — this is exactly the case that failed on 09-07 (a
+      conflict-policy-only change produced no summary line at all). Now fixed.
+- [x] Repeat with **Overwrite** (`overwrite`) and **Save as a new file**
+      (`save as new`). Verified both — summary read `overwrite`, then
+      `save as new`.
+- [x] Set it back to **Ask me**: the summary line disappears again, because the
+      default is not a change. Verified.
+- [x] Set a codec **and** a conflict policy: both appear, joined by `·`.
+      Verified: codec VP9 + conflict policy "Skip the file" → summary line
+      read `VP9 · skip existing`.
 
 ### The conflict prompt can abort the run
 
-- [ ] Queue six colliding files and press **Convert**.
-- [ ] With the prompt open, press **Cancel All**. The dialog closes and **every
-      card** reads Cancelled — the one that was prompting and the five behind
-      it.
-- [ ] The footer leaves its converting state; the app is not stuck.
-- [ ] Re-run. Press **Skip This File**. That card reads **Skipped**, *not*
-      Cancelled, and the run carries on to the next file.
-- [ ] Re-run. Tick **Apply to all remaining files** and press **Skip This
+- [x] Queue six colliding files and press **Convert**. Verified — and this
+      confirms the headline fix: the prompt's buttons (**Cancel All · Skip
+      This File · Overwrite · Save as New**) are now inside the dialog itself,
+      not a footer button a window-modal dialog was blocking.
+- [ ] **FAILED (partially).** With the prompt open, press **Cancel All**. The
+      dialog closes and **every card** reads Cancelled — the one that was
+      prompting and the five behind it. **Not what happened.** Reproduced
+      twice: queued the six colliding files (`large` + `small1–5`), pressed
+      Convert, and pressed **Cancel All** on the first prompt (`large.webm`).
+      That cancelled only `large.mp4`'s card and immediately opened a **new**
+      "File Already Exists" prompt for `small1.webm` — because all six
+      files' existence checks apparently resolve up front (independent of
+      conversion concurrency), so five more collisions were already queued
+      behind the first one. Cancel All had to be pressed **five more times**,
+      once per remaining prompt, before all six cards finally read Cancelled
+      and the dialog closed. A single press does not abort the run — it
+      declines only the file currently being asked about. (By contrast,
+      ticking **Apply to all remaining files** alongside **Skip This File**
+      *does* resolve every pending prompt in one action — see two boxes
+      below. Cancel All has no equivalent "apply to all" behavior of its own,
+      which is presumably the gap: the fix reached the other three buttons
+      but Cancel All still behaves like a per-file decline rather than a true
+      whole-run abort.)
+- [x] The footer leaves its converting state; the app is not stuck. Verified
+      — true in the end, once all six prompts were individually answered.
+- [x] Re-run. Press **Skip This File**. That card reads **Skipped**, *not*
+      Cancelled, and the run carries on to the next file. Verified — this
+      part of the fix is solid. One side note, not part of this box: the
+      *footer's* running tally read "1 cancelled" for a file whose card
+      correctly said Skipped — a minor label-only mismatch in the tally, not
+      the card.
+- [x] Re-run. Tick **Apply to all remaining files** and press **Skip This
       File**. Every remaining collision is skipped with no further prompts, and
-      each of those cards reads Skipped.
-- [ ] Re-run. **Overwrite** and **Save as New** both still behave as they did.
-- [ ] Nothing is written to disk by a run that was cancelled.
+      each of those cards reads Skipped. Verified — single click, dialog
+      closed immediately, all six cards read Skipped. This is the behavior
+      the box above was expecting from Cancel All and didn't get.
+- [x] Re-run. **Overwrite** and **Save as New** both still behave as they did.
+      Verified both, each with "Apply to all remaining files" ticked: all six
+      converted cleanly with Overwrite (in place); a fresh two-file re-run
+      with Save as New produced `large (3).webm` and `small1 (5).webm`
+      alongside the originals, both playable-size, no errors.
+- [x] Nothing is written to disk by a run that was cancelled. Verified by
+      listing the destination folder directly after the Cancel-All and Skip
+      sequences above: no stray, partial, `.tmp`, or `.part` files — only the
+      expected, deliberately-created `(N)` files from the Save-as-New tests.
+
+> The failure recorded above is fixed. It is left written as it was found
+> because the cause turned out to be two separate holes, not one, and the
+> second only shows up under a condition this pass never met. Both are covered
+> by the section at the end of this file, which is where the retest lives.
 
 > ### Not testable by an agent — the user tests this one
 >
@@ -1877,4 +1965,144 @@ danger are white on colour.
 >
 > Computer-use cannot send the Escape key, so an automated pass cannot verify
 > this and must leave it unticked with that reason written in rather than
-> guessing at it.
+> guessing at it. **Not testable by an agent — computer-use cannot send
+> Escape.** Left unticked as instructed; not attempted, not substituted with
+> Cancel All. Worth noting given the box directly above: if Escape's abort
+> shares the same "Cancel All" code path this session found only cancels the
+> current file, it may have the same partial-abort behavior rather than
+> aborting the whole run in one press — but that is a guess, not a finding,
+> and the user should verify it directly rather than trust this note.
+
+---
+
+## 2.0.0-alpha.5 — one press of Cancel All
+
+> **Status: re-tested 2026-09-11.** Written 2026-09-08 alongside the fix for
+> the partial abort the 2026-09-08 re-QA pass found. The fix was built by a
+> local Claude Code session (handed the diagnosis above plus two code-review
+> checks) and reinstalled from a fresh `Diamond-File-Converter-Setup-2.0.0-
+> alpha.5.exe`, then re-tested below. `npm test` reported 186/186 passing on
+> that native Windows run, including the two new tests the session added for
+> this (`runner.test.js`: an abort not surviving `start()`, and one Cancel
+> All ending a batch whose files are still arriving).
+
+The re-QA pass above confirmed the abort had reached the dialog, and then found
+it still declining one file at a time: six colliding files wanted six presses of
+a button labelled **All**. Two causes sit behind that, and only the first was
+obvious.
+
+**The prompts behind the answered one were already in the queue.** Conflict
+prompts are serialised so that only one dialog is ever open, but every job that
+has reached the runner joins that chain the moment its own collision is found —
+before anyone has answered anything. Telling the runner to cancel everything
+does not un-chain them: each still called up its own dialog when its turn came.
+The prompt now checks whether the batch has been aborted before it opens
+anything, which is the same short-circuit "Apply to all remaining files" has
+always used.
+
+**The runner forgets an abort between two files of the same batch.** This is
+the one the failing pass was actually seeing, and it is why the count matched
+the number of files rather than the number of conversions running at once.
+Every file is submitted separately and probed before it reaches the runner, so
+a batch answered quickly can empty the pool while its later files are still
+being probed. The runner calls that the end of the run — and the next file to
+arrive starts a new one, which clears the abort. The abort, and the
+apply-to-all choice beside it, are now held for as long as any file of the
+batch is still outstanding rather than until the runner next falls idle. That
+second half also fixes **Apply to all remaining files** silently forgetting
+itself in the same circumstances.
+
+### One press stops everything
+
+- [x] Queue six colliding files (the `large` + `small1–5` set), press
+      **Convert**, and press **Cancel All** on the first prompt. Exactly one
+      dialog appears. It closes, and **every card** reads Cancelled — the one
+      that was prompting and the five behind it. No second prompt opens.
+      **Re-tested 2026-09-11.** Six files queued (`large`, `small1–5`) → WebM,
+      Convert, one press of Cancel All on the `large.webm` prompt. Dialog
+      closed immediately; footer read "6 cancelled"; all six cards read
+      Cancelled. No second prompt appeared. Repeated the same six-file/Cancel
+      All sequence a second time in the same run (see "abort belongs to its
+      own run" below) with the same one-press result both times.
+- [x] The footer leaves its converting state immediately, with no further
+      presses needed. **Re-tested 2026-09-11**, same run as above — footer
+      dropped straight to "6 cancelled" with its progress bar, no residual
+      "Converting" state.
+- [x] Nothing was written: the destination has no new, partial, `.tmp` or
+      `.part` files. **Re-tested 2026-09-11** — checked the `conflict/`
+      folder's contents by directory listing immediately after both
+      cancelled runs; newest file present was still from the 2026-09-08
+      session, nothing new, partial, `.tmp` or `.part` from tonight's test.
+
+### One press stops everything, when the files are still arriving
+
+This is the case the previous pass was hitting. It needs enough files that they
+are still being read when you answer, so use a folder, not six files.
+
+- [ ] Queue **thirty or more** colliding files — a folder ingest of a
+      directory whose outputs already exist is the easiest way — and press
+      **Convert**.
+- [ ] Press **Cancel All** on the first prompt **as soon as it appears**,
+      without waiting. Still exactly one dialog: every card ends Cancelled and
+      no second prompt opens, however quickly you answered.
+- [ ] Repeat, this time ticking **Apply to all remaining files** with **Skip
+      This File** instead. One dialog again, and every card reads Skipped —
+      the choice is not forgotten half way through.
+
+> **Not attempted 2026-09-11.** Left unticked, not guessed at. Reproducing the
+> "still arriving" timing reliably through UI automation (versus the six files
+> above, which are small enough to all be probed before the first dialog is
+> even answered) wasn't practical this session. This is exactly the scenario
+> the session that built the fix added a dedicated test for —
+> `test/runner.test.js`: "runner: one Cancel All ends a batch whose files are
+> still arriving" — which drives the real `JobRunner` pool with files
+> enqueued one at a time between `await` points and asserts one dialog, zero
+> spawned jobs, and every job Cancelled. That test passed as part of the
+> 186/186 run. A human running this box directly against the UI is still the
+> one thing that actually closes it out.
+
+### The abort belongs to its own run and no other
+
+- [x] After an aborted run, press **Convert** again on the same cards. The
+      conflict prompt appears normally. *(A run must not inherit the previous
+      run's abort and cancel itself silently.)* **Re-tested 2026-09-11** —
+      `large.mp4` + `small1.mp4` → WebM, Convert, Cancel All (one press, both
+      Cancelled). Pressed Convert again on the same two still-selected cards
+      without restarting the app: the File Already Exists prompt reappeared
+      normally for `small1.webm` — not silently skipped or re-cancelled.
+      Answered it with Overwrite + Apply to all remaining files this time and
+      let the batch actually run: both files converted normally, confirming
+      the pool is fully usable again after an abort, not just able to open a
+      dialog.
+- [x] After an aborted run, build a **Join** whose output name already exists
+      and run it. It prompts, rather than cancelling itself without asking.
+      **Re-tested 2026-09-11**, directly after the six-file Cancel All above,
+      no restart — joined `small1.mp4` + `small2.mp4` into `large.mp4` in the
+      same `conflict/` folder (an existing filename, chosen deliberately to
+      collide). The File Already Exists prompt appeared normally for
+      `large.mp4`; pressed Cancel All to close it out. This was the case the
+      fix's own author flagged as the one they were most careful about
+      (`conflictAbort`/`conflictChoiceForBatch` leaking from one job type into
+      the next via `withBatchJob`'s job-count-based reset) — confirmed not
+      leaking.
+- [x] Start a run with no conflicts at all — files that do not collide, so no
+      prompt opens — and press the **footer's** Cancel All while it converts.
+      It still stops the run. **Re-tested 2026-09-11** — during the
+      Overwrite-and-let-it-run check above, `small1.mp4` finished first while
+      `large.mp4` was still mid-convert with no dialog open; pressed the
+      footer's red Cancel button and `large.mp4` immediately read Cancelled
+      (`small1.mp4` stayed Done). Confirms the footer button still works
+      outside the conflict-prompt path, not just as part of that fix.
+
+> ### Not testable by an agent — the user tests this one
+>
+> - [ ] Press **Escape** at the conflict prompt instead of clicking Cancel
+>       All. One press aborts the **whole run**, exactly as Cancel All does.
+>       This is intended.
+>
+> Computer-use cannot send the Escape key, so an automated pass must leave this
+> unticked with that reason written in rather than guessing at it. Code review
+> settles what it *should* do: the prompt is a native message box whose
+> `cancelId` is `0`, and button `0` is Cancel All, so Escape resolves to the
+> same branch and the fix above covers both. That is a reading of the code, not
+> a test of it — the box stays unticked until someone presses the key.
diff --git a/src/main.js b/src/main.js
index 82076df..19bef9c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -363,15 +363,40 @@ function getRunner() {
         }
     });
 
-    // "Apply to all remaining" is scoped to one batch, not to the session.
-    runner.on("idle", () => { conflictChoiceForBatch = null; });
-
     return runner;
 }
 
-// A choice the user asked to apply to the rest of the batch. Cleared whenever
-// the runner goes idle, so it never leaks into the next run.
+// The two answers that belong to a whole batch rather than to one file: a
+// choice to apply to the rest of it, and the abort that ends it.
+//
+// A batch is one press of Convert — the renderer submits every card at once
+// and awaits them together — and the runner cannot be asked where one ends.
+// It goes idle between two files of the same batch whenever the later one is
+// still being probed, and start() clears its own _cancelledAll on the way back
+// in. Scoping this state to the runner's idle therefore threw it away mid-batch:
+// an abort answered on the first dialog was forgotten, and the next file to
+// arrive opened a dialog of its own for a run the user had already stopped.
+//
+// Counting the job:run calls that have not returned yet bounds the batch
+// properly, because the file being prompted about is itself one of them — the
+// count cannot reach zero while a prompt is open.
 let conflictChoiceForBatch = null;
+let conflictAbort = false;
+let jobsInFlight = 0;
+
+/** Run one submitted job as part of the batch it arrived with. */
+async function withBatchJob(work) {
+    if (jobsInFlight === 0) {
+        conflictChoiceForBatch = null;
+        conflictAbort = false;
+    }
+    jobsInFlight++;
+    try {
+        return await work();
+    } finally {
+        jobsInFlight--;
+    }
+}
 
 // Serialises the output-exists prompts so only one dialog is ever open.
 let conflictPromptChain = Promise.resolve();
@@ -427,6 +452,14 @@ async function resolveConflict(job, candidatePath) {
 
 /** The prompt itself. Only ever called one at a time, via resolveConflict. */
 async function promptForConflict(candidatePath, isDirectory) {
+    // Cancel All ends the batch, not just the file it was answered on. The
+    // prompts behind this one were chained before the abort and are already
+    // past the runner's own cancelled check, so without this each of them
+    // still opened a dialog of its own — six colliding files meant six presses
+    // of a button labelled All. Escape arrives here too: cancelId is 0, which
+    // is that same button.
+    if (conflictAbort) return { action: "cancel" };
+
     if (conflictChoiceForBatch) {
         return applyConflictChoice(conflictChoiceForBatch, candidatePath, isDirectory);
     }
@@ -451,12 +484,14 @@ async function promptForConflict(candidatePath, isDirectory) {
     const choice = ["cancelAll", "skip", "overwrite", "unique"][result.response] ?? "cancelAll";
 
     // Cancelling the run is a decision about the batch, not about this file, so
-    // it is answered here rather than in applyConflictChoice — and it is never
-    // remembered as the batch choice, because there is no batch left to apply
-    // it to. This job is not settled here either: the runner re-reads
-    // _cancelledAll before it looks at the answer, and finishes it as Cancelled
-    // on the way past.
+    // it is answered here rather than in applyConflictChoice. It is not kept as
+    // the batch *choice* — there is nothing left to apply one to — but it is
+    // kept as the batch's abort, which is what stops the prompts already chained
+    // behind this one from ever being shown. This job is not settled here
+    // either: the runner re-reads _cancelledAll before it looks at the answer,
+    // and finishes it as Cancelled on the way past.
     if (choice === "cancelAll") {
+        conflictAbort = true;
         if (runner) runner.cancelAll();
         return { action: "cancel" };
     }
@@ -490,7 +525,7 @@ function runJobToCompletion(job) {
 
 // ── IPC ──────────────────────────────────────────────────────────────────────
 
-ipcMain.handle(IPC.JOB_RUN, async (_event, spec) => {
+async function runSubmittedJob(spec) {
     const settings = appSettings();
 
     const job = createJob({
@@ -539,9 +574,11 @@ ipcMain.handle(IPC.JOB_RUN, async (_event, spec) => {
     }
 
     return result;
-});
+}
+
+ipcMain.handle(IPC.JOB_RUN, (_event, spec) => withBatchJob(() => runSubmittedJob(spec)));
 
-ipcMain.handle(IPC.JOIN_RUN, async (_event, spec) => {
+async function runSubmittedJoin(spec) {
     const settings = appSettings();
 
     // A join always names its own destination, so only the conflict policy is
@@ -563,10 +600,14 @@ ipcMain.handle(IPC.JOIN_RUN, async (_event, spec) => {
         log(LOG.ERROR, `Join failed: ${result.error}`);
     }
     return result;
-});
+}
+
+ipcMain.handle(IPC.JOIN_RUN, (_event, spec) => withBatchJob(() => runSubmittedJoin(spec)));
 
 ipcMain.handle(IPC.JOB_CANCEL, (_event, jobId) => getRunner().cancel(jobId));
-ipcMain.handle(IPC.QUEUE_CANCEL_ALL, () => { getRunner().cancelAll(); });
+// The footer button, reachable only when no prompt is open — but it aborts the
+// same batch, so it records it the same way.
+ipcMain.handle(IPC.QUEUE_CANCEL_ALL, () => { conflictAbort = true; getRunner().cancelAll(); });
 ipcMain.handle(IPC.QUEUE_SET_CONCURRENCY, (_event, n) => {
     getRunner().setConcurrency(n);
     store.set("settings.concurrency", n);
diff --git a/test/runner.test.js b/test/runner.test.js
index 4f7a555..3d6c64b 100644
--- a/test/runner.test.js
+++ b/test/runner.test.js
@@ -296,3 +296,83 @@ test("runner: cancelAll while a job is parked at the prompt settles the whole ba
         cleanup();
     }
 });
+
+// ---------------------------------------------------------------------------
+// One press of Cancel All, one dialog
+// ---------------------------------------------------------------------------
+
+// The fix above moved the abort into the dialog, and a re-QA pass then found it
+// still declined only the file it was answered on: every remaining collision
+// opened a prompt of its own, so six files wanted six presses of a button
+// labelled All. Two things behind that, both about where a batch ends.
+
+test("runner: an abort does not survive the next start, so it cannot live here", () => {
+    // Every job:run nudges the pool with start(), and start() clears the abort.
+    // That is fine while a batch is one run — but the renderer submits each card
+    // separately and main probes each one before enqueueing it, so a batch whose
+    // first file is answered before its last file has finished probing empties
+    // the pool, ends the run, and starts a new one. main therefore keeps the
+    // abort itself, for as long as any job:run of the batch is outstanding.
+    const runner = new JobRunner({ ffmpegPath: "ffmpeg" });
+
+    runner.start();
+    runner.cancelAll();
+    assert.equal(runner._cancelledAll, true);
+
+    runner.start();
+    assert.equal(runner._cancelledAll, false,
+        "start() forgets the abort, which is why the runner cannot be asked whether the batch was cancelled");
+});
+
+test("runner: one Cancel All ends a batch whose files are still arriving", async () => {
+    // main's conflict resolver in miniature — prompts serialised so only one
+    // dialog is ever open, and an abort held outside the runner for the life of
+    // the batch. Transcribed rather than imported because it lives in main.js,
+    // which cannot be loaded without Electron; the pool it drives is the real
+    // one, and the pool is where the jobs that were never asked about sit.
+    const { jobs, cleanup } = collidingJobs(6);
+    try {
+        let batchAborted = false;
+        let chain = Promise.resolve();
+        let dialogs = 0;
+        let spawned = 0;
+
+        const runner = new JobRunner({
+            ffmpegPath: "ffmpeg",
+            concurrency: 4,
+            spawn: () => {
+                spawned++;
+                const child = fakeChild();
+                setImmediate(() => child.emit("close", 0));
+                return child;
+            },
+            conflictResolver: () => {
+                const mine = chain.then(() => {
+                    if (batchAborted) return { action: "cancel" };
+                    dialogs++;
+                    // The user presses Cancel All on the first dialog they see.
+                    batchAborted = true;
+                    runner.cancelAll();
+                    return { action: "cancel" };
+                });
+                chain = mine.then(() => {}, () => {});
+                return mine;
+            },
+        });
+
+        // Each file reaches the pool as its own job:run, once its probe returns.
+        for (const job of jobs) {
+            runner.enqueue(job);
+            runner.start();
+            for (let i = 0; i < 5; i++) await settle();
+        }
+        for (let i = 0; i < 40; i++) await settle();
+
+        assert.equal(dialogs, 1, "one press of Cancel All, one dialog — not one per file");
+        assert.equal(spawned, 0, "an aborted batch converts nothing on its way out");
+        assert.deepEqual([...new Set(jobs.map(j => j.status))], [STATUS.CANCELLED],
+            "every card ends Cancelled, including the ones that arrived after the abort");
+    } finally {
+        cleanup();
+    }
+});
diff --git a/test/version.test.js b/test/version.test.js
index 35bf6d0..27a7f89 100644
--- a/test/version.test.js
+++ b/test/version.test.js
@@ -318,3 +318,27 @@ test("conflict: the prompt carries the abort, because nothing behind it can be c
     assert.match(main, /if \(choice === "skip"\) return \{ action: "skip" \};/,
         "Skip must settle the card as Skipped, which the runner already knows how to do");
 });
+
+test("conflict: Cancel All ends the run, not just the file it was answered on", () => {
+    // Re-QA found the button above still declining one file at a time. Two
+    // holes, both about where a batch ends: the prompts behind the answered one
+    // were chained before the abort and so were already past the runner's own
+    // cancelled check, and the runner clears that check on its next start() —
+    // which happens whenever a batch goes idle waiting for a later file to
+    // finish probing. Both let a fresh dialog open for a run already stopped.
+    //
+    // Escape is not a separate path to fix: cancelId picks button 0, which is
+    // Cancel All, so it lands on the same branch.
+    const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8");
+
+    assert.match(main, /if \(conflictAbort\) return \{ action: "cancel" \};/,
+        "no dialog may open for a batch that has already been aborted");
+    assert.match(main, /conflictAbort = true;\s+if \(runner\) runner\.cancelAll\(\);/,
+        "answering Cancel All must record the abort as well as tell the runner");
+    assert.match(main, /jobsInFlight === 0/,
+        "the batch is bounded by the job:run calls still outstanding, not by the runner going idle");
+    assert.ok(!/runner\.on\("idle",[^)]*conflictChoiceForBatch/.test(main),
+        "batch state cannot be scoped to idle: a batch outlives an idle whenever a later file is still being probed");
+    assert.match(main, /cancelId:\s*0,/,
+        "Escape must resolve to Cancel All, which is what the checklist promises it does");
+});

From 0ce9b9243fdf7e020259ea958c3a5204bd9e8b3e Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Fri, 11 Sep 2026 15:09:32 +0100
Subject: [PATCH 35/81] chore: keep test-media out of the installer, Electron
 44.3

The QA media folder was being packed into the asar. Excluding it via
build.files; the lockfile already had 44.3.0, so package.json's range
now says so too.
---
 package.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4230386..56f43f7 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,11 @@
     },
     "build": {
         "appId": "com.diamonddigitaldev.diamondfileconverter",
+        "files": [
+            "**/*",
+            "!test-media",
+            "!test-media/**/*"
+        ],
         "productName": "Diamond File Converter",
         "artifactName": "Diamond-File-Converter-Setup-${version}.${ext}",
         "extraResources": [
@@ -94,7 +99,7 @@
     "author": "Diamond Digital Development ",
     "license": "Apache-2.0",
     "devDependencies": {
-        "electron": "^44.0.0",
+        "electron": "^44.3.0",
         "electron-builder": "^26.15.3"
     },
     "dependencies": {

From e45934e30759e64af6e43d5578dd5add9019deb5 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Fri, 11 Sep 2026 15:10:25 +0100
Subject: [PATCH 36/81] fix: hold the header and the rail still, and give Join
 the same front door
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Three things stopped the two sections reading as one app.

Switching moved the title. The Add Files / Add Folder group was hidden on
Join, and those buttons are 31px tall against a 24px title, so the header
shrank by 7px and everything under it jumped on every switch. The toolbar
is now shared: it stays on both sections and adds to whichever is showing.
That also puts the buttons on Join, which had none — and gives Join a
folder route through the same scanner Convert uses, with the same folder
options and the same ingest toast. A dropped directory used to bounce.

Collapsing moved the icons. A rail item's height came from its label's
line box (21.6px at Bootstrap's 1.5) rather than from its 20px icon, so
hiding the label shrank each item and the icons below crept up. The item's
line box is pinned to the icon's height now, and the chevron turns rather
than flips.

Join's empty state was its own design. It is now Convert's zone line for
line, and each zone's icon is its section's rail glyph — which is why
Files is now Convert, drawn with the source-to-target arrow the cards use.
The rule is in the design system: a section is named by one glyph, not
two. Also: the first launch now highlights Convert; the class was only
ever applied on a switch.

Measured in the running app: header, title, toolbar and drop zone occupy
identical rectangles on both sections, and the rail icons share a y in
both states.
---
 docs/MANUAL-TESTING.md                       | 109 +++++++++++++++++++
 docs/design-system/build.js                  |  39 ++++++-
 docs/design-system/components/drop-zone.html |  24 ++++
 docs/design-system/shell/nav-rail.html       |  15 ++-
 src/index.html                               |  32 ++++--
 src/renderer.js                              |  82 ++++++++++----
 src/styles.css                               |  26 +++--
 7 files changed, 277 insertions(+), 50 deletions(-)

diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md
index 624bc49..3c89527 100644
--- a/docs/MANUAL-TESTING.md
+++ b/docs/MANUAL-TESTING.md
@@ -2106,3 +2106,112 @@ are still being read when you answer, so use a folder, not six files.
 > `cancelId` is `0`, and button `0` is Cancel All, so Escape resolves to the
 > same branch and the fix above covers both. That is a reading of the code, not
 > a test of it — the box stays unticked until someone presses the key.
+
+## 2.0.0-beta.1 — one app, two sections
+
+> **Status: written 2026-09-11 alongside the fix, not yet run by hand.** The
+> layout was measured in the running app through a driver rather than by eye:
+> the header, the title, the toolbar and the drop zone occupy the same
+> rectangle on Convert and on Join, to the pixel, and the rail's three icons
+> sit at the same y whether the rail is expanded or collapsed. What a driver
+> cannot judge — whether it *looks* still — is what this section is for.
+
+Three things stopped the two sections reading as one app, and all three were
+visible in the first thirty seconds of using it.
+
+**Switching moved the title.** The Add Files / Add Folder group was hidden on
+Join, and those buttons are 31px tall against a 24px title. Taking them out of
+the header shrank it by 7px, and the title and everything under it jumped up on
+every switch. The toolbar is now shared: it stays in the header on both
+sections and adds to whichever one is showing, so the header is the same height
+everywhere. That is also what puts the buttons on Join — they were missing
+there, and Join could not take a folder at all.
+
+**Collapsing moved the icons.** A rail item is a 20px icon beside a label whose
+line box, at Bootstrap's 1.5, is 21.6px. The label sets the item's height;
+collapsing hides the label; every item shrinks by 1.6px and every icon below it
+creeps up. The item's line box is now pinned to the icon's height, so the two
+states are identical and the icons hold still while the width animates.
+
+**Join's empty state was its own design.** Different lines, a hint in the wrong
+colour, no "or", and the section's icon on the rail was a grid while the zone
+above it showed an upload arrow. The two zones are now the same zone line for
+line, and the icon at the top of each is the same glyph as that section's rail
+item. **Files is now Convert**, with the source-to-target arrow the cards
+already draw. That last rule is written into the design system — a section is
+named by one glyph, not two — in `docs/design-system/` (regenerate with
+`node docs/design-system/build.js`; the Claude Design project needs a
+`/design-login` from an interactive session to receive it).
+
+### Nothing moves when you switch
+
+- [ ] Launch the app. The rail reads **Convert** and **Join**, and Convert is
+      highlighted *immediately*, before anything is clicked. *(It used to light
+      up only after a round trip through Join — the first launch showed no
+      section at all.)*
+- [ ] Click Join, then Convert, then Join again, watching the title **Diamond
+      File Converter**. It does not move by a pixel. *(It jumped up 7px on
+      Join.)*
+- [ ] Same switch, watching the drop zone's dashed border. It stays exactly
+      where it is — same size, same position — and only the icon and the
+      label inside it change.
+- [ ] Same switch, watching **Add Files** and **Add Folder** in the header.
+      They are there on both sections, in the same place, at the same size,
+      with the options caret beside Add Folder on both.
+- [ ] Both themes.
+
+### Nothing moves when you collapse
+
+- [ ] With the rail expanded, press **Collapse**, watching the three icons —
+      Convert, Join and the chevron. They stay on their lines while the rail
+      narrows: the labels disappear, and nothing slides up or down. *(Each
+      item used to shrink by 1.6px, so the icons below it crept upward.)*
+- [ ] Press **Expand**. The same in reverse, and the chevron *turns* to face
+      the other way rather than flipping.
+- [ ] Do it from Join as well. The collapse must not care which section is
+      showing.
+- [ ] Collapsed, hover each icon: the hover wash is the same rounded box as
+      when expanded, just narrower.
+
+### The two sections read as one app
+
+- [ ] Convert's zone, top to bottom: a green ⇄ arrow, "Drag & Drop Files or
+      Folders Here", a grey "or", **Select Files**. The ⇄ is the same glyph
+      as the Convert item on the rail.
+- [ ] Join's zone, top to bottom: the green two-into-one arrow, "Drag & Drop
+      Files to Join Here", a grey "or", **Select Files**. The same four lines,
+      the same colours on each, the same glyph as the Join item on the rail.
+      *(It had five lines, and the extra one was in body colour, not grey.)*
+- [ ] Click anywhere in Join's zone that is not the button: the file dialog
+      opens. Click the button: it opens once, not twice. *(Convert's zone has
+      always done this; Join's only answered to its button.)*
+- [ ] Hover Join's zone: the same green wash as Convert's. Drag a file over it:
+      the same stronger wash.
+
+### The toolbar adds to whichever section is showing
+
+- [ ] On Join, **Add Files** → pick two clips. They are listed on Join, and
+      Convert's grid is untouched.
+- [ ] On Join, **Add Folder** → a folder of clips. Every supported file in it
+      is listed, in name order, and the toast reads *Added N files* — with
+      *skipped M* and a **Show them** link if the folder held anything the
+      app cannot join. *(Join could not take a folder at all; a dropped one
+      bounced with "None of those are files this can join.")*
+- [ ] Drop a folder onto Join's zone. The same result as Add Folder.
+- [ ] Untick **Include subfolders** in the options caret, then Add Folder a
+      folder that has a subfolder of clips. The subfolder's clips are not
+      listed. *(The folder options apply on Join exactly as on Convert.)*
+- [ ] Switch to Convert, **Add Files**. They go to the grid, not to Join.
+- [ ] Drop files on Convert while Join has a list. They go to the grid; the
+      join list is untouched.
+
+### Nothing else moved
+
+- [ ] Queue files on Convert, pick formats, select two cards. Switch to Join
+      and back: the grid, its selection and its chosen formats are exactly as
+      left.
+- [ ] Ctrl+A and Delete still act on the grid on Convert and do nothing on
+      Join.
+- [ ] Collapse the rail, quit, relaunch. Still collapsed.
+- [ ] Add the same clip twice on Join, by two separate Add Files. It appears
+      twice. *(A folder walk lists each file once, but two adds are two adds.)*
diff --git a/docs/design-system/build.js b/docs/design-system/build.js
index 091ff29..a0324bf 100644
--- a/docs/design-system/build.js
+++ b/docs/design-system/build.js
@@ -382,6 +382,30 @@ card("components/drop-zone.html", "Drop Zone",
 
    The nested-button guard
    
 
    .drop-zone:hover:not(:has(button:hover))
    
 
    The whole zone is a click target, so it must stop signalling "drop here" once the pointer is over a button inside it. This exact idiom appears in the File Converter, the Dropgate client and the Dropgate server. Note the matching JS guard: the zone's click handler returns early when the event originated on a button, or the browse dialog opens twice.
    
+
+
    One zone per section, and the icon is the section's
    
+
    
+  
    
+    
    
+      
    ⇄
    
+      
    Drag & Drop Files or Folders Here
    
+      
    or
    
+      
+    
    
+    
    Convert — the rail item's glyph, at 48px
    
+  
    
+  
    
+    
    
+      
    ⑂
    
+      
    Drag & Drop Files to Join Here
    
+      
    or
    
+      
+    
    
+    
    Join — same zone, its own glyph
    
+  
    
+
    
+
    In an app with a rail, the zone's icon is the rail item's icon. A section is named by one glyph, not two: whatever sits beside its label on the rail is what sits at the top of its empty state, in the accent at --opacity-muted. Never a generic upload glyph — File Converter's Convert zone showed upload_file under a rail item drawn as grid_view, and the two never met.
    
+
    Sibling sections get the same zone, line for line. Icon, label, "or", button — same classes, same colours, same count of lines. Only the icon and the label change. A hint line that one section has and the other lacks makes one zone taller than the other, and the two sections stop reading as one app.
    
 `);
 
 card("components/file-row.html", "File Row & List",
@@ -927,15 +951,15 @@ card("shell/nav-rail.html", "Navigation Rail",
 
    
   
    
     
    
-      
    ▦Files
    
+      
    ⇄Convert
    
       
    ⑂Join
    
       
    ‹Collapse
    
     
    
-    
    Files
    The active section fills the rest of the window.
    
+    
    Convert
    The active section fills the rest of the window.
    
   
    
   
    
     
    
-      
    ▦Files
    
+      
    ⇄Convert
    
       
    ⑂Join
    
       
    ›Expand
    
     
    
@@ -948,13 +972,18 @@ card("shell/nav-rail.html", "Navigation Rail",
 PartValue
 Rail168px expanded, 56px collapsed, --dur-state --ease-state on width
 Surface--bs-tertiary-bg with a --bs-border-color right edge — a step back from the content, not a block of accent
-Item.5rem .6rem padding, --radius-control, icon 20px + label, .6rem gap
+Item.5rem .6rem padding, --radius-control, icon 20px + label, .6rem gap, line-height: 20px — see "Two jitters" below
+IconThe section's one glyph: the same icon heads that section's empty-state drop zone. Convert is swap_horiz, Join is merge_type
 Hoverborder rgba(accent, .5), fill rgba(accent, .04) — the standard wash ladder
 Activeborder rgba(accent, 1), fill rgba(accent, .06), and the label in --accent
-Collapse controlPinned with margin-top:auto, muted, chevron rotated 180° when collapsed
+Collapse controlPinned with margin-top:auto, muted, chevron rotated 180° when collapsed, with --dur-state on the transform so it turns rather than flips
 Focusbox-shadow: 0 0 0 .2rem rgba(accent, .35) on :focus-visible, outline:none
 
 
+
    Two jitters, and what stops them
    
+
    Pin the item's line box to the icon. Bootstrap's 1.5 line-height makes a .9rem label 21.6px tall against a 20px icon, and the label is what sets the item's height. Collapse hides the label, every item shrinks by that 1.6px, and every icon below it creeps up. line-height: 20px on the item makes the expanded and collapsed states the same height, so the icons hold still while the width animates.
    
+
    Nothing in the header may change height with the view. The header's toolbar is shared by every section and routed to whichever is showing, never hidden per view. File Converter hid Add Files / Add Folder on Join, which took the buttons' 31px out of a header whose title is 24px — so the title and everything under it jumped 7px on every switch. If a section genuinely has no use for a control, reserve its height; do not remove it.
    
+
 
    Where it sits in the shell
    
 
    The rail is outside the padded content column, so it reaches the window edge. That means the shell is no longer the outermost element: an .app-frame row wraps the rail and the column, and the column keeps the padding, the header, the content and the footer. Give the column min-width:0 or a wide child stretches it and the whole window scrolls sideways.
    
 
diff --git a/docs/design-system/components/drop-zone.html b/docs/design-system/components/drop-zone.html
index 32c0e64..5e962c7 100644
--- a/docs/design-system/components/drop-zone.html
+++ b/docs/design-system/components/drop-zone.html
@@ -94,4 +94,28 @@ 
    The nested-button guard
    
 
    .drop-zone:hover:not(:has(button:hover))
    
 
    The whole zone is a click target, so it must stop signalling "drop here" once the pointer is over a button inside it. This exact idiom appears in the File Converter, the Dropgate client and the Dropgate server. Note the matching JS guard: the zone's click handler returns early when the event originated on a button, or the browse dialog opens twice.
    
 
+
    One zone per section, and the icon is the section's
    
+
    
+  
    
+    
    
+      
    ⇄
    
+      
    Drag & Drop Files or Folders Here
    
+      
    or
    
+      
+    
    
+    
    Convert — the rail item's glyph, at 48px
    
+  
    
+  
    
+    
    
+      
    ⑂
    
+      
    Drag & Drop Files to Join Here
    
+      
    or
    
+      
+    
    
+    
    Join — same zone, its own glyph
    
+  
    
+
    
+
    In an app with a rail, the zone's icon is the rail item's icon. A section is named by one glyph, not two: whatever sits beside its label on the rail is what sits at the top of its empty state, in the accent at --opacity-muted. Never a generic upload glyph — File Converter's Convert zone showed upload_file under a rail item drawn as grid_view, and the two never met.
    
+
    Sibling sections get the same zone, line for line. Icon, label, "or", button — same classes, same colours, same count of lines. Only the icon and the label change. A hint line that one section has and the other lacks makes one zone taller than the other, and the two sections stop reading as one app.
    
+
 
diff --git a/docs/design-system/shell/nav-rail.html b/docs/design-system/shell/nav-rail.html
index 29764a0..a77c001 100644
--- a/docs/design-system/shell/nav-rail.html
+++ b/docs/design-system/shell/nav-rail.html
@@ -64,15 +64,15 @@ 
    Expanded and collapsed
    
 
    
   
    
     
    
-      
    ▦Files
    
+      
    ⇄Convert
    
       
    ⑂Join
    
       
    ‹Collapse
    
     
    
-    
    Files
    The active section fills the rest of the window.
    
+    
    Convert
    The active section fills the rest of the window.
    
   
    
   
    
     
    
-      
    ▦Files
    
+      
    ⇄Convert
    
       
    ⑂Join
    
       
    ›Expand
    
     
    
@@ -85,13 +85,18 @@ 
    The recipe
    
 PartValue
 Rail168px expanded, 56px collapsed, --dur-state --ease-state on width
 Surface--bs-tertiary-bg with a --bs-border-color right edge — a step back from the content, not a block of accent
-Item.5rem .6rem padding, --radius-control, icon 20px + label, .6rem gap
+Item.5rem .6rem padding, --radius-control, icon 20px + label, .6rem gap, line-height: 20px — see "Two jitters" below
+IconThe section's one glyph: the same icon heads that section's empty-state drop zone. Convert is swap_horiz, Join is merge_type
 Hoverborder rgba(accent, .5), fill rgba(accent, .04) — the standard wash ladder
 Activeborder rgba(accent, 1), fill rgba(accent, .06), and the label in --accent
-Collapse controlPinned with margin-top:auto, muted, chevron rotated 180° when collapsed
+Collapse controlPinned with margin-top:auto, muted, chevron rotated 180° when collapsed, with --dur-state on the transform so it turns rather than flips
 Focusbox-shadow: 0 0 0 .2rem rgba(accent, .35) on :focus-visible, outline:none
 
 
+
    Two jitters, and what stops them
    
+
    Pin the item's line box to the icon. Bootstrap's 1.5 line-height makes a .9rem label 21.6px tall against a 20px icon, and the label is what sets the item's height. Collapse hides the label, every item shrinks by that 1.6px, and every icon below it creeps up. line-height: 20px on the item makes the expanded and collapsed states the same height, so the icons hold still while the width animates.
    
+
    Nothing in the header may change height with the view. The header's toolbar is shared by every section and routed to whichever is showing, never hidden per view. File Converter hid Add Files / Add Folder on Join, which took the buttons' 31px out of a header whose title is 24px — so the title and everything under it jumped 7px on every switch. If a section genuinely has no use for a control, reserve its height; do not remove it.
    
+
 
    Where it sits in the shell
    
 
    The rail is outside the padded content column, so it reaches the window edge. That means the shell is no longer the outermost element: an .app-frame row wraps the rail and the column, and the column keeps the padding, the header, the content and the footer. Give the column min-width:0 or a wide child stretches it and the whole window scrolls sideways.
    
 
diff --git a/src/index.html b/src/index.html
index 1a34197..423a443 100644
--- a/src/index.html
+++ b/src/index.html
@@ -21,12 +21,18 @@
 
     
    
 
-        
+        
         
    
-    
    
+        
    
 
     
     
+    
     
 
 
diff --git a/src/main.js b/src/main.js
index 19bef9c..80bd540 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,4 +1,4 @@
-const { app, BrowserWindow, ipcMain, dialog, Menu, shell, nativeTheme } = require("electron");
+const { app, BrowserWindow, dialog, shell } = require("electron");
 const Store = require("electron-store").default;
 const fs = require("fs");
 const { spawn } = require("child_process");
@@ -14,6 +14,7 @@ const probe = require("./core/probe");
 const paths = require("./core/paths");
 const scan = require("./core/scan");
 const version = require("./core/version");
+const { menuItems } = require("./menu");
 
 const LOG_LEVELS = { ERROR: 0, WARN: 1, INFO: 2, DEBUG: 3 };
 
@@ -55,13 +56,30 @@ if (process.platform === "win32") {
 const gotLock = app.requestSingleInstanceLock();
 if (!gotLock) app.quit();
 
+// The house frame: the shared preload (window.kitAPI) on the app's session,
+// the settings, the Credits tab, the menu and the theme push. The settings are
+// the kit's to keep, in the same "settings" key of the same config.json as
+// 2.0.0, so what was saved carries over; this file's own store below keeps
+// the window's bounds and the migration's marker beside them.
+const kit = require("@diamonddigitaldev/electron-kit/main").start({
+    settings: { defaults: SETTINGS_DEFAULTS },
+    credits: {
+        lines: [
+            ["Created and maintained by ", { text: "Diamond Digital Development", href: "https://diamonddigital.dev" }, "."],
+            ["Logo designed by ", { text: "TheFuturisticIdiot", href: "https://github.com/TheFuturisticIdiot" }, "."],
+            "This software is licensed under the Apache 2.0 license.",
+        ],
+        donate: "https://buymeacoff.ee/willtda",
+    },
+    menu: { items: menuItems({ openFiles, openFolder }) },
+});
+
 const store = new Store({
     defaults: {
         windowBounds: {
             width: WINDOW.DEFAULT_WIDTH,
             height: WINDOW.DEFAULT_HEIGHT,
         },
-        settings: SETTINGS_DEFAULTS,
     }
 });
 
@@ -92,16 +110,12 @@ function migrateStore() {
 }
 
 /**
- * The app-wide settings, with the defaults underneath.
- *
- * electron-store's `defaults` replace the whole `settings` key the first time
- * anything writes to it, and the renderer only ever writes `scan` and
- * `navCollapsed` — so reading the key raw hands back an object missing every
- * other field, and `?? SETTINGS_DEFAULTS` never fires because the object it is
- * guarding is present. Merging is what actually restores a default.
+ * The app-wide settings, with the defaults underneath: the kit reads what's
+ * stored merged over SETTINGS_DEFAULTS, so a setting a partial saved object
+ * leaves out still has its default.
  */
 function appSettings() {
-    return { ...SETTINGS_DEFAULTS, ...(store.get("settings") ?? {}) };
+    return kit.settings.get();
 }
 
 let mainWindow;
@@ -139,6 +153,7 @@ function createWindow() {
         icon: getIconPath(),
         webPreferences: {
             preload: path.join(__dirname, "preload.js"),
+            sandbox: true,
             contextIsolation: true,
             nodeIntegration: false,
         }
@@ -169,133 +184,25 @@ function createWindow() {
     mainWindow.webContents.on("did-finish-load", flushPendingFiles);
 }
 
-// Both pages follow the OS theme through a prefers-color-scheme listener of
-// their own, which is the mechanism that is supposed to carry a live change.
-// A tester on real Windows saw the app stay dark after switching Windows to
-// Light, so this pushes the change explicitly as well: nativeTheme is the
-// main process's own view of the OS setting, and does not depend on the media
-// query notification reaching the renderer. Belt and braces — the page applies
-// whichever arrives first, and applying twice is a no-op.
-function broadcastTheme() {
-    const theme = nativeTheme.shouldUseDarkColors ? "dark" : "light";
-    for (const win of BrowserWindow.getAllWindows()) {
-        if (!win.isDestroyed()) win.webContents.send(IPC.THEME_CHANGED, theme);
-    }
-}
-
-// Only ever one Credits window. Without this guard the menu opened another
-// modal on every click, stacking identical windows: Escape closed the top one
-// and revealed the one behind it, which looks exactly like Escape doing
-// nothing. The handler below was never the problem.
-let creditsWindow = null;
+// The menu's own items (menu.js): the kit puts them first in the house menu.
 
-function createCreditsWindow() {
-    if (creditsWindow && !creditsWindow.isDestroyed()) {
-        creditsWindow.focus();
-        return;
-    }
-
-    creditsWindow = new BrowserWindow({
-        width: 750,
-        height: 450,
-        parent: mainWindow,
-        modal: true,
-        resizable: false,
-        minimizable: false,
-        maximizable: false,
-        fullscreenable: false,
-        webPreferences: {
-            preload: path.join(__dirname, "preload.js"),
-            contextIsolation: true,
-            nodeIntegration: false,
-        },
-        icon: getIconPath()
-    });
-    creditsWindow.on("minimize", (e) => {
-        e.preventDefault();
-        creditsWindow.show();
-        creditsWindow.focus();
-    });
-
-    // Escape closes the window. Handled in the main process rather than with a
-    // keydown listener in the page: before-input-event fires no matter where
-    // focus sits inside the document, and does not depend on the page script
-    // having run. The page-level handler worked when run unpackaged but not in
-    // the packaged build, which is exactly the fragility this avoids.
-    creditsWindow.webContents.on("before-input-event", (event, input) => {
-        if (input.type === "keyDown" && input.key === "Escape") {
-            event.preventDefault();
-            if (!creditsWindow.isDestroyed()) creditsWindow.close();
-        }
+async function openFiles() {
+    const result = await dialog.showOpenDialog(mainWindow, {
+        properties: ["openFile", "multiSelections"],
+        filters: FILE_DIALOG_FILTERS,
     });
-    creditsWindow.on("closed", () => { creditsWindow = null; });
-    creditsWindow.setMenu(null);
-    creditsWindow.loadFile(path.join(__dirname, "credits.html"));
+    if (!result.canceled && result.filePaths.length > 0) {
+        sendFilesToRenderer(result.filePaths);
+    }
 }
 
-function setupMenu() {
-    const template = [
-        {
-            label: "Menu",
-            submenu: [
-                {
-                    label: "Open Files",
-                    accelerator: "Ctrl+O",
-                    click: async () => {
-                        const result = await dialog.showOpenDialog(mainWindow, {
-                            properties: ["openFile", "multiSelections"],
-                            filters: FILE_DIALOG_FILTERS,
-                        });
-                        if (!result.canceled && result.filePaths.length > 0) {
-                            sendFilesToRenderer(result.filePaths);
-                        }
-                    }
-                },
-                {
-                    label: "Open Folder",
-                    accelerator: "Ctrl+Shift+O",
-                    click: async () => {
-                        const result = await dialog.showOpenDialog(mainWindow, {
-                            properties: ["openDirectory"],
-                        });
-                        if (!result.canceled && result.filePaths.length > 0) {
-                            sendFilesToRenderer(result.filePaths);
-                        }
-                    }
-                },
-                { type: "separator" },
-                {
-                    label: "Check for Updates",
-                    click: checkForUpdatesManually
-                },
-                { type: "separator" },
-                // Electron's F12 / Ctrl+Shift+I shortcut comes from the default
-                // application menu, so replacing that menu with this one took
-                // DevTools away with it — which left testers unable to check
-                // the console at all. Re-declared explicitly; webPreferences
-                // never disabled devTools, so this was an accident, not a
-                // lock-down.
-                {
-                    label: "Toggle Developer Tools",
-                    accelerator: "F12",
-                    role: "toggleDevTools"
-                },
-                { type: "separator" },
-                {
-                    label: "Exit",
-                    accelerator: "Alt+F4",
-                    role: "quit"
-                }
-            ]
-        },
-        {
-            label: "Credits",
-            accelerator: "CmdOrCtrl+Shift+C",
-            click: () => { createCreditsWindow(); }
-        }
-    ];
-
-    Menu.setApplicationMenu(Menu.buildFromTemplate(template));
+async function openFolder() {
+    const result = await dialog.showOpenDialog(mainWindow, {
+        properties: ["openDirectory"],
+    });
+    if (!result.canceled && result.filePaths.length > 0) {
+        sendFilesToRenderer(result.filePaths);
+    }
 }
 
 // ── Incoming files (file associations, "Open with", Explorer context menu) ───
@@ -524,6 +431,10 @@ function runJobToCompletion(job) {
 }
 
 // ── IPC ──────────────────────────────────────────────────────────────────────
+//
+// Every handler goes through kit.ipc.handle(), which answers the app's own
+// page only: a window of the app navigated anywhere else still has the
+// preload's bridge, and is refused before the handler runs.
 
 async function runSubmittedJob(spec) {
     const settings = appSettings();
@@ -576,7 +487,7 @@ async function runSubmittedJob(spec) {
     return result;
 }
 
-ipcMain.handle(IPC.JOB_RUN, (_event, spec) => withBatchJob(() => runSubmittedJob(spec)));
+kit.ipc.handle(IPC.JOB_RUN, (_event, spec) => withBatchJob(() => runSubmittedJob(spec)));
 
 async function runSubmittedJoin(spec) {
     const settings = appSettings();
@@ -602,22 +513,22 @@ async function runSubmittedJoin(spec) {
     return result;
 }
 
-ipcMain.handle(IPC.JOIN_RUN, (_event, spec) => withBatchJob(() => runSubmittedJoin(spec)));
+kit.ipc.handle(IPC.JOIN_RUN, (_event, spec) => withBatchJob(() => runSubmittedJoin(spec)));
 
-ipcMain.handle(IPC.JOB_CANCEL, (_event, jobId) => getRunner().cancel(jobId));
+kit.ipc.handle(IPC.JOB_CANCEL, (_event, jobId) => getRunner().cancel(jobId));
 // The footer button, reachable only when no prompt is open — but it aborts the
 // same batch, so it records it the same way.
-ipcMain.handle(IPC.QUEUE_CANCEL_ALL, () => { conflictAbort = true; getRunner().cancelAll(); });
-ipcMain.handle(IPC.QUEUE_SET_CONCURRENCY, (_event, n) => {
+kit.ipc.handle(IPC.QUEUE_CANCEL_ALL, () => { conflictAbort = true; getRunner().cancelAll(); });
+kit.ipc.handle(IPC.QUEUE_SET_CONCURRENCY, (_event, n) => {
     getRunner().setConcurrency(n);
-    store.set("settings.concurrency", n);
+    kit.settings.set({ concurrency: n });
 });
 
-ipcMain.handle(IPC.PROBE_FILE, (_event, filePath) => probe.probe(filePath));
+kit.ipc.handle(IPC.PROBE_FILE, (_event, filePath) => probe.probe(filePath));
 
-ipcMain.handle(IPC.FS_SCAN, (_event, inputPaths, options) => scan.scanPaths(inputPaths ?? [], options ?? {}));
+kit.ipc.handle(IPC.FS_SCAN, (_event, inputPaths, options) => scan.scanPaths(inputPaths ?? [], options ?? {}));
 
-ipcMain.handle(IPC.DIALOG_BROWSE_FILES, async () => {
+kit.ipc.handle(IPC.DIALOG_BROWSE_FILES, async () => {
     const result = await dialog.showOpenDialog(mainWindow, {
         properties: ["openFile", "multiSelections"],
         filters: FILE_DIALOG_FILTERS,
@@ -626,13 +537,13 @@ ipcMain.handle(IPC.DIALOG_BROWSE_FILES, async () => {
     return result.filePaths;
 });
 
-ipcMain.handle(IPC.DIALOG_BROWSE_FOLDER, async () => {
+kit.ipc.handle(IPC.DIALOG_BROWSE_FOLDER, async () => {
     const result = await dialog.showOpenDialog(mainWindow, { properties: ["openDirectory"] });
     if (result.canceled || result.filePaths.length === 0) return null;
     return result.filePaths;
 });
 
-ipcMain.handle(IPC.DIALOG_CHOOSE_OUTPUT, async () => {
+kit.ipc.handle(IPC.DIALOG_CHOOSE_OUTPUT, async () => {
     const result = await dialog.showOpenDialog(mainWindow, {
         properties: ["openDirectory", "createDirectory"],
         title: "Choose an output folder",
@@ -641,21 +552,15 @@ ipcMain.handle(IPC.DIALOG_CHOOSE_OUTPUT, async () => {
     return result.filePaths[0];
 });
 
-ipcMain.handle(IPC.SHELL_OPEN_PATH, (_event, target) => shell.openPath(target));
-ipcMain.handle(IPC.SHELL_SHOW_IN_FOLDER, (_event, target) => { shell.showItemInFolder(target); });
-ipcMain.handle(IPC.SHELL_OPEN_EXTERNAL, (_event, url) => {
-    // Only ever hand the OS an http(s) URL, whatever the page asked for.
-    if (typeof url === "string" && /^https?:\/\//i.test(url)) return shell.openExternal(url);
-    log(LOG.WARN, `Refused to open external URL: ${url}`);
-});
-
+kit.ipc.handle(IPC.SHELL_OPEN_PATH, (_event, target) => shell.openPath(target));
+kit.ipc.handle(IPC.SHELL_SHOW_IN_FOLDER, (_event, target) => { shell.showItemInFolder(target); });
 /**
  * Decode a single frame for the dialog to show. Deliberately forgiving: a source
  * that will not seek, will not decode, or simply has no picture there resolves
  * to null and the dialog shows nothing. A missing preview must never be able to
  * block choosing a frame.
  */
-ipcMain.handle(IPC.PREVIEW_FRAME, (_event, request) => {
+kit.ipc.handle(IPC.PREVIEW_FRAME, (_event, request) => {
     const inputPath = request && request.inputPath;
     const timestamp = Number(request && request.timestamp) || 0;
     if (!inputPath) return null;
@@ -694,8 +599,7 @@ ipcMain.handle(IPC.PREVIEW_FRAME, (_event, request) => {
     });
 });
 
-ipcMain.handle(IPC.APP_GET_VERSION, () => app.getVersion());
-ipcMain.handle(IPC.APP_GET_FORMATS, () => ({
+kit.ipc.handle(IPC.APP_GET_FORMATS, () => ({
     conversionMap: formats.buildLegacyConversionMap(),
     aliases: formats.EXT_ALIASES,
     supported: formats.SUPPORTED_EXTENSIONS,
@@ -714,7 +618,7 @@ ipcMain.handle(IPC.APP_GET_FORMATS, () => ({
 
 // Live ffmpeg preview for the New Job dialog. Runs the spec through the real
 // argument builder, so what the dialog shows is what will actually be executed.
-ipcMain.handle(IPC.JOB_PREVIEW, (_event, spec) => {
+kit.ipc.handle(IPC.JOB_PREVIEW, (_event, spec) => {
     try {
         const job = createJob(spec);
         const validation = validateJob(job);
@@ -734,11 +638,6 @@ ipcMain.handle(IPC.JOB_PREVIEW, (_event, spec) => {
     }
 });
 
-ipcMain.handle(IPC.SETTINGS_GET, () => store.get("settings"));
-ipcMain.handle(IPC.SETTINGS_SET, (_event, settings) => {
-    store.set("settings", { ...store.get("settings"), ...settings });
-    return store.get("settings");
-});
 
 
 // ── Auto-update ──────────────────────────────────────────────────────────────
@@ -815,50 +714,16 @@ function setupAutoUpdater() {
     }, 5000);
 }
 
-function checkForUpdatesManually() {
-    const { autoUpdater } = require("electron-updater");
-    autoUpdater.allowPrerelease = false;
-    autoUpdater.allowDowngrade = false;
-    autoUpdater.channel = "latest";
-
-    autoUpdater.checkForUpdates().then(result => {
-        const found = result?.updateInfo?.version ?? null;
-        // Equality was the wrong test: running 2.0.0-alpha.1 against a latest
-        // stable of 1.0.0 is neither equal nor an update, and the check used to
-        // fall through and do nothing at all.
-        if (!version.isOfferableUpdate(found, app.getVersion())) {
-            dialog.showMessageBox(mainWindow, {
-                type: "info",
-                title: "No Updates",
-                message: "You're up to date!",
-                detail: `Diamond File Converter ${app.getVersion()} is the latest version.`,
-                buttons: ["OK", "View Changelog"]
-            }).then(r => {
-                if (r.response === 1) shell.openExternal(`https://github.com/diamonddigitaldev/Diamond-File-Converter/releases/tag/${app.getVersion()}`);
-            });
-        }
-    }).catch(err => {
-        dialog.showMessageBox(mainWindow, {
-            type: "error",
-            title: "Update Check Failed",
-            message: "Could not check for updates.",
-            detail: err.message,
-            buttons: ["OK"]
-        });
-    });
-}
-
 // ── Lifecycle ────────────────────────────────────────────────────────────────
 
-app.whenReady().then(() => {
+// kit.ready: the app is ready, and the kit's preload, menu and theme push are in place.
+kit.ready.then(() => {
     log(LOG.INFO, "=== App ready ===");
     // Before the window, because the renderer asks for settings on load and
     // should never be handed a value the migration is about to remove.
     migrateStore();
     probe.setFfprobePath(getFfprobePath());
     createWindow();
-    setupMenu();
-    nativeTheme.on("updated", broadcastTheme);
     queueIncomingFiles(filePathsFromArgv(process.argv));
     if (app.isPackaged) setupAutoUpdater();
 });
diff --git a/src/menu.js b/src/menu.js
new file mode 100644
index 0000000..dab0515
--- /dev/null
+++ b/src/menu.js
@@ -0,0 +1,22 @@
+"use strict";
+
+// The app's own items in the house menu. The kit builds the rest of it
+// (Settings on CmdOrCtrl+,, Check for Updates, Toggle Developer Tools on a
+// pre-release, Exit) and puts these first. Credits is the last tab of
+// Settings, so it has no item.
+//
+// Kept apart from main.js so test/kit.test.js can check the accelerators
+// without launching Electron.
+
+/**
+ * @param {{ openFiles: () => void, openFolder: () => void }} actions
+ * @returns {Electron.MenuItemConstructorOptions[]}
+ */
+function menuItems({ openFiles, openFolder }) {
+    return [
+        { label: "Open Files", accelerator: "CmdOrCtrl+O", click: openFiles },
+        { label: "Open Folder", accelerator: "CmdOrCtrl+Shift+O", click: openFolder },
+    ];
+}
+
+module.exports = { menuItems };
diff --git a/src/preload.js b/src/preload.js
index c258c5f..9167d2d 100644
--- a/src/preload.js
+++ b/src/preload.js
@@ -4,8 +4,10 @@
 //
 // v1 had no preload at all: the renderer ran with nodeIntegration:true and
 // contextIsolation:false and required fs, path and electron directly. This is
-// the entire surface the renderer is now allowed to touch, exposed under the
-// same `electronAPI` name the Dropgate client uses.
+// the app's own surface the renderer is allowed to touch, exposed under the
+// same `electronAPI` name the Dropgate client uses. The shared channels
+// (the version, settings, links out, the theme) are the kit's own preload's,
+// window.kitAPI, which the kit registers on the app's session.
 //
 // IMPORTANT: this file runs in a sandboxed preload, where require() is limited
 // to a small allowlist ("electron", "events", "timers", "url"). Requiring
@@ -32,13 +34,8 @@ const CH = {
     DIALOG_CHOOSE_OUTPUT:  "dialog:choose-output",
     SHELL_OPEN_PATH:       "shell:open-path",
     SHELL_SHOW_IN_FOLDER:  "shell:show-in-folder",
-    SHELL_OPEN_EXTERNAL:   "shell:open-external",
-    APP_GET_VERSION:       "app:get-version",
     APP_GET_FORMATS:       "app:get-formats",
-    SETTINGS_GET:          "settings:get",
-    SETTINGS_SET:          "settings:set",
     FILES_OPENED:          "files:opened",
-    THEME_CHANGED:         "theme:changed",
 };
 
 /** Subscribe helper that hands back an unsubscribe function. */
@@ -101,14 +98,9 @@ contextBridge.exposeInMainWorld("electronAPI", {
     // -- Shell and app --------------------------------------------------------
     openPath:     (target) => ipcRenderer.invoke(CH.SHELL_OPEN_PATH, target),
     showInFolder: (target) => ipcRenderer.invoke(CH.SHELL_SHOW_IN_FOLDER, target),
-    openExternal: (url)    => ipcRenderer.invoke(CH.SHELL_OPEN_EXTERNAL, url),
-    getVersion:   ()       => ipcRenderer.invoke(CH.APP_GET_VERSION),
     getFormats:   ()       => ipcRenderer.invoke(CH.APP_GET_FORMATS),
-    getSettings:  ()       => ipcRenderer.invoke(CH.SETTINGS_GET),
-    setSettings:  (s)      => ipcRenderer.invoke(CH.SETTINGS_SET, s),
 
     onFilesOpened:  (cb) => on(CH.FILES_OPENED, cb),
-    onThemeChanged: (cb) => on(CH.THEME_CHANGED, cb),
 });
 
 // Path helpers. The renderer needs basename, extname and stem for display and
diff --git a/src/renderer.js b/src/renderer.js
index ef9315d..a8c6ede 100644
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -1,13 +1,16 @@
 // Renderer — job card grid.
 //
 // Runs with contextIsolation on and no Node access. Everything reaches the main
-// process through window.electronAPI, exposed by preload.js.
+// process through window.electronAPI, exposed by preload.js, except the
+// settings, which go through the kit's window.kitAPI. The frame, the nav rail,
+// the Settings view and the theme are the kit's (kit.ui.mountShell() below).
 //
 // The v1 UI was a single-column list with one shared target format per media
 // kind and a strictly sequential convert loop. This is a grid of independently
 // configurable job cards that run through the runner's concurrency pool.
 
 const api = window.electronAPI;
+const kitApi = window.kitAPI;
 const p = window.pathAPI;
 
 // -- State -------------------------------------------------------------------
@@ -1678,20 +1681,14 @@ function confirmDialog({ title, body, confirmLabel = "Confirm", variant = "prima
 
 let currentView = "convert";
 
-/** The single route between views: a rail click, or a file drop from elsewhere. */
-async function showView(name) {
-    if (name === currentView) return;
+/** The kit's shell, once mounted: showView() is the single route between views. */
+let shell = null;
 
+/** What arriving at a view does: the kit shows it, and this brings it up to date. */
+function onViewChange(name) {
     currentView = name;
-    document.querySelector(".app-shell").dataset.view = name;
-
-    for (const item of document.querySelectorAll(".nav-item")) {
-        const active = item.dataset.view === name;
-        item.classList.toggle("active", active);
-        if (active) item.setAttribute("aria-current", "page");
-        else item.removeAttribute("aria-current");
-    }
-
+    // The first view is shown as the shell is mounted, before the formats have arrived.
+    if (!FORMATS) return;
     if (name === "convert") render();
     else if (name === "join") renderJoin();
 }
@@ -2039,11 +2036,6 @@ function setupJoin() {
     }
 }
 
-function setNavCollapsed(collapsed) {
-    $("nav-rail").classList.toggle("collapsed", collapsed);
-    $("nav-collapse").title = collapsed ? "Expand" : "Collapse";
-}
-
 // -- Folder options ----------------------------------------------------------
 
 /**
@@ -2072,7 +2064,7 @@ function setupScanOptions() {
             followSymlinks: $("scan-symlinks").checked,
             kinds,
         };
-        await api.setSettings({ ...(await api.getSettings()), scan: scanPrefs });
+        await kitApi.setSettings({ scan: scanPrefs });
     }
 
     function setOpen(open) {
@@ -2110,32 +2102,34 @@ function setupScanOptions() {
 }
 
 document.addEventListener("DOMContentLoaded", async () => {
+    // The frame around the two sections. The kit adds Settings (with its
+    // Update and Credits tabs) and Collapse to the rail, and remembers
+    // Collapse, because a narrow window is exactly where someone collapses it
+    // and exactly where it would be most annoying to have to do so again.
+    // Mounted first, so the page is never seen without its frame.
+    shell = kit.ui.mountShell({
+        title: "Diamond File Converter",
+        sections: [
+            { view: "convert", label: "Convert", icon: "swap_horiz", element: $("convert-view") },
+            { view: "join", label: "Join", icon: "merge_type", element: $("join-view") },
+        ],
+        toolbar: $("toolbar"),
+        credits: { logo: "assets/diamondfileconverter.png" },
+        onViewChange,
+    });
+
     FORMATS = await api.getFormats();
     TARGETS = FORMATS.targetsByExt;
     DESCRIPTORS = FORMATS.descriptors;
 
-    // Navigation rail. Collapse is remembered, because a narrow window is
-    // exactly where someone collapses it and exactly where it would be most
-    // annoying to have to do so again every launch.
-    const settings = await api.getSettings();
-    setNavCollapsed(settings?.navCollapsed === true);
-
+    const settings = await kitApi.getSettings();
     if (settings?.scan) scanPrefs = { ...scanPrefs, ...settings.scan };
     setupScanOptions();
     setupJoin();
 
-    for (const item of document.querySelectorAll(".nav-item")) {
-        item.addEventListener("click", () => showView(item.dataset.view));
-    }
-    $("nav-collapse").addEventListener("click", async () => {
-        const collapsed = !$("nav-rail").classList.contains("collapsed");
-        setNavCollapsed(collapsed);
-        await api.setSettings({ ...(await api.getSettings()), navCollapsed: collapsed });
-    });
-
     // Drag and drop. The document-level guard stops a stray drop navigating the
     // window to the file and replacing the app with it.
-    const shell = document.querySelector(".app-shell");
+    const appShell = document.querySelector(".app-shell");
     let dragDepth = 0;
 
     document.addEventListener("dragover", (e) => e.preventDefault());
@@ -2147,7 +2141,7 @@ document.addEventListener("DOMContentLoaded", async () => {
         // The highlight belongs to the grid, so it stays off while Join is
         // showing — Join's own zone lights itself.
         if (currentView !== "convert") return;
-        shell.classList.add("drag-over");
+        appShell.classList.add("drag-over");
         if (jobs.length === 0) $("drop-zone").classList.add("drag-over");
     });
     document.addEventListener("dragleave", () => {
@@ -2156,13 +2150,13 @@ document.addEventListener("DOMContentLoaded", async () => {
         // highlight flicker.
         dragDepth = Math.max(0, dragDepth - 1);
         if (dragDepth === 0) {
-            shell.classList.remove("drag-over");
+            appShell.classList.remove("drag-over");
             $("drop-zone").classList.remove("drag-over");
         }
     });
     document.addEventListener("drop", async (e) => {
         dragDepth = 0;
-        shell.classList.remove("drag-over");
+        appShell.classList.remove("drag-over");
         $("drop-zone").classList.remove("drag-over");
 
         // Read the paths before any await — dataTransfer does not survive one.
@@ -2180,9 +2174,10 @@ document.addEventListener("DOMContentLoaded", async () => {
 
     // The header's Add Files and Add Folder serve both sections, so they take
     // the same reading as a drop: whichever section is showing gets the files.
+    // Settings isn't one, so files arriving there go to Convert, shown.
     function takePaths(paths) {
         if (currentView === "join") addJoinPaths(paths);
-        else ingestPaths(paths);
+        else ingestFromAnywhere(paths);
     }
     async function browseFiles() {
         const filePaths = await api.browseFiles();
@@ -2326,14 +2321,12 @@ api.onJobStatus(({ jobId, status }) => {
     }
 });
 
-api.onFilesOpened((filePaths) => {
-    ingestPaths(Array.isArray(filePaths) ? filePaths : [filePaths]);
-});
+/** Files for Convert, from wherever they came: shown on Convert if Settings is showing. */
+function ingestFromAnywhere(paths) {
+    if (currentView === "settings") shell?.showView("convert");
+    ingestPaths(paths);
+}
 
-// The page already follows the OS theme through its own prefers-color-scheme
-// listener in index.html. This is the second route: main pushes the change
-// from nativeTheme, so a live switch does not depend on the media query
-// notification arriving. Whichever lands first wins; the other is a no-op.
-api.onThemeChanged((theme) => {
-    document.documentElement.setAttribute("data-bs-theme", theme);
+api.onFilesOpened((filePaths) => {
+    ingestFromAnywhere(Array.isArray(filePaths) ? filePaths : [filePaths]);
 });
diff --git a/src/styles.css b/src/styles.css
index f7fd675..9c7800e 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -1,5 +1,7 @@
-/* App-specific styles. Shared house tokens live in styles/tokens.css, which
-   must be linked before this file. */
+/* App-specific styles. The house tokens, the shell (the frame, the nav rail,
+   the header and the Settings view) and Bootstrap's controls are the kit's
+   kit.css, and the accent is styles/accent.css; both are linked before this
+   file, which never restyles the kit's own components. */
 
 html {
     height: 100%;
@@ -31,59 +33,7 @@ a {
 }
 
 .accent {
-    color: var(--accent);
-}
-
-/* base styles for modal/secondary windows (credits, settings, etc.)
-   add class="popup-window" to the  of those pages */
-body.popup-window {
-    background-color: var(--bs-body-bg);
-    color: var(--bs-body-color);
-    padding: 20px;
-    height: auto;
-    overflow: auto;
-}
-
-body.popup-window h1 {
-    font-size: 24px;
-    margin-bottom: 20px;
-    text-align: center;
-}
-
-body.popup-window hr {
-    margin: 20px 0;
-    border: none;
-    border-top: 1px solid var(--bs-border-color);
-}
-
-body.popup-window .btn {
-    display: block;
-    width: 100%;
-    padding: 10px;
-    margin-top: 20px;
-    font-size: 16px;
-    background-color: var(--bs-secondary-bg);
-    color: var(--bs-body-color);
-    border: none;
-    border-radius: var(--radius-control);
-    transition: background-color var(--dur-default);
-    cursor: pointer;
-}
-
-body.popup-window .btn:hover {
-    background-color: var(--bs-tertiary-bg);
-}
-
-body.popup-window span {
-    color: var(--accent-muted);
-    text-decoration: none;
-    cursor: pointer;
-    transition: all var(--dur-default);
-}
-
-body.popup-window span:hover {
-    color: var(--accent);
-    text-decoration: underline;
+    color: var(--accent-text);
 }
 
 /* ── Drop zone ───────────────────────────────────────────────────────────── */
@@ -117,7 +67,7 @@ body.popup-window span:hover {
 
 .drop-icon {
     font-size: 48px;
-    color: var(--accent);
+    color: var(--accent-text);
     opacity: var(--opacity-muted);
 }
 
@@ -127,46 +77,19 @@ body.popup-window span:hover {
     margin: 0.75rem 0 0;
 }
 
-/* ── App shell ───────────────────────────────────────────────────────────── */
+/* ── Convert ───────────────────────────────────────────────────────────────── */
 
-/* The rail sits outside the padded content column so it can reach the window
-   edge, which is why the shell is no longer the outermost element. */
-.app-frame {
-    display: flex;
-    height: 100vh;
-    overflow: hidden;
-}
-
-.app-shell {
+/* The Convert view: its drop target, the selection bar, the grid and the
+   action bar, one column in the kit's content area. The grid scrolls, not the
+   view, so the bars stay put. */
+.convert-view {
     display: flex;
     flex-direction: column;
     flex: 1 1 auto;
-    height: 100%;
-    /* Without this a long filename stretches the column and the whole window
-       scrolls sideways. */
-    min-width: 0;
-    padding: 1rem 1.25rem;
+    min-height: 0;
     gap: 0.75rem;
 }
 
-/* The toolbar on the right is shared by both sections and never hidden, which
-   is what keeps this the same height on every view. The title is shorter than
-   the buttons, so hiding them would drop the header by 7px and everything
-   under it with it. */
-.app-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: 1rem;
-    flex-shrink: 0;
-}
-
-.app-title {
-    font-size: 1.25rem;
-    font-weight: 600;
-    margin: 0;
-}
-
 /* ── Folder options ──────────────────────────────────────────────────────── */
 
 /* Add Folder keeps its own click; the caret beside it is a separate control
@@ -346,16 +269,6 @@ body.popup-window span:hover {
     --bs-form-check-bg: var(--bs-body-bg);
 }
 
-.card-select:checked {
-    background-color: var(--accent);
-    border-color: var(--accent);
-}
-
-.card-select:focus {
-    border-color: var(--accent);
-    box-shadow: 0 0 0 0.2rem rgba(var(--accent-rgb), 0.25);
-}
-
 .card-head .kind-icon {
     font-size: 18px;
     flex-shrink: 0;
@@ -489,7 +402,7 @@ body.popup-window span:hover {
     animation: status-pulse var(--dur-ambient) infinite var(--ease-state);
 }
 
-.tone-running .status-text { color: var(--accent); }
+.tone-running .status-text { color: var(--accent-text); }
 
 .card-progress {
     height: 4px;
@@ -637,12 +550,12 @@ body.popup-window span:hover {
     transition: color var(--dur-micro) var(--ease-micro);
 }
 
-.card-configure:hover { color: var(--accent); }
+.card-configure:hover { color: var(--accent-text); }
 .card-configure .material-icons-round { font-size: 16px; line-height: 1; display: block; }
 
 .card-settings {
     font-size: 0.72rem;
-    color: var(--accent);
+    color: var(--accent-text);
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -858,121 +771,6 @@ body.popup-window span:hover {
 
 /* ── Credits logo ────────────────────────────────────────────────────────── */
 
-#credits-logo {
-    margin: 0;
-    width: 24px;
-    height: 24px;
-    pointer-events: none;
-    vertical-align: middle;
-    margin-top: 5px;
-    margin-right: 10px;
-}
-
-/* ── Navigation rail ─────────────────────────────────────────────────────── */
-
-.nav-rail {
-    display: flex;
-    flex-direction: column;
-    gap: 0.25rem;
-    flex-shrink: 0;
-    width: 168px;
-    padding: 1rem 0.5rem;
-    background-color: var(--bs-tertiary-bg);
-    border-right: 1px solid var(--bs-border-color);
-    transition: width var(--dur-state) var(--ease-state);
-}
-
-.nav-rail.collapsed {
-    width: 56px;
-}
-
-.nav-item,
-.nav-collapse {
-    display: flex;
-    align-items: center;
-    gap: 0.6rem;
-    width: 100%;
-    padding: 0.5rem 0.6rem;
-    border: 1px solid transparent;
-    border-radius: var(--radius-control);
-    background: none;
-    color: var(--bs-body-color);
-    font-size: 0.9rem;
-    /* The label's line box is what sets the item's height, and Bootstrap's 1.5
-       makes it 21.6px against a 20px icon. Collapsing hides the label, the
-       item shrinks by that 1.6px, and every icon below it creeps up. Pinning
-       the line box to the icon's own height makes both states identical. */
-    line-height: 20px;
-    text-align: left;
-    white-space: nowrap;
-    overflow: hidden;
-    cursor: pointer;
-    transition: background-color var(--dur-state) var(--ease-state),
-                border-color var(--dur-state) var(--ease-state);
-}
-
-.nav-item:hover,
-.nav-collapse:hover {
-    border-color: rgba(var(--accent-rgb), var(--wash-hover-border));
-    background-color: rgba(var(--accent-rgb), var(--wash-hover-fill));
-}
-
-.nav-item.active {
-    border-color: rgba(var(--accent-rgb), var(--wash-active-border));
-    background-color: rgba(var(--accent-rgb), var(--wash-active-fill));
-    color: var(--accent);
-}
-
-.nav-item:focus-visible,
-.nav-collapse:focus-visible {
-    outline: none;
-    box-shadow: 0 0 0 0.2rem rgba(var(--accent-rgb), 0.35);
-}
-
-.nav-icon {
-    font-size: 20px;
-    flex-shrink: 0;
-}
-
-/* Collapsing is not a destination, so it sits apart from the two that are. */
-.nav-collapse {
-    margin-top: auto;
-    color: var(--bs-secondary-color);
-}
-
-.nav-rail.collapsed .nav-label {
-    display: none;
-}
-
-.nav-collapse .nav-icon {
-    transition: transform var(--dur-state) var(--ease-state);
-}
-
-.nav-rail.collapsed .nav-collapse .nav-icon {
-    transform: rotate(180deg);
-}
-
-/* ── View switching ──────────────────────────────────────────────────────── */
-
-/* render() and renderSelection() own d-none on the convert elements and know
-   nothing about which view is showing, so these must force-hide with
-   !important rather than compete with them. Each view then keeps its own state
-   while hidden and returns to it intact rather than being rebuilt.
-
-   Four elements, not three: #bulk-bar is toggled by renderSelection rather
-   than by render. The header's Add Files / Add Folder group is deliberately
-   not here — it serves both sections, and hiding it moved the header. */
-.app-shell[data-view="join"] #empty-state,
-.app-shell[data-view="join"] #grid-scroll,
-.app-shell[data-view="join"] #action-bar,
-.app-shell[data-view="join"] #bulk-bar {
-    display: none !important;
-}
-
-.app-shell[data-view="convert"] #join-view {
-    display: none !important;
-}
-
 /* ── Join ────────────────────────────────────────────────────────────────── */
 
 .join-view { flex: 1 1 auto; min-height: 0; display: flex; flex-direction: column; }
diff --git a/src/styles/accent.css b/src/styles/accent.css
new file mode 100644
index 0000000..2f34dd7
--- /dev/null
+++ b/src/styles/accent.css
@@ -0,0 +1,16 @@
+/* Diamond File Converter's accent: the only colours that differ between the
+   house apps. Its green is shaded 20% so white text on it meets WCAG AA
+   (4.64:1; the old #28a745 gave 3.13:1), with a darker hover. The text and
+   link shades are the ones that pass on the page and the rail in each theme.
+   test/kit.test.js checks every pairing. */
+
+:root {
+    --accent:            #208637;      /* the fill: primary buttons, progress, checked boxes */
+    --accent-hover:      #1b722f;      /* the fill, hovered or pressed */
+    --accent-rgb:        32, 134, 55;  /* --accent as r, g, b, for the washes */
+    --accent-contrast:   #fff;         /* text and icons on the fill */
+    --accent-text-light: #1a6b2c;      /* accent text, and links on hover, in each theme */
+    --accent-text-dark:  #98d5a5;
+    --accent-link-light: #208637;      /* links, in each theme */
+    --accent-link-dark:  #7eca8f;
+}
diff --git a/src/styles/tokens.css b/src/styles/tokens.css
deleted file mode 100644
index 95745d0..0000000
--- a/src/styles/tokens.css
+++ /dev/null
@@ -1,102 +0,0 @@
-/* ============================================================================
-   Diamond Digital — Electron house tokens
-   ----------------------------------------------------------------------------
-   Shared across Diamond File Converter, Diamond Media Player and the Dropgate
-   client. Bootstrap 5.3's own custom properties remain the semantic base; this
-   file adds the slots the house style actually uses and that Bootstrap has no
-   opinion about, then binds the brand accent into Bootstrap's primary.
-
-   House rule: per-app accent, everything else shared. An app overrides the
-   four --accent-* values below and nothing else.
-       File Converter  #28a745 (green)
-       Media Player    #9740fb (purple)
-       Dropgate        #0d6efd (Bootstrap blue, unchanged)
-   ========================================================================== */
-
-:root {
-    /* -- Accent: the single per-app override ------------------------------- */
-    --accent:        #28a745;
-    --accent-hover:  #34d058;
-    --accent-muted:  #5dd879;
-    --accent-rgb:    40, 167, 69;
-
-    /* -- Motion ------------------------------------------------------------
-       Micro is for hover/press on small controls, state for surfaces that
-       change meaning, default for everything else, enter for page load. */
-    --dur-micro:   120ms;
-    --dur-state:   0.2s;
-    --dur-default: 0.3s;
-    --dur-enter:   0.4s;
-    --dur-ambient: 2s;
-
-    --ease-micro:    ease;
-    --ease-state:    ease-in-out;
-    --ease-standard: cubic-bezier(0.4, 0, 0.2, 1);
-
-    /* -- Wash ladder --------------------------------------------------------
-       Interaction: idle-hover fill, active fill, hover border, active border.
-       Semantic: the fill/border pair for success, warning and danger states. */
-    --wash-hover-fill:    0.04;
-    --wash-active-fill:   0.06;
-    --wash-hover-border:  0.5;
-    --wash-active-border: 1;
-    --wash-semantic-fill:   0.1;
-    --wash-semantic-border: 0.3;
-
-    /* -- Radii -------------------------------------------------------------- */
-    --radius-control: 5px;
-    --radius-card:    8px;
-    --radius-zone:    12px;
-    --radius-pill:    50rem;
-
-    /* -- Opacity ------------------------------------------------------------ */
-    --opacity-disabled: 0.5;
-    --opacity-muted:    0.75;
-
-    /* -- Timings the JS side shares ----------------------------------------- */
-    --timing-debounce:       500ms;
-    --timing-progress-reset: 3000ms;
-    --timing-toast:          4500ms;
-
-    /* -- Scrollbar ---------------------------------------------------------- */
-    --scrollbar-width:       6px;
-    --scrollbar-thumb:       rgba(128, 128, 128, 0.3);
-    --scrollbar-thumb-hover: rgba(128, 128, 128, 0.5);
-}
-
-/* Bind the accent into Bootstrap's primary in BOTH themes.
-
-   v1 did this only inside [data-bs-theme="dark"], which left every
-   .btn-primary rendering Bootstrap blue in light mode while the rest of the
-   app was green. Listing the bare :root alongside both explicit themes covers
-   the "system" case, where neither data-bs-theme attribute is present. */
-:root,
-[data-bs-theme="light"],
-[data-bs-theme="dark"] {
-    --bs-primary:          var(--accent);
-    --bs-primary-rgb:      var(--accent-rgb);
-    --bs-link-color:       var(--accent);
-    --bs-link-color-rgb:   var(--accent-rgb);
-    --bs-link-hover-color: var(--accent-hover);
-    --bs-focus-ring-color: rgba(var(--accent-rgb), 0.25);
-}
-
-/* Bootstrap's progress bar has the same problem as .btn-primary below: .progress
-   sets --bs-progress-bar-bg to a literal #0d6efd rather than to var(--bs-primary),
-   so an accent-bound primary leaves the bar Bootstrap blue. */
-.progress {
-    --bs-progress-bar-bg: var(--accent);
-}
-
-/* Bootstrap derives .btn-primary from its own component-level variables, not
-   from --bs-primary, so the button needs the accent applied directly. */
-.btn-primary {
-    --bs-btn-bg:               var(--accent);
-    --bs-btn-border-color:     var(--accent);
-    --bs-btn-hover-bg:         var(--accent-hover);
-    --bs-btn-hover-border-color: var(--accent-hover);
-    --bs-btn-active-bg:        var(--accent-hover);
-    --bs-btn-active-border-color: var(--accent-hover);
-    --bs-btn-disabled-bg:      var(--accent);
-    --bs-btn-disabled-border-color: var(--accent);
-}
diff --git a/test/kit.test.js b/test/kit.test.js
new file mode 100644
index 0000000..9133989
--- /dev/null
+++ b/test/kit.test.js
@@ -0,0 +1,87 @@
+"use strict";
+
+// What DFC takes from the house kit, checked with the kit's own helpers: the
+// accent meets WCAG 2.2 AA in both themes, the app's menu items need a
+// modifier, every one of the app's own IPC handlers goes through
+// kit.ipc.handle() (which answers the app's own page only), and the page loads
+// the kit's styles and scripts in the order they need.
+
+const test = require("node:test");
+const assert = require("node:assert/strict");
+const fs = require("fs");
+const path = require("path");
+const { assertAccentContrast, assertNoBareAccelerators } = require("@diamonddigitaldev/electron-kit/testing");
+
+const { IPC, SETTINGS_DEFAULTS } = require("../src/constants");
+const { menuItems } = require("../src/menu");
+
+const read = (file) => fs.readFileSync(path.join(__dirname, "..", "src", file), "utf8");
+
+test("the accent meets WCAG 2.2 AA in both themes", () => {
+    assertAccentContrast(path.join(__dirname, "..", "src", "styles", "accent.css"));
+});
+
+test("the app's menu items each need a modifier", () => {
+    const items = menuItems({ openFiles: () => {}, openFolder: () => {} });
+    assertNoBareAccelerators(items);
+    assert.deepEqual(items.map(i => [i.label, i.accelerator]), [
+        ["Open Files", "CmdOrCtrl+O"],
+        ["Open Folder", "CmdOrCtrl+Shift+O"],
+    ]);
+});
+
+test("every one of the app's own handlers goes through kit.ipc.handle()", () => {
+    const main = read("main.js");
+    assert.ok(!/ipcMain/.test(main), "main.js must not register a handler straight on ipcMain: it would answer any page");
+
+    // Every channel the page invokes has its handler, and pushes have none.
+    const pushes = [IPC.JOB_PROGRESS, IPC.JOB_STATUS, IPC.FILES_OPENED];
+    const handled = [...main.matchAll(/kit\.ipc\.handle\(IPC\.([A-Z_]+)/g)].map(m => IPC[m[1]]);
+    assert.deepEqual(handled.sort(), Object.values(IPC).filter(c => !pushes.includes(c)).sort());
+});
+
+test("the settings defaults are ones the kit takes", () => {
+    // kit.start() throws at launch on either; this says so before then.
+    assert.ok(!Object.hasOwn(SETTINGS_DEFAULTS, "navCollapsed"), "navCollapsed is the kit's own setting");
+    assert.deepEqual(JSON.parse(JSON.stringify(SETTINGS_DEFAULTS)), SETTINGS_DEFAULTS, "every default is a JSON value");
+});
+
+test("the page links the kit's styles after Bootstrap's and before its own, and loads kit.js before renderer.js", () => {
+    const html = read("index.html");
+    const order = (list) => list.map(needle => {
+        const at = html.indexOf(needle);
+        assert.ok(at >= 0, `index.html loads ${needle}`);
+        return at;
+    });
+    const styles = order([
+        "bootstrap/dist/css/bootstrap.min.css",
+        "material-icons/iconfont/round.css",
+        "electron-kit/css/kit.css",
+        "styles/accent.css",
+        "\"styles.css\"",
+    ]);
+    assert.deepEqual(styles, [...styles].sort((a, b) => a - b), "Bootstrap, Material Icons, kit.css, accent.css, then styles.css");
+    const scripts = order(["bootstrap.bundle.min.js\"", "src=\"core/display.js\"", "electron-kit/page/kit.js\"", "src=\"renderer.js\""]);
+    assert.deepEqual(scripts, [...scripts].sort((a, b) => a - b));
+    assert.ok(!/styles\/tokens\.css/.test(html), "the kit's kit.css holds the tokens now");
+});
+
+test("renderer.js declares nothing named after a global the bridges or the kit set", () => {
+    // It's a classic script, so a top-level const kitAPI collides with
+    // window.kitAPI: "Identifier 'kitAPI' has already been declared", and the
+    // whole script never runs.
+    const renderer = read("renderer.js");
+    for (const name of ["kitAPI", "electronAPI", "pathAPI", "kit"]) {
+        assert.ok(!new RegExp(`^(const|let|var|function|class)\\s+${name}\\b`, "m").test(renderer), `renderer.js declares ${name}`);
+    }
+});
+
+test("the app's styles leave the kit's shell alone", () => {
+    // The rail, the header and the view switching are the kit's (kit.css).
+    const css = read("styles.css");
+    for (const selector of [".nav-rail", ".nav-item", ".nav-collapse", ".app-frame", ".app-header", ".app-title", "popup-window"]) {
+        assert.ok(!css.includes(selector), `styles.css must not restyle ${selector}`);
+    }
+    // The fill as text fails AA in one theme: text in the accent uses its text shade.
+    assert.ok(!/(^|[\s{;])color:\s*var\(--accent\)/m.test(css), "accent text uses var(--accent-text)");
+});
diff --git a/test/preload.test.js b/test/preload.test.js
index 05aa01c..e10a14f 100644
--- a/test/preload.test.js
+++ b/test/preload.test.js
@@ -16,6 +16,7 @@ const assert = require("node:assert/strict");
 const fs = require("fs");
 const path = require("path");
 
+const { loadPreload } = require("@diamonddigitaldev/electron-kit/testing");
 const { IPC } = require("../src/constants");
 
 const PRELOAD_PATH = path.join(__dirname, "..", "src", "preload.js");
@@ -40,7 +41,7 @@ test("preload only requires modules a sandboxed preload can load", () => {
 test("every channel the preload uses exists in the IPC map", () => {
     // The channels declared in the preload's CH table.
     const declared = [...source.matchAll(/^\s*[A-Z_]+:\s*["']([^"']+)["'],/gm)].map(m => m[1]);
-    assert.ok(declared.length >= 20, `expected the full channel table, found ${declared.length}`);
+    assert.ok(declared.length >= 15, `expected the full channel table, found ${declared.length}`);
 
     const known = new Set(Object.values(IPC));
     for (const channel of declared) {
@@ -48,6 +49,35 @@ test("every channel the preload uses exists in the IPC map", () => {
     }
 });
 
+// The kit's loadPreload() runs the preload as a sandboxed renderer would, so
+// this follows each call of the bridge to the channel it really uses, rather
+// than reading the table.
+test("the preload runs sandboxed, and every call of the bridge reaches a channel in the IPC map", () => {
+    const { required, exposed, calls } = loadPreload(PRELOAD_PATH);
+    assert.deepEqual([...new Set(required)], ["electron"]);
+
+    const known = new Set(Object.values(IPC));
+    for (const [name, fn] of Object.entries(exposed.electronAPI)) {
+        if (name === "getPathForFile") continue; // no IPC: webUtils, in the preload itself
+        const before = calls.length;
+        fn(() => {});
+        const made = calls.slice(before);
+        assert.equal(made.length, 1, `electronAPI.${name}() makes one IPC call`);
+        assert.ok(known.has(made[0].channel), `electronAPI.${name}() uses "${made[0].channel}", which is not in constants.js IPC`);
+    }
+    // And every channel in the map is one the bridge uses.
+    const used = new Set(calls.map(c => c.channel));
+    for (const channel of known) assert.ok(used.has(channel), `nothing in the preload uses "${channel}"`);
+});
+
+test("the preload leaves the kit's shared channels to the kit's own bridge", () => {
+    // window.kitAPI has these; the kit answers them, and kit.ipc.handle() refuses to.
+    for (const channel of ["app:get-version", "app:get-info", "settings:get", "settings:set", "shell:open-external", "theme:changed", "view:show"]) {
+        assert.ok(!Object.values(IPC).includes(channel), `${channel} is the kit's`);
+        assert.ok(!source.includes(`"${channel}"`), `the preload must not use ${channel}`);
+    }
+});
+
 test("channel names are namespaced, so updater events cannot be confused for IPC", () => {
     // v1 kept "update-available" (an electron-updater event) in the same flat
     // map as real IPC channels.
@@ -104,13 +134,9 @@ test("the renderer reaches Node only through the bridge", () => {
     assert.ok(!/\brequire\s*\(/.test(renderer), "renderer.js must not call require()");
     assert.ok(!/\bwindow\.process\b/.test(renderer), "renderer.js must not reach for process");
 
-    const credits = stripComments(fs.readFileSync(path.join(__dirname, "..", "src", "credits.html"), "utf8"));
-    assert.ok(!/\brequire\s*\(/.test(credits), "credits.html must not call require()");
-    assert.ok(!/onclick=/.test(credits), "credits.html should not use inline onclick handlers");
-
-    // Both pages must actually go through the bridge.
+    // The page goes through its own bridge, and the kit's for the settings.
     assert.match(renderer, /window\.electronAPI/);
-    assert.match(credits, /window\.electronAPI/);
+    assert.match(renderer, /window\.kitAPI/);
 });
 
 test("main enables context isolation and disables node integration", () => {
@@ -119,11 +145,12 @@ test("main enables context isolation and disables node integration", () => {
     assert.ok(!/nodeIntegration:\s*true/.test(main), "nodeIntegration must not be enabled");
     assert.ok(!/contextIsolation:\s*false/.test(main), "contextIsolation must not be disabled");
 
-    // Both windows must set all three, or one of them silently regresses.
+    // The one window (Credits is a tab of Settings now) sets all four.
     const windows = main.match(/webPreferences:\s*\{[^}]*\}/g) ?? [];
-    assert.equal(windows.length, 2, "expected exactly the main and credits windows");
+    assert.equal(windows.length, 1, "expected exactly the main window");
     for (const block of windows) {
         assert.match(block, /preload:/);
+        assert.match(block, /sandbox:\s*true/);
         assert.match(block, /contextIsolation:\s*true/);
         assert.match(block, /nodeIntegration:\s*false/);
     }
diff --git a/test/version.test.js b/test/version.test.js
index 27a7f89..cab7e7b 100644
--- a/test/version.test.js
+++ b/test/version.test.js
@@ -205,36 +205,25 @@ test("settings: main.js still runs the migration, once, before the window", () =
         "migrateStore must run before the window is created");
     assert.match(main, /store\.get\("settingsSchema"\) === SETTINGS_SCHEMA_VERSION/,
         "the migration must be guarded by the schema version, or it runs every launch");
-    assert.match(main, /\{ \.\.\.SETTINGS_DEFAULTS, \.\.\.\(store\.get\("settings"\) \?\? \{\}\) \}/,
-        "settings must be read with the defaults merged underneath");
+    // The kit reads the settings merged over SETTINGS_DEFAULTS; main.js must read them from it.
+    assert.match(main, /settings:\s*\{\s*defaults:\s*SETTINGS_DEFAULTS\s*\}/,
+        "the kit must be given the defaults to merge underneath");
+    assert.match(main, /function appSettings\(\) \{\s*return kit\.settings\.get\(\);/,
+        "settings must be read through the kit, with the defaults merged underneath");
 });
 
-test("credits: Escape is handled in the main process, not the page", () => {
+// Credits used to be a window of its own, with a guard against a second one,
+// Escape handled in main, and a top-level Credits menu item. It's the last tab
+// of the kit's Settings view now, from kit.start()'s credits.
+test("credits: a tab of Settings, not a window or a menu item", () => {
     const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8");
-    assert.match(main, /before-input-event/,
-        "Escape must be handled via before-input-event, which does not depend on the page script");
-    assert.match(main, /input\.key === "Escape"/);
-
-    // The page-level handler was the fragile version that failed when packaged.
-    const credits = fs.readFileSync(path.join(__dirname, "..", "src", "credits.html"), "utf8");
-    assert.ok(!/addEventListener\(\s*["']keydown["']/.test(credits),
-        "credits.html should no longer rely on its own keydown listener");
-});
-
-// ---------------------------------------------------------------------------
-// alpha.2 test-pass regressions (main process)
-// ---------------------------------------------------------------------------
+    assert.ok(!fs.existsSync(path.join(__dirname, "..", "src", "credits.html")), "credits.html is gone");
+    assert.ok(!/credits\.html|createCreditsWindow/.test(main), "main.js opens no Credits window");
+    assert.match(main, /credits:\s*\{\s*lines:/, "the Credits tab gets DFC's credit lines");
+    assert.match(main, /donate:\s*"https:\/\/buymeacoff\.ee\/willtda"/);
 
-test("credits: only one Credits window can ever be open", () => {
-    // Every menu click used to build another modal. Escape closed the top one
-    // and uncovered an identical window behind it, which reads as Escape doing
-    // nothing at all — the before-input-event handler was never at fault.
-    const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8");
-    const fn = main.slice(main.indexOf("function createCreditsWindow"));
-    assert.match(fn.slice(0, 400), /if \(creditsWindow && !creditsWindow\.isDestroyed\(\)\)/,
-        "an existing Credits window must be focused rather than duplicated");
-    assert.match(fn.slice(0, 2000), /creditsWindow\.on\("closed"/,
-        "the reference must be cleared, or Credits can never be reopened");
+    const menu = fs.readFileSync(path.join(__dirname, "..", "src", "menu.js"), "utf8");
+    assert.ok(!/label:\s*"Credits"/.test(menu + main), "no Credits menu item");
 });
 
 // Prompt serialisation used to be asserted here by matching three identifiers
@@ -244,24 +233,23 @@ test("credits: only one Credits window can ever be open", () => {
 // "Apply to all remaining files" cases in docs/MANUAL-TESTING.md. What the
 // pool does around those prompts is covered properly in test/runner.test.js.
 
-test("theme: an OS theme change is pushed to the windows, not only observed", () => {
+// The kit pushes an OS theme change to every window (theme:changed from
+// nativeTheme), and its theme.js applies it, beside the media query.
+test("theme: the page follows the OS theme through the kit, not code of its own", () => {
     const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8");
-    assert.match(main, /nativeTheme\.on\("updated"/,
-        "a live OS theme change must reach the renderer without a restart");
-    assert.match(main, /IPC\.THEME_CHANGED/);
+    assert.ok(!/nativeTheme|broadcastTheme/.test(main), "main.js leaves the theme push to the kit");
 
-    // The media query listener in the page stays as the first route.
     const html = fs.readFileSync(path.join(__dirname, "..", "src", "index.html"), "utf8");
-    assert.match(html, /addEventListener\("change", apply\)/,
-        "the prefers-color-scheme listener must remain");
+    const head = html.slice(0, html.indexOf(""));
+    assert.match(head, /
-    
-    
     
+    
     
 
 
diff --git a/src/main.js b/src/main.js
index 44f10e5..a3e2ff9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,11 +1,9 @@
-const { app, BrowserWindow, dialog, shell } = require("electron");
-const Store = require("electron-store").default;
-const fs = require("fs");
+const { app, dialog, shell } = require("electron");
 const { spawn } = require("child_process");
 const path = require("path");
 
-const { APP_NAME, IPC, WINDOW, LOG, ARGV_BATCH_DEBOUNCE_MS, SETTINGS_DEFAULTS,
-        LEGACY_STORE_KEYS, SETTINGS_SCHEMA_VERSION, pruneLegacySettings } = require("./constants");
+const { APP_NAME, IPC, WINDOW, SETTINGS_DEFAULTS, LEGACY_STORE_KEYS,
+        SETTINGS_SCHEMA_VERSION, CONFLICT_CHOICES, pruneLegacySettings } = require("./constants");
 const formats = require("./core/formats");
 const { createJob, createJoinJob, validateJob, validateJoin, defaultModeFor, STATUS } = require("./core/job");
 const { JobRunner, defaultConcurrency } = require("./core/runner");
@@ -15,8 +13,6 @@ const paths = require("./core/paths");
 const scan = require("./core/scan");
 const { menuItems } = require("./menu");
 
-const LOG_LEVELS = { ERROR: 0, WARN: 1, INFO: 2, DEBUG: 3 };
-
 // Frame previews are decoration beside a slider, not content.
 const PREVIEW_FRAME_HEIGHT = 144;
 const PREVIEW_FRAME_TIMEOUT_MS = 5000;
@@ -32,39 +28,27 @@ function extensionsOfKind(kind) {
     return Object.values(formats.FORMATS).filter(f => f.kind === kind).map(f => f.ext);
 }
 
-const LOG_LEVEL = LOG_LEVELS[String(process.env.LOG_LEVEL || "INFO").toUpperCase()] ?? LOG_LEVELS.INFO;
-
-const logFile = path.join(app.getPath("userData"), "debug.log");
-fs.writeFileSync(logFile, `=== App started at ${new Date().toISOString()} ===\n`);
-
-function log(level, ...args) {
-    const lvl = String(level).toUpperCase();
-    if ((LOG_LEVELS[lvl] ?? LOG_LEVELS.INFO) > LOG_LEVEL) return;
-    const message = `[${new Date().toISOString()}] [${lvl}] ${args.join(" ")}\n`;
-    fs.appendFileSync(logFile, message);
-    if (lvl === "ERROR") console.error(...args);
-    else if (lvl === "WARN") console.warn(...args);
-    else console.log(...args);
-}
-
-if (process.platform === "win32") {
-    app.setAppUserModelId(app.getName());
-}
-
-// prevent multiple instances
-const gotLock = app.requestSingleInstanceLock();
-if (!gotLock) app.quit();
-
-// The house frame: the shared preload (window.kitAPI) on the app's session,
-// the settings, the Credits tab, the menu, the theme push and the updater
-// (Settings > Update: the channel, automatic downloads, the dot). The settings are
-// the kit's to keep, in the same "settings" key of the same config.json as
-// 2.0.0, so what was saved carries over; this file's own store below keeps
-// the window's bounds and the migration's marker beside them.
+// The house frame (electron-kit): the shared preload (window.kitAPI) on the
+// app's session; the settings, in the same "settings" key of the same
+// config.json as 2.0.0, so what was saved carries over, and migrated once per
+// version; the log, debug.log in userData, redacted (a path keeps its file
+// name only); one instance, and the files it's opened with ("Open with", a
+// second launch, the menu), pushed to the page as files:opened; the main
+// window with its bounds kept (2.0.0's windowBounds); the Credits tab, the
+// menu, the theme push and the updater (Settings > Update).
 const kit = require("@diamonddigitaldev/electron-kit/main").start({
     // package.json's name is the npm name, which names the userData folder too.
     name: APP_NAME,
-    settings: { defaults: SETTINGS_DEFAULTS },
+    settings: {
+        defaults: SETTINGS_DEFAULTS,
+        // Version 2: the settings v1 wrote that 2.0 can't show, and the store
+        // keys whose code is gone, removed once (constants.js says why).
+        version: SETTINGS_SCHEMA_VERSION,
+        migrate: (settings) => pruneLegacySettings(settings).settings,
+        obsoleteKeys: LEGACY_STORE_KEYS,
+    },
+    log: "file",
+    files: true,
     credits: {
         lines: [
             ["Created and maintained by ", { text: "Diamond Digital Development", href: "https://diamonddigital.dev" }, "."],
@@ -79,41 +63,6 @@ const kit = require("@diamonddigitaldev/electron-kit/main").start({
     updates: {},
 });
 
-const store = new Store({
-    defaults: {
-        windowBounds: {
-            width: WINDOW.DEFAULT_WIDTH,
-            height: WINDOW.DEFAULT_HEIGHT,
-        },
-    }
-});
-
-/**
- * One-time cleanup of keys v1 wrote and 2.0 cannot reach. See constants.js for
- * why they have to go rather than simply be ignored.
- *
- * Guarded by a version marker so it runs once. An unconditional prune would eat
- * a value a future preferences screen legitimately wrote, on the very next
- * launch, which is the same class of bug in the opposite direction.
- */
-function migrateStore() {
-    if (store.get("settingsSchema") === SETTINGS_SCHEMA_VERSION) return;
-
-    const { settings, removed } = pruneLegacySettings(store.get("settings"));
-    if (removed.length > 0) {
-        log(LOG.INFO, `Removing settings 2.0 has no screen for: ${removed.join(", ")}`);
-        store.set("settings", settings);
-    }
-    for (const key of LEGACY_STORE_KEYS) {
-        if (store.has(key)) {
-            log(LOG.INFO, `Removing the orphaned store key ${key}`);
-            store.delete(key);
-        }
-    }
-
-    store.set("settingsSchema", SETTINGS_SCHEMA_VERSION);
-}
-
 /**
  * The app-wide settings, with the defaults underneath: the kit reads what's
  * stored merged over SETTINGS_DEFAULTS, so a setting a partial saved object
@@ -123,16 +72,10 @@ function appSettings() {
     return kit.settings.get();
 }
 
-let mainWindow;
-let runner = null;
+/** The main window, or null. */
+const mainWindow = () => kit.windows.main();
 
-function getIconPath() {
-    switch (process.platform) {
-        case "darwin": return path.join(__dirname, "assets", "diamondfileconverter.icns");
-        case "linux":  return path.join(__dirname, "assets", "diamondfileconverter.png");
-        default:       return path.join(__dirname, "assets", "diamondfileconverter.ico");
-    }
-}
+let runner = null;
 
 function getFfmpegPath() {
     if (app.isPackaged) return path.join(process.resourcesPath, "ffmpeg", "ffmpeg.exe");
@@ -145,109 +88,36 @@ function getFfprobePath() {
 }
 
 function createWindow() {
-    const savedBounds = store.get("windowBounds");
-
-    mainWindow = new BrowserWindow({
-        width: savedBounds.width,
-        height: savedBounds.height,
-        x: savedBounds.x,
-        y: savedBounds.y,
-        minWidth: WINDOW.MIN_WIDTH,
-        minHeight: WINDOW.MIN_HEIGHT,
+    const win = kit.windows.createMain({
+        page: path.join(__dirname, "index.html"),
+        size: { width: WINDOW.DEFAULT_WIDTH, height: WINDOW.DEFAULT_HEIGHT },
+        min: { width: WINDOW.MIN_WIDTH, height: WINDOW.MIN_HEIGHT },
         title: APP_NAME,
-        icon: getIconPath(),
-        webPreferences: {
-            preload: path.join(__dirname, "preload.js"),
-            sandbox: true,
-            contextIsolation: true,
-            nodeIntegration: false,
-        }
+        icon: path.join(__dirname, "assets", "diamondfileconverter"),
+        webPreferences: { preload: path.join(__dirname, "preload.js") },
     });
-
-    mainWindow.loadFile(path.join(__dirname, "index.html"));
-
-    // debounced save so we dont spam the disk with updates
-    let saveBoundsTimeout;
-    const saveBounds = () => {
-        clearTimeout(saveBoundsTimeout);
-        saveBoundsTimeout = setTimeout(() => {
-            if (mainWindow && !mainWindow.isDestroyed()) {
-                store.set("windowBounds", mainWindow.getBounds());
-            }
-        }, 500);
-    };
-
-    mainWindow.on("resize", saveBounds);
-    mainWindow.on("move", saveBounds);
-    mainWindow.on("close", () => {
-        if (!mainWindow.isDestroyed()) store.set("windowBounds", mainWindow.getBounds());
-    });
-    mainWindow.on("closed", () => {
-        mainWindow = null;
-    });
-
-    mainWindow.webContents.on("did-finish-load", flushPendingFiles);
+    // A question still open when the window goes has no one to answer it.
+    win.on("closed", () => answerAllConflicts({ choice: "cancelAll", all: false }));
 }
 
 // The menu's own items (menu.js): the kit puts them first in the house menu.
+// What they pick reaches the page as files:opened, as files from "Open with"
+// and a second launch do: the kit gathers those from argv, second-instance
+// and open-file (v1 had none of this, and second-instance threw the paths away).
 
 async function openFiles() {
-    const result = await dialog.showOpenDialog(mainWindow, {
+    const result = await dialog.showOpenDialog(mainWindow(), {
         properties: ["openFile", "multiSelections"],
         filters: FILE_DIALOG_FILTERS,
     });
-    if (!result.canceled && result.filePaths.length > 0) {
-        sendFilesToRenderer(result.filePaths);
-    }
+    if (!result.canceled && result.filePaths.length > 0) kit.files.open(result.filePaths);
 }
 
 async function openFolder() {
-    const result = await dialog.showOpenDialog(mainWindow, {
+    const result = await dialog.showOpenDialog(mainWindow(), {
         properties: ["openDirectory"],
     });
-    if (!result.canceled && result.filePaths.length > 0) {
-        sendFilesToRenderer(result.filePaths);
-    }
-}
-
-// ── Incoming files (file associations, "Open with", Explorer context menu) ───
-//
-// v1 had none of this: no open-file handler, no argv parsing, and
-// second-instance discarded the paths it was handed. Windows launches one
-// process per selected file, so arrivals are batched before being forwarded.
-
-let pendingFiles = [];
-let pendingTimer = null;
-
-function queueIncomingFiles(filePaths) {
-    const usable = filePaths.filter(p => typeof p === "string" && !p.startsWith("-"));
-    if (usable.length === 0) return;
-
-    pendingFiles.push(...usable);
-    clearTimeout(pendingTimer);
-    pendingTimer = setTimeout(flushPendingFiles, ARGV_BATCH_DEBOUNCE_MS);
-}
-
-function flushPendingFiles() {
-    if (pendingFiles.length === 0) return;
-    if (!mainWindow || mainWindow.webContents.isLoading()) return;
-
-    const batch = pendingFiles;
-    pendingFiles = [];
-    sendFilesToRenderer(batch);
-}
-
-function sendFilesToRenderer(filePaths) {
-    if (!mainWindow || mainWindow.isDestroyed()) return;
-    mainWindow.webContents.send(IPC.FILES_OPENED, filePaths);
-}
-
-/** Strip Electron's own arguments and keep anything that exists on disk. */
-function filePathsFromArgv(argv) {
-    return argv.slice(app.isPackaged ? 1 : 2).filter((arg) => {
-        if (typeof arg !== "string" || arg.startsWith("-")) return false;
-        try { return fs.existsSync(arg); } catch (_) { return false; }
-    });
+    if (!result.canceled && result.filePaths.length > 0) kit.files.open(result.filePaths);
 }
 
 // ── Conversion ───────────────────────────────────────────────────────────────
@@ -264,15 +134,11 @@ function getRunner() {
     });
 
     runner.on("progress", (payload) => {
-        if (mainWindow && !mainWindow.isDestroyed()) {
-            mainWindow.webContents.send(IPC.JOB_PROGRESS, payload);
-        }
+        mainWindow()?.webContents.send(IPC.JOB_PROGRESS, payload);
     });
 
     runner.on("status", (payload) => {
-        if (mainWindow && !mainWindow.isDestroyed()) {
-            mainWindow.webContents.send(IPC.JOB_STATUS, payload);
-        }
+        mainWindow()?.webContents.send(IPC.JOB_STATUS, payload);
     });
 
     return runner;
@@ -310,7 +176,7 @@ async function withBatchJob(work) {
     }
 }
 
-// Serialises the output-exists prompts so only one dialog is ever open.
+// Serialises the output-exists prompts so only one is ever open.
 let conflictPromptChain = Promise.resolve();
 
 /** Turn a chosen action into the result the runner expects. */
@@ -330,28 +196,24 @@ function applyConflictChoice(choice, candidatePath, isDirectory) {
 }
 
 /**
- * The output-exists prompt.
- *
- * This departs from v1's button set, which was kept unchanged until now. It had
- * to: the dialog is window-modal, so while it is open Windows blocks every
- * click on the app behind it — including the footer's own "Cancel All", which
- * left a user who wanted to abort a batch with no reachable way to say so.
- * Dragging the dialog aside does not help, because position was never the
- * problem. The abort therefore lives in the only surface that can receive
- * input, and v1's "Cancel" is renamed to "Skip This File", which is what it
- * always did to a single job.
+ * The output-exists prompt: "File Already Exists", asked in the page, as a
+ * modal through the kit (kit.ui.confirm()'s batch form), never a native box
+ * (DESIGN §10). A native box is window-modal: while it was open, Windows
+ * blocked every click on the app behind it, including the footer's own
+ * Cancel All. The abort lives in the prompt itself for the same reason, and
+ * v1's "Cancel" is "Skip This File", which is what it always did to one job.
  *
  * The checkbox matters: jobs run through a concurrency pool, so without a way
  * to answer once for the whole batch, converting fifty files into a folder
- * that already has them would mean fifty dialogs.
+ * that already has them would mean fifty prompts.
  */
 async function resolveConflict(job, candidatePath) {
     const isDirectory = formats.producesDirectory(job.mode);
 
     // Prompts are serialised, one at a time. The concurrency pool brings
     // several jobs here at once, and each used to read conflictChoiceForBatch
-    // (still null) and open its own dialog *before* the first answer came
-    // back — so ticking "apply to all remaining" had no effect on the dialogs
+    // (still null) and open its own prompt *before* the first answer came
+    // back — so ticking "apply to all remaining" had no effect on the prompts
     // already queued behind it, and the user was asked again for every file.
     // Chaining means each prompt re-reads the batch choice after the previous
     // one has settled.
@@ -362,38 +224,55 @@ async function resolveConflict(job, candidatePath) {
     return mine;
 }
 
+// The prompts the page has been asked and hasn't answered: id -> resolve.
+const conflictAsks = new Map();
+let conflictAskId = 0;
+
+/**
+ * Ask the page, and resolve with its answer, { choice, all }. With no window
+ * to ask, or once it closes, the answer is Cancel All: nobody can be asked.
+ */
+function askPage(candidatePath, isDirectory) {
+    const win = mainWindow();
+    if (!win) return Promise.resolve({ choice: "cancelAll", all: false });
+    const id = ++conflictAskId;
+    return new Promise((resolve) => {
+        conflictAsks.set(id, resolve);
+        win.webContents.send(IPC.CONFLICT_ASK, { id, name: path.basename(candidatePath), isDirectory });
+    });
+}
+
+/** Answer every prompt still waiting. */
+function answerAllConflicts(answer) {
+    for (const resolve of conflictAsks.values()) resolve(answer);
+    conflictAsks.clear();
+}
+
+kit.ipc.handle(IPC.CONFLICT_ANSWER, (_event, id, answer) => {
+    const resolve = conflictAsks.get(id);
+    if (!resolve) return false;
+    conflictAsks.delete(id);
+    // Anything but one of the four choices is a dismissed prompt, which is Cancel All, as Escape is.
+    const choice = CONFLICT_CHOICES.includes(answer?.choice) ? answer.choice : "cancelAll";
+    resolve({ choice, all: answer?.all === true });
+    return true;
+});
+
 /** The prompt itself. Only ever called one at a time, via resolveConflict. */
 async function promptForConflict(candidatePath, isDirectory) {
     // Cancel All ends the batch, not just the file it was answered on. The
     // prompts behind this one were chained before the abort and are already
     // past the runner's own cancelled check, so without this each of them
-    // still opened a dialog of its own — six colliding files meant six presses
-    // of a button labelled All. Escape arrives here too: cancelId is 0, which
-    // is that same button.
+    // still opened a prompt of its own — six colliding files meant six presses
+    // of a button labelled All. Escape and dismissing it arrive here too, as
+    // Cancel All.
     if (conflictAbort) return { action: "cancel" };
 
     if (conflictChoiceForBatch) {
         return applyConflictChoice(conflictChoiceForBatch, candidatePath, isDirectory);
     }
 
-    const result = await dialog.showMessageBox(mainWindow, {
-        type: "question",
-        title: "File Already Exists",
-        message: `${path.basename(candidatePath)} already exists.`,
-        detail: isDirectory
-            ? "A folder with this name is already in the destination."
-            : "A file with this name is already in the destination.",
-        buttons: ["Cancel All", "Skip This File", "Overwrite", "Save as New"],
-        defaultId: 3,
-        cancelId: 0,
-        checkboxLabel: "Apply to all remaining files",
-        checkboxChecked: false,
-    });
-
-    // An out-of-range response is a dismissed dialog, which cancelId already
-    // defines as Cancel All, so the fallback matches it rather than inventing a
-    // gentler answer the button set does not offer.
-    const choice = ["cancelAll", "skip", "overwrite", "unique"][result.response] ?? "cancelAll";
+    const { choice, all } = await askPage(candidatePath, isDirectory);
 
     // Cancelling the run is a decision about the batch, not about this file, so
     // it is answered here rather than in applyConflictChoice. It is not kept as
@@ -408,7 +287,7 @@ async function promptForConflict(candidatePath, isDirectory) {
         return { action: "cancel" };
     }
 
-    if (result.checkboxChecked) conflictChoiceForBatch = choice;
+    if (all) conflictChoiceForBatch = choice;
 
     return applyConflictChoice(choice, candidatePath, isDirectory);
 }
@@ -470,13 +349,13 @@ async function runSubmittedJob(spec) {
                 job.mode = defaultModeFor(job.sourceExt, job.output.ext, meta);
             }
         } else {
-            log(LOG.WARN, `Could not probe ${job.inputPath}: ${meta.error}`);
+            kit.log.warn(`Could not probe ${job.inputPath}: ${meta.error}`);
         }
     }
 
     const validation = validateJob(job);
     if (!validation.valid) {
-        log(LOG.ERROR, `Invalid job: ${validation.errors.join(" ")}`);
+        kit.log.error(`Invalid job: ${validation.errors.join(" ")}`);
         return { jobId: job.id, status: STATUS.ERROR, error: validation.errors[0] };
     }
 
@@ -486,7 +365,7 @@ async function runSubmittedJob(spec) {
     // dialog. v1 opened one modal per failed file mid-queue, which with a
     // concurrency pool would stack several at once and halt the whole batch.
     if (result.status === STATUS.ERROR) {
-        log(LOG.ERROR, `Conversion failed for ${job.inputPath}: ${result.error}`);
+        kit.log.error(`Conversion failed for ${job.inputPath}: ${result.error}`);
     }
 
     return result;
@@ -507,13 +386,13 @@ async function runSubmittedJoin(spec) {
 
     const validation = validateJoin(job);
     if (!validation.ok) {
-        log(LOG.ERROR, `Invalid join: ${validation.errors.join(" ")}`);
+        kit.log.error(`Invalid join: ${validation.errors.join(" ")}`);
         return { jobId: job.id, status: STATUS.ERROR, error: validation.errors[0] };
     }
 
     const result = await runJobToCompletion(job);
     if (result.status === STATUS.ERROR) {
-        log(LOG.ERROR, `Join failed: ${result.error}`);
+        kit.log.error(`Join failed: ${result.error}`);
     }
     return result;
 }
@@ -534,7 +413,7 @@ kit.ipc.handle(IPC.PROBE_FILE, (_event, filePath) => probe.probe(filePath));
 kit.ipc.handle(IPC.FS_SCAN, (_event, inputPaths, options) => scan.scanPaths(inputPaths ?? [], options ?? {}));
 
 kit.ipc.handle(IPC.DIALOG_BROWSE_FILES, async () => {
-    const result = await dialog.showOpenDialog(mainWindow, {
+    const result = await dialog.showOpenDialog(mainWindow(), {
         properties: ["openFile", "multiSelections"],
         filters: FILE_DIALOG_FILTERS,
     });
@@ -543,13 +422,13 @@ kit.ipc.handle(IPC.DIALOG_BROWSE_FILES, async () => {
 });
 
 kit.ipc.handle(IPC.DIALOG_BROWSE_FOLDER, async () => {
-    const result = await dialog.showOpenDialog(mainWindow, { properties: ["openDirectory"] });
+    const result = await dialog.showOpenDialog(mainWindow(), { properties: ["openDirectory"] });
     if (result.canceled || result.filePaths.length === 0) return null;
     return result.filePaths;
 });
 
 kit.ipc.handle(IPC.DIALOG_CHOOSE_OUTPUT, async () => {
-    const result = await dialog.showOpenDialog(mainWindow, {
+    const result = await dialog.showOpenDialog(mainWindow(), {
         properties: ["openDirectory", "createDirectory"],
         title: "Choose an output folder",
     });
@@ -647,39 +526,14 @@ kit.ipc.handle(IPC.JOB_PREVIEW, (_event, spec) => {
 
 // ── Lifecycle ────────────────────────────────────────────────────────────────
 
-// kit.ready: the app is ready, and the kit's preload, menu and theme push are in place.
+// kit.ready: the app is ready, and the kit's preload, menu and theme push are
+// in place. The settings are migrated as the store is first opened, before
+// the page can ask for them. The kit quits the app with its last window, and
+// pushes the files it was opened with once the page has loaded.
 kit.ready.then(() => {
-    log(LOG.INFO, "=== App ready ===");
-    // Before the window, because the renderer asks for settings on load and
-    // should never be handed a value the migration is about to remove.
-    migrateStore();
+    kit.log.info("=== App ready ===");
     probe.setFfprobePath(getFfprobePath());
     createWindow();
-    queueIncomingFiles(filePathsFromArgv(process.argv));
-});
-
-// macOS delivers associated files through this event rather than argv.
-app.on("open-file", (event, filePath) => {
-    event.preventDefault();
-    queueIncomingFiles([filePath]);
-});
-
-app.on("second-instance", (_event, argv) => {
-    if (mainWindow) {
-        if (mainWindow.isMinimized()) mainWindow.restore();
-        mainWindow.focus();
-    }
-    // v1 focused the window but threw the paths away, so "Open with" on an
-    // already-running app did nothing.
-    queueIncomingFiles(filePathsFromArgv(argv));
-});
-
-app.on("window-all-closed", () => {
-    if (process.platform !== "darwin") app.quit();
-});
-
-app.on("activate", () => {
-    if (BrowserWindow.getAllWindows().length === 0) createWindow();
 });
 
 app.on("will-quit", () => {
diff --git a/src/preload.js b/src/preload.js
index 9167d2d..8aa2004 100644
--- a/src/preload.js
+++ b/src/preload.js
@@ -7,7 +7,9 @@
 // the app's own surface the renderer is allowed to touch, exposed under the
 // same `electronAPI` name the Dropgate client uses. The shared channels
 // (the version, settings, links out, the theme) are the kit's own preload's,
-// window.kitAPI, which the kit registers on the app's session.
+// window.kitAPI, which the kit registers on the app's session: a dropped
+// File's path (kitAPI.getPathForFile) and the files the app is opened with
+// (kitAPI.onFilesOpened) are the kit's too.
 //
 // IMPORTANT: this file runs in a sandboxed preload, where require() is limited
 // to a small allowlist ("electron", "events", "timers", "url"). Requiring
@@ -15,7 +17,7 @@
 // inlined below. test/preload.test.js asserts every one of them still matches
 // src/constants.js, so the two cannot drift apart unnoticed.
 
-const { contextBridge, ipcRenderer, webUtils } = require("electron");
+const { contextBridge, ipcRenderer } = require("electron");
 
 const CH = {
     JOB_RUN:               "job:run",
@@ -35,7 +37,8 @@ const CH = {
     SHELL_OPEN_PATH:       "shell:open-path",
     SHELL_SHOW_IN_FOLDER:  "shell:show-in-folder",
     APP_GET_FORMATS:       "app:get-formats",
-    FILES_OPENED:          "files:opened",
+    CONFLICT_ASK:          "conflict:ask",
+    CONFLICT_ANSWER:       "conflict:answer",
 };
 
 /** Subscribe helper that hands back an unsubscribe function. */
@@ -68,28 +71,6 @@ contextBridge.exposeInMainWorld("electronAPI", {
     previewFrame: (request) => ipcRenderer.invoke(CH.PREVIEW_FRAME, request),
     scanPaths: (paths, opts) => ipcRenderer.invoke(CH.FS_SCAN, paths, opts),
 
-    /**
-     * Resolve one dropped File to an absolute path. webUtils exists only in the
-     * main world and the preload, which is why a drop has to come through here
-     * rather than being handled entirely in the renderer.
-     *
-     * **One file at a time, deliberately.** This used to take the whole
-     * `FileList` and iterate it here, which threw "files is not iterable" on
-     * every single drop: a FileList is not one of the types the context bridge
-     * can carry, so it arrived as a plain object with no iterator. A File does
-     * cross intact, so the renderer keeps the iteration where the FileList is
-     * still a FileList and calls this per file.
-     */
-    getPathForFile: (file) => {
-        try {
-            return webUtils.getPathForFile(file);
-        } catch (_) {
-            // A dragged item with no filesystem path (a browser-sourced drag,
-            // say) is simply not something we can convert.
-            return "";
-        }
-    },
-
     // -- Dialogs --------------------------------------------------------------
     browseFiles:  () => ipcRenderer.invoke(CH.DIALOG_BROWSE_FILES),
     browseFolder: () => ipcRenderer.invoke(CH.DIALOG_BROWSE_FOLDER),
@@ -100,7 +81,10 @@ contextBridge.exposeInMainWorld("electronAPI", {
     showInFolder: (target) => ipcRenderer.invoke(CH.SHELL_SHOW_IN_FOLDER, target),
     getFormats:   ()       => ipcRenderer.invoke(CH.APP_GET_FORMATS),
 
-    onFilesOpened:  (cb) => on(CH.FILES_OPENED, cb),
+    // -- "File Already Exists" ------------------------------------------------
+    // Main asks ({ id, name, isDirectory }); the page asks the person, and answers.
+    onConflictAsk: (cb) => on(CH.CONFLICT_ASK, cb),
+    answerConflict: (id, answer) => ipcRenderer.invoke(CH.CONFLICT_ANSWER, id, answer),
 });
 
 // Path helpers. The renderer needs basename, extname and stem for display and
diff --git a/src/renderer.js b/src/renderer.js
index a8c6ede..81959a9 100644
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -109,26 +109,9 @@ const SKIP_REASONS = {
     "excluded":     "turned off in folder options",
 };
 
-/** The list behind "Show them", built only if the button is actually pressed. */
-function buildSkippedDetail(skipped) {
-    const list = document.createElement("ul");
-    list.className = "toast-detail";
-
-    for (const item of skipped.slice(0, 50)) {
-        const row = document.createElement("li");
-        const name = document.createElement("span");
-        name.className = "toast-detail-name";
-        name.textContent = p.basename(item.path);
-        row.append(name, document.createTextNode(` — ${SKIP_REASONS[item.reason] ?? item.reason}`));
-        list.appendChild(row);
-    }
-    if (skipped.length > 50) {
-        const more = document.createElement("li");
-        more.className = "toast-detail-more";
-        more.textContent = `and ${display.countOf(skipped.length - 50, "more file")}`;
-        list.appendChild(more);
-    }
-    return list;
+/** The rows behind "Show Them": each file's name, and why it was skipped. The kit shows the first 50. */
+function skippedRows(skipped) {
+    return skipped.map((item) => ({ name: p.basename(item.path), note: SKIP_REASONS[item.reason] ?? item.reason }));
 }
 
 /**
@@ -185,7 +168,7 @@ async function ingestPaths(inputPaths) {
         reportIngest({ added, skipped, duplicates, truncated: result.truncated, found: result.files.length });
 
         for (const err of result.errors ?? []) {
-            toast(`Could not read ${p.basename(err.path)}: ${err.error}`, "danger");
+            kit.ui.toast(`Could not read ${p.basename(err.path)}: ${err.error}`, { type: "danger" });
         }
     } catch (_) {
         // The scan itself failed, so folders cannot be expanded. Queue whatever
@@ -209,10 +192,10 @@ async function ingestPaths(inputPaths) {
  */
 function reportIngest({ added, skipped, duplicates, truncated, found }) {
     const clauses = [];
-    if (added > 0) clauses.push(`Added ${display.countOf(added, "file")}`);
+    if (added > 0) clauses.push(`Added ${kit.format.countOf(added, "file")}`);
     if (skipped.length > 0) clauses.push(`skipped ${skipped.length}`);
     if (duplicates > 0) clauses.push(`${duplicates} already in the list`);
-    if (truncated) clauses.push(`stopped at ${display.countOf(found, "file")} — the folder is very large`);
+    if (truncated) clauses.push(`stopped at ${kit.format.countOf(found, "file")} — the folder is very large`);
 
     if (clauses.length === 0) return;
 
@@ -231,9 +214,10 @@ function reportIngest({ added, skipped, duplicates, truncated, found }) {
         message = `${clauses.join(", ")}.`;
     }
 
-    toast(message, type, 4500, skipped.length > 0
-        ? { actionLabel: "Show them", onAction: () => buildSkippedDetail(skipped) }
-        : {});
+    kit.ui.toast(message, {
+        type,
+        ...(skipped.length > 0 ? { action: { label: "Show Them", items: () => skippedRows(skipped) } } : {}),
+    });
 }
 
 /**
@@ -390,6 +374,9 @@ function render() {
     renderActionBar();
 }
 
+/** Each card's progress bar (kit.ui.progress()). */
+const cardProgress = new WeakMap();
+
 function buildCard(job) {
     const card = document.createElement("div");
     card.className = "job-card";
@@ -413,6 +400,7 @@ function buildCard(job) {
 
     const icon = document.createElement("span");
     icon.className = "material-icons-round kind-icon";
+    icon.setAttribute("aria-hidden", "true");
     icon.textContent = display.iconForKind(job.kind);
 
     const name = document.createElement("span");
@@ -422,9 +410,11 @@ function buildCard(job) {
 
     const configure = document.createElement("button");
     configure.className = "card-configure";
-    configure.title = "Advanced options";
+    configure.title = "Advanced Options";
+    configure.setAttribute("aria-label", "Advanced Options");
     const configureIcon = document.createElement("span");
     configureIcon.className = "material-icons-round";
+    configureIcon.setAttribute("aria-hidden", "true");
     configureIcon.textContent = "tune";
     configure.appendChild(configureIcon);
     configure.addEventListener("click", (e) => {
@@ -435,8 +425,10 @@ function buildCard(job) {
     const remove = document.createElement("button");
     remove.className = "card-remove";
     remove.title = "Remove";
+    remove.setAttribute("aria-label", `Remove ${p.basename(job.filePath)}`);
     const removeIcon = document.createElement("span");
     removeIcon.className = "material-icons-round";
+    removeIcon.setAttribute("aria-hidden", "true");
     removeIcon.textContent = "close";
     remove.appendChild(removeIcon);
     remove.addEventListener("click", (e) => {
@@ -473,10 +465,13 @@ function buildCard(job) {
 
     const arrow = document.createElement("span");
     arrow.className = "material-icons-round card-arrow";
+    arrow.setAttribute("aria-hidden", "true");
     arrow.textContent = "arrow_forward";
 
     const select = document.createElement("select");
     select.className = "form-select form-select-sm card-target";
+    // Its name: axe found the card's format select had none (the arrow beside it is a glyph).
+    select.setAttribute("aria-label", `Convert ${p.basename(job.filePath)} to`);
     fillTargetSelect(select, display.commonTargets([job.ext], TARGETS), job.targetExt);
     select.addEventListener("click", (e) => e.stopPropagation());
     select.addEventListener("change", () => setTarget([job.id], select.value || null));
@@ -492,19 +487,17 @@ function buildCard(job) {
     statusText.className = "status-text";
     status.append(dot, statusText);
 
-    // -- progress
-    const progress = document.createElement("div");
-    progress.className = "card-progress d-none";
-    const bar = document.createElement("div");
-    bar.className = "bar";
-    bar.style.width = "0%";
-    progress.appendChild(bar);
+    // -- progress: the kit's thin bar, named for the file. A percent of null is
+    // an unknown duration, which slides rather than sitting at a frozen 0%.
+    const progress = kit.ui.progress({ label: `Converting ${p.basename(job.filePath)}`, thin: true });
+    progress.element.classList.add("card-progress", "d-none");
+    cardProgress.set(card, progress);
 
     // -- actions (revealed once a job finishes)
     const actions = document.createElement("div");
     actions.className = "card-actions d-none";
 
-    card.append(head, meta, outputLine, settingsLine, convert, status, progress, actions);
+    card.append(head, meta, outputLine, settingsLine, convert, status, progress.element, actions);
     card.addEventListener("click", (e) => handleCardClick(job.id, e));
 
     paintCard(card, job);
@@ -570,12 +563,9 @@ function paintCard(card, job) {
     statusText.title = text;
 
     const running = job.status === "running";
-    const progress = card.querySelector(".card-progress");
-    progress.classList.toggle("d-none", !running);
-    progress.classList.toggle("indeterminate", running && job.progress === null);
-    if (running && typeof job.progress === "number") {
-        progress.querySelector(".bar").style.width = `${job.progress}%`;
-    }
+    const progress = cardProgress.get(card);
+    progress.element.classList.toggle("d-none", !running);
+    if (running) progress.set(typeof job.progress === "number" ? job.progress : null);
 
     // The target select locks while the job is in flight.
     const select = card.querySelector(".card-target");
@@ -595,7 +585,7 @@ function renderCardActions(card, job) {
         buttons.push(makeAction("Cancel", "btn-outline-danger", () => api.cancelJob(job.id)));
     } else if (job.status === "done" && job.outputPath) {
         buttons.push(makeAction(
-            job.isDirectory ? "Open folder" : "Show in folder",
+            job.isDirectory ? "Open Folder" : "Show in Folder",
             "btn-outline-secondary",
             () => (job.isDirectory ? api.openPath(job.outputPath) : api.showInFolder(job.outputPath))
         ));
@@ -676,7 +666,11 @@ function renderSelection() {
         : "";
 }
 
+/** The bar under the grid (kit.ui.actionBar()): made once, in DOMContentLoaded. */
+let actionBar = null;
+
 function renderActionBar() {
+    if (!actionBar) return;
     const total = jobs.length;
     const ready = jobs.filter(j => j.targetExt).length;
     const withoutTarget = total - ready;
@@ -688,41 +682,34 @@ function renderActionBar() {
     // "1 file queued" — describing files that had just been converted as still
     // waiting. And while a run was under way with nothing finished yet, the
     // summary read "Nothing converted", which is true but reads like a failure.
-    if (settled > 0) {
-        $("queue-summary").textContent = display.summarise(jobs);
-    } else if (converting) {
-        $("queue-summary").textContent = `Converting ${display.countOf(ready, "file")}…`;
-    } else {
-        $("queue-summary").textContent = `${display.countOf(total, "file")} queued`;
-    }
-
-    if (converting) {
-        $("queue-detail").textContent = `${running} running`;
-    } else if (withoutTarget > 0) {
-        $("queue-detail").textContent =
-            `${display.countOf(withoutTarget, "file")} still ${display.plural(withoutTarget, "needs", "need")} a format`;
-    } else {
-        // After a finished run "Ready to convert" would be misleading, so the
-        // outcome in the summary is left to speak for itself.
-        $("queue-detail").textContent = settled > 0 ? "" : "Ready to convert";
-    }
-
-    const percent = display.overallProgress(jobs);
-    $("overall-bar").style.width = `${percent}%`;
+    let summary;
+    if (settled > 0) summary = display.summarise(jobs);
+    else if (converting) summary = `Converting ${kit.format.countOf(ready, "file")}…`;
+    else summary = `${kit.format.countOf(total, "file")} queued`;
+
+    let detail;
+    if (converting) detail = `${running} running`;
+    else if (withoutTarget > 0) detail = `${kit.format.countOf(withoutTarget, "file")} still ${kit.format.plural(withoutTarget, "needs", "need")} a format`;
+    // After a finished run "Ready to convert" would be misleading, so the
+    // outcome in the summary is left to speak for itself.
+    else detail = settled > 0 ? "" : "Ready to convert";
 
     // House pattern: the primary action and its abort share one slot rather
-    // than sitting side by side, so only one is ever visible.
-    $("btn-convert").classList.toggle("d-none", converting);
-    // Enabled only while there is something left to run. `ready` counts cards
-    // that *could* run, including ones already converted, and is what the
-    // "still need a format" copy is derived from — so the button needs its own
-    // count, or it sits enabled doing nothing once a batch has finished.
-    $("btn-convert").disabled = jobs.filter(
-        j => j.targetExt && j.status !== "done"
-    ).length === 0;
+    // than sitting side by side, so only one is ever visible (the kit's bar).
+    // Convert is enabled only while there is something left to run. `ready`
+    // counts cards that *could* run, including ones already converted, and is
+    // what the "still need a format" copy is derived from — so the button
+    // needs its own count, or it sits enabled doing nothing once a batch has
+    // finished.
+    actionBar.update({
+        summary,
+        detail,
+        percent: display.overallProgress(jobs),
+        running: converting,
+        canRun: jobs.some(j => j.targetExt && j.status !== "done"),
+        canClear: !converting,
+    });
     $("bulk-edit").disabled = converting;
-    $("btn-cancel-all").classList.toggle("d-none", !converting);
-    $("btn-clear-all").disabled = converting;
 }
 
 // -- New Job dialog ----------------------------------------------------------
@@ -976,7 +963,7 @@ function renderTrim() {
         thumb.setAttribute("aria-valuemin", "0");
         thumb.setAttribute("aria-valuemax", String(Math.round(duration)));
         thumb.setAttribute("aria-valuenow", String(Math.round(value)));
-        thumb.setAttribute("aria-valuetext", display.formatDuration(value) ?? "");
+        thumb.setAttribute("aria-valuetext", kit.format.formatDuration(value) ?? "");
     }
 }
 
@@ -1137,10 +1124,10 @@ function openJobModal(ids) {
     const scoped = jobs.filter(j => modalScope.includes(j.id));
     const single = scoped.length === 1;
 
-    $("jm-title").textContent = single ? "Advanced options" : "Bulk edit";
+    $("jm-title").textContent = single ? "Advanced Options" : "Bulk Edit";
     $("jm-scope").textContent = single
         ? p.basename(scoped[0].filePath)
-        : `Applies to ${display.countOf(scoped.length, "file")}`;
+        : `Applies to ${kit.format.countOf(scoped.length, "file")}`;
 
     // Target options are the intersection, exactly as the bulk bar computes it.
     const targets = display.commonTargets(scoped.map(j => j.ext), TARGETS);
@@ -1467,83 +1454,7 @@ function applyJobModal() {
 
     jobModal.hide();
     const n = modalScope.length;
-    toast(`Settings applied to ${display.countOf(n, "file")}.`, "success");
-}
-
-// -- Toasts ------------------------------------------------------------------
-
-const TOAST_ICONS = { info: "info", success: "check_circle", warning: "warning", danger: "error" };
-
-/**
- * @param {object} [options]
- * @param {string}   [options.actionLabel] adds a button beside the message
- * @param {() => (Node|null)} [options.onAction] builds what the button reveals,
- *        appended inside this same toast. A toast carrying an action does not
- *        time out by default — an action nobody can reach is not an action.
- *
- * Everything here is set with textContent. A toast reports filenames and
- * ffmpeg's own words, neither of which this app gets to trust as markup.
- */
-function toast(message, type = "info", timeoutMs = 4500, options = {}) {
-    const host = $("toast-host");
-    const { actionLabel = null, onAction = null } = options;
-    if (actionLabel && timeoutMs === 4500) timeoutMs = 0;
-
-    const note = document.createElement("div");
-    note.className = `toast-note toast-${type}`;
-
-    const icon = document.createElement("span");
-    icon.className = "material-icons-round";
-    icon.textContent = TOAST_ICONS[type] ?? "info";
-
-    const body = document.createElement("span");
-    body.className = "toast-body";
-    body.textContent = message;
-
-    if (actionLabel && onAction) {
-        const action = document.createElement("button");
-        action.className = "toast-action";
-        action.type = "button";
-        action.textContent = actionLabel;
-
-        // Both the button and whatever it reveals live inside the body. The
-        // toast itself is a flex row of icon | body | dismiss, so anything
-        // appended to it directly becomes a fourth column instead.
-        let detail = null;
-        action.addEventListener("click", () => {
-            if (detail) {
-                detail.remove();
-                detail = null;
-                action.textContent = actionLabel;
-                return;
-            }
-            detail = onAction();
-            if (!detail) return;
-            body.appendChild(detail);
-            action.textContent = "Hide";
-        });
-        body.append(" ", action);
-    }
-
-    const close = document.createElement("button");
-    close.className = "toast-close material-icons-round";
-    close.textContent = "close";
-    close.title = "Dismiss";
-    close.addEventListener("click", () => dismiss());
-
-    note.append(icon, body, close);
-    host.appendChild(note);
-
-    let timer = null;
-    function dismiss() {
-        if (!note.isConnected) return;
-        clearTimeout(timer);
-        note.classList.add("leaving");
-        setTimeout(() => note.remove(), 200);
-    }
-
-    if (timeoutMs > 0) timer = setTimeout(dismiss, timeoutMs);
-    return dismiss;
+    kit.ui.toast(`Settings applied to ${kit.format.countOf(n, "file")}.`, { type: "success" });
 }
 
 // -- Conversion --------------------------------------------------------------
@@ -1561,11 +1472,11 @@ async function startConversion() {
     // only hint beforehand is a line on the card. Ask once, with the number.
     const frames = runnable.reduce((total, job) => total + frameCountOf(job), 0);
     if (frames >= FRAME_CONFIRM_THRESHOLD) {
-        const ok = await confirmDialog({
-            title: "That is a lot of images",
-            body: `This writes about ${display.countOf(frames, "image")}. Narrow the range in `
-                + `Advanced options if that is more than you meant.`,
-            confirmLabel: "Write them",
+        const ok = await kit.ui.confirm({
+            title: "Large Frame Export",
+            body: `This writes about ${kit.format.countOf(frames, "image")}. Narrow the range in `
+                + `Advanced Options if that is more than you meant.`,
+            confirmLabel: "Write Them",
             variant: "warning",
             icon: "burst_mode",
         });
@@ -1615,64 +1526,18 @@ function announce(results) {
         // One toast, not one blocking dialog per failure. The per-card status
         // carries each individual reason.
         const detail = failed.length === 1 ? ` — ${failed[0].error ?? "unknown error"}` : "";
-        toast(
-            `${display.countOf(failed.length, "file")} failed to convert${detail}`,
-            "danger",
-            0
-        );
+        kit.ui.toast(`${kit.format.countOf(failed.length, "file")} failed to convert${detail}`, { type: "danger", timeout: 0 });
     }
     if (done > 0) {
-        toast(`${display.countOf(done, "file")} converted.`, "success");
+        kit.ui.toast(`${kit.format.countOf(done, "file")} converted.`, { type: "success" });
     } else if (failed.length === 0 && cancelled > 0) {
-        toast("Conversion cancelled.", "info");
+        kit.ui.toast("Conversion cancelled.");
     }
 }
 
 // -- Wiring ------------------------------------------------------------------
 
 
-let confirmModal = null;
-
-/**
- * Promise-wrapped confirm, per the house pattern. Resolves true only on the
- * confirm button; every other way out resolves false, and both listeners are
- * removed in one shared cleanup either way.
- */
-function confirmDialog({ title, body, confirmLabel = "Confirm", variant = "primary", icon = "help_outline" }) {
-    return new Promise((resolve) => {
-        const modalEl = $("confirm-modal");
-        const okBtn = $("confirm-ok");
-
-        $("confirm-title").textContent = title;
-        $("confirm-body").textContent = body;
-        $("confirm-icon").textContent = icon;
-        okBtn.textContent = confirmLabel;
-        okBtn.className = `btn btn-${variant}`;
-
-        if (!confirmModal) confirmModal = new bootstrap.Modal(modalEl);
-
-        let confirmed = false;
-        const cleanup = () => {
-            okBtn.removeEventListener("click", onOk);
-            modalEl.removeEventListener("hidden.bs.modal", onHidden);
-        };
-        const onOk = () => {
-            confirmed = true;
-            cleanup();
-            confirmModal.hide();
-            resolve(true);
-        };
-        const onHidden = () => {
-            cleanup();
-            if (!confirmed) resolve(false);
-        };
-
-        okBtn.addEventListener("click", onOk);
-        modalEl.addEventListener("hidden.bs.modal", onHidden);
-        confirmModal.show();
-    });
-}
-
 // -- Views ---------------------------------------------------------------------
 //
 // Convert and Join. Everything the file grid owns keeps its own d-none state
@@ -1730,13 +1595,13 @@ async function addJoinPaths(inputPaths) {
             found: result.files.length,
         });
         for (const err of result.errors ?? []) {
-            toast(`Could not read ${p.basename(err.path)}: ${err.error}`, "danger");
+            kit.ui.toast(`Could not read ${p.basename(err.path)}: ${err.error}`, { type: "danger" });
         }
     } catch (_) {
         // The scan itself failed, so folders cannot be expanded. List whatever
         // was handed over as plain files.
         const added = await addJoinClips(inputPaths);
-        if (added === 0) toast("None of those are files this can join.", "warning");
+        if (added === 0) kit.ui.toast("None of those are files this can join.", { type: "warning" });
     }
 }
 
@@ -1827,10 +1692,10 @@ function buildJoinRow(clip, index) {
     else if (!clip.meta.ok) { meta.textContent = "unreadable"; meta.classList.add("is-bad"); }
     else {
         const span = joinClipSpan(clip);
-        const bits = [display.formatDuration(clip.meta.duration)];
+        const bits = [kit.format.formatDuration(clip.meta.duration)];
         if (clip.meta.video) bits.push(`${clip.meta.video.width}×${clip.meta.video.height}`);
         if (span != null && Math.abs(span - clip.meta.duration) > 0.05) {
-            bits.push(`keeping ${display.formatDuration(span)}`);
+            bits.push(`keeping ${kit.format.formatDuration(span)}`);
         }
         meta.textContent = bits.join(" · ");
     }
@@ -1863,7 +1728,7 @@ function timeInput(clip, which, placeholder) {
     input.type = "text";
     input.placeholder = placeholder;
     input.spellcheck = false;
-    input.value = clip.trim[which] != null ? display.formatDuration(clip.trim[which]) : "";
+    input.value = clip.trim[which] != null ? kit.format.formatDuration(clip.trim[which]) : "";
     input.addEventListener("change", () => {
         clip.trim[which] = parseTime(input.value);
         renderJoin();
@@ -1875,9 +1740,11 @@ function iconButton(icon, title, onClick, disabled = false) {
     const button = document.createElement("button");
     button.type = "button";
     button.title = title;
+    button.setAttribute("aria-label", title);
     button.disabled = disabled;
     const glyph = document.createElement("span");
     glyph.className = "material-icons-round";
+    glyph.setAttribute("aria-hidden", "true");
     glyph.textContent = icon;
     button.appendChild(glyph);
     button.addEventListener("click", onClick);
@@ -1921,7 +1788,7 @@ function renderJoinPlan() {
         return;
     }
 
-    const plan = display.describeJoinPlan(display.compareClips(metas));
+    const plan = display.describeJoinPlan(display.compareClips(metas), { targetExt: $("join-format").value || null, metas });
     box.className = `join-plan is-${plan.strategy === "demuxer" ? "copy" : plan.strategy === "filter" ? "encode" : "blocked"}`;
     box.textContent = "";
     box.appendChild(Object.assign(document.createElement("div"), { textContent: plan.headline }));
@@ -1936,9 +1803,9 @@ function renderJoinPlan() {
 function joinStrategy() {
     const metas = joinMetas();
     if (metas.length < joinClips.length || joinClips.length < 2) return null;
-    const comparison = display.compareClips(metas);
-    if (comparison.blocked) return null;
-    return comparison.compatible ? "demuxer" : "filter";
+    // The plan's own strategy: matching clips are copied only into their own container.
+    const plan = display.describeJoinPlan(display.compareClips(metas), { targetExt: $("join-format").value || null, metas });
+    return plan.strategy === "blocked" ? null : plan.strategy;
 }
 
 function renderJoinActions() {
@@ -1962,7 +1829,7 @@ function renderJoinActions() {
     $("btn-join-run").classList.toggle("d-none", Boolean(joinRunning));
     $("btn-join-cancel").classList.toggle("d-none", !joinRunning);
     $("btn-join-clear").disabled = Boolean(joinRunning);
-    document.querySelector(".join-progress").classList.toggle("d-none", !joinRunning);
+    joinProgress.element.classList.toggle("d-none", !joinRunning);
 }
 
 async function runJoin() {
@@ -1988,7 +1855,7 @@ async function runJoin() {
 
     joinRunning = generateId();
     spec.id = joinRunning;
-    $("join-bar").style.width = "0%";
+    joinProgress.set(0);
     renderJoinActions();
 
     const result = await api.runJoin(spec);
@@ -1996,25 +1863,36 @@ async function runJoin() {
     renderJoinActions();
 
     if (result.status === "done") {
-        toast(`Joined ${display.countOf(joinClips.length, "file")} into ${p.basename(result.outputPath)}.`, "success");
+        kit.ui.toast(`Joined ${kit.format.countOf(joinClips.length, "file")} into ${p.basename(result.outputPath)}.`, { type: "success" });
     } else if (result.status === "cancelled") {
-        toast("Join cancelled.", "info");
+        kit.ui.toast("Join cancelled.");
     } else if (result.status === "skipped") {
-        toast("That file already exists, so the join was skipped.", "warning");
+        kit.ui.toast("That file already exists, so the join was skipped.", { type: "warning" });
     } else {
-        toast(result.error || "The join failed.", "danger");
+        kit.ui.toast(result.error || "The join failed.", { type: "danger" });
     }
 }
 
+/** Join's progress bar (kit.ui.progress()), made in setupJoin. */
+let joinProgress = null;
+
 function setupJoin() {
-    $("btn-join-add").addEventListener("click", browseJoinFiles);
-    $("btn-join-add-more").addEventListener("click", browseJoinFiles);
-    // The whole zone is a click target, as Convert's is — with the same guard,
-    // or the button inside it opens the dialog twice.
-    $("join-drop").addEventListener("click", (e) => {
-        if (e.target.closest("button")) return;
-        browseJoinFiles();
+    joinProgress = kit.ui.progress({ label: "Joining" });
+    joinProgress.element.classList.add("join-progress", "d-none");
+    $("join-progress").replaceWith(joinProgress.element);
+
+    // The same drop zone as Convert's, from the kit, so the two sections read
+    // as one app: only the icon and the label change. Files dropped anywhere
+    // in Join, or picked with its button, join the list.
+    const { zone } = kit.ui.dropZone($("join-view"), {
+        onPaths: addJoinPaths,
+        icon: "merge_type",
+        label: "Drag & Drop Files to Join Here",
+        onBrowse: browseJoinFiles,
     });
+    $("join-empty").append(zone);
+
+    $("btn-join-add-more").addEventListener("click", browseJoinFiles);
     $("btn-join-clear").addEventListener("click", () => { joinClips = []; renderJoin(); });
     $("btn-join-run").addEventListener("click", runJoin);
     $("btn-join-cancel").addEventListener("click", () => { if (joinRunning) api.cancelJob(joinRunning); });
@@ -2023,12 +1901,11 @@ function setupJoin() {
         if (dir) { $("join-dir").value = dir; renderJoinActions(); }
     });
     $("join-name").addEventListener("input", renderJoinActions);
-    $("join-format").addEventListener("change", renderJoinActions);
-
-    const zone = $("join-drop");
-    zone.addEventListener("dragenter", () => zone.classList.add("drag-over"));
-    zone.addEventListener("dragleave", () => zone.classList.remove("drag-over"));
-    zone.addEventListener("drop", () => zone.classList.remove("drag-over"));
+    // The plan says whether this format copies or re-encodes, so it's said again for each.
+    $("join-format").addEventListener("change", () => {
+        renderJoinPlan();
+        renderJoinActions();
+    });
 
     async function browseJoinFiles() {
         const filePaths = await api.browseFiles();
@@ -2036,7 +1913,7 @@ function setupJoin() {
     }
 }
 
-// -- Folder options ----------------------------------------------------------
+// -- Folder Options ----------------------------------------------------------
 
 /**
  * Three checkboxes, saved as they are changed. No save button, and no dialog:
@@ -2127,50 +2004,19 @@ document.addEventListener("DOMContentLoaded", async () => {
     setupScanOptions();
     setupJoin();
 
-    // Drag and drop. The document-level guard stops a stray drop navigating the
-    // window to the file and replacing the app with it.
-    const appShell = document.querySelector(".app-shell");
-    let dragDepth = 0;
-
-    document.addEventListener("dragover", (e) => e.preventDefault());
-    document.addEventListener("drop", (e) => e.preventDefault());
-
-    document.addEventListener("dragenter", (e) => {
-        e.preventDefault();
-        dragDepth++;
-        // The highlight belongs to the grid, so it stays off while Join is
-        // showing — Join's own zone lights itself.
-        if (currentView !== "convert") return;
-        appShell.classList.add("drag-over");
-        if (jobs.length === 0) $("drop-zone").classList.add("drag-over");
-    });
-    document.addEventListener("dragleave", () => {
-        // dragleave also fires crossing onto child elements, so count depth
-        // rather than clearing on the first one — that is what made the v1
-        // highlight flicker.
-        dragDepth = Math.max(0, dragDepth - 1);
-        if (dragDepth === 0) {
-            appShell.classList.remove("drag-over");
-            $("drop-zone").classList.remove("drag-over");
-        }
-    });
-    document.addEventListener("drop", async (e) => {
-        dragDepth = 0;
-        appShell.classList.remove("drag-over");
-        $("drop-zone").classList.remove("drag-over");
-
-        // Read the paths before any await — dataTransfer does not survive one.
-        // The FileList is iterated here rather than in the preload: it cannot
-        // cross the context bridge, but the individual File objects can.
-        const paths = Array.from(e.dataTransfer?.files ?? [])
-            .map(file => api.getPathForFile(file))
-            .filter(Boolean);
-
-        // A drop means "take these", and where they go is whichever view is
-        // showing. Switching to Convert under someone who is assembling a join
-        // would be the surprising reading of the same gesture.
-        takePaths(paths);
+    // Files dropped anywhere in Convert, and the empty grid's drop zone, from
+    // the kit: it counts drags in and out across children (v1's highlight
+    // flickered), takes each File's path one at a time, and guards the page
+    // against a stray drop navigating the window to the file. Join takes its
+    // own (setupJoin). While files are over Convert, it's lit (.drag-over), so
+    // a grid with cards is the target too.
+    const { zone } = kit.ui.dropZone($("convert-view"), {
+        onPaths: (paths) => ingestFromAnywhere(paths),
+        icon: "swap_horiz",
+        label: "Drag & Drop Files or Folders Here",
+        onBrowse: () => browseFiles(),
     });
+    $("empty-state").append(zone);
 
     // The header's Add Files and Add Folder serve both sections, so they take
     // the same reading as a drop: whichever section is showing gets the files.
@@ -2188,21 +2034,22 @@ document.addEventListener("DOMContentLoaded", async () => {
         if (folders) takePaths(folders);
     }
 
-    $("browse-btn").addEventListener("click", browseFiles);
     $("btn-add-files").addEventListener("click", browseFiles);
     $("btn-add-folder").addEventListener("click", browseFolder);
-    $("drop-zone").addEventListener("click", (e) => {
-        if (e.target.closest("button")) return;
-        browseFiles();
-    });
 
-    $("btn-convert").addEventListener("click", startConversion);
-    $("btn-cancel-all").addEventListener("click", () => api.cancelAll());
-    $("btn-clear-all").addEventListener("click", () => {
-        jobs = [];
-        clearSelection();
-        render();
+    actionBar = kit.ui.actionBar({
+        run: { label: "Convert", onClick: startConversion },
+        abort: { onClick: () => api.cancelAll() },
+        clear: {
+            onClick: () => {
+                jobs = [];
+                clearSelection();
+                render();
+            },
+        },
+        progressLabel: "Converting",
     });
+    $("action-bar").append(actionBar.element);
 
     // An empty value is the placeholder, which clears the target across the
     // selection — pass it through rather than ignoring it.
@@ -2211,7 +2058,7 @@ document.addEventListener("DOMContentLoaded", async () => {
     });
     $("bulk-remove").addEventListener("click", () => removeJobs([...selection]));
     $("bulk-deselect").addEventListener("click", clearSelection);
-    // Bulk edit lives in the selection bar and follows the same scope rule as
+    // Bulk Edit lives in the selection bar and follows the same scope rule as
     // the format dropdown beside it: the selection, or everything when nothing
     // is selected.
     $("bulk-edit").addEventListener("click", () => {
@@ -2263,27 +2110,13 @@ document.addEventListener("DOMContentLoaded", async () => {
         if (e.target === $("grid-scroll") || e.target === $("job-grid")) clearSelection();
     });
 
-    document.addEventListener("keydown", (e) => {
-        // Only a control the user can actually type into should swallow these.
-        // This used to include SELECT, and a  must not be treated as typing", () => {
-    // A  from
+    // counting as typing (it keeps focus after an option is picked, and used to
+    // swallow the next Escape, Delete or Ctrl+A anywhere in the app), a
+    // checkbox from counting as one either, and a prompt or the settings dialog
+    // owning the keyboard while it's open (Delete must not remove the very
+    // cards being edited behind it). The kit's tests hold it to all three.
     const renderer = stripSource(fs.readFileSync(path.join(__dirname, "..", "src", "renderer.js"), "utf8"));
-    assert.match(renderer, /\.modal\.show/,
-        "Delete must not remove the very cards being edited behind the dialog");
+    assert.match(renderer, /kit\.keys\.onKey\(\(e\) => \{[\s\S]*?\}, \{ view: "convert" \}\);/,
+        "the grid's Ctrl+A, Delete and Escape must go through kit.keys.onKey(), for Convert only");
+    assert.ok(!/document\.addEventListener\("keydown"/.test(renderer.replace(/document\.addEventListener\("keydown", \(e\) => \{\s*if \(e\.key === "Escape" && isOpen\(\)\)/, "")),
+        "the grid must not have a keydown handler of its own beside the kit's (the folder popover's Escape is its own)");
 });
 
 test("convert: an already-converted card is not resubmitted", () => {
@@ -865,3 +816,21 @@ test("join: one clip needs no comparison", () => {
     assert.equal(d.compareClips([clip()]).compatible, true);
     assert.equal(d.compareClips([]).compatible, true);
 });
+
+test("join: matching clips are copied only into their own container, else re-encoded", () => {
+    // Two WAVs copied into an MP3 is PCM in a file that can't hold it: ffmpeg
+    // refused it ("Could not write header"), found by the M3 agent pass, as
+    // MP3 is the first format Join offers for audio.
+    const wav = { ok: true, hasVideo: false, hasAudio: true, duration: 2, formatName: "wav", audio: { codec: "pcm_s16le", sampleRate: 44100, channels: 1 } };
+    const comparison = d.compareClips([wav, wav]);
+    assert.equal(comparison.compatible, true);
+    assert.equal(d.describeJoinPlan(comparison, { targetExt: "wav", metas: [wav, wav] }).strategy, "demuxer");
+    const intoMp3 = d.describeJoinPlan(comparison, { targetExt: "mp3", metas: [wav, wav] });
+    assert.equal(intoMp3.strategy, "filter");
+    assert.match(intoMp3.headline, /joined into MP3, not their own format, so they will be re-encoded/);
+    const mp4 = { ...wav, formatName: "mov,mp4,m4a,3gp,3g2,mj2" };
+    assert.equal(d.joinCopiesInto([mp4, mp4], "mp4"), true);
+    assert.equal(d.joinCopiesInto([mp4, mp4], "mkv"), false);
+    // With no target named, the comparison alone decides, as before.
+    assert.equal(d.describeJoinPlan(comparison).strategy, "demuxer");
+});
diff --git a/test/kit.test.js b/test/kit.test.js
index 918652c..7f55bf1 100644
--- a/test/kit.test.js
+++ b/test/kit.test.js
@@ -35,7 +35,7 @@ test("every one of the app's own handlers goes through kit.ipc.handle()", () =>
     assert.ok(!/ipcMain/.test(main), "main.js must not register a handler straight on ipcMain: it would answer any page");
 
     // Every channel the page invokes has its handler, and pushes have none.
-    const pushes = [IPC.JOB_PROGRESS, IPC.JOB_STATUS, IPC.FILES_OPENED];
+    const pushes = [IPC.JOB_PROGRESS, IPC.JOB_STATUS, IPC.CONFLICT_ASK];
     const handled = [...main.matchAll(/kit\.ipc\.handle\(IPC\.([A-Z_]+)/g)].map(m => IPC[m[1]]);
     assert.deepEqual(handled.sort(), Object.values(IPC).filter(c => !pushes.includes(c)).sort());
 });
@@ -74,7 +74,7 @@ test("the settings defaults are ones the kit takes", () => {
     assert.deepEqual(JSON.parse(JSON.stringify(SETTINGS_DEFAULTS)), SETTINGS_DEFAULTS, "every default is a JSON value");
 });
 
-test("the page links the kit's styles after Bootstrap's and before its own, and loads kit.js before renderer.js", () => {
+test("the page links the kit's styles after Bootstrap's and before its own, and loads kit.js before display.js and renderer.js", () => {
     const html = read("index.html");
     const order = (list) => list.map(needle => {
         const at = html.indexOf(needle);
@@ -89,7 +89,8 @@ test("the page links the kit's styles after Bootstrap's and before its own, and
         "\"styles.css\"",
     ]);
     assert.deepEqual(styles, [...styles].sort((a, b) => a - b), "Bootstrap, Material Icons, kit.css, accent.css, then styles.css");
-    const scripts = order(["bootstrap.bundle.min.js\"", "src=\"core/display.js\"", "electron-kit/page/kit.js\"", "src=\"renderer.js\""]);
+    // kit.js before display.js, which takes the house's wording from its kit.format.
+    const scripts = order(["bootstrap.bundle.min.js\"", "electron-kit/page/kit.js\"", "src=\"core/display.js\"", "src=\"renderer.js\""]);
     assert.deepEqual(scripts, [...scripts].sort((a, b) => a - b));
     assert.ok(!/styles\/tokens\.css/.test(html), "the kit's kit.css holds the tokens now");
 });
@@ -113,3 +114,48 @@ test("the app's styles leave the kit's shell alone", () => {
     // The fill as text fails AA in one theme: text in the accent uses its text shade.
     assert.ok(!/(^|[\s{;])color:\s*var\(--accent\)/m.test(css), "accent text uses var(--accent-text)");
 });
+
+test("the shared parts are the kit's: no toast, prompt, drop zone, action bar or progress bar of DFC's own", () => {
+    const renderer = read("renderer.js");
+    const html = read("index.html");
+    const css = read("styles.css");
+    for (const own of ["function toast(", "function confirmDialog(", "dragDepth", "getPathForFile"]) {
+        assert.ok(!renderer.includes(own), `renderer.js has ${own}`);
+    }
+    for (const call of ["kit.ui.toast(", "kit.ui.confirm(", "kit.ui.dropZone(", "kit.ui.actionBar(", "kit.ui.progress(", "kit.keys.onKey(", "kit.format.countOf("]) {
+        assert.ok(renderer.includes(call), `renderer.js uses ${call}`);
+    }
+    for (const markup of ["confirm-modal", "toast-host", "drop-zone", "join-drop", "overall-bar", "btn-convert"]) {
+        assert.ok(!html.includes(markup), `index.html has ${markup}`);
+    }
+    for (const rule of [".toast-", ".drop-zone", ".drop-label", ".action-status", ".card-progress .bar", "@keyframes slide"]) {
+        assert.ok(!css.includes(rule), `styles.css has ${rule}`);
+    }
+});
+
+test("the Title Case slips DESIGN.md lists are fixed: buttons and titles are Title Case", () => {
+    const text = read("renderer.js") + read("index.html");
+    for (const slip of ["Bulk edit", "Add more", "Write them", "Show in folder", "Open folder", "Show them", "Advanced options", "That is a lot of images", "Folder options"]) {
+        assert.ok(!text.includes(slip), `"${slip}" is still sentence case`);
+    }
+});
+
+test("progress of null is \"not known\": a card's and Join's bars slide, never sit at 0% or read null%", () => {
+    const renderer = read("renderer.js");
+    assert.match(renderer, /progress\.set\(typeof job\.progress === "number" \? job\.progress : null\)/);
+    assert.match(renderer, /joinProgress\?\.set\(typeof percent === "number" \? percent : null\)/);
+    assert.ok(!/style\.width = `\$\{percent\}%`/.test(renderer), "Join's bar used to read \"null%\"");
+});
+
+test("every icon is hidden from screen readers, and every icon-only button has a name", () => {
+    const html = read("index.html");
+    const spans = html.match(/ {
 // mean anything on an install that already carries a v1 value, and it must stay
 // version-guarded — an unconditional prune would eat whatever a preferences
 // screen writes, on the very next launch.
-test("settings: main.js still runs the migration, once, before the window", () => {
+test("settings: main.js hands the kit the migration, which runs once per version, before anything reads a setting", () => {
     const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8");
-    assert.match(main, /migrateStore\(\);\s*probe\.setFfprobePath/,
-        "migrateStore must run before the window is created");
-    assert.match(main, /store\.get\("settingsSchema"\) === SETTINGS_SCHEMA_VERSION/,
-        "the migration must be guarded by the schema version, or it runs every launch");
-    // The kit reads the settings merged over SETTINGS_DEFAULTS; main.js must read them from it.
-    assert.match(main, /settings:\s*\{\s*defaults:\s*SETTINGS_DEFAULTS\s*\}/,
-        "the kit must be given the defaults to merge underneath");
+    // The kit runs it as the store is first opened, and marks settingsSchema (2.0.0's own key), so it runs
+    // once per version: the kit's tests hold it to that.
+    assert.match(main, /settings:\s*\{\s*defaults:\s*SETTINGS_DEFAULTS,[\s\S]*?version:\s*SETTINGS_SCHEMA_VERSION,\s*migrate:\s*\(settings\)\s*=>\s*pruneLegacySettings\(settings\)\.settings,\s*obsoleteKeys:\s*LEGACY_STORE_KEYS,\s*\}/,
+        "the kit must be given the defaults, the schema version, the prune and the orphaned store keys");
+    assert.ok(!/migrateStore|new Store\(/.test(main), "main.js keeps no store or migration of its own");
     assert.match(main, /function appSettings\(\) \{\s*return kit\.settings\.get\(\);/,
         "settings must be read through the kit, with the defaults merged underneath");
 });
@@ -196,15 +194,19 @@ test("preview: the command shown resolves a real destination, not a placeholder"
         "the preview must resolve the destination with the same code the run uses");
 });
 
-test("conflict: the prompt carries the abort, because nothing behind it can be clicked", () => {
-    // The dialog is window-modal: while it is open Windows blocks every click
-    // on the app behind it, so the footer's own "Cancel All" was unreachable.
-    // Position was never the problem, which is why dragging the dialog clear
-    // changed nothing. The only surface that can take the answer is the dialog.
+test("conflict: \"File Already Exists\" is asked in the page, and carries the abort", () => {
+    // It was a native box, window-modal: while it was open Windows blocked
+    // every click on the app behind it, so the footer's own "Cancel All" was
+    // unreachable. It's a prompt in the page now (kit.ui.confirm()'s batch
+    // form, DESIGN §10), and the abort stays in it, since the footer is behind it.
     const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8");
+    const renderer = fs.readFileSync(path.join(__dirname, "..", "src", "renderer.js"), "utf8");
 
-    assert.match(main, /buttons:\s*\["Cancel All", "Skip This File", "Overwrite", "Save as New"\]/,
-        "the prompt must offer a whole-run abort as well as a per-file answer");
+    assert.ok(!/showMessageBox/.test(main), "no native box: \"File Already Exists\" is asked in the page");
+    assert.match(main, /win\.webContents\.send\(IPC\.CONFLICT_ASK, \{ id, name: path\.basename\(candidatePath\), isDirectory \}\)/,
+        "main asks the page, with the file's name only");
+    assert.match(renderer, /title: "File Already Exists",[\s\S]*?choices: \[\s*\{ value: "cancelAll", label: "Cancel All" \},\s*\{ value: "skip", label: "Skip This File" \},\s*\{ value: "overwrite", label: "Overwrite" \},\s*\{ value: "unique", label: "Save as New" \},\s*\],\s*cancel: "cancelAll",\s*defaultChoice: "unique",\s*applyToAll: true,/,
+        "the prompt must offer a whole-run abort as well as a per-file answer, with Save as New the safe default");
     assert.match(main, /if \(runner\) runner\.cancelAll\(\);/,
         "Cancel All must actually reach the runner");
     assert.match(main, /if \(choice === "skip"\) return \{ action: "skip" \};/,
@@ -219,9 +221,10 @@ test("conflict: Cancel All ends the run, not just the file it was answered on",
     // which happens whenever a batch goes idle waiting for a later file to
     // finish probing. Both let a fresh dialog open for a run already stopped.
     //
-    // Escape is not a separate path to fix: cancelId picks button 0, which is
+    // Escape is not a separate path to fix: the prompt's cancel choice is
     // Cancel All, so it lands on the same branch.
     const main = fs.readFileSync(path.join(__dirname, "..", "src", "main.js"), "utf8");
+    const renderer = fs.readFileSync(path.join(__dirname, "..", "src", "renderer.js"), "utf8");
 
     assert.match(main, /if \(conflictAbort\) return \{ action: "cancel" \};/,
         "no dialog may open for a batch that has already been aborted");
@@ -231,6 +234,10 @@ test("conflict: Cancel All ends the run, not just the file it was answered on",
         "the batch is bounded by the job:run calls still outstanding, not by the runner going idle");
     assert.ok(!/runner\.on\("idle",[^)]*conflictChoiceForBatch/.test(main),
         "batch state cannot be scoped to idle: a batch outlives an idle whenever a later file is still being probed");
-    assert.match(main, /cancelId:\s*0,/,
+    assert.match(renderer, /cancel: "cancelAll",/,
         "Escape must resolve to Cancel All, which is what the checklist promises it does");
+    assert.match(main, /CONFLICT_CHOICES\.includes\(answer\?\.choice\) \? answer\.choice : "cancelAll"/,
+        "an answer that isn't one of the four is a dismissed prompt: Cancel All");
+    assert.match(main, /win\.on\("closed", \(\) => answerAllConflicts\(\{ choice: "cancelAll", all: false \}\)\)/,
+        "a prompt still open when the window goes is Cancel All, not a hang");
 });
diff --git a/test/preload.test.js b/test/preload.test.js
index e10a14f..e7851e4 100644
--- a/test/preload.test.js
+++ b/test/preload.test.js
@@ -145,13 +145,13 @@ test("main enables context isolation and disables node integration", () => {
     assert.ok(!/nodeIntegration:\s*true/.test(main), "nodeIntegration must not be enabled");
     assert.ok(!/contextIsolation:\s*false/.test(main), "contextIsolation must not be disabled");
 
-    // The one window (Credits is a tab of Settings now) sets all four.
+    // The one window (Credits is a tab of Settings now) is the kit's main
+    // window, which lays the house's sandbox, isolation and no Node over the
+    // app's own web preferences, and throws on anything weaker (the kit's
+    // tests). DFC gives it its preload, and no BrowserWindow of its own.
     const windows = main.match(/webPreferences:\s*\{[^}]*\}/g) ?? [];
     assert.equal(windows.length, 1, "expected exactly the main window");
-    for (const block of windows) {
-        assert.match(block, /preload:/);
-        assert.match(block, /sandbox:\s*true/);
-        assert.match(block, /contextIsolation:\s*true/);
-        assert.match(block, /nodeIntegration:\s*false/);
-    }
+    assert.match(windows[0], /^webPreferences:\s*\{\s*preload:\s*path\.join\(__dirname, "preload\.js"\)\s*\}$/);
+    assert.match(main, /kit\.windows\.createMain\(\{/);
+    assert.ok(!/new BrowserWindow|BrowserWindow\s*\}/.test(main), "main.js makes no window of its own");
 });

From bb9e69ea8a204d36ebb481eaabf60f7d66ca6253 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Thu, 1 Oct 2026 03:06:56 +0100
Subject: [PATCH 47/81] Name the kit by its package only, in two comments

---
 src/core/display.js | 2 +-
 src/main.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/display.js b/src/core/display.js
index ff53817..66db24e 100644
--- a/src/core/display.js
+++ b/src/core/display.js
@@ -7,7 +7,7 @@
 // or passed in as an argument. test/display.test.js enforces this.
 //
 // The house's wording for counts, sizes and times (plural, countOf,
-// formatDuration, formatBytes, formatEta) is electron-kit's kit.format: in the
+// formatDuration, formatBytes, formatEta) is the house kit's kit.format: in the
 // page, from kit.js (loaded before this file); under Node, from the kit's
 // format export, which runs the same code. This file holds the converter's own.
 
diff --git a/src/main.js b/src/main.js
index a3e2ff9..67d912e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -28,7 +28,7 @@ function extensionsOfKind(kind) {
     return Object.values(formats.FORMATS).filter(f => f.kind === kind).map(f => f.ext);
 }
 
-// The house frame (electron-kit): the shared preload (window.kitAPI) on the
+// The house frame (the kit): the shared preload (window.kitAPI) on the
 // app's session; the settings, in the same "settings" key of the same
 // config.json as 2.0.0, so what was saved carries over, and migrated once per
 // version; the log, debug.log in userData, redacted (a path keeps its file

From ed4719be1ca5e5c71ebeba2528405b6d363050ba Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Thu, 1 Oct 2026 03:08:35 +0100
Subject: [PATCH 48/81] Pack ffmpeg and ffprobe per platform, for Linux too,
 and only once

Each platform takes its own binaries into resources/ffmpeg (win and linux
extraResources), main.js looks for them without .exe off Windows, and the
packages' own binaries (every platform's ffprobe) stay out of
app.asar.unpacked, where 2.0.0 shipped 415 MB of them unused.
---
 package.json     | 40 ++++++++++++++++++++++++++++------------
 src/main.js      |  8 ++++++--
 test/kit.test.js | 18 ++++++++++++++++++
 3 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 728cb1c..6a487b4 100644
--- a/package.json
+++ b/package.json
@@ -22,20 +22,12 @@
         "files": [
             "**/*",
             "!test-media",
-            "!test-media/**/*"
+            "!test-media/**/*",
+            "!node_modules/ffmpeg-static/ffmpeg{,.exe}",
+            "!node_modules/ffprobe-static/bin/**"
         ],
         "productName": "Diamond File Converter",
         "artifactName": "Diamond-File-Converter-Setup-${version}.${ext}",
-        "extraResources": [
-            {
-                "from": "node_modules/ffmpeg-static/ffmpeg.exe",
-                "to": "ffmpeg/ffmpeg.exe"
-            },
-            {
-                "from": "node_modules/ffprobe-static/bin/win32/x64/ffprobe.exe",
-                "to": "ffmpeg/ffprobe.exe"
-            }
-        ],
         "fileAssociations": [
             {
                 "ext": [
@@ -84,7 +76,31 @@
             "repo": "Diamond-File-Converter"
         },
         "win": {
-            "icon": "src/assets/diamondfileconverter.ico"
+            "icon": "src/assets/diamondfileconverter.ico",
+            "extraResources": [
+                {
+                    "from": "node_modules/ffmpeg-static/ffmpeg.exe",
+                    "to": "ffmpeg/ffmpeg.exe"
+                },
+                {
+                    "from": "node_modules/ffprobe-static/bin/win32/x64/ffprobe.exe",
+                    "to": "ffmpeg/ffprobe.exe"
+                }
+            ]
+        },
+        "linux": {
+            "icon": "src/assets/diamondfileconverter.png",
+            "category": "AudioVideo",
+            "extraResources": [
+                {
+                    "from": "node_modules/ffmpeg-static/ffmpeg",
+                    "to": "ffmpeg/ffmpeg"
+                },
+                {
+                    "from": "node_modules/ffprobe-static/bin/linux/x64/ffprobe",
+                    "to": "ffmpeg/ffprobe"
+                }
+            ]
         },
         "nsis": {
             "perMachine": true,
diff --git a/src/main.js b/src/main.js
index 67d912e..38b8978 100644
--- a/src/main.js
+++ b/src/main.js
@@ -77,13 +77,17 @@ const mainWindow = () => kit.windows.main();
 
 let runner = null;
 
+// Packaged, ffmpeg and ffprobe are this platform's own, in resources/ffmpeg
+// (package.json's win and linux extraResources); from source, the packages'.
+const EXE = process.platform === "win32" ? ".exe" : "";
+
 function getFfmpegPath() {
-    if (app.isPackaged) return path.join(process.resourcesPath, "ffmpeg", "ffmpeg.exe");
+    if (app.isPackaged) return path.join(process.resourcesPath, "ffmpeg", `ffmpeg${EXE}`);
     return require("ffmpeg-static"); // dev: executable path inside node_modules
 }
 
 function getFfprobePath() {
-    if (app.isPackaged) return path.join(process.resourcesPath, "ffmpeg", "ffprobe.exe");
+    if (app.isPackaged) return path.join(process.resourcesPath, "ffmpeg", `ffprobe${EXE}`);
     return require("ffprobe-static").path;
 }
 
diff --git a/test/kit.test.js b/test/kit.test.js
index 7f55bf1..bcfe0f8 100644
--- a/test/kit.test.js
+++ b/test/kit.test.js
@@ -159,3 +159,21 @@ test("every icon is hidden from screen readers, and every icon-only button has a
         assert.ok(renderer.includes(`${name}.setAttribute("aria-hidden", "true");`), `${name} isn't aria-hidden`);
     }
 });
+
+test("ffmpeg and ffprobe are packed per platform, where main.js looks for them, and only once", () => {
+    const { build } = require("../package.json");
+    const main = read("main.js");
+    const exe = { win: ".exe", linux: "" };
+    for (const platform of ["win", "linux"]) {
+        const to = build[platform].extraResources.map((r) => r.to).sort();
+        assert.deepEqual(to, [`ffmpeg/ffmpeg${exe[platform]}`, `ffmpeg/ffprobe${exe[platform]}`], platform);
+    }
+    assert.equal(build.extraResources, undefined, "no extraResources for every platform: each takes its own binaries");
+    assert.match(main, /const EXE = process\.platform === "win32" \? "\.exe" : "";/);
+    assert.match(main, /path\.join\(process\.resourcesPath, "ffmpeg", `ffmpeg\$\{EXE\}`\)/);
+    assert.match(main, /path\.join\(process\.resourcesPath, "ffmpeg", `ffprobe\$\{EXE\}`\)/);
+    // The packages' own binaries (every platform's ffprobe) stay out of app.asar.unpacked: 415 MB in 2.0.0.
+    assert.ok(build.files.includes("!node_modules/ffprobe-static/bin/**"));
+    assert.ok(build.files.includes("!node_modules/ffmpeg-static/ffmpeg{,.exe}"));
+    assert.equal(build.linux.icon, "src/assets/diamondfileconverter.png");
+});

From 974dc6501342f915e27d789b27881e62d7dfaeb3 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Thu, 1 Oct 2026 03:14:42 +0100
Subject: [PATCH 49/81] Run the common-root test on Linux too, with each
 platform's own root

DFC builds for Linux now, so its tests run there: path.join("C:", ...) is a
relative path off Windows. The separate-drives case is Windows' only.
---
 test/core.test.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/test/core.test.js b/test/core.test.js
index aaa2cf4..a583f3d 100644
--- a/test/core.test.js
+++ b/test/core.test.js
@@ -468,12 +468,17 @@ test("scan: deduplicates and reports unreadable paths without throwing", async (
 });
 
 test("scan: common root finds the shared ancestor for mirrored output", () => {
-    const a = path.join("C:", "media", "a", "one.mp4");
-    const b = path.join("C:", "media", "b", "two.mp4");
-    assert.equal(commonRoot([a, b]), path.join("C:", "media"));
-    assert.equal(commonRoot([a]), path.join("C:", "media", "a"));
+    // An absolute root on this platform: a drive's on Windows, / elsewhere
+    // (DFC builds for Linux too, so these run there as well).
+    const root = process.platform === "win32" ? "C:\\" : "/";
+    const a = path.join(root, "media", "a", "one.mp4");
+    const b = path.join(root, "media", "b", "two.mp4");
+    assert.equal(commonRoot([a, b]), path.join(root, "media"));
+    assert.equal(commonRoot([a]), path.join(root, "media", "a"));
     assert.equal(commonRoot([]), null);
+});
 
+test("scan: common root across drives is none, and a drive's own root is a path (Windows)", { skip: process.platform !== "win32" && "drives are Windows' only" }, () => {
     // Separate drives have no shared root at all. resolveOutputDir treats null
     // as plain fixed output rather than throwing, so this must be null and not
     // something creative.

From b659b9740e8229253a9f5d650b5a7aeaa9546c77 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Thu, 1 Oct 2026 09:58:54 +0100
Subject: [PATCH 50/81] Name the Linux files for the app and version, and add a
 Linux section to the manual pass

Only the Windows installer is a Setup (nsis.artifactName, unchanged, so its
update files point where they did); the AppImage, .deb and .rpm are
Diamond-File-Converter-.
---
 docs/MANUAL-TESTING.md | 40 ++++++++++++++++++++++++++++++++++++++++
 package.json           |  3 ++-
 test/kit.test.js       |  8 ++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md
index 08273aa..13b1b97 100644
--- a/docs/MANUAL-TESTING.md
+++ b/docs/MANUAL-TESTING.md
@@ -2482,3 +2482,43 @@ outputs next to them.
 - [ ] A toast is read when it shows; a danger toast at once.
 - [ ] "File Already Exists" is read as a dialog with its question, and Tab
       stays inside it.
+
+## Linux — the first build
+
+DFC builds for Linux now: an AppImage, a `.deb` and an `.rpm`, each with
+Linux's own ffmpeg and ffprobe. They're built on Linux (ffmpeg-static
+downloads the binary for the machine it's installed on), and named
+`Diamond-File-Converter-.`: only the Windows installer is a
+`Setup`.
+
+> **Status: not yet run by a person.** An agent drove the built app
+> (`linux-unpacked`, what the AppImage holds) under Xvfb in a Debian 12
+> container: 23/23, and the M1 checks on a profile 2.0.0 had saved, 29/29
+> (2026-10-01). Its `.deb` and `.rpm` hold `resources/ffmpeg/ffmpeg` and
+> `ffprobe`, executable, and name Diamond Digital Development
+>  as the maintainer.
+
+Run it in the Linux VM, on a desktop.
+
+### Install and run
+
+- [ ] `sudo apt install ./Diamond-File-Converter-.deb`: it installs,
+      and **Diamond File Converter** is in the applications menu under Sound &
+      Video. It opens, in the desktop's light or dark theme.
+- [ ] The AppImage (`chmod +x`, then run it) opens the same app.
+- [ ] Known until M6: the dock may show a generic icon for the running window
+      (no `desktopName` yet), and DFC isn't offered in "Open with" for media
+      files (no MimeType yet). Note it, don't fail it.
+
+### The same pass as Windows
+
+- [ ] From a terminal, `diamond-file-converter ~/Music/a.wav`: the app opens
+      with it as a card. Run the same with another file while it's open: it
+      comes to the front with the file added, and there's still one window.
+- [ ] Convert a file to MP3, then again to see "File Already Exists" in the
+      app, and **Save as New**: `name (1).mp3` is written.
+- [ ] Join two files: it works, in MP3 and in their own format.
+- [ ] Settings: General, Update and Credits, the rail collapsed and expanded.
+      Close and reopen: the window is where you left it.
+- [ ] `~/.config/diamond-file-converter/debug.log` names files by their names
+      only, with no folder.
diff --git a/package.json b/package.json
index 6a487b4..6e17fc8 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
             "!node_modules/ffprobe-static/bin/**"
         ],
         "productName": "Diamond File Converter",
-        "artifactName": "Diamond-File-Converter-Setup-${version}.${ext}",
+        "artifactName": "Diamond-File-Converter-${version}.${ext}",
         "fileAssociations": [
             {
                 "ext": [
@@ -103,6 +103,7 @@
             ]
         },
         "nsis": {
+            "artifactName": "Diamond-File-Converter-Setup-${version}.${ext}",
             "perMachine": true,
             "createDesktopShortcut": true,
             "include": "installer.nsh"
diff --git a/test/kit.test.js b/test/kit.test.js
index bcfe0f8..f78a96c 100644
--- a/test/kit.test.js
+++ b/test/kit.test.js
@@ -177,3 +177,11 @@ test("ffmpeg and ffprobe are packed per platform, where main.js looks for them,
     assert.ok(build.files.includes("!node_modules/ffmpeg-static/ffmpeg{,.exe}"));
     assert.equal(build.linux.icon, "src/assets/diamondfileconverter.png");
 });
+
+test("the Windows installer is the one called Setup: Linux's files are named for the app and version only", () => {
+    const { build } = require("../package.json");
+    assert.equal(build.artifactName, "Diamond-File-Converter-${version}.${ext}");
+    // The installer's name is what its update files point at: unchanged from 2.0.0.
+    assert.equal(build.nsis.artifactName, "Diamond-File-Converter-Setup-${version}.${ext}");
+    assert.equal(build.linux.artifactName, undefined, "Linux takes the top-level name");
+});

From f47816c5b10550f498313c8b4b316ded4dde86ae Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Thu, 1 Oct 2026 10:51:59 +0100
Subject: [PATCH 51/81] Give DFC's two prompts a detail line, in the kit's new
 prompt look

---
 src/renderer.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/renderer.js b/src/renderer.js
index 81959a9..821fc24 100644
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -1474,8 +1474,8 @@ async function startConversion() {
     if (frames >= FRAME_CONFIRM_THRESHOLD) {
         const ok = await kit.ui.confirm({
             title: "Large Frame Export",
-            body: `This writes about ${kit.format.countOf(frames, "image")}. Narrow the range in `
-                + `Advanced Options if that is more than you meant.`,
+            body: `This writes about ${kit.format.countOf(frames, "image")}.`,
+            detail: "Narrow the range in Advanced Options if that is more than you meant.",
             confirmLabel: "Write Them",
             variant: "warning",
             icon: "burst_mode",
@@ -2174,7 +2174,8 @@ kitApi.onFilesOpened((filePaths) => {
 api.onConflictAsk(async ({ id, name, isDirectory }) => {
     const answer = await kit.ui.confirm({
         title: "File Already Exists",
-        body: `${name} already exists. ${isDirectory ? "A folder" : "A file"} with this name is already in the destination.`,
+        body: `${name} already exists.`,
+        detail: `${isDirectory ? "A folder" : "A file"} with this name is already in the destination.`,
         icon: "file_copy",
         choices: [
             { value: "cancelAll", label: "Cancel All" },

From a28e7a55b7a531057f594449876753c4d7b1a623 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Thu, 1 Oct 2026 12:14:37 +0100
Subject: [PATCH 52/81] Record the Windows manual pass of 2026-10-01 in
 MANUAL-TESTING, with what it found

---
 docs/MANUAL-TESTING.md | 136 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 120 insertions(+), 16 deletions(-)

diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md
index 13b1b97..5f25628 100644
--- a/docs/MANUAL-TESTING.md
+++ b/docs/MANUAL-TESTING.md
@@ -2401,10 +2401,17 @@ window's size and position, one instance and "Open with" all come from the
 house kit now. DFC's own versions are gone. "File Already Exists" is asked in
 the app, not in a Windows box, and the Title Case slips are fixed.
 
-> **Status: not yet run by a person.** An agent drove the app built from
-> source through every step it can (23/23 on Windows, 2026-10-01), and the
-> M1 checks again on a profile 2.0.0 had saved (29/29). The packaged runs and
-> the Linux build follow; this line is updated when Will has run it.
+> **Status: run on Windows on 2026-10-01, on Will's installed 2.0.0-beta.2
+> (per machine), by an agent driving the real app while Will watched.** Boxes
+> ticked below were seen working; each says how. **Not run, so left unticked:**
+> every "Open with" and every drag from Explorer (Explorer is click-only for
+> the agent: no right-click, no drag), every Escape (an agent can't send it),
+> unplugging a monitor, and `debug.log` after a second "Open with". NVDA was
+> skipped: it isn't installed on Will's machine. An agent had earlier driven
+> the app built from source through every step it can (23/23 on Windows,
+> 2026-10-01), and the M1 checks again on a profile 2.0.0 had saved (29/29).
+> What the pass found is under "Found in the pass", at the end of this
+> section. The Linux build is in the next section: not run.
 
 Test a packaged, installed build. Use files you can lose: the steps write
 outputs next to them.
@@ -2413,6 +2420,7 @@ outputs next to them.
 
 - [ ] Right-click an audio file in Explorer, **Open with** the app, with the app
       closed: it opens with the file as a card.
+      Not run: Explorer is click-only for the agent. Will's to run.
 - [ ] With the app open, **Open with** two more files at once: the app comes to
       the front, and both arrive together as cards, in one go.
 - [ ] Only one window, ever, and the app opened only once (one taskbar button).
@@ -2422,66 +2430,159 @@ outputs next to them.
 - [ ] Drag a supported file and a `.txt` onto the empty Convert view: the
       dashed box lights while you're over it, and one toast says "Added 1 file,
       skipped 1." with **Show Them**.
-- [ ] **Show Them** lists `notes.txt — not a supported format`, and says
+      Not run (a drag). The toast itself was seen the other way: Add Folder on a
+      folder holding a WAV and a notes.txt gave "Added 1 file, skipped 1." with
+      **Show Them**. The dashed box lighting up while you drag is Will's to see.
+- [x] **Show Them** lists `notes.txt — not a supported format`, and says
       **Hide**; the toast stays until you close it.
+      Verified 2026-10-01, through Add Folder rather than a drag: it listed
+      `notes.txt — not a supported format`, the link read **Hide**, and the toast
+      was still there 12 seconds later.
 - [ ] With cards on screen, drag more files anywhere over the grid: the grid
       lights, and they're added.
+      Not run (a drag). Will's to run.
 - [ ] Drag files onto Join: they're added to Join, not Convert.
+      Not run (a drag). Will's to run.
 
 ### A conversion, and "File Already Exists"
 
 - [ ] Convert a file to MP3: the card's thin bar fills (or slides, for a file
       whose length isn't known), the bar under the grid says "Converting 1
       file…" with **Cancel** where **Convert** was, then "1 file converted".
-- [ ] Clear All, add the same file, convert it to MP3 again: a prompt in the
+      Partly seen 2026-10-01: the bar under the grid said "Converting 1 file…" with
+      a red **Cancel** where **Convert** was, then "1 file converted". Not seen: the
+      card's own thin bar. A 4-second WAV finishes before a screenshot can catch it.
+      Try a longer file.
+- [x] Clear All, add the same file, convert it to MP3 again: a prompt in the
       app, not a Windows box, says "File Already Exists", with **Cancel All**,
       **Skip This File**, **Overwrite** and **Save as New** (focused), and
       **Apply to All Remaining**.
+      Verified 2026-10-01: an in-app prompt titled "File Already Exists" with **Cancel
+      All**, **Skip This File**, **Overwrite** and **Save as New**, the last with a
+      visible focus ring. **Apply to All Remaining** is a checkbox above the buttons.
 - [ ] Press Escape: the run is cancelled, nothing is written, and focus is back
       where it was.
-- [ ] Again, **Save as New**: `name (1).mp3` is written.
-- [ ] Convert five files that all exist, tick **Apply to All Remaining** on the
+      Not run: an agent can't send Escape. Will's to run. (The prompt's **Cancel All**
+      button was checked instead: the run stopped, the cards read Cancelled, and
+      nothing was written.)
+- [x] Again, **Save as New**: `name (1).mp3` is written.
+      Verified 2026-10-01: `tone-a (1).mp3` was written beside `tone-a.mp3`.
+- [x] Convert five files that all exist, tick **Apply to All Remaining** on the
       first prompt with **Skip This File**: no more prompts, all five skipped.
+      Verified 2026-10-01 for the behaviour: all five cards read Skipped and no
+      second prompt came. **But the result says the wrong thing:** the toast read
+      "Conversion cancelled." and the bar under the grid "5 cancelled". Skipped
+      files are counted as cancelled (`announce()` in renderer.js). See "Found".
 
 ### A join
 
-- [ ] Join two WAV files into **MP3** (the first format offered): the plan
+- [x] Join two WAV files into **MP3** (the first format offered): the plan
       says they'll be re-encoded, because MP3 isn't their own format, and the
       join works. (It used to try to copy them, and failed in ffmpeg.)
-- [ ] Join the same two into **WAV**: the plan says they'll be joined without
+      Verified 2026-10-01: the plan read "These match, but they are joined into MP3,
+      not their own format, so they will be re-encoded. It takes longer and the result
+      is not identical to the sources.", and `joined.mp3` came out at 8.05 s (two 4 s
+      WAVs).
+- [x] Join the same two into **WAV**: the plan says they'll be joined without
       re-encoding, and that works too.
-- [ ] While a long join runs, its bar moves (or slides if the length isn't
+      Verified 2026-10-01: "…joined without re-encoding — quick, and no quality is
+      lost.", and `joined.wav` was written.
+- [x] While a long join runs, its bar moves (or slides if the length isn't
       known), and never says "null%".
+      Verified 2026-10-01 with two 25-minute 8 kHz WAVs into MP3: the bar grew across
+      about three screenshots and **Cancel** replaced **Join** meanwhile. The bar
+      carries no number, so there was no "null%" to see.
 
 ### Keys
 
-- [ ] Pick a format on a card, then press Delete with a card selected: the card
+- [x] Pick a format on a card, then press Delete with a card selected: the card
       goes (the select doesn't count as typing).
-- [ ] With a prompt or the Advanced Options dialog open, Delete removes nothing.
-- [ ] Type in Join's file name: Delete and Ctrl+A edit the text, and touch no
+      Verified 2026-10-01: with one card ticked and its format just changed from the
+      card's own select, Delete removed that card and no other.
+- [x] With a prompt or the Advanced Options dialog open, Delete removes nothing.
+      Verified 2026-10-01 for both: every card was still there afterwards.
+- [x] Type in Join's file name: Delete and Ctrl+A edit the text, and touch no
       card.
+      Verified 2026-10-01: Ctrl+A, Delete and Backspace edited the name and both clips
+      stayed. An empty name showed "Give the joined file a name." in red.
 
 ### Settings, the window and the log
 
 - [ ] Settings > General, Update and Credits look as before. **Will's note
       (2026-10-01): give Settings > Update a proper look as a person would, and
       list what to refine in its UI.**
+      Looked at 2026-10-01 as a person would: **there is no General tab.** Settings has
+      Update and Credits, and the source has no General either, so these two words (here
+      and in the Linux section) are stale. What the Update tab looked like, and what to
+      refine, went onto the kit's own backlog. Will's own look is still his.
 - [ ] Move and resize the window, close it, reopen it: same place, same size.
       Unplug a second monitor the window was on: it opens centred on the one
       you have.
-- [ ] `%APPDATA%\diamond-file-converter\debug.log` starts with
+      First half verified 2026-10-01: moved and resized (left edge dragged in), closed,
+      reopened by name: same place, same size, and `config.json` held the bounds. The
+      second monitor was not unplugged: Will's to run.
+- [x] `%APPDATA%\diamond-file-converter\debug.log` starts with
       `=== Diamond File Converter  started at …`, names the files you
       used by their names only (`…\clip.mp4`), and has no folder in it.
+      Verified 2026-10-01: line 1 `=== Diamond File Converter 2.0.0-beta.2 started at
+      2026-10-01T10:45:53.011Z ===`. A corrupt `broken.mp4` logged "Could not probe
+      …/broken.mp4" and "Conversion failed for …/broken.mp4: moov atom not found",
+      with the file's name and a leading ellipsis where its folder was, in the ffprobe
+      command too. **Worth knowing:** only warnings and errors are written, so a clean
+      session's log is two lines, and a failed update check writes nothing at all.
 - [ ] After a second **Open with**, `debug.log` still has the first launch's
       lines (a second launch used to empty it).
+      Not run: needs Open with. (A plain close and reopen does start a fresh log, as it
+      should: the header's time changed.)
 
 ### With a screen reader (NVDA)
 
 - [ ] The rail, the toolbar and each card's controls are read with their names
       (no "swap_horiz", no "close" read out from an icon).
+      Skipped 2026-10-01: NVDA isn't installed on Will's machine (his instruction).
 - [ ] A toast is read when it shows; a danger toast at once.
+      Skipped, as above.
 - [ ] "File Already Exists" is read as a dialog with its question, and Tab
       stays inside it.
+      Skipped, as above.
+
+### Found in the pass, 2026-10-01
+
+Wrong or worth a look, in the order they turned up. The pass added no code.
+
+- **Skipping every file reads as cancelling.** After **Apply to All Remaining** with
+  **Skip This File**, the cards read Skipped but the toast says "Conversion cancelled."
+  and the bar "5 cancelled". `announce()` counts `skipped` with `cancelled`
+  (renderer.js). Say "Skipped" in both, or name each ("2 converted, 3 skipped").
+- **The Beta channel can't check, so Settings > Update opens on a red "Couldn't check for
+  updates. Try again later."** on a machine that is online. On **Stable** the same check
+  says "You're up to date." The Beta check reads a `beta.yml` from the latest
+  pre-release, and none of the published pre-releases lists one (only the installer;
+  checked from GitHub's list of releases), and `dist/` held only a `latest.yml` for this
+  beta build. Not an app bug as such, but the next beta must publish the files its own
+  channel reads, or Beta users see this error.
+- **A failed check leaves no trace.** The updater turns the error into the red line and
+  writes nothing to `debug.log`, so there's nothing to read when it happens. Log the
+  reason (redacted like the rest).
+- **The switch was Off on this profile** though the default is On. `config.json` held
+  `autoDownloadUpdates: false`, carried over from what 2.0.0 saved. So the first box in
+  "Settings > Update" (switch on) can't be judged here: it needs a clean profile.
+- **The toast overlaps the Join page's right panel.** After a join, "Joined 2 files into
+  joined.mp3." sat across the left edge of the right-hand panel instead of over the clip
+  list. Seen on Windows; Will's note.
+- **GIFs get no trim and no frame previews in Convert's Advanced Options.** A 3-second,
+  30-frame animated GIF reads "Duration is not known for this file, so it cannot be
+  trimmed." (`trimScopeDuration()` wants `meta.duration`; a GIF has no container
+  duration with the bundled ffprobe, as a comment in job.js says). The start and end
+  frames are only for things that have them, and a GIF has. To judge: count the frames
+  and divide by the frame rate when the container gives no duration.
+- **Join takes a GIF as a clip but can't say how long it is.** The row reads "· 240×180"
+  with nothing before the dot (no duration), and has From and To boxes that can't mean
+  anything without a length. Join has no frame previews yet at all.
+- **Smaller:** the file picker opens at Downloads every time rather than where the last
+  one was; the Add Files and Add Folder buttons stay in the header on the Settings page,
+  where they aren't meant for anything; "Check for Updates" showed no "Checking…" state
+  for a failing check (the red line was simply there when the screenshot came).
 
 ## Linux — the first build
 
@@ -2491,7 +2592,10 @@ downloads the binary for the machine it's installed on), and named
 `Diamond-File-Converter-.`: only the Windows installer is a
 `Setup`.
 
-> **Status: not yet run by a person.** An agent drove the built app
+> **Status: not run by a person; skipped on 2026-10-01.** The Zorin VM couldn't be
+> logged in to (Will was working remotely, with no physical access), so no box
+> below was run and none is ticked. It still stands as the pass to do. An agent
+> drove the built app
 > (`linux-unpacked`, what the AppImage holds) under Xvfb in a Debian 12
 > container: 23/23, and the M1 checks on a profile 2.0.0 had saved, 29/29
 > (2026-10-01). Its `.deb` and `.rpm` hold `resources/ffmpeg/ffmpeg` and

From 111435b3217bb885e9f4c7734c3e4fe5559d9393 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Thu, 1 Oct 2026 13:20:36 +0100
Subject: [PATCH 53/81] Say skipped files as skipped, not cancelled, in the
 toast and the bar

Found in the manual pass: Apply to All Remaining with Skip This File left
every card reading Skipped, but the toast said "Conversion cancelled." and the
bar "5 cancelled". Now "5 files skipped." and "5 files skipped", and a mix
reads "2 files converted, 3 skipped." (the kit's summarise() takes skipped).
---
 src/core/display.js  | 5 +++--
 src/renderer.js      | 9 +++++++--
 test/display.test.js | 4 +++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/core/display.js b/src/core/display.js
index 66db24e..7319f04 100644
--- a/src/core/display.js
+++ b/src/core/display.js
@@ -200,13 +200,14 @@
         }
     }
 
-    /** "3 files converted, 1 failed" — the post-run summary, in the kit's words. */
+    /** "3 files converted, 1 failed, 2 skipped" — the post-run summary, in the kit's words. Skipped is told from cancelled. */
     function summarise(jobs) {
         const tally = (status) => jobs.filter(j => j.status === status).length;
         return format.summarise({
             done: tally(STATUS.DONE),
             failed: tally(STATUS.ERROR),
-            cancelled: tally(STATUS.CANCELLED) + tally(STATUS.SKIPPED),
+            skipped: tally(STATUS.SKIPPED),
+            cancelled: tally(STATUS.CANCELLED),
         }, { one: "file", done: "converted" });
     }
 
diff --git a/src/renderer.js b/src/renderer.js
index 821fc24..a0476a9 100644
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -1520,7 +1520,8 @@ function applyResult(job, result) {
 function announce(results) {
     const failed = results.filter(r => r.status === "error");
     const done = results.filter(r => r.status === "done").length;
-    const cancelled = results.filter(r => r.status === "cancelled" || r.status === "skipped").length;
+    const skipped = results.filter(r => r.status === "skipped").length;
+    const cancelled = results.filter(r => r.status === "cancelled").length;
 
     if (failed.length > 0) {
         // One toast, not one blocking dialog per failure. The per-card status
@@ -1528,10 +1529,14 @@ function announce(results) {
         const detail = failed.length === 1 ? ` — ${failed[0].error ?? "unknown error"}` : "";
         kit.ui.toast(`${kit.format.countOf(failed.length, "file")} failed to convert${detail}`, { type: "danger", timeout: 0 });
     }
+    // Skipped files were left out by choice ("File Already Exists"), so they're said as skipped, not cancelled.
     if (done > 0) {
-        kit.ui.toast(`${kit.format.countOf(done, "file")} converted.`, { type: "success" });
+        const also = skipped > 0 ? `, ${kit.format.groupDigits(skipped)} skipped` : "";
+        kit.ui.toast(`${kit.format.countOf(done, "file")} converted${also}.`, { type: "success" });
     } else if (failed.length === 0 && cancelled > 0) {
         kit.ui.toast("Conversion cancelled.");
+    } else if (failed.length === 0 && skipped > 0) {
+        kit.ui.toast(`${kit.format.countOf(skipped, "file")} skipped.`);
     }
 }
 
diff --git a/test/display.test.js b/test/display.test.js
index eeaef16..2dc039e 100644
--- a/test/display.test.js
+++ b/test/display.test.js
@@ -188,7 +188,9 @@ test("display: summary counts every outcome", () => {
         { status: STATUS.ERROR },
         { status: STATUS.CANCELLED }, { status: STATUS.SKIPPED },
     ];
-    assert.equal(d.summarise(jobs), "2 files converted, 1 failed, 2 cancelled");
+    assert.equal(d.summarise(jobs), "2 files converted, 1 failed, 1 skipped, 1 cancelled");
+    // Skipping every file (Apply to All Remaining with Skip) isn't cancelling.
+    assert.equal(d.summarise(Array(5).fill({ status: STATUS.SKIPPED })), "5 files skipped");
     assert.equal(d.summarise([{ status: STATUS.DONE }]), "1 file converted");
     assert.equal(d.summarise([]), "Nothing converted");
 });

From a925ff89857422deb984a4cb19cd58ebfe09d1d4 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Thu, 1 Oct 2026 13:20:36 +0100
Subject: [PATCH 54/81] Time an animated GIF by its frames, so it can be
 trimmed and shows its length in Join
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Found in the manual pass: the bundled ffprobe gives a GIF no duration, so
Advanced Options said "Duration is not known" (no trim, no frame previews)
and Join's row read " · 240x180". A moving picture with no duration gets a
second probe that counts its packets without decoding, over its frame rate.
Join's row also never starts with an empty part.
---
 src/core/ffmpeg-args.js | 17 +++++++++++++++
 src/core/probe.js       | 46 +++++++++++++++++++++++++++++++++++++++--
 src/renderer.js         |  3 ++-
 test/core.test.js       | 28 +++++++++++++++++++++++++
 4 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/src/core/ffmpeg-args.js b/src/core/ffmpeg-args.js
index e191e17..9400f08 100644
--- a/src/core/ffmpeg-args.js
+++ b/src/core/ffmpeg-args.js
@@ -448,9 +448,26 @@ function buildProbeArgs(inputPath) {
     ];
 }
 
+/**
+ * A second probe for a moving picture whose container gives no duration (an
+ * animated GIF, with the bundled ffprobe): its first video stream's packets,
+ * counted without decoding, and its frame rate. Each GIF packet is a frame.
+ */
+function buildFrameCountArgs(inputPath) {
+    return [
+        "-v", "quiet",
+        "-print_format", "json",
+        "-count_packets",
+        "-select_streams", "v:0",
+        "-show_entries", "stream=nb_read_packets,avg_frame_rate,r_frame_rate",
+        inputPath,
+    ];
+}
+
 module.exports = {
     buildArgs,
     buildJoinArgs,
+    buildFrameCountArgs,
     buildConcatList,
     buildProbeArgs,
     buildVideoFilters,
diff --git a/src/core/probe.js b/src/core/probe.js
index cef9abf..3036469 100644
--- a/src/core/probe.js
+++ b/src/core/probe.js
@@ -9,7 +9,7 @@
 // duration, resolution and codecs when this resolves.
 
 const { execFile } = require("child_process");
-const { buildProbeArgs } = require("./ffmpeg-args");
+const { buildProbeArgs, buildFrameCountArgs } = require("./ffmpeg-args");
 
 const PROBE_TIMEOUT_MS = 30000;
 const MAX_BUFFER = 8 * 1024 * 1024;
@@ -44,16 +44,57 @@ function probe(inputPath) {
                     resolve({ ok: false, error: err.message, inputPath });
                     return;
                 }
+                let result;
                 try {
-                    resolve(normalise(JSON.parse(stdout), inputPath));
+                    result = normalise(JSON.parse(stdout), inputPath);
                 } catch (parseErr) {
                     resolve({ ok: false, error: `Could not parse ffprobe output: ${parseErr.message}`, inputPath });
+                    return;
+                }
+                // A moving picture with no duration (an animated GIF): count its frames.
+                if (result.ok && result.hasVideo && !result.isStill && result.duration == null) {
+                    countedDuration(inputPath).then((duration) => resolve({ ...result, duration }));
+                } else {
+                    resolve(result);
+                }
+            }
+        );
+    });
+}
+
+/**
+ * How long a moving picture lasts, from its frames over its frame rate, for
+ * a file whose container gives no duration. The bundled ffprobe gives an
+ * animated GIF none, so it could not be trimmed or timed in Join. Always
+ * resolves: null when it can't be counted.
+ */
+function countedDuration(inputPath) {
+    return new Promise((resolve) => {
+        execFile(
+            ffprobePath,
+            buildFrameCountArgs(inputPath),
+            { timeout: PROBE_TIMEOUT_MS, maxBuffer: MAX_BUFFER, windowsHide: true },
+            (err, stdout) => {
+                if (err) return resolve(null);
+                try {
+                    resolve(durationFromCount(JSON.parse(stdout)));
+                } catch {
+                    resolve(null);
                 }
             }
         );
     });
 }
 
+/** The count probe's frames over its frame rate, in seconds; null when either is missing. */
+function durationFromCount(raw) {
+    const stream = Array.isArray(raw?.streams) ? raw.streams[0] : null;
+    const frames = toNumber(stream?.nb_read_packets);
+    const fps = parseFrameRate(stream?.avg_frame_rate) ?? parseFrameRate(stream?.r_frame_rate);
+    if (!(frames > 0) || !(fps > 0)) return null;
+    return frames / fps;
+}
+
 /** Flatten ffprobe's raw JSON into the shape the UI actually binds to. */
 function normalise(raw, inputPath) {
     const streams = Array.isArray(raw.streams) ? raw.streams : [];
@@ -199,4 +240,5 @@ module.exports = {
     normalise,
     parseFrameRate,
     parseRational,
+    durationFromCount,
 };
diff --git a/src/renderer.js b/src/renderer.js
index a0476a9..c11e6e7 100644
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -1702,7 +1702,8 @@ function buildJoinRow(clip, index) {
         if (span != null && Math.abs(span - clip.meta.duration) > 0.05) {
             bits.push(`keeping ${kit.format.formatDuration(span)}`);
         }
-        meta.textContent = bits.join(" · ");
+        // A length that can't be known leaves no empty part before the first dot.
+        meta.textContent = bits.filter(Boolean).join(" · ");
     }
     main.append(name, meta);
 
diff --git a/test/core.test.js b/test/core.test.js
index a583f3d..ddc4790 100644
--- a/test/core.test.js
+++ b/test/core.test.js
@@ -581,6 +581,34 @@ test("probe: rational frame rates parse, degenerate ones do not", () => {
     assert.equal(probe.parseFrameRate("N/A"), null);
 });
 
+test("probe: a moving picture with no container duration is timed by its frames over its frame rate", () => {
+    const count = (packets, avg, r) => ({ streams: [{ nb_read_packets: packets, avg_frame_rate: avg, r_frame_rate: r }] });
+    assert.equal(probe.durationFromCount(count("30", "10/1")), 3);
+    assert.equal(probe.durationFromCount(count("48", "0/0", "24/1")), 2, "r_frame_rate when there's no average");
+    assert.equal(probe.durationFromCount(count("N/A", "10/1")), null);
+    assert.equal(probe.durationFromCount(count("30", "0/0", "0/0")), null);
+    assert.equal(probe.durationFromCount({}), null);
+});
+
+test("probe: a real animated GIF has a duration (the bundled ffprobe gives its container none)", async (t) => {
+    const ffmpeg = require("ffmpeg-static");
+    const ffprobe = require("ffprobe-static").path;
+    if (!ffmpeg || !fs.existsSync(ffmpeg) || !fs.existsSync(ffprobe)) return t.skip("no bundled ffmpeg or ffprobe");
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "dfc-gif-"));
+    t.after(() => fs.rmSync(dir, { recursive: true, force: true }));
+    const gif = path.join(dir, "anim.gif");
+    // 30 frames at 10 per second: 3 seconds.
+    require("child_process").execFileSync(ffmpeg, ["-v", "error", "-f", "lavfi", "-i", "testsrc=size=64x48:rate=10:duration=3", gif], { windowsHide: true });
+    const before = probe.getFfprobePath();
+    probe.setFfprobePath(ffprobe);
+    t.after(() => probe.setFfprobePath(before));
+    const meta = await probe.probe(gif);
+    assert.equal(meta.ok, true);
+    assert.equal(meta.hasVideo, true);
+    assert.equal(meta.isStill, false);
+    assert.ok(Math.abs(meta.duration - 3) < 0.01, `3 seconds, not ${meta.duration}`);
+});
+
 test("probe: an unconfigured binary degrades instead of throwing", async () => {
     const before = probe.getFfprobePath();
     probe.setFfprobePath(null);

From 3ce75f3b8a207d79ee68594b5da755af7f12d8d5 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Thu, 1 Oct 2026 13:20:36 +0100
Subject: [PATCH 55/81] Open the file picker where the last pick was made, kept
 between launches

Found in the manual pass: Add Files, Add Folder and the menu's Open always
opened at Downloads. lastOpenFolder (null by default) keeps the folder of the
files picked, or the folder a picked folder is in, and is used when it exists.
---
 src/constants.js |  3 +++
 src/main.js      | 47 ++++++++++++++++++++++++++---------------------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/constants.js b/src/constants.js
index 743ac61..683d0fe 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -76,6 +76,9 @@ const SETTINGS_DEFAULTS = {
     concurrency:     null,   // null = derive from the CPU count
     nameTemplate:    "{name}",
     lastTargetByKind: {},
+    // Where Add Files, Add Folder and Open last picked from, so the picker
+    // opens there next time (null: the system's own choice).
+    lastOpenFolder:  null,
     // Folder ingest. maxDepth and maxFiles are deliberately not here: they are
     // safety rails rather than preferences, and the toast that fires when one
     // bites explains itself at the moment it matters.
diff --git a/src/main.js b/src/main.js
index 38b8978..79d9a16 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,5 +1,6 @@
 const { app, dialog, shell } = require("electron");
 const { spawn } = require("child_process");
+const fs = require("fs");
 const path = require("path");
 
 const { APP_NAME, IPC, WINDOW, SETTINGS_DEFAULTS, LEGACY_STORE_KEYS,
@@ -109,19 +110,34 @@ function createWindow() {
 // and a second launch do: the kit gathers those from argv, second-instance
 // and open-file (v1 had none of this, and second-instance threw the paths away).
 
-async function openFiles() {
+/**
+ * The open dialog for files or a folder, opening where the last pick was made
+ * (lastOpenFolder, kept between launches) rather than at the system's choice.
+ * After files, their folder is kept; after a folder, the folder it's in, so
+ * the next folder pick opens beside it. Returns the paths, or null.
+ * @param {"files" | "folder"} what
+ */
+async function pickToOpen(what) {
+    const last = kit.settings.get().lastOpenFolder;
     const result = await dialog.showOpenDialog(mainWindow(), {
-        properties: ["openFile", "multiSelections"],
-        filters: FILE_DIALOG_FILTERS,
+        ...(what === "files"
+            ? { properties: ["openFile", "multiSelections"], filters: FILE_DIALOG_FILTERS }
+            : { properties: ["openDirectory"] }),
+        ...(typeof last === "string" && fs.existsSync(last) ? { defaultPath: last } : {}),
     });
-    if (!result.canceled && result.filePaths.length > 0) kit.files.open(result.filePaths);
+    if (result.canceled || result.filePaths.length === 0) return null;
+    kit.settings.set({ lastOpenFolder: path.dirname(result.filePaths[0]) });
+    return result.filePaths;
+}
+
+async function openFiles() {
+    const picked = await pickToOpen("files");
+    if (picked) kit.files.open(picked);
 }
 
 async function openFolder() {
-    const result = await dialog.showOpenDialog(mainWindow(), {
-        properties: ["openDirectory"],
-    });
-    if (!result.canceled && result.filePaths.length > 0) kit.files.open(result.filePaths);
+    const picked = await pickToOpen("folder");
+    if (picked) kit.files.open(picked);
 }
 
 // ── Conversion ───────────────────────────────────────────────────────────────
@@ -416,20 +432,9 @@ kit.ipc.handle(IPC.PROBE_FILE, (_event, filePath) => probe.probe(filePath));
 
 kit.ipc.handle(IPC.FS_SCAN, (_event, inputPaths, options) => scan.scanPaths(inputPaths ?? [], options ?? {}));
 
-kit.ipc.handle(IPC.DIALOG_BROWSE_FILES, async () => {
-    const result = await dialog.showOpenDialog(mainWindow(), {
-        properties: ["openFile", "multiSelections"],
-        filters: FILE_DIALOG_FILTERS,
-    });
-    if (result.canceled || result.filePaths.length === 0) return null;
-    return result.filePaths;
-});
+kit.ipc.handle(IPC.DIALOG_BROWSE_FILES, () => pickToOpen("files"));
 
-kit.ipc.handle(IPC.DIALOG_BROWSE_FOLDER, async () => {
-    const result = await dialog.showOpenDialog(mainWindow(), { properties: ["openDirectory"] });
-    if (result.canceled || result.filePaths.length === 0) return null;
-    return result.filePaths;
-});
+kit.ipc.handle(IPC.DIALOG_BROWSE_FOLDER, () => pickToOpen("folder"));
 
 kit.ipc.handle(IPC.DIALOG_CHOOSE_OUTPUT, async () => {
     const result = await dialog.showOpenDialog(mainWindow(), {

From d07d5eafbd5cb97ffb5934ba177405b1a382b069 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Thu, 1 Oct 2026 13:20:36 +0100
Subject: [PATCH 56/81] Settings has no General tab: say Update and Credits in
 both manual-pass sections

---
 docs/MANUAL-TESTING.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md
index 5f25628..9b00d23 100644
--- a/docs/MANUAL-TESTING.md
+++ b/docs/MANUAL-TESTING.md
@@ -2508,13 +2508,14 @@ outputs next to them.
 
 ### Settings, the window and the log
 
-- [ ] Settings > General, Update and Credits look as before. **Will's note
+- [ ] Settings > Update and Credits look as before. **Will's note
       (2026-10-01): give Settings > Update a proper look as a person would, and
       list what to refine in its UI.**
-      Looked at 2026-10-01 as a person would: **there is no General tab.** Settings has
-      Update and Credits, and the source has no General either, so these two words (here
-      and in the Linux section) are stale. What the Update tab looked like, and what to
-      refine, went onto the kit's own backlog. Will's own look is still his.
+      Looked at 2026-10-01 as a person would. (This box and the Linux one said "General":
+      Settings has no General tab, so both now read "Update and Credits".) What the Update
+      tab looked like, and what to refine, went onto the kit's own backlog, and the kit
+      reworked the tab from it (two cards, a reason for a failed check, the version linked
+      to its release). Will's own look at the new tab is still his.
 - [ ] Move and resize the window, close it, reopen it: same place, same size.
       Unplug a second monitor the window was on: it opens centred on the one
       you have.
@@ -2622,7 +2623,7 @@ Run it in the Linux VM, on a desktop.
 - [ ] Convert a file to MP3, then again to see "File Already Exists" in the
       app, and **Save as New**: `name (1).mp3` is written.
 - [ ] Join two files: it works, in MP3 and in their own format.
-- [ ] Settings: General, Update and Credits, the rail collapsed and expanded.
+- [ ] Settings: Update and Credits, the rail collapsed and expanded.
       Close and reopen: the window is where you left it.
 - [ ] `~/.config/diamond-file-converter/debug.log` names files by their names
       only, with no folder.

From 31340148cdd92770c8882f5dfa0dcde822d439be Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Thu, 1 Oct 2026 13:22:05 +0100
Subject: [PATCH 57/81] Say in MANUAL-TESTING what was done about each thing
 the pass found, and what's still to run

---
 docs/MANUAL-TESTING.md | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md
index 9b00d23..9b3be13 100644
--- a/docs/MANUAL-TESTING.md
+++ b/docs/MANUAL-TESTING.md
@@ -2411,7 +2411,8 @@ the app, not in a Windows box, and the Title Case slips are fixed.
 > the app built from source through every step it can (23/23 on Windows,
 > 2026-10-01), and the M1 checks again on a profile 2.0.0 had saved (29/29).
 > What the pass found is under "Found in the pass", at the end of this
-> section. The Linux build is in the next section: not run.
+> section, with what was done about each. The unticked boxes are still to run,
+> before the next beta is released. The Linux build is in the next section: not run.
 
 Test a packaged, installed build. Use files you can lose: the steps write
 outputs next to them.
@@ -2585,6 +2586,32 @@ Wrong or worth a look, in the order they turned up. The pass added no code.
   where they aren't meant for anything; "Check for Updates" showed no "Checking…" state
   for a failing check (the red line was simply there when the screenshot came).
 
+What was done about them, 2026-10-01 (re-run the boxes above to see each one):
+
+- **Skipped:** said as skipped: "5 files skipped." in the toast and "5 files skipped" in
+  the bar; a mix reads "2 files converted, 3 skipped." (the kit's `summarise()` took a
+  skipped count).
+- **The Beta channel:** the cause is the releases, not the app: every pre-release went out
+  with only its installer. With GitHub, electron-builder writes one `latest.yml` whatever
+  the version, and the updater reads it from the newest pre-release on Beta, so **the next
+  beta attaches `latest.yml`, `latest-linux.yml` and the `.blockmap` files** beside the
+  installers. Until a release does, the Update tab now says "Couldn't check for updates.
+  The newest release has no update files yet." in the warning shade, not red.
+- **A failed check is logged:** one warning in `debug.log`: the channel, the reason and the
+  error, redacted.
+- **Settings > Update** was reworked in the kit from the pass's list: two cards ("Version x"
+  with its status and buttons, then Preferences), "Checking for updates…" for a second at
+  least, the switch's help saying what On and Off do, each channel's help saying what it
+  brings, and "Version x" in "Version x is available." a link to its release on GitHub.
+- **Add Files and Add Folder** are hidden on Settings.
+- **GIFs:** timed by their frames, so Advanced Options trims one and shows its first and
+  last frames, and Join's row reads "0:03 · 240×180". Join's own frame previews are still
+  to come (WORKQUEUE item 22).
+- **The file picker** opens where the last pick was made, even after a restart.
+- **The switch Off on an upgraded profile** is as it should be (2.0.0's saved choice is
+  kept); the first Update box needs a clean profile.
+- **The toast over Join's right panel:** not fixed here (WORKQUEUE item 22).
+
 ## Linux — the first build
 
 DFC builds for Linux now: an AppImage, a `.deb` and an `.rpm`, each with
@@ -2595,7 +2622,8 @@ downloads the binary for the machine it's installed on), and named
 
 > **Status: not run by a person; skipped on 2026-10-01.** The Zorin VM couldn't be
 > logged in to (Will was working remotely, with no physical access), so no box
-> below was run and none is ticked. It still stands as the pass to do. An agent
+> below was run and none is ticked. It still stands as the pass to do, before the
+> next beta (which ships these files) is released. An agent
 > drove the built app
 > (`linux-unpacked`, what the AppImage holds) under Xvfb in a Debian 12
 > container: 23/23, and the M1 checks on a profile 2.0.0 had saved, 29/29

From 35381ce3441158ffe25324a6019862ef2aa61e01 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Thu, 1 Oct 2026 16:14:41 +0100
Subject: [PATCH 58/81] Tick the boxes Will ran before the next beta: Open
 with, drags, Escapes, a second monitor, and the Linux build

M4's gate. Every box left for a person in the house-kit section (Windows) and the whole Linux section (the VM) passed, 2026-10-01. NVDA stays skipped.
---
 docs/MANUAL-TESTING.md | 95 +++++++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 44 deletions(-)

diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md
index 9b3be13..ac7ae18 100644
--- a/docs/MANUAL-TESTING.md
+++ b/docs/MANUAL-TESTING.md
@@ -2350,8 +2350,9 @@ picture).
 > A computer-use agent cannot send Escape. Leave these boxes unticked and say
 > so. Only a person at the keyboard can run them.
 
-- [ ] Type a refused value in End, then press **Escape**. The dialog closes and
+- [x] Type a refused value in End, then press **Escape**. The dialog closes and
       nothing is applied. Reopen it: the trim is what it was before.
+      Verified by Will at the keyboard, 2026-10-01 (M4's gate).
 
 ## Settings > Update — channels and automatic downloads
 
@@ -2411,39 +2412,46 @@ the app, not in a Windows box, and the Title Case slips are fixed.
 > the app built from source through every step it can (23/23 on Windows,
 > 2026-10-01), and the M1 checks again on a profile 2.0.0 had saved (29/29).
 > What the pass found is under "Found in the pass", at the end of this
-> section, with what was done about each. The unticked boxes are still to run,
-> before the next beta is released. The Linux build is in the next section: not run.
+> section, with what was done about each.
+>
+> **Then run by Will, 2026-10-01, before the next beta (M4's gate):** every
+> box left for a person (the three "Open with", the second-Open-with log, the
+> Explorer drags, the Escapes, the second monitor, and his own look at the
+> reworked Settings > Update), all as written. NVDA stays skipped. The Linux
+> build was passed the same day: the next section.
 
 Test a packaged, installed build. Use files you can lose: the steps write
 outputs next to them.
 
 ### Open with, and a second "Open with"
 
-- [ ] Right-click an audio file in Explorer, **Open with** the app, with the app
+- [x] Right-click an audio file in Explorer, **Open with** the app, with the app
       closed: it opens with the file as a card.
-      Not run: Explorer is click-only for the agent. Will's to run.
-- [ ] With the app open, **Open with** two more files at once: the app comes to
+      Verified by Will, 2026-10-01.
+- [x] With the app open, **Open with** two more files at once: the app comes to
       the front, and both arrive together as cards, in one go.
-- [ ] Only one window, ever, and the app opened only once (one taskbar button).
+      Verified by Will, 2026-10-01.
+- [x] Only one window, ever, and the app opened only once (one taskbar button).
+      Verified by Will, 2026-10-01.
 
 ### Drops and the toast's list
 
-- [ ] Drag a supported file and a `.txt` onto the empty Convert view: the
+- [x] Drag a supported file and a `.txt` onto the empty Convert view: the
       dashed box lights while you're over it, and one toast says "Added 1 file,
       skipped 1." with **Show Them**.
-      Not run (a drag). The toast itself was seen the other way: Add Folder on a
-      folder holding a WAV and a notes.txt gave "Added 1 file, skipped 1." with
-      **Show Them**. The dashed box lighting up while you drag is Will's to see.
+      The toast was first seen the other way: Add Folder on a folder holding a WAV
+      and a notes.txt gave "Added 1 file, skipped 1." with **Show Them**. The drag
+      itself, with the dashed box lighting, verified by Will, 2026-10-01.
 - [x] **Show Them** lists `notes.txt — not a supported format`, and says
       **Hide**; the toast stays until you close it.
       Verified 2026-10-01, through Add Folder rather than a drag: it listed
       `notes.txt — not a supported format`, the link read **Hide**, and the toast
       was still there 12 seconds later.
-- [ ] With cards on screen, drag more files anywhere over the grid: the grid
+- [x] With cards on screen, drag more files anywhere over the grid: the grid
       lights, and they're added.
-      Not run (a drag). Will's to run.
-- [ ] Drag files onto Join: they're added to Join, not Convert.
-      Not run (a drag). Will's to run.
+      Verified by Will, 2026-10-01.
+- [x] Drag files onto Join: they're added to Join, not Convert.
+      Verified by Will, 2026-10-01.
 
 ### A conversion, and "File Already Exists"
 
@@ -2461,11 +2469,11 @@ outputs next to them.
       Verified 2026-10-01: an in-app prompt titled "File Already Exists" with **Cancel
       All**, **Skip This File**, **Overwrite** and **Save as New**, the last with a
       visible focus ring. **Apply to All Remaining** is a checkbox above the buttons.
-- [ ] Press Escape: the run is cancelled, nothing is written, and focus is back
+- [x] Press Escape: the run is cancelled, nothing is written, and focus is back
       where it was.
-      Not run: an agent can't send Escape. Will's to run. (The prompt's **Cancel All**
-      button was checked instead: the run stopped, the cards read Cancelled, and
-      nothing was written.)
+      Verified by Will at the keyboard, 2026-10-01. (The agent's pass had checked the
+      prompt's **Cancel All** button instead: the run stopped, the cards read
+      Cancelled, and nothing was written.)
 - [x] Again, **Save as New**: `name (1).mp3` is written.
       Verified 2026-10-01: `tone-a (1).mp3` was written beside `tone-a.mp3`.
 - [x] Convert five files that all exist, tick **Apply to All Remaining** on the
@@ -2509,20 +2517,20 @@ outputs next to them.
 
 ### Settings, the window and the log
 
-- [ ] Settings > Update and Credits look as before. **Will's note
+- [x] Settings > Update and Credits look as before. **Will's note
       (2026-10-01): give Settings > Update a proper look as a person would, and
       list what to refine in its UI.**
       Looked at 2026-10-01 as a person would. (This box and the Linux one said "General":
       Settings has no General tab, so both now read "Update and Credits".) What the Update
       tab looked like, and what to refine, went onto the kit's own backlog, and the kit
       reworked the tab from it (two cards, a reason for a failed check, the version linked
-      to its release). Will's own look at the new tab is still his.
-- [ ] Move and resize the window, close it, reopen it: same place, same size.
+      to its release). Will looked at the new tab himself, 2026-10-01: good.
+- [x] Move and resize the window, close it, reopen it: same place, same size.
       Unplug a second monitor the window was on: it opens centred on the one
       you have.
       First half verified 2026-10-01: moved and resized (left edge dragged in), closed,
       reopened by name: same place, same size, and `config.json` held the bounds. The
-      second monitor was not unplugged: Will's to run.
+      second monitor, unplugged, verified by Will, 2026-10-01.
 - [x] `%APPDATA%\diamond-file-converter\debug.log` starts with
       `=== Diamond File Converter  started at …`, names the files you
       used by their names only (`…\clip.mp4`), and has no folder in it.
@@ -2532,10 +2540,10 @@ outputs next to them.
       with the file's name and a leading ellipsis where its folder was, in the ffprobe
       command too. **Worth knowing:** only warnings and errors are written, so a clean
       session's log is two lines, and a failed update check writes nothing at all.
-- [ ] After a second **Open with**, `debug.log` still has the first launch's
+- [x] After a second **Open with**, `debug.log` still has the first launch's
       lines (a second launch used to empty it).
-      Not run: needs Open with. (A plain close and reopen does start a fresh log, as it
-      should: the header's time changed.)
+      Verified by Will, 2026-10-01. (A plain close and reopen does start a fresh log, as
+      it should: the header's time changed.)
 
 ### With a screen reader (NVDA)
 
@@ -2620,38 +2628,37 @@ downloads the binary for the machine it's installed on), and named
 `Diamond-File-Converter-.`: only the Windows installer is a
 `Setup`.
 
-> **Status: not run by a person; skipped on 2026-10-01.** The Zorin VM couldn't be
-> logged in to (Will was working remotely, with no physical access), so no box
-> below was run and none is ticked. It still stands as the pass to do, before the
-> next beta (which ships these files) is released. An agent
-> drove the built app
-> (`linux-unpacked`, what the AppImage holds) under Xvfb in a Debian 12
-> container: 23/23, and the M1 checks on a profile 2.0.0 had saved, 29/29
-> (2026-10-01). Its `.deb` and `.rpm` hold `resources/ffmpeg/ffmpeg` and
-> `ffprobe`, executable, and name Diamond Digital Development
->  as the maintainer.
+> **Status: run by Will in the Linux VM, 2026-10-01 (M4's gate): every box
+> below passed.** Orca wasn't part of it (optional). It had been skipped earlier
+> the same day (the Zorin VM couldn't be logged in to while Will was remote).
+> Before that, an agent drove the built app (`linux-unpacked`, what the
+> AppImage holds) under Xvfb in a Debian 12 container: 23/23, and the M1
+> checks on a profile 2.0.0 had saved, 29/29 (2026-10-01). Its `.deb` and
+> `.rpm` hold `resources/ffmpeg/ffmpeg` and `ffprobe`, executable, and name
+> Diamond Digital Development  as the
+> maintainer.
 
 Run it in the Linux VM, on a desktop.
 
 ### Install and run
 
-- [ ] `sudo apt install ./Diamond-File-Converter-.deb`: it installs,
+- [x] `sudo apt install ./Diamond-File-Converter-.deb`: it installs,
       and **Diamond File Converter** is in the applications menu under Sound &
       Video. It opens, in the desktop's light or dark theme.
-- [ ] The AppImage (`chmod +x`, then run it) opens the same app.
-- [ ] Known until M6: the dock may show a generic icon for the running window
+- [x] The AppImage (`chmod +x`, then run it) opens the same app.
+- [x] Known until M6: the dock may show a generic icon for the running window
       (no `desktopName` yet), and DFC isn't offered in "Open with" for media
       files (no MimeType yet). Note it, don't fail it.
 
 ### The same pass as Windows
 
-- [ ] From a terminal, `diamond-file-converter ~/Music/a.wav`: the app opens
+- [x] From a terminal, `diamond-file-converter ~/Music/a.wav`: the app opens
       with it as a card. Run the same with another file while it's open: it
       comes to the front with the file added, and there's still one window.
-- [ ] Convert a file to MP3, then again to see "File Already Exists" in the
+- [x] Convert a file to MP3, then again to see "File Already Exists" in the
       app, and **Save as New**: `name (1).mp3` is written.
-- [ ] Join two files: it works, in MP3 and in their own format.
-- [ ] Settings: Update and Credits, the rail collapsed and expanded.
+- [x] Join two files: it works, in MP3 and in their own format.
+- [x] Settings: Update and Credits, the rail collapsed and expanded.
       Close and reopen: the window is where you left it.
-- [ ] `~/.config/diamond-file-converter/debug.log` names files by their names
+- [x] `~/.config/diamond-file-converter/debug.log` names files by their names
       only, with no folder.

From f89c5a7ce071c2fabbaf19c90732105b466307fb Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Thu, 1 Oct 2026 18:57:54 +0100
Subject: [PATCH 59/81] chore: 2.0.0-beta.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6e17fc8..9c3e129 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "diamond-file-converter",
-    "version": "2.0.0-beta.2",
+    "version": "2.0.0-beta.3",
     "description": "An Electron-based Windows app for converting audio, video, and image files.",
     "main": "src/main.js",
     "funding": {

From 2ab6dccf55092da2043a001e3665cfcb205b9ced Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Thu, 1 Oct 2026 19:25:49 +0100
Subject: [PATCH 60/81] Run the tests on Windows and Ubuntu for pushes and pull
 requests, and keep dependencies current

CI: npm 12 (so only the install scripts package.json allows run), npm ci and npm test, on both platforms. It needs package-lock.json, which is committed with the switch to the kit from npm.

Dependabot: weekly, minors and patches grouped, against 2.0.0. GitHub reads it from the default branch, so it starts when 2.0 reaches master.
---
 .github/dependabot.yml   | 23 +++++++++++++++++
 .github/workflows/ci.yml | 54 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 .github/dependabot.yml
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..7374167
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,23 @@
+# Weekly, with patches and minors grouped into one pull request. Majors come
+# one at a time, and are taken on evidence: the real app driven, not only the
+# tests passing. The workflows' actions are kept current the same way.
+
+version: 2
+updates:
+  - package-ecosystem: npm
+    directory: "/"
+    target-branch: "2.0.0"
+    schedule:
+      interval: weekly
+    groups:
+      minor-and-patch:
+        update-types: [minor, patch]
+
+  - package-ecosystem: github-actions
+    directory: "/"
+    target-branch: "2.0.0"
+    schedule:
+      interval: weekly
+    groups:
+      actions:
+        update-types: [minor, patch]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..25b9d7e
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,54 @@
+name: CI
+
+# The tests, on Windows and Ubuntu, for every push to a release branch and
+# every pull request. They run under Node, with no window: the shared UI's own
+# real-Electron and visual tests are @diamonddigitaldev/electron-kit's.
+
+on:
+  push:
+    branches: [master, '2.0.0']
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    name: Tests (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 15
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest, ubuntu-latest]
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
+
+      - uses: actions/setup-node@v7
+        with:
+          node-version: 24
+          cache: npm
+          cache-dependency-path: package-lock.json
+
+      # npm 12, as on the development machine: it only runs the install scripts
+      # package.json allows (ffmpeg-static downloads its binary in one).
+      - name: Install npm 12
+        run: npm install -g npm@12
+
+      # Windows runners install global packages outside Node's own folder, and
+      # setup-node puts Node's folder, with its bundled npm, first on PATH.
+      - name: Put npm 12 first on PATH
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: npm prefix -g >> $env:GITHUB_PATH
+
+      - name: Install dependencies
+        run: |
+          npm --version
+          npm ci
+
+      - name: Run the tests
+        run: npm test

From bee60ed57f9bf8387ad90b413dce5e69df098d38 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Thu, 1 Oct 2026 21:03:15 +0100
Subject: [PATCH 61/81] Take @diamonddigitaldev/electron-kit 0.1.0-beta.1 from
 npm, pinned, and commit the lock file

The kit was a packed tarball while it was private. It's on npm now, and pinned to exactly 0.1.0-beta.1, so a fresh install can't move to a later beta before it's been tried here. Its code is the same as the tarball's, file for file.

package-lock.json is committed from now on, so every install and build gets the same versions, and CI can run npm ci.
---
 .gitignore        |    1 -
 package-lock.json | 3696 +++++++++++++++++++++++++++++++++++++++++++++
 package.json      |    2 +-
 3 files changed, 3697 insertions(+), 2 deletions(-)
 create mode 100644 package-lock.json

diff --git a/.gitignore b/.gitignore
index defbaf8..ef00807 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 node_modules/
 dist/
-package-lock.json
 # Local test media and its conversion output. Generated by hand while testing;
 # never part of the repo.
 test-media/
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..c734f56
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,3696 @@
+{
+    "name": "diamond-file-converter",
+    "version": "2.0.0-beta.3",
+    "lockfileVersion": 3,
+    "requires": true,
+    "packages": {
+        "": {
+            "name": "diamond-file-converter",
+            "version": "2.0.0-beta.3",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@diamonddigitaldev/electron-kit": "0.1.0-beta.1",
+                "bootstrap": "^5.3.3",
+                "electron-store": "^11.0.2",
+                "electron-updater": "^6.8.9",
+                "ffmpeg-static": "^5.2.0",
+                "ffprobe-static": "^3.1.0",
+                "material-icons": "^1.13.14"
+            },
+            "devDependencies": {
+                "electron": "^44.4.5",
+                "electron-builder": "^26.15.3"
+            },
+            "funding": {
+                "type": "buymeacoffee",
+                "url": "https://www.buymeacoffee.com/willtda"
+            }
+        },
+        "node_modules/@derhuerst/http-basic": {
+            "version": "8.2.4",
+            "license": "MIT",
+            "dependencies": {
+                "caseless": "^0.12.0",
+                "concat-stream": "^2.0.0",
+                "http-response-object": "^3.0.1",
+                "parse-cache-control": "^1.0.1"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@diamonddigitaldev/electron-kit": {
+            "version": "0.1.0-beta.1",
+            "resolved": "https://registry.npmjs.org/@diamonddigitaldev/electron-kit/-/electron-kit-0.1.0-beta.1.tgz",
+            "integrity": "sha512-JPq1Qj9e1iruR3il6Io7ztoZK4jNk2INMI5m1xU0S2TVAIEiP3qg1M4L/cVCdAn/lBLVFoAsL4RSQSFE4f5rKA==",
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=24.0.0"
+            },
+            "funding": {
+                "type": "buymeacoffee",
+                "url": "https://www.buymeacoffee.com/willtda"
+            },
+            "peerDependencies": {
+                "bootstrap": "^5.3.0",
+                "electron": ">=44.0.0",
+                "electron-store": "^11.0.2",
+                "electron-updater": "^6.8.9",
+                "material-icons": "^1.13.14"
+            },
+            "peerDependenciesMeta": {
+                "electron-updater": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@electron-internal/extract-zip": {
+            "version": "1.0.5",
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=22.12.0"
+            }
+        },
+        "node_modules/@electron/asar": {
+            "version": "3.4.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "commander": "^5.0.0",
+                "glob": "^7.1.6",
+                "minimatch": "^3.0.4"
+            },
+            "bin": {
+                "asar": "bin/asar.js"
+            },
+            "engines": {
+                "node": ">=10.12.0"
+            }
+        },
+        "node_modules/@electron/asar/node_modules/balanced-match": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@electron/asar/node_modules/brace-expansion": {
+            "version": "1.1.18",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/@electron/asar/node_modules/minimatch": {
+            "version": "3.1.5",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/@electron/fuses": {
+            "version": "1.8.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "^4.1.1",
+                "fs-extra": "^9.0.1",
+                "minimist": "^1.2.5"
+            },
+            "bin": {
+                "electron-fuses": "dist/bin.js"
+            }
+        },
+        "node_modules/@electron/fuses/node_modules/fs-extra": {
+            "version": "9.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "at-least-node": "^1.0.0",
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@electron/fuses/node_modules/jsonfile": {
+            "version": "6.2.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/@electron/fuses/node_modules/universalify": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/@electron/get": {
+            "version": "5.1.0",
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^4.1.1",
+                "env-paths": "^3.0.0",
+                "graceful-fs": "^4.2.11",
+                "progress": "^2.0.3",
+                "semver": "^7.6.3",
+                "sumchecker": "^3.0.1"
+            },
+            "engines": {
+                "node": ">=22.12.0"
+            },
+            "optionalDependencies": {
+                "undici": "^7.24.4"
+            }
+        },
+        "node_modules/@electron/get/node_modules/env-paths": {
+            "version": "3.0.0",
+            "license": "MIT",
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/@electron/get/node_modules/undici": {
+            "version": "7.29.0",
+            "license": "MIT",
+            "optional": true,
+            "engines": {
+                "node": ">=20.18.1"
+            }
+        },
+        "node_modules/@electron/notarize": {
+            "version": "2.5.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^4.1.1",
+                "fs-extra": "^9.0.1",
+                "promise-retry": "^2.0.1"
+            },
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/@electron/notarize/node_modules/fs-extra": {
+            "version": "9.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "at-least-node": "^1.0.0",
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@electron/notarize/node_modules/jsonfile": {
+            "version": "6.2.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/@electron/notarize/node_modules/universalify": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/@electron/osx-sign": {
+            "version": "1.3.3",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "compare-version": "^0.1.2",
+                "debug": "^4.3.4",
+                "fs-extra": "^10.0.0",
+                "isbinaryfile": "^4.0.8",
+                "minimist": "^1.2.6",
+                "plist": "^3.0.5"
+            },
+            "bin": {
+                "electron-osx-flat": "bin/electron-osx-flat.js",
+                "electron-osx-sign": "bin/electron-osx-sign.js"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
+        "node_modules/@electron/osx-sign/node_modules/fs-extra": {
+            "version": "10.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@electron/osx-sign/node_modules/isbinaryfile": {
+            "version": "4.0.10",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 8.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/gjtorikian/"
+            }
+        },
+        "node_modules/@electron/osx-sign/node_modules/jsonfile": {
+            "version": "6.2.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/@electron/osx-sign/node_modules/universalify": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/@electron/rebuild": {
+            "version": "4.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@malept/cross-spawn-promise": "^2.0.0",
+                "debug": "^4.1.1",
+                "node-abi": "^4.2.0",
+                "node-api-version": "^0.2.1",
+                "node-gyp": "^12.2.0",
+                "read-binary-file-arch": "^1.0.6"
+            },
+            "bin": {
+                "electron-rebuild": "lib/cli.js"
+            },
+            "engines": {
+                "node": ">=22.12.0"
+            }
+        },
+        "node_modules/@electron/universal": {
+            "version": "2.0.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@electron/asar": "^3.3.1",
+                "@malept/cross-spawn-promise": "^2.0.0",
+                "debug": "^4.3.1",
+                "dir-compare": "^4.2.0",
+                "fs-extra": "^11.1.1",
+                "minimatch": "^9.0.3",
+                "plist": "^3.1.0"
+            },
+            "engines": {
+                "node": ">=16.4"
+            }
+        },
+        "node_modules/@electron/universal/node_modules/balanced-match": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@electron/universal/node_modules/brace-expansion": {
+            "version": "2.1.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/@electron/universal/node_modules/fs-extra": {
+            "version": "11.4.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=14.14"
+            }
+        },
+        "node_modules/@electron/universal/node_modules/jsonfile": {
+            "version": "6.2.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/@electron/universal/node_modules/minimatch": {
+            "version": "9.0.9",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.2"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/@electron/universal/node_modules/universalify": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/@electron/windows-sign": {
+            "version": "1.2.2",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "optional": true,
+            "peer": true,
+            "dependencies": {
+                "cross-dirname": "^0.1.0",
+                "debug": "^4.3.4",
+                "fs-extra": "^11.1.1",
+                "minimist": "^1.2.8",
+                "postject": "^1.0.0-alpha.6"
+            },
+            "bin": {
+                "electron-windows-sign": "bin/electron-windows-sign.js"
+            },
+            "engines": {
+                "node": ">=14.14"
+            }
+        },
+        "node_modules/@electron/windows-sign/node_modules/fs-extra": {
+            "version": "11.4.0",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "peer": true,
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=14.14"
+            }
+        },
+        "node_modules/@electron/windows-sign/node_modules/jsonfile": {
+            "version": "6.2.1",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "peer": true,
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/@electron/windows-sign/node_modules/universalify": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "peer": true,
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/@isaacs/fs-minipass": {
+            "version": "4.0.1",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "minipass": "^7.0.4"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@malept/cross-spawn-promise": {
+            "version": "2.0.0",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "individual",
+                    "url": "https://github.com/sponsors/malept"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund"
+                }
+            ],
+            "license": "Apache-2.0",
+            "dependencies": {
+                "cross-spawn": "^7.0.1"
+            },
+            "engines": {
+                "node": ">= 12.13.0"
+            }
+        },
+        "node_modules/@malept/flatpak-bundler": {
+            "version": "0.4.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^4.1.1",
+                "fs-extra": "^9.0.0",
+                "lodash": "^4.17.15",
+                "tmp-promise": "^3.0.2"
+            },
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/@malept/flatpak-bundler/node_modules/fs-extra": {
+            "version": "9.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "at-least-node": "^1.0.0",
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@malept/flatpak-bundler/node_modules/jsonfile": {
+            "version": "6.2.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/@malept/flatpak-bundler/node_modules/universalify": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/@noble/hashes": {
+            "version": "2.4.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 20.19.0"
+            },
+            "funding": {
+                "url": "https://paulmillr.com/funding/"
+            }
+        },
+        "node_modules/@peculiar/asn1-schema": {
+            "version": "2.9.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@peculiar/utils": "^2.0.2",
+                "asn1js": "^3.0.10",
+                "tslib": "^2.8.1"
+            },
+            "engines": {
+                "node": ">=14"
+            }
+        },
+        "node_modules/@peculiar/json-schema": {
+            "version": "1.1.12",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "tslib": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8.0.0"
+            }
+        },
+        "node_modules/@peculiar/utils": {
+            "version": "2.0.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "tslib": "^2.8.1"
+            }
+        },
+        "node_modules/@peculiar/webcrypto": {
+            "version": "1.7.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@peculiar/asn1-schema": "^2.7.0",
+                "@peculiar/json-schema": "^1.1.12",
+                "@peculiar/utils": "^2.0.2",
+                "tslib": "^2.8.1",
+                "webcrypto-core": "^1.9.2"
+            },
+            "engines": {
+                "node": ">=14.18.0"
+            }
+        },
+        "node_modules/@popperjs/core": {
+            "version": "2.11.8",
+            "license": "MIT",
+            "peer": true,
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/popperjs"
+            }
+        },
+        "node_modules/@sindresorhus/is": {
+            "version": "4.6.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sindresorhus/is?sponsor=1"
+            }
+        },
+        "node_modules/@szmarczak/http-timer": {
+            "version": "4.0.6",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "defer-to-connect": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@types/cacheable-request": {
+            "version": "6.0.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/http-cache-semantics": "*",
+                "@types/keyv": "^3.1.4",
+                "@types/node": "*",
+                "@types/responselike": "^1.0.0"
+            }
+        },
+        "node_modules/@types/debug": {
+            "version": "4.1.13",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/ms": "*"
+            }
+        },
+        "node_modules/@types/fs-extra": {
+            "version": "9.0.13",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/http-cache-semantics": {
+            "version": "4.2.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/keyv": {
+            "version": "3.1.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/ms": {
+            "version": "2.1.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/node": {
+            "version": "24.12.0",
+            "license": "MIT",
+            "dependencies": {
+                "undici-types": "~7.16.0"
+            }
+        },
+        "node_modules/@types/responselike": {
+            "version": "1.0.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@xmldom/xmldom": {
+            "version": "0.8.15",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.0.0"
+            }
+        },
+        "node_modules/abbrev": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "^20.17.0 || >=22.9.0"
+            }
+        },
+        "node_modules/agent-base": {
+            "version": "7.1.4",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/ajv": {
+            "version": "8.20.0",
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3",
+                "fast-uri": "^3.0.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/ajv-formats": {
+            "version": "3.0.1",
+            "license": "MIT",
+            "dependencies": {
+                "ajv": "^8.0.0"
+            },
+            "peerDependencies": {
+                "ajv": "^8.0.0"
+            },
+            "peerDependenciesMeta": {
+                "ajv": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/app-builder-lib": {
+            "version": "26.15.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@electron/asar": "3.4.1",
+                "@electron/fuses": "^1.8.0",
+                "@electron/get": "^3.0.0",
+                "@electron/notarize": "2.5.0",
+                "@electron/osx-sign": "1.3.3",
+                "@electron/rebuild": "^4.0.4",
+                "@electron/universal": "2.0.3",
+                "@malept/flatpak-bundler": "^0.4.0",
+                "@noble/hashes": "^2.2.0",
+                "@peculiar/webcrypto": "^1.7.1",
+                "@types/fs-extra": "9.0.13",
+                "ajv": "^8.18.0",
+                "asn1js": "^3.0.10",
+                "async-exit-hook": "^2.0.1",
+                "builder-util": "26.15.3",
+                "builder-util-runtime": "9.7.0",
+                "chromium-pickle-js": "^0.2.0",
+                "ci-info": "4.3.1",
+                "debug": "^4.3.4",
+                "dotenv": "^16.4.5",
+                "dotenv-expand": "^11.0.6",
+                "ejs": "^3.1.8",
+                "electron-publish": "26.15.3",
+                "fs-extra": "^10.1.0",
+                "hosted-git-info": "^4.1.0",
+                "isbinaryfile": "^5.0.0",
+                "jiti": "^2.4.2",
+                "js-yaml": "^4.1.0",
+                "json5": "^2.2.3",
+                "lazy-val": "^1.0.5",
+                "minimatch": "^10.2.5",
+                "pkijs": "^3.4.0",
+                "plist": "3.1.0",
+                "proper-lockfile": "^4.1.2",
+                "resedit": "^1.7.0",
+                "semver": "~7.7.3",
+                "tar": "^7.5.7",
+                "temp-file": "^3.4.0",
+                "tiny-async-pool": "1.3.0",
+                "unzipper": "^0.12.3",
+                "which": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "dmg-builder": "26.15.3",
+                "electron-builder-squirrel-windows": "26.15.3"
+            }
+        },
+        "node_modules/app-builder-lib/node_modules/@electron/get": {
+            "version": "3.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^4.1.1",
+                "env-paths": "^2.2.0",
+                "fs-extra": "^8.1.0",
+                "got": "^11.8.5",
+                "progress": "^2.0.3",
+                "semver": "^6.2.0",
+                "sumchecker": "^3.0.1"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "optionalDependencies": {
+                "global-agent": "^3.0.0"
+            }
+        },
+        "node_modules/app-builder-lib/node_modules/@electron/get/node_modules/fs-extra": {
+            "version": "8.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^4.0.0",
+                "universalify": "^0.1.0"
+            },
+            "engines": {
+                "node": ">=6 <7 || >=8"
+            }
+        },
+        "node_modules/app-builder-lib/node_modules/@electron/get/node_modules/semver": {
+            "version": "6.3.1",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/app-builder-lib/node_modules/ci-info": {
+            "version": "4.3.1",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/sibiraj-s"
+                }
+            ],
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/app-builder-lib/node_modules/fs-extra": {
+            "version": "10.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/app-builder-lib/node_modules/fs-extra/node_modules/jsonfile": {
+            "version": "6.2.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/app-builder-lib/node_modules/fs-extra/node_modules/universalify": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/app-builder-lib/node_modules/semver": {
+            "version": "7.7.4",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/argparse": {
+            "version": "2.0.1",
+            "license": "Python-2.0"
+        },
+        "node_modules/asn1js": {
+            "version": "3.0.10",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "pvtsutils": "^1.3.6",
+                "pvutils": "^1.1.5",
+                "tslib": "^2.8.1"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
+        "node_modules/async": {
+            "version": "3.2.6",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/async-exit-hook": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.12.0"
+            }
+        },
+        "node_modules/asynckit": {
+            "version": "0.4.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/at-least-node": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">= 4.0.0"
+            }
+        },
+        "node_modules/atomically": {
+            "version": "2.1.1",
+            "license": "MIT",
+            "dependencies": {
+                "stubborn-fs": "^2.0.0",
+                "when-exit": "^2.1.4"
+            }
+        },
+        "node_modules/aws4": {
+            "version": "1.13.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/balanced-match": {
+            "version": "4.0.4",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "18 || 20 || >=22"
+            }
+        },
+        "node_modules/base64-js": {
+            "version": "1.5.1",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/bluebird": {
+            "version": "3.7.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/boolean": {
+            "version": "3.2.0",
+            "dev": true,
+            "license": "MIT",
+            "optional": true
+        },
+        "node_modules/bootstrap": {
+            "version": "5.3.8",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/twbs"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/bootstrap"
+                }
+            ],
+            "license": "MIT",
+            "peerDependencies": {
+                "@popperjs/core": "^2.11.8"
+            }
+        },
+        "node_modules/brace-expansion": {
+            "version": "5.0.9",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^4.0.2"
+            },
+            "engines": {
+                "node": "20 || >=22"
+            }
+        },
+        "node_modules/buffer-from": {
+            "version": "1.1.2",
+            "license": "MIT"
+        },
+        "node_modules/builder-util": {
+            "version": "26.15.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/debug": "^4.1.6",
+                "builder-util-runtime": "9.7.0",
+                "chalk": "^4.1.2",
+                "cross-spawn": "^7.0.6",
+                "debug": "^4.3.4",
+                "fs-extra": "^10.1.0",
+                "http-proxy-agent": "^7.0.0",
+                "https-proxy-agent": "^7.0.0",
+                "js-yaml": "^4.1.0",
+                "sanitize-filename": "^1.6.3",
+                "source-map-support": "^0.5.19",
+                "stat-mode": "^1.0.0",
+                "temp-file": "^3.4.0",
+                "tiny-async-pool": "1.3.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/builder-util-runtime": {
+            "version": "9.7.0",
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^4.3.4",
+                "sax": "^1.2.4"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
+        "node_modules/builder-util/node_modules/fs-extra": {
+            "version": "10.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/builder-util/node_modules/jsonfile": {
+            "version": "6.2.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/builder-util/node_modules/universalify": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/bytestreamjs": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/cacheable-lookup": {
+            "version": "5.0.4",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.6.0"
+            }
+        },
+        "node_modules/cacheable-request": {
+            "version": "7.0.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "clone-response": "^1.0.2",
+                "get-stream": "^5.1.0",
+                "http-cache-semantics": "^4.0.0",
+                "keyv": "^4.0.0",
+                "lowercase-keys": "^2.0.0",
+                "normalize-url": "^6.0.1",
+                "responselike": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/call-bind-apply-helpers": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/caseless": {
+            "version": "0.12.0",
+            "license": "Apache-2.0"
+        },
+        "node_modules/chalk": {
+            "version": "4.1.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/chalk?sponsor=1"
+            }
+        },
+        "node_modules/chownr": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "BlueOak-1.0.0",
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/chromium-pickle-js": {
+            "version": "0.2.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/ci-info": {
+            "version": "4.4.0",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/sibiraj-s"
+                }
+            ],
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cliui": {
+            "version": "8.0.1",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.1",
+                "wrap-ansi": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/clone-response": {
+            "version": "1.0.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "mimic-response": "^1.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/color-convert": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/color-name": {
+            "version": "1.1.4",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/combined-stream": {
+            "version": "1.0.8",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "delayed-stream": "~1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/commander": {
+            "version": "5.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/compare-version": {
+            "version": "0.1.2",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/concat-map": {
+            "version": "0.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/concat-stream": {
+            "version": "2.0.0",
+            "engines": [
+                "node >= 6.0"
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "buffer-from": "^1.0.0",
+                "inherits": "^2.0.3",
+                "readable-stream": "^3.0.2",
+                "typedarray": "^0.0.6"
+            }
+        },
+        "node_modules/conf": {
+            "version": "15.1.0",
+            "license": "MIT",
+            "dependencies": {
+                "ajv": "^8.17.1",
+                "ajv-formats": "^3.0.1",
+                "atomically": "^2.0.3",
+                "debounce-fn": "^6.0.0",
+                "dot-prop": "^10.0.0",
+                "env-paths": "^3.0.0",
+                "json-schema-typed": "^8.0.1",
+                "semver": "^7.7.2",
+                "uint8array-extras": "^1.5.0"
+            },
+            "engines": {
+                "node": ">=20"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/conf/node_modules/env-paths": {
+            "version": "3.0.0",
+            "license": "MIT",
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/core-util-is": {
+            "version": "1.0.3",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/cross-dirname": {
+            "version": "0.1.0",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "peer": true
+        },
+        "node_modules/cross-spawn": {
+            "version": "7.0.6",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "path-key": "^3.1.0",
+                "shebang-command": "^2.0.0",
+                "which": "^2.0.1"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/cross-spawn/node_modules/isexe": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/cross-spawn/node_modules/which": {
+            "version": "2.0.2",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "isexe": "^2.0.0"
+            },
+            "bin": {
+                "node-which": "bin/node-which"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/debounce-fn": {
+            "version": "6.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "mimic-function": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/debug": {
+            "version": "4.4.3",
+            "license": "MIT",
+            "dependencies": {
+                "ms": "^2.1.3"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/decompress-response": {
+            "version": "6.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "mimic-response": "^3.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/decompress-response/node_modules/mimic-response": {
+            "version": "3.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/defer-to-connect": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/define-data-property": {
+            "version": "1.1.4",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "es-define-property": "^1.0.0",
+                "es-errors": "^1.3.0",
+                "gopd": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/define-properties": {
+            "version": "1.2.1",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "define-data-property": "^1.0.1",
+                "has-property-descriptors": "^1.0.0",
+                "object-keys": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/delayed-stream": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/detect-node": {
+            "version": "2.1.0",
+            "dev": true,
+            "license": "MIT",
+            "optional": true
+        },
+        "node_modules/dir-compare": {
+            "version": "4.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "minimatch": "^3.0.5",
+                "p-limit": "^3.1.0 "
+            }
+        },
+        "node_modules/dir-compare/node_modules/balanced-match": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/dir-compare/node_modules/brace-expansion": {
+            "version": "1.1.18",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/dir-compare/node_modules/minimatch": {
+            "version": "3.1.5",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/dmg-builder": {
+            "version": "26.15.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "app-builder-lib": "26.15.3",
+                "builder-util": "26.15.3",
+                "fs-extra": "^10.1.0",
+                "js-yaml": "^4.1.0"
+            }
+        },
+        "node_modules/dmg-builder/node_modules/fs-extra": {
+            "version": "10.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/dmg-builder/node_modules/jsonfile": {
+            "version": "6.2.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/dmg-builder/node_modules/universalify": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/dot-prop": {
+            "version": "10.1.0",
+            "license": "MIT",
+            "dependencies": {
+                "type-fest": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=20"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/dotenv": {
+            "version": "16.6.1",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://dotenvx.com"
+            }
+        },
+        "node_modules/dotenv-expand": {
+            "version": "11.0.7",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "dotenv": "^16.4.5"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://dotenvx.com"
+            }
+        },
+        "node_modules/dunder-proto": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind-apply-helpers": "^1.0.1",
+                "es-errors": "^1.3.0",
+                "gopd": "^1.2.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/duplexer2": {
+            "version": "0.1.4",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "readable-stream": "^2.0.2"
+            }
+        },
+        "node_modules/duplexer2/node_modules/readable-stream": {
+            "version": "2.3.8",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+            }
+        },
+        "node_modules/duplexer2/node_modules/safe-buffer": {
+            "version": "5.1.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/duplexer2/node_modules/string_decoder": {
+            "version": "1.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "node_modules/ejs": {
+            "version": "3.1.10",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "jake": "^10.8.5"
+            },
+            "bin": {
+                "ejs": "bin/cli.js"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/electron": {
+            "version": "44.4.5",
+            "license": "MIT",
+            "dependencies": {
+                "@electron-internal/extract-zip": "^1.0.1",
+                "@electron/get": "^5.0.0",
+                "@types/node": "^24.9.0"
+            },
+            "bin": {
+                "electron": "cli.js",
+                "install-electron": "install.js"
+            },
+            "engines": {
+                "node": ">= 22.12.0"
+            }
+        },
+        "node_modules/electron-builder": {
+            "version": "26.15.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "app-builder-lib": "26.15.3",
+                "builder-util": "26.15.3",
+                "builder-util-runtime": "9.7.0",
+                "chalk": "^4.1.2",
+                "ci-info": "^4.2.0",
+                "dmg-builder": "26.15.3",
+                "fs-extra": "^10.1.0",
+                "lazy-val": "^1.0.5",
+                "simple-update-notifier": "2.0.0",
+                "yargs": "^17.6.2"
+            },
+            "bin": {
+                "electron-builder": "cli.js",
+                "install-app-deps": "install-app-deps.js"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/electron-builder-squirrel-windows": {
+            "version": "26.15.3",
+            "dev": true,
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "app-builder-lib": "26.15.3",
+                "builder-util": "26.15.3",
+                "electron-winstaller": "5.4.0"
+            }
+        },
+        "node_modules/electron-builder/node_modules/fs-extra": {
+            "version": "10.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/electron-builder/node_modules/jsonfile": {
+            "version": "6.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/electron-builder/node_modules/universalify": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/electron-publish": {
+            "version": "26.15.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/fs-extra": "^9.0.11",
+                "aws4": "^1.13.2",
+                "builder-util": "26.15.3",
+                "builder-util-runtime": "9.7.0",
+                "chalk": "^4.1.2",
+                "form-data": "^4.0.5",
+                "fs-extra": "^10.1.0",
+                "lazy-val": "^1.0.5",
+                "mime": "^2.5.2"
+            }
+        },
+        "node_modules/electron-publish/node_modules/fs-extra": {
+            "version": "10.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/electron-publish/node_modules/jsonfile": {
+            "version": "6.2.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/electron-publish/node_modules/universalify": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/electron-store": {
+            "version": "11.0.2",
+            "license": "MIT",
+            "dependencies": {
+                "conf": "^15.0.2",
+                "type-fest": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=20"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/electron-updater": {
+            "version": "6.8.9",
+            "license": "MIT",
+            "dependencies": {
+                "builder-util-runtime": "9.7.0",
+                "fs-extra": "^10.1.0",
+                "js-yaml": "^4.1.0",
+                "lazy-val": "^1.0.5",
+                "lodash.escaperegexp": "^4.1.2",
+                "lodash.isequal": "^4.5.0",
+                "semver": "~7.7.3",
+                "tiny-typed-emitter": "^2.1.0"
+            }
+        },
+        "node_modules/electron-updater/node_modules/fs-extra": {
+            "version": "10.1.0",
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/electron-updater/node_modules/jsonfile": {
+            "version": "6.2.0",
+            "license": "MIT",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/electron-updater/node_modules/semver": {
+            "version": "7.7.4",
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/electron-updater/node_modules/universalify": {
+            "version": "2.0.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/electron-winstaller": {
+            "version": "5.4.0",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@electron/asar": "^3.2.1",
+                "debug": "^4.1.1",
+                "fs-extra": "^7.0.1",
+                "lodash": "^4.17.21",
+                "temp": "^0.9.0"
+            },
+            "engines": {
+                "node": ">=8.0.0"
+            },
+            "optionalDependencies": {
+                "@electron/windows-sign": "^1.1.2"
+            }
+        },
+        "node_modules/electron-winstaller/node_modules/fs-extra": {
+            "version": "7.0.1",
+            "dev": true,
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "graceful-fs": "^4.1.2",
+                "jsonfile": "^4.0.0",
+                "universalify": "^0.1.0"
+            },
+            "engines": {
+                "node": ">=6 <7 || >=8"
+            }
+        },
+        "node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/end-of-stream": {
+            "version": "1.4.5",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "once": "^1.4.0"
+            }
+        },
+        "node_modules/env-paths": {
+            "version": "2.2.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/err-code": {
+            "version": "2.0.3",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/es-define-property": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-errors": {
+            "version": "1.3.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-object-atoms": {
+            "version": "1.1.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-errors": "^1.3.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-set-tostringtag": {
+            "version": "2.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-errors": "^1.3.0",
+                "get-intrinsic": "^1.2.6",
+                "has-tostringtag": "^1.0.2",
+                "hasown": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es6-error": {
+            "version": "4.1.1",
+            "dev": true,
+            "license": "MIT",
+            "optional": true
+        },
+        "node_modules/escalade": {
+            "version": "3.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/escape-string-regexp": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/exponential-backoff": {
+            "version": "3.1.3",
+            "dev": true,
+            "license": "Apache-2.0"
+        },
+        "node_modules/fast-deep-equal": {
+            "version": "3.1.3",
+            "license": "MIT"
+        },
+        "node_modules/fast-uri": {
+            "version": "3.1.7",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/fastify"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/fastify"
+                }
+            ],
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/fdir": {
+            "version": "6.5.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12.0.0"
+            },
+            "peerDependencies": {
+                "picomatch": "^3 || ^4"
+            },
+            "peerDependenciesMeta": {
+                "picomatch": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/ffmpeg-static": {
+            "version": "5.3.0",
+            "hasInstallScript": true,
+            "license": "GPL-3.0-or-later",
+            "dependencies": {
+                "@derhuerst/http-basic": "^8.2.0",
+                "env-paths": "^2.2.0",
+                "https-proxy-agent": "^5.0.0",
+                "progress": "^2.0.3"
+            },
+            "engines": {
+                "node": ">=16"
+            }
+        },
+        "node_modules/ffmpeg-static/node_modules/agent-base": {
+            "version": "6.0.2",
+            "license": "MIT",
+            "dependencies": {
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6.0.0"
+            }
+        },
+        "node_modules/ffmpeg-static/node_modules/https-proxy-agent": {
+            "version": "5.0.1",
+            "license": "MIT",
+            "dependencies": {
+                "agent-base": "6",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/ffprobe-static": {
+            "version": "3.1.0",
+            "license": "MIT"
+        },
+        "node_modules/filelist": {
+            "version": "1.0.6",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "minimatch": "^5.0.1"
+            }
+        },
+        "node_modules/filelist/node_modules/balanced-match": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/filelist/node_modules/brace-expansion": {
+            "version": "2.1.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/filelist/node_modules/minimatch": {
+            "version": "5.1.9",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/form-data": {
+            "version": "4.0.6",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "asynckit": "^0.4.0",
+                "combined-stream": "^1.0.8",
+                "es-set-tostringtag": "^2.1.0",
+                "hasown": "^2.0.4",
+                "mime-types": "^2.1.35"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/fs.realpath": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/function-bind": {
+            "version": "1.1.2",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/get-caller-file": {
+            "version": "2.0.5",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "6.* || 8.* || >= 10.*"
+            }
+        },
+        "node_modules/get-intrinsic": {
+            "version": "1.3.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind-apply-helpers": "^1.0.2",
+                "es-define-property": "^1.0.1",
+                "es-errors": "^1.3.0",
+                "es-object-atoms": "^1.1.1",
+                "function-bind": "^1.1.2",
+                "get-proto": "^1.0.1",
+                "gopd": "^1.2.0",
+                "has-symbols": "^1.1.0",
+                "hasown": "^2.0.2",
+                "math-intrinsics": "^1.1.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/get-proto": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "dunder-proto": "^1.0.1",
+                "es-object-atoms": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/get-stream": {
+            "version": "5.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "pump": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/glob": {
+            "version": "7.2.3",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/glob/node_modules/balanced-match": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/glob/node_modules/brace-expansion": {
+            "version": "1.1.18",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/glob/node_modules/minimatch": {
+            "version": "3.1.5",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/global-agent": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "optional": true,
+            "dependencies": {
+                "boolean": "^3.0.1",
+                "es6-error": "^4.1.1",
+                "matcher": "^3.0.0",
+                "roarr": "^2.15.3",
+                "semver": "^7.3.2",
+                "serialize-error": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=10.0"
+            }
+        },
+        "node_modules/globalthis": {
+            "version": "1.0.4",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "define-properties": "^1.2.1",
+                "gopd": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/gopd": {
+            "version": "1.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/got": {
+            "version": "11.8.6",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@sindresorhus/is": "^4.0.0",
+                "@szmarczak/http-timer": "^4.0.5",
+                "@types/cacheable-request": "^6.0.1",
+                "@types/responselike": "^1.0.0",
+                "cacheable-lookup": "^5.0.3",
+                "cacheable-request": "^7.0.2",
+                "decompress-response": "^6.0.0",
+                "http2-wrapper": "^1.0.0-beta.5.2",
+                "lowercase-keys": "^2.0.0",
+                "p-cancelable": "^2.0.0",
+                "responselike": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10.19.0"
+            },
+            "funding": {
+                "url": "https://github.com/sindresorhus/got?sponsor=1"
+            }
+        },
+        "node_modules/graceful-fs": {
+            "version": "4.2.11",
+            "license": "ISC"
+        },
+        "node_modules/has-flag": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/has-property-descriptors": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "es-define-property": "^1.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/has-symbols": {
+            "version": "1.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/has-tostringtag": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-symbols": "^1.0.3"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/hasown": {
+            "version": "2.0.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/hosted-git-info": {
+            "version": "4.1.0",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "lru-cache": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/http-cache-semantics": {
+            "version": "4.2.0",
+            "dev": true,
+            "license": "BSD-2-Clause"
+        },
+        "node_modules/http-proxy-agent": {
+            "version": "7.0.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "agent-base": "^7.1.0",
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/http-response-object": {
+            "version": "3.0.2",
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "^10.0.3"
+            }
+        },
+        "node_modules/http-response-object/node_modules/@types/node": {
+            "version": "10.17.60",
+            "license": "MIT"
+        },
+        "node_modules/http2-wrapper": {
+            "version": "1.0.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "quick-lru": "^5.1.1",
+                "resolve-alpn": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=10.19.0"
+            }
+        },
+        "node_modules/https-proxy-agent": {
+            "version": "7.0.6",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "agent-base": "^7.1.2",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/inflight": {
+            "version": "1.0.6",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+            }
+        },
+        "node_modules/inherits": {
+            "version": "2.0.4",
+            "license": "ISC"
+        },
+        "node_modules/is-fullwidth-code-point": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/isarray": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/isbinaryfile": {
+            "version": "5.0.7",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 18.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/gjtorikian/"
+            }
+        },
+        "node_modules/isexe": {
+            "version": "3.1.5",
+            "dev": true,
+            "license": "BlueOak-1.0.0",
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/jake": {
+            "version": "10.9.4",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "async": "^3.2.6",
+                "filelist": "^1.0.4",
+                "picocolors": "^1.1.1"
+            },
+            "bin": {
+                "jake": "bin/cli.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jiti": {
+            "version": "2.7.0",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "jiti": "lib/jiti-cli.mjs"
+            }
+        },
+        "node_modules/js-yaml": {
+            "version": "4.3.2",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/puzrin"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/nodeca"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^2.0.1"
+            },
+            "bin": {
+                "js-yaml": "bin/js-yaml.js"
+            }
+        },
+        "node_modules/json-buffer": {
+            "version": "3.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "license": "MIT"
+        },
+        "node_modules/json-schema-typed": {
+            "version": "8.0.2",
+            "license": "BSD-2-Clause"
+        },
+        "node_modules/json-stringify-safe": {
+            "version": "5.0.1",
+            "dev": true,
+            "license": "ISC",
+            "optional": true
+        },
+        "node_modules/json5": {
+            "version": "2.2.3",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "json5": "lib/cli.js"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/jsonfile": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/keyv": {
+            "version": "4.5.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "json-buffer": "3.0.1"
+            }
+        },
+        "node_modules/lazy-val": {
+            "version": "1.0.5",
+            "license": "MIT"
+        },
+        "node_modules/lodash": {
+            "version": "4.18.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/lodash.escaperegexp": {
+            "version": "4.1.2",
+            "license": "MIT"
+        },
+        "node_modules/lodash.isequal": {
+            "version": "4.5.0",
+            "license": "MIT"
+        },
+        "node_modules/lowercase-keys": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/lru-cache": {
+            "version": "6.0.0",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "yallist": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/matcher": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "escape-string-regexp": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/material-icons": {
+            "version": "1.13.14",
+            "license": "Apache-2.0"
+        },
+        "node_modules/math-intrinsics": {
+            "version": "1.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/mime": {
+            "version": "2.6.0",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "mime": "cli.js"
+            },
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
+        "node_modules/mime-db": {
+            "version": "1.52.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/mime-types": {
+            "version": "2.1.35",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "mime-db": "1.52.0"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/mimic-function": {
+            "version": "5.0.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/mimic-response": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/minimatch": {
+            "version": "10.2.6",
+            "dev": true,
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "brace-expansion": "^5.0.8"
+            },
+            "engines": {
+                "node": "18 || 20 || >=22"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/minimist": {
+            "version": "1.2.8",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/minipass": {
+            "version": "7.1.3",
+            "dev": true,
+            "license": "BlueOak-1.0.0",
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            }
+        },
+        "node_modules/minizlib": {
+            "version": "3.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "minipass": "^7.1.2"
+            },
+            "engines": {
+                "node": ">= 18"
+            }
+        },
+        "node_modules/mkdirp": {
+            "version": "0.5.6",
+            "dev": true,
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "minimist": "^1.2.6"
+            },
+            "bin": {
+                "mkdirp": "bin/cmd.js"
+            }
+        },
+        "node_modules/ms": {
+            "version": "2.1.3",
+            "license": "MIT"
+        },
+        "node_modules/node-abi": {
+            "version": "4.35.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "semver": "^7.6.3"
+            },
+            "engines": {
+                "node": ">=22.12.0"
+            }
+        },
+        "node_modules/node-api-version": {
+            "version": "0.2.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "semver": "^7.3.5"
+            }
+        },
+        "node_modules/node-gyp": {
+            "version": "12.4.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "env-paths": "^2.2.0",
+                "exponential-backoff": "^3.1.1",
+                "graceful-fs": "^4.2.6",
+                "nopt": "^9.0.0",
+                "proc-log": "^6.0.0",
+                "semver": "^7.3.5",
+                "tar": "^7.5.4",
+                "tinyglobby": "^0.2.12",
+                "undici": "^6.25.0",
+                "which": "^6.0.0"
+            },
+            "bin": {
+                "node-gyp": "bin/node-gyp.js"
+            },
+            "engines": {
+                "node": "^20.17.0 || >=22.9.0"
+            }
+        },
+        "node_modules/node-gyp/node_modules/isexe": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "BlueOak-1.0.0",
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/node-gyp/node_modules/which": {
+            "version": "6.0.1",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "isexe": "^4.0.0"
+            },
+            "bin": {
+                "node-which": "bin/which.js"
+            },
+            "engines": {
+                "node": "^20.17.0 || >=22.9.0"
+            }
+        },
+        "node_modules/node-int64": {
+            "version": "0.4.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/nopt": {
+            "version": "9.0.0",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "abbrev": "^4.0.0"
+            },
+            "bin": {
+                "nopt": "bin/nopt.js"
+            },
+            "engines": {
+                "node": "^20.17.0 || >=22.9.0"
+            }
+        },
+        "node_modules/normalize-url": {
+            "version": "6.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/object-keys": {
+            "version": "1.1.1",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/once": {
+            "version": "1.4.0",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "wrappy": "1"
+            }
+        },
+        "node_modules/p-cancelable": {
+            "version": "2.1.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/p-limit": {
+            "version": "3.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "yocto-queue": "^0.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/parse-cache-control": {
+            "version": "1.0.1"
+        },
+        "node_modules/path-is-absolute": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/path-key": {
+            "version": "3.1.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/pe-library": {
+            "version": "0.4.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12",
+                "npm": ">=6"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/jet2jet"
+            }
+        },
+        "node_modules/picocolors": {
+            "version": "1.1.1",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/picomatch": {
+            "version": "4.0.7",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
+        "node_modules/pkijs": {
+            "version": "3.4.0",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@noble/hashes": "1.4.0",
+                "asn1js": "^3.0.6",
+                "bytestreamjs": "^2.0.1",
+                "pvtsutils": "^1.3.6",
+                "pvutils": "^1.1.3",
+                "tslib": "^2.8.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/pkijs/node_modules/@noble/hashes": {
+            "version": "1.4.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 16"
+            },
+            "funding": {
+                "url": "https://paulmillr.com/funding/"
+            }
+        },
+        "node_modules/plist": {
+            "version": "3.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@xmldom/xmldom": "^0.8.8",
+                "base64-js": "^1.5.1",
+                "xmlbuilder": "^15.1.1"
+            },
+            "engines": {
+                "node": ">=10.4.0"
+            }
+        },
+        "node_modules/postject": {
+            "version": "1.0.0-alpha.6",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "peer": true,
+            "dependencies": {
+                "commander": "^9.4.0"
+            },
+            "bin": {
+                "postject": "dist/cli.js"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/postject/node_modules/commander": {
+            "version": "9.5.0",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "peer": true,
+            "engines": {
+                "node": "^12.20.0 || >=14"
+            }
+        },
+        "node_modules/proc-log": {
+            "version": "6.1.0",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "^20.17.0 || >=22.9.0"
+            }
+        },
+        "node_modules/process-nextick-args": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/progress": {
+            "version": "2.0.3",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/promise-retry": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "err-code": "^2.0.2",
+                "retry": "^0.12.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/proper-lockfile": {
+            "version": "4.1.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.4",
+                "retry": "^0.12.0",
+                "signal-exit": "^3.0.2"
+            }
+        },
+        "node_modules/pump": {
+            "version": "3.0.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "end-of-stream": "^1.1.0",
+                "once": "^1.3.1"
+            }
+        },
+        "node_modules/pvtsutils": {
+            "version": "1.3.6",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "tslib": "^2.8.1"
+            }
+        },
+        "node_modules/pvutils": {
+            "version": "1.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/quick-lru": {
+            "version": "5.1.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/read-binary-file-arch": {
+            "version": "1.0.6",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^4.3.4"
+            },
+            "bin": {
+                "read-binary-file-arch": "cli.js"
+            }
+        },
+        "node_modules/readable-stream": {
+            "version": "3.6.2",
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "^2.0.3",
+                "string_decoder": "^1.1.1",
+                "util-deprecate": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/require-directory": {
+            "version": "2.1.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/require-from-string": {
+            "version": "2.0.2",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/resedit": {
+            "version": "1.7.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "pe-library": "^0.4.1"
+            },
+            "engines": {
+                "node": ">=12",
+                "npm": ">=6"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/jet2jet"
+            }
+        },
+        "node_modules/resolve-alpn": {
+            "version": "1.2.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/responselike": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "lowercase-keys": "^2.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/retry": {
+            "version": "0.12.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/rimraf": {
+            "version": "2.6.3",
+            "dev": true,
+            "license": "ISC",
+            "peer": true,
+            "dependencies": {
+                "glob": "^7.1.3"
+            },
+            "bin": {
+                "rimraf": "bin.js"
+            }
+        },
+        "node_modules/roarr": {
+            "version": "2.15.4",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "optional": true,
+            "dependencies": {
+                "boolean": "^3.0.1",
+                "detect-node": "^2.0.4",
+                "globalthis": "^1.0.1",
+                "json-stringify-safe": "^5.0.1",
+                "semver-compare": "^1.0.0",
+                "sprintf-js": "^1.1.2"
+            },
+            "engines": {
+                "node": ">=8.0"
+            }
+        },
+        "node_modules/safe-buffer": {
+            "version": "5.2.1",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/sanitize-filename": {
+            "version": "1.6.4",
+            "dev": true,
+            "license": "WTFPL OR ISC",
+            "dependencies": {
+                "truncate-utf8-bytes": "^1.0.0"
+            }
+        },
+        "node_modules/sax": {
+            "version": "1.6.0",
+            "license": "BlueOak-1.0.0",
+            "engines": {
+                "node": ">=11.0.0"
+            }
+        },
+        "node_modules/semver": {
+            "version": "7.8.5",
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/semver-compare": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT",
+            "optional": true
+        },
+        "node_modules/serialize-error": {
+            "version": "7.0.1",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "type-fest": "^0.13.1"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/serialize-error/node_modules/type-fest": {
+            "version": "0.13.1",
+            "dev": true,
+            "license": "(MIT OR CC0-1.0)",
+            "optional": true,
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/shebang-command": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "shebang-regex": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/shebang-regex": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/signal-exit": {
+            "version": "3.0.7",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/simple-update-notifier": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "semver": "^7.5.3"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/source-map": {
+            "version": "0.6.1",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/source-map-support": {
+            "version": "0.5.21",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "buffer-from": "^1.0.0",
+                "source-map": "^0.6.0"
+            }
+        },
+        "node_modules/sprintf-js": {
+            "version": "1.1.3",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "optional": true
+        },
+        "node_modules/stat-mode": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/string_decoder": {
+            "version": "1.3.0",
+            "license": "MIT",
+            "dependencies": {
+                "safe-buffer": "~5.2.0"
+            }
+        },
+        "node_modules/string-width": {
+            "version": "4.2.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/stubborn-fs": {
+            "version": "2.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "stubborn-utils": "^1.0.1"
+            }
+        },
+        "node_modules/stubborn-utils": {
+            "version": "1.0.2",
+            "license": "MIT"
+        },
+        "node_modules/sumchecker": {
+            "version": "3.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "debug": "^4.1.0"
+            },
+            "engines": {
+                "node": ">= 8.0"
+            }
+        },
+        "node_modules/supports-color": {
+            "version": "7.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/tagged-tag": {
+            "version": "1.0.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=20"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/tar": {
+            "version": "7.5.22",
+            "dev": true,
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "@isaacs/fs-minipass": "^4.0.0",
+                "chownr": "^3.0.0",
+                "minipass": "^7.1.2",
+                "minizlib": "^3.1.0",
+                "yallist": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/tar/node_modules/yallist": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "BlueOak-1.0.0",
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/temp": {
+            "version": "0.9.4",
+            "dev": true,
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "mkdirp": "^0.5.1",
+                "rimraf": "~2.6.2"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/temp-file": {
+            "version": "3.4.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "async-exit-hook": "^2.0.1",
+                "fs-extra": "^10.0.0"
+            }
+        },
+        "node_modules/temp-file/node_modules/fs-extra": {
+            "version": "10.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/temp-file/node_modules/jsonfile": {
+            "version": "6.2.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/temp-file/node_modules/universalify": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/tiny-async-pool": {
+            "version": "1.3.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "semver": "^5.5.0"
+            }
+        },
+        "node_modules/tiny-async-pool/node_modules/semver": {
+            "version": "5.7.2",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver"
+            }
+        },
+        "node_modules/tiny-typed-emitter": {
+            "version": "2.1.0",
+            "license": "MIT"
+        },
+        "node_modules/tinyglobby": {
+            "version": "0.2.17",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fdir": "^6.5.0",
+                "picomatch": "^4.0.4"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/SuperchupuDev"
+            }
+        },
+        "node_modules/tmp": {
+            "version": "0.2.7",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=14.14"
+            }
+        },
+        "node_modules/tmp-promise": {
+            "version": "3.0.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "tmp": "^0.2.0"
+            }
+        },
+        "node_modules/truncate-utf8-bytes": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "WTFPL",
+            "dependencies": {
+                "utf8-byte-length": "^1.0.1"
+            }
+        },
+        "node_modules/tslib": {
+            "version": "2.8.1",
+            "dev": true,
+            "license": "0BSD"
+        },
+        "node_modules/type-fest": {
+            "version": "5.5.0",
+            "license": "(MIT OR CC0-1.0)",
+            "dependencies": {
+                "tagged-tag": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=20"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/typedarray": {
+            "version": "0.0.6",
+            "license": "MIT"
+        },
+        "node_modules/uint8array-extras": {
+            "version": "1.5.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/undici": {
+            "version": "6.28.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.17"
+            }
+        },
+        "node_modules/undici-types": {
+            "version": "7.16.0",
+            "license": "MIT"
+        },
+        "node_modules/universalify": {
+            "version": "0.1.2",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4.0.0"
+            }
+        },
+        "node_modules/unzipper": {
+            "version": "0.12.5",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "bluebird": "~3.7.2",
+                "duplexer2": "~0.1.4",
+                "fs-extra": "11.3.1",
+                "graceful-fs": "^4.2.2",
+                "node-int64": "^0.4.0"
+            }
+        },
+        "node_modules/unzipper/node_modules/fs-extra": {
+            "version": "11.3.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=14.14"
+            }
+        },
+        "node_modules/unzipper/node_modules/jsonfile": {
+            "version": "6.2.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/unzipper/node_modules/universalify": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/utf8-byte-length": {
+            "version": "1.0.5",
+            "dev": true,
+            "license": "(WTFPL OR MIT)"
+        },
+        "node_modules/util-deprecate": {
+            "version": "1.0.2",
+            "license": "MIT"
+        },
+        "node_modules/webcrypto-core": {
+            "version": "1.9.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@peculiar/asn1-schema": "^2.7.0",
+                "@peculiar/json-schema": "^1.1.12",
+                "@peculiar/utils": "^2.0.2",
+                "asn1js": "^3.0.10",
+                "tslib": "^2.8.1"
+            }
+        },
+        "node_modules/when-exit": {
+            "version": "2.1.5",
+            "license": "MIT"
+        },
+        "node_modules/which": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "isexe": "^3.1.1"
+            },
+            "bin": {
+                "node-which": "bin/which.js"
+            },
+            "engines": {
+                "node": "^18.17.0 || >=20.5.0"
+            }
+        },
+        "node_modules/wrap-ansi": {
+            "version": "7.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrappy": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/xmlbuilder": {
+            "version": "15.1.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8.0"
+            }
+        },
+        "node_modules/y18n": {
+            "version": "5.0.8",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yallist": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/yargs": {
+            "version": "17.7.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cliui": "^8.0.1",
+                "escalade": "^3.1.1",
+                "get-caller-file": "^2.0.5",
+                "require-directory": "^2.1.1",
+                "string-width": "^4.2.3",
+                "y18n": "^5.0.5",
+                "yargs-parser": "^21.1.1"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/yargs-parser": {
+            "version": "21.1.1",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/yocto-queue": {
+            "version": "0.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        }
+    }
+}
diff --git a/package.json b/package.json
index 9c3e129..56a2c11 100644
--- a/package.json
+++ b/package.json
@@ -117,7 +117,7 @@
         "electron-builder": "^26.15.3"
     },
     "dependencies": {
-        "@diamonddigitaldev/electron-kit": "file:../packs/diamonddigitaldev-electron-kit-0.0.0.tgz",
+        "@diamonddigitaldev/electron-kit": "0.1.0-beta.1",
         "bootstrap": "^5.3.3",
         "electron-store": "^11.0.2",
         "electron-updater": "^6.8.9",

From 8aa9df3b91ce319e75636f3104617e1cd3c66d8e Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Thu, 1 Oct 2026 21:07:11 +0100
Subject: [PATCH 62/81] Approve the install scripts so npm 12.1 runs them too,
 and fail CI if FFmpeg is missing

npm 12.1 no longer counts a version-pinned allowScripts entry (ffmpeg-static@5.3.0) as approving that package, though 5.3.0 is what's installed, so a fresh install on Linux never downloaded FFmpeg. The tests that need it skipped, and electron-builder built an AppImage and a .deb without it, saying nothing. The approvals are now by name, the form npm 12.1's own install-scripts approve writes; npm 12.0.2 runs them the same way (checked). electron@44.0.0 goes: Electron 44.4 has no install script.

CI now checks that FFmpeg and FFprobe are there after npm ci.
---
 .github/workflows/ci.yml | 7 +++++++
 package.json             | 5 ++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 25b9d7e..2ecd3a1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,5 +50,12 @@ jobs:
           npm --version
           npm ci
 
+      # ffmpeg-static downloads FFmpeg in an install script, which npm only runs
+      # when package.json's allowScripts approves it. Without the binary, the
+      # tests that need it skip, and electron-builder leaves it out of the build
+      # without a word, so this fails instead.
+      - name: Check FFmpeg and FFprobe are there
+        run: node -e "for (const [name, file] of [['FFmpeg', require('ffmpeg-static')], ['FFprobe', require('ffprobe-static').path]]) { require('fs').accessSync(file); console.log(name + ':', file); }"
+
       - name: Run the tests
         run: npm test
diff --git a/package.json b/package.json
index 56a2c11..5c1ebb6 100644
--- a/package.json
+++ b/package.json
@@ -126,8 +126,7 @@
         "material-icons": "^1.13.14"
     },
     "allowScripts": {
-        "electron@44.0.0": true,
-        "ffmpeg-static@5.3.0": true,
-        "electron-winstaller@5.4.0": true
+        "ffmpeg-static": true,
+        "electron-winstaller": true
     }
 }

From f254dc67fdf4abd0702e2febf876ea4d83bd4894 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Fri, 2 Oct 2026 03:58:08 +0100
Subject: [PATCH 63/81] Call it a desktop app everywhere, and give the README
 installation steps for Windows and Linux

package.json's description said "An Electron-based Windows app", and it's what the .deb and .rpm show as their description; it now matches the README's own tagline. The README's platform badge said Windows only, though 2.0 builds for Linux too.

Installation now has a part per system, as 2.0.0-beta.3's release notes do: the Windows installer and its SmartScreen note; the .deb, .rpm and AppImage, with what doesn't work on Linux yet; then what's bundled, what the updater's files are, and how to go back.
---
 README.md    | 27 +++++++++++++++++++++++----
 package.json |  2 +-
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 882668b..ee296b2 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 
   ![license](https://img.shields.io/badge/license-Apache%202.0-blue?style=flat-square)
   ![version](https://img.shields.io/badge/version-1.0.0-brightgreen?style=flat-square)
-  ![platform](https://img.shields.io/badge/platform-Windows-lightgrey?style=flat-square)
+  ![platform](https://img.shields.io/badge/platform-Windows%20%7C%20Linux-lightgrey?style=flat-square)
 
   [![discord](https://img.shields.io/discord/667479986214666272?logo=discord&logoColor=white&style=flat-square)](https://diamonddigital.dev/discord)
   [![buy me a coffee](https://img.shields.io/badge/-Buy%20Me%20a%20Coffee-ffdd00?logo=Buy%20Me%20A%20Coffee&logoColor=000000&style=flat-square)](https://www.buymeacoffee.com/willtda)
@@ -30,9 +30,28 @@
 
 ## Installation
 
-1. Download the latest release from the [releases page](https://github.com/diamonddigitaldev/Diamond-File-Converter/releases).
-2. Run the installer and follow the on-screen instructions.
-3. Launch Diamond File Converter and start converting!
+Download the files for your system from the [releases page](https://github.com/diamonddigitaldev/Diamond-File-Converter/releases). In the names below, `` is the release's version, such as `2.0.0`.
+
+### Windows
+
+Download **Diamond-File-Converter-Setup-``.exe** and run it. It installs for all users, so it will ask for administrator rights.
+
+> [!NOTE]
+> You may get a Windows SmartScreen popup when trying to run the installer. This is normal as the installer is not signed.
+
+### Linux
+
+- **Debian, Ubuntu and derivatives:** download **Diamond-File-Converter-``.deb**, then run `sudo apt install ./Diamond-File-Converter-.deb`. Diamond File Converter is then in your applications menu under Sound & Video.
+- **Fedora, openSUSE and others using RPM:** download **Diamond-File-Converter-``.rpm** and install it with your package manager, such as `sudo dnf install ./Diamond-File-Converter-.rpm`.
+- **Anywhere else:** download **Diamond-File-Converter-``.AppImage**, make it executable with `chmod +x`, and run it.
+
+Linux builds start with 2.0. For now, the app isn't offered in "Open with" for media files on Linux, and the dock may show a generic icon for its window; opening files from a terminal (`diamond-file-converter file.mp4`) works.
+
+### On every system
+
+FFmpeg and FFprobe are bundled, so there is nothing else to install and nothing to add to your PATH. The `latest.yml`, `latest-linux.yml` and `.blockmap` files on each release are for the app's updater: you don't need to download them.
+
+To go back to an earlier version, uninstall the app and install that version from the releases page.
 
 ## Usage
 
diff --git a/package.json b/package.json
index 5c1ebb6..933a1ab 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "diamond-file-converter",
     "version": "2.0.0-beta.3",
-    "description": "An Electron-based Windows app for converting audio, video, and image files.",
+    "description": "An Electron-based desktop app for converting audio, video, and image files.",
     "main": "src/main.js",
     "funding": {
         "type": "buymeacoffee",

From 25e4241ae7d5c5f63a5ed41a79aec7158546a957 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Fri, 2 Oct 2026 18:22:44 +0100
Subject: [PATCH 64/81] chore: 2.0.0-beta.4, on electron-kit 0.1.0-beta.3

---
 package-lock.json | 12 ++++++------
 package.json      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c734f56..247bc57 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,15 +1,15 @@
 {
     "name": "diamond-file-converter",
-    "version": "2.0.0-beta.3",
+    "version": "2.0.0-beta.4",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "diamond-file-converter",
-            "version": "2.0.0-beta.3",
+            "version": "2.0.0-beta.4",
             "license": "Apache-2.0",
             "dependencies": {
-                "@diamonddigitaldev/electron-kit": "0.1.0-beta.1",
+                "@diamonddigitaldev/electron-kit": "0.1.0-beta.3",
                 "bootstrap": "^5.3.3",
                 "electron-store": "^11.0.2",
                 "electron-updater": "^6.8.9",
@@ -40,9 +40,9 @@
             }
         },
         "node_modules/@diamonddigitaldev/electron-kit": {
-            "version": "0.1.0-beta.1",
-            "resolved": "https://registry.npmjs.org/@diamonddigitaldev/electron-kit/-/electron-kit-0.1.0-beta.1.tgz",
-            "integrity": "sha512-JPq1Qj9e1iruR3il6Io7ztoZK4jNk2INMI5m1xU0S2TVAIEiP3qg1M4L/cVCdAn/lBLVFoAsL4RSQSFE4f5rKA==",
+            "version": "0.1.0-beta.3",
+            "resolved": "https://registry.npmjs.org/@diamonddigitaldev/electron-kit/-/electron-kit-0.1.0-beta.3.tgz",
+            "integrity": "sha512-s9fTQ4LpI1FrJ1kzXtVDfDwLlGfxzr40liRZsWyTt9F839JZ8BkpC3Y4Y+L87kpexCBgGPZR/swLepwFCxuA+A==",
             "license": "Apache-2.0",
             "engines": {
                 "node": ">=24.0.0"
diff --git a/package.json b/package.json
index 933a1ab..41c8eb9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "diamond-file-converter",
-    "version": "2.0.0-beta.3",
+    "version": "2.0.0-beta.4",
     "description": "An Electron-based desktop app for converting audio, video, and image files.",
     "main": "src/main.js",
     "funding": {
@@ -117,7 +117,7 @@
         "electron-builder": "^26.15.3"
     },
     "dependencies": {
-        "@diamonddigitaldev/electron-kit": "0.1.0-beta.1",
+        "@diamonddigitaldev/electron-kit": "0.1.0-beta.3",
         "bootstrap": "^5.3.3",
         "electron-store": "^11.0.2",
         "electron-updater": "^6.8.9",

From 2f6cc0a6ee4f79658e7affe3a5583169b5283cdd Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Mon, 5 Oct 2026 19:20:36 +0100
Subject: [PATCH 65/81] Fix three card bugs: Cancel flicker, blank last frame,
 options on a converting card

- Cancel no longer flickers under the pointer: a card's buttons are only
  rebuilt when they change, not on every progress tick.
- The Last frame preview steps back when its seek lands after the video's
  last picture, as it does when the audio runs longer than the video.
- A card in a running batch, queued or converting, locks its Advanced
  Options button, its image-count line and its format select. The dialog
  used to open and report settings applied that never took effect.

2.0.0-beta.5, with its manual testing section.
---
 docs/MANUAL-TESTING.md | 56 +++++++++++++++++++++++++++++++++++++++++-
 package-lock.json      |  4 +--
 package.json           |  2 +-
 src/main.js            | 27 +++++++++++++++++---
 src/renderer.js        | 39 +++++++++++++++++++++++------
 src/styles.css         |  8 ++++--
 6 files changed, 120 insertions(+), 16 deletions(-)

diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md
index ac7ae18..271310b 100644
--- a/docs/MANUAL-TESTING.md
+++ b/docs/MANUAL-TESTING.md
@@ -24,7 +24,7 @@ sections — the history is useful.
 
 ```
 npm install
-npm test          # expect 193 passing, 0 failing
+npm test          # expect 198 passing, 0 failing
 npm start
 ```
 
@@ -2662,3 +2662,57 @@ Run it in the Linux VM, on a desktop.
       Close and reopen: the window is where you left it.
 - [x] `~/.config/diamond-file-converter/debug.log` names files by their names
       only, with no folder.
+
+---
+
+## 2.0.0-beta.5: card fixes (2026-10-05)
+
+Three bugs Will found on beta.4, all in the app itself (electron-kit has no
+part in any of them):
+
+- **Cancel flickered under the pointer.** Every progress tick rebuilt the
+  card's buttons, so the Cancel being hovered was swapped for a fresh one many
+  times a second. The buttons are now only rebuilt when they change.
+- **The Last frame box stayed empty.** A file's container can run a moment past
+  its video's last frame when the audio is longer (`visualiser.mp4` here: the
+  container ends at 3:10.334, the picture at 3:10.284). A seek into that gap
+  decodes nothing. The preview now steps back until it finds a picture.
+- **Advanced Options opened, and "applied", on a card being converted.**
+  Nothing changed (the settings were sent when Convert was pressed), but the
+  dialog said it had. A card in the batch, queued or running, now locks its
+  options button, its image-count line and its format.
+
+> **Status: not yet run.**
+
+Use a video long enough to convert for ten seconds or more (a few minutes of
+1080p to WebM is plenty), plus a second file to queue behind it.
+
+### Cancel
+
+- [ ] Convert the long video. While it runs, rest the pointer on its
+      **Cancel** button without moving it: the hover colour holds steady, with
+      no flicker, in both light and dark themes.
+- [ ] Click it: the job cancels and the card shows Cancelled, with no Cancel
+      button left behind.
+
+### Last frame
+
+- [ ] Add `visualiser.mp4` (or any video whose audio runs past its picture),
+      choose WebM, open **Advanced Options**. Under Trim, **Last frame** shows
+      a picture, not an empty grey box.
+- [ ] Drag the end handle back a few seconds and then right to the end: the
+      picture updates each time and is never left blank.
+- [ ] A normal video still shows the right first and last frames.
+
+### Locked while converting
+
+- [ ] Add two files, set both to a format, select neither, and press
+      **Convert**. While the first runs, both cards' **tune** icons are dimmed
+      and do nothing when clicked, and both format selects are disabled. The
+      second is still queued, so its are too.
+- [ ] On a frames conversion (a video to PNG), the orange "about N images"
+      line is not clickable while the job is in the batch.
+- [ ] When the batch finishes, the tune icon, the image-count line and the
+      format select all work again. Advanced Options opens, and Apply says
+      **Settings applied to 1 file.**
+- [ ] Bulk Edit still works on a selection when nothing is converting.
diff --git a/package-lock.json b/package-lock.json
index 247bc57..a503b95 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "diamond-file-converter",
-    "version": "2.0.0-beta.4",
+    "version": "2.0.0-beta.5",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "diamond-file-converter",
-            "version": "2.0.0-beta.4",
+            "version": "2.0.0-beta.5",
             "license": "Apache-2.0",
             "dependencies": {
                 "@diamonddigitaldev/electron-kit": "0.1.0-beta.3",
diff --git a/package.json b/package.json
index 41c8eb9..a52dea7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "diamond-file-converter",
-    "version": "2.0.0-beta.4",
+    "version": "2.0.0-beta.5",
     "description": "An Electron-based desktop app for converting audio, video, and image files.",
     "main": "src/main.js",
     "funding": {
diff --git a/src/main.js b/src/main.js
index 79d9a16..af12b65 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,6 +17,8 @@ const { menuItems } = require("./menu");
 // Frame previews are decoration beside a slider, not content.
 const PREVIEW_FRAME_HEIGHT = 144;
 const PREVIEW_FRAME_TIMEOUT_MS = 5000;
+// How far back to step, in seconds, when a seek lands after the last picture.
+const PREVIEW_FRAME_BACKOFF = [0.25, 1, 5];
 
 const FILE_DIALOG_FILTERS = [
     { name: "Supported Files", extensions: formats.SUPPORTED_EXTENSIONS },
@@ -453,11 +455,29 @@ kit.ipc.handle(IPC.SHELL_SHOW_IN_FOLDER, (_event, target) => { shell.showItemInF
  * to null and the dialog shows nothing. A missing preview must never be able to
  * block choosing a frame.
  */
-kit.ipc.handle(IPC.PREVIEW_FRAME, (_event, request) => {
+kit.ipc.handle(IPC.PREVIEW_FRAME, async (_event, request) => {
     const inputPath = request && request.inputPath;
     const timestamp = Number(request && request.timestamp) || 0;
     if (!inputPath) return null;
 
+    // The container's duration is often a little past the video's last frame,
+    // because the audio runs on longer. A seek into that gap decodes nothing and
+    // exits cleanly, which left the end preview blank; the frame worth showing
+    // there is the last one, a moment earlier.
+    let result = await grabFrame(inputPath, timestamp);
+    for (const back of PREVIEW_FRAME_BACKOFF) {
+        if (result !== "empty" || timestamp <= 0) break;
+        result = await grabFrame(inputPath, Math.max(0, timestamp - back));
+    }
+    return result === "empty" ? null : result;
+});
+
+/**
+ * One frame at `timestamp` as a JPEG data URL. "empty" when ffmpeg ran cleanly
+ * and found no picture there, which is worth stepping back from; null when it
+ * failed, which is not.
+ */
+function grabFrame(inputPath, timestamp) {
     return new Promise((resolve) => {
         const child = spawn(getFfmpegPath(), [
             "-hide_banner", "-loglevel", "error",
@@ -486,11 +506,12 @@ kit.ipc.handle(IPC.PREVIEW_FRAME, (_event, request) => {
         child.stdout.on("data", (chunk) => chunks.push(chunk));
         child.on("error", () => finish(null));
         child.on("close", (code) => {
-            if (code !== 0 || chunks.length === 0) return finish(null);
+            if (code !== 0) return finish(null);
+            if (chunks.length === 0) return finish("empty");
             finish(`data:image/jpeg;base64,${Buffer.concat(chunks).toString("base64")}`);
         });
     });
-});
+}
 
 kit.ipc.handle(IPC.APP_GET_FORMATS, () => ({
     conversionMap: formats.buildLegacyConversionMap(),
diff --git a/src/renderer.js b/src/renderer.js
index c11e6e7..8461135 100644
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -20,6 +20,14 @@ let jobs = [];
 let selection = new Set();
 let selectionAnchor = null;
 let converting = false;
+// Jobs handed to main and not yet back. Their format and settings were sent
+// when Convert was pressed, so nothing edited on them now would take effect.
+let inFlight = new Set();
+
+/** Is this job part of the conversion that is running, queued or not? */
+function isLocked(job) {
+    return inFlight.has(job.id);
+}
 
 // Loaded as a plain script by index.html — the renderer has no Node access,
 // and functions cannot cross the IPC bridge, so it cannot be required.
@@ -324,8 +332,8 @@ function setTarget(ids, targetExt) {
     for (const job of jobs) {
         if (!set.has(job.id)) continue;
         // The per-card select is disabled mid-run, but the bulk bar can still
-        // reach a running job.
-        if (job.status === "running") continue;
+        // reach a job in the batch.
+        if (isLocked(job)) continue;
         // Guard against a stale bulk option: never assign a format the source
         // cannot produce. Does not apply when clearing.
         if (next !== null && !canTarget(job, next)) continue;
@@ -567,9 +575,13 @@ function paintCard(card, job) {
     progress.element.classList.toggle("d-none", !running);
     if (running) progress.set(typeof job.progress === "number" ? job.progress : null);
 
-    // The target select locks while the job is in flight.
+    // The format and the options lock while the job is in flight, queued as
+    // well as running: both were sent to main when Convert was pressed.
+    const locked = isLocked(job);
     const select = card.querySelector(".card-target");
-    select.disabled = running;
+    select.disabled = locked;
+    card.querySelector(".card-configure").disabled = locked;
+    outputLine.disabled = locked;
     if (select.value !== (job.targetExt ?? "")) select.value = job.targetExt ?? "";
 
     renderCardActions(card, job);
@@ -577,6 +589,13 @@ function paintCard(card, job) {
 
 function renderCardActions(card, job) {
     const actions = card.querySelector(".card-actions");
+
+    // Repainted on every progress tick, so the buttons are only rebuilt when
+    // what they are changes. Rebuilding them each time swapped the Cancel
+    // button out from under the pointer, and its hover flickered as it ran.
+    const key = `${job.status}|${job.outputPath ?? ""}|${job.isDirectory === true}`;
+    if (actions.dataset.key === key) return;
+    actions.dataset.key = key;
     actions.innerHTML = "";
 
     const buttons = [];
@@ -1118,7 +1137,7 @@ function fillSelect(select, options, current, placeholder) {
 
 /** Open the dialog for a set of job ids. */
 function openJobModal(ids) {
-    modalScope = ids.filter(id => jobs.some(j => j.id === id));
+    modalScope = ids.filter(id => jobs.some(j => j.id === id && !isLocked(j)));
     if (modalScope.length === 0) return;
 
     const scoped = jobs.filter(j => modalScope.includes(j.id));
@@ -1441,19 +1460,23 @@ function applyJobModal() {
     // chosen format takes setTarget's early return and kept its settings.
     if (target) setTarget(modalScope, target);
 
+    let n = 0;
     for (const job of jobs) {
         if (!modalScope.includes(job.id)) continue;
-        if (job.status === "running") continue;
+        // Opening it on a job in flight is refused, but one can start
+        // converting while the dialog is open.
+        if (isLocked(job)) continue;
 
         // Each card gets its own copy. One shared object across a bulk edit
         // works only for as long as nothing ever edits a single card's settings
         // in place, which is not a property worth relying on.
         job.settings = structuredClone(settings);
         updateCard(job);
+        n++;
     }
 
     jobModal.hide();
-    const n = modalScope.length;
+    if (n === 0) return;
     kit.ui.toast(`Settings applied to ${kit.format.countOf(n, "file")}.`, { type: "success" });
 }
 
@@ -1484,6 +1507,7 @@ async function startConversion() {
     }
 
     converting = true;
+    inFlight = new Set(runnable.map(j => j.id));
     for (const job of runnable) {
         job.status = "pending";
         job.progress = 0;
@@ -1508,6 +1532,7 @@ async function startConversion() {
 }
 
 function applyResult(job, result) {
+    inFlight.delete(job.id);
     job.status = result.status;
     job.error = result.error ?? null;
     job.outputPath = result.outputPath ?? null;
diff --git a/src/styles.css b/src/styles.css
index 66af845..6e3ddbf 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -458,7 +458,9 @@ a {
     transition: color var(--dur-micro) var(--ease-micro);
 }
 
-.card-configure:hover { color: var(--accent-text); }
+.card-configure:hover:not(:disabled) { color: var(--accent-text); }
+/* Locked while its conversion is in flight. */
+.card-configure:disabled { opacity: 0.4; cursor: default; }
 .card-configure .material-icons-round { font-size: 16px; line-height: 1; display: block; }
 
 .card-settings {
@@ -760,10 +762,12 @@ a {
     cursor: pointer;
 }
 
-.card-output:hover {
+.card-output:hover:not(:disabled) {
     text-decoration: underline;
 }
 
+.card-output:disabled { cursor: default; }
+
 .card-output:focus-visible {
     outline: none;
     box-shadow: 0 0 0 0.2rem rgba(var(--accent-rgb), 0.35);

From 8b930687805db0bf85674b3e16467aa30b142688 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Tue, 6 Oct 2026 01:47:17 +0100
Subject: [PATCH 66/81] Build with the kit's config(): the asking installer,
 Open With on Linux, appId and busy

- electron-builder.cjs, from config(): package.json's build moves there, with the 22 types as fileTypes and
  "Convert with Diamond File Converter" on files and folders as contextMenu. installer.nsh goes: the kit's
  installer writes the same key, asks who it's for (upgrading an install for everyone in place), and asks for
  each type and the right-click entry. On Linux, the .deb and .rpm put the app in Open With for each type.
- start({ appId }): Windows groups the window under its pinned icon and shows its notifications.
- mountShell({ busy }): Restart Now asks first while a conversion or a join runs.
- README's installation, the design-system note, and a beta.6 section in MANUAL-TESTING.md.
---
 README.md                                  |  4 +-
 docs/MANUAL-TESTING.md                     | 47 +++++++++++
 docs/design-system/build.js                |  2 +-
 docs/design-system/shell/context-menu.html |  2 +-
 electron-builder.cjs                       | 61 ++++++++++++++
 installer.nsh                              | 17 ----
 package-lock.json                          |  8 +-
 package.json                               | 95 +---------------------
 src/main.js                                |  3 +
 src/renderer.js                            |  2 +
 test/kit.test.js                           | 27 ++++--
 11 files changed, 141 insertions(+), 127 deletions(-)
 create mode 100644 electron-builder.cjs
 delete mode 100644 installer.nsh

diff --git a/README.md b/README.md
index ee296b2..aa62f45 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Download the files for your system from the [releases page](https://github.com/d
 
 ### Windows
 
-Download **Diamond-File-Converter-Setup-``.exe** and run it. It installs for all users, so it will ask for administrator rights.
+Download **Diamond-File-Converter-Setup-``.exe** and run it. It asks who it's for: only you (the default, with no administrator prompt) or everyone on the computer. If Diamond File Converter is already installed for everyone, as every version before 2.0.0-beta.6 was, that copy is updated instead. It then asks which file types to open with it, all ticked, and whether to add **Convert with Diamond File Converter** to the menu files and folders show when you right-click them.
 
 > [!NOTE]
 > You may get a Windows SmartScreen popup when trying to run the installer. This is normal as the installer is not signed.
@@ -45,7 +45,7 @@ Download **Diamond-File-Converter-Setup-``.exe** and run it. It install
 - **Fedora, openSUSE and others using RPM:** download **Diamond-File-Converter-``.rpm** and install it with your package manager, such as `sudo dnf install ./Diamond-File-Converter-.rpm`.
 - **Anywhere else:** download **Diamond-File-Converter-``.AppImage**, make it executable with `chmod +x`, and run it.
 
-Linux builds start with 2.0. For now, the app isn't offered in "Open with" for media files on Linux, and the dock may show a generic icon for its window; opening files from a terminal (`diamond-file-converter file.mp4`) works.
+Linux builds start with 2.0. With the `.deb` or `.rpm`, the app is in your file manager's "Open with" for the files it converts. Opening files from a terminal (`diamond-file-converter file.mp4`) works too.
 
 ### On every system
 
diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md
index 271310b..de3e18c 100644
--- a/docs/MANUAL-TESTING.md
+++ b/docs/MANUAL-TESTING.md
@@ -2716,3 +2716,50 @@ Use a video long enough to convert for ten seconds or more (a few minutes of
       format select all work again. Advanced Options opens, and Apply says
       **Settings applied to 1 file.**
 - [ ] Bulk Edit still works on a selection when nothing is converting.
+
+## 2.0.0-beta.6: the kit's installer, and electron-kit 0.1.0-beta.8 (2026-10-06)
+
+DFC moves its build config to the kit's `config()` (`electron-builder.cjs`), so
+the Windows installer is the kit's asking installer and `installer.nsh` is gone.
+It also passes its `appId` to the kit, says when it's busy, and takes the kit's
+Update tab changes since 0.1.0-beta.3.
+
+> **Status: not yet run.**
+
+### Upgrading an install for everyone (every earlier version's)
+
+- [ ] With beta.5 installed (for everyone), run the beta.6 installer. It does
+      not ask who it's for: it upgrades that copy, and Settings > Apps lists
+      Diamond File Converter once.
+- [ ] Right-click a file, then a folder: **Convert with Diamond File
+      Converter** is there once on each (Windows 11: under "Show more
+      options"), with the app's icon, and opens the file or folder in the app.
+- [ ] Right-click an `.mp3`, Open with: Diamond File Converter is offered.
+
+### A fresh install, only for me
+
+- [ ] Uninstall, then run the installer again: it asks who it's for, "Only for
+      me" chosen, and installs with no administrator prompt.
+- [ ] The file types page shows the 22 types in three groups, all ticked, and
+      the right-click box ticked. Untick **WMA** and the right-click box.
+- [ ] After the install, a `.wma` doesn't offer the app in Open with, an
+      `.mp3` does, and there's no Convert entry on right-click.
+- [ ] Install the same build again over it: WMA and the right-click box start
+      unticked.
+- [ ] Uninstall: the app is gone from Open with for every type.
+
+### The Update tab and Restart Now
+
+- [ ] Open the app and go straight to Settings > Update: the status line is
+      never empty. It says "Updates haven't been checked yet." for a moment
+      at most, then "Checking for updates…", then the result.
+- [ ] Open Settings > Update only after ten seconds: one check has run, and
+      Check for Updates runs another.
+- [ ] With an update downloaded, start a long conversion and press **Restart
+      Now**: it asks first ("A conversion is running."), and Cancel keeps the
+      conversion going. The same while a join runs ("A join is running.").
+
+### Notifications and the taskbar (Windows)
+
+- [ ] Pin the app to the taskbar and open it: its window groups under the
+      pinned icon, not a second one.
diff --git a/docs/design-system/build.js b/docs/design-system/build.js
index a0324bf..d4092c3 100644
--- a/docs/design-system/build.js
+++ b/docs/design-system/build.js
@@ -833,7 +833,7 @@ card("shell/context-menu.html", "Context Menu",
 !macro customUninstall
   DeleteRegKey HKCR "*\\shell\\<App>"
 !macroend
    
-
    Lives in installer.nsh, referenced from build.nsis.include. Always pair customInstall with customUninstall — an uninstall that leaves the key behind puts a dead entry in every user's context menu.
    
+
    Made by electron-kit's config() from contextMenu in electron-builder.cjs: the installer asks before adding it, and uninstalling takes it away. An app never writes its own installer.nsh.
    
 
 
    The batching problem
    
 
    Windows launches one process per selected file. Selecting 30 files spawns 30 processes, 29 of which hit the single-instance lock and forward their path through second-instance. Collect those arrivals and debounce for 500ms before handing them to the renderer, or the queue is rebuilt 30 times. Dropgate's BATCH_DEBOUNCE_MS is the reference.
    
diff --git a/docs/design-system/shell/context-menu.html b/docs/design-system/shell/context-menu.html
index 5e86b0a..6eeb878 100644
--- a/docs/design-system/shell/context-menu.html
+++ b/docs/design-system/shell/context-menu.html
@@ -71,7 +71,7 @@ 
    How it is registered
    
 !macro customUninstall
   DeleteRegKey HKCR "*\shell\<App>"
 !macroend
    
-
    Lives in installer.nsh, referenced from build.nsis.include. Always pair customInstall with customUninstall — an uninstall that leaves the key behind puts a dead entry in every user's context menu.
    
+
    Made by electron-kit's config() from contextMenu in electron-builder.cjs: the installer asks before adding it, and uninstalling takes it away. An app never writes its own installer.nsh.
    
 
 
    The batching problem
    
 
    Windows launches one process per selected file. Selecting 30 files spawns 30 processes, 29 of which hit the single-instance lock and forward their path through second-instance. Collect those arrivals and debounce for 500ms before handing them to the renderer, or the queue is rebuilt 30 times. Dropgate's BATCH_DEBOUNCE_MS is the reference.
    
diff --git a/electron-builder.cjs b/electron-builder.cjs
new file mode 100644
index 0000000..f136772
--- /dev/null
+++ b/electron-builder.cjs
@@ -0,0 +1,61 @@
+"use strict";
+
+// The desktop app's electron-builder config, made by the kit's config() on its
+// base (NSIS in the Diamond Digital Development menu folder; AppImage, .deb and
+// .rpm). It's .cjs, never .js: on Windows, electron-builder typed in this
+// folder would run electron-builder.js with Windows Script Host instead.
+//
+// - The installer asks who it's for (an install for everyone, as every one
+//   before 2.0.0-beta.6 was, is upgraded in place), then which of the 22 types
+//   to open and whether to add "Convert with Diamond File Converter" to the
+//   menu files and folders have when they're right-clicked. It replaced
+//   installer.nsh, and keeps its registry key, so an upgrade never shows the
+//   entry twice. On Linux, the app is in Open With for each type.
+// - ffmpeg and ffprobe are packed per platform, where main.js looks for them;
+//   the packages' own binaries stay out of app.asar.unpacked (415 MB in 2.0.0).
+const { config } = require("@diamonddigitaldev/electron-kit/builder");
+
+module.exports = config(require("./package.json"), {
+    build: {
+        appId: "com.diamonddigitaldev.diamondfileconverter",
+        productName: "Diamond File Converter",
+        artifactName: "Diamond-File-Converter-${version}.${ext}",
+        files: [
+            "**/*",
+            "!test-media",
+            "!test-media/**/*",
+            "!node_modules/ffmpeg-static/ffmpeg{,.exe}",
+            "!node_modules/ffprobe-static/bin/**",
+        ],
+        publish: {
+            provider: "github",
+            owner: "diamonddigitaldev",
+            repo: "Diamond-File-Converter",
+        },
+        win: {
+            icon: "src/assets/diamondfileconverter.ico",
+            extraResources: [
+                { from: "node_modules/ffmpeg-static/ffmpeg.exe", to: "ffmpeg/ffmpeg.exe" },
+                { from: "node_modules/ffprobe-static/bin/win32/x64/ffprobe.exe", to: "ffmpeg/ffprobe.exe" },
+            ],
+        },
+        linux: {
+            icon: "src/assets/diamondfileconverter.png",
+            category: "AudioVideo",
+            extraResources: [
+                { from: "node_modules/ffmpeg-static/ffmpeg", to: "ffmpeg/ffmpeg" },
+                { from: "node_modules/ffprobe-static/bin/linux/x64/ffprobe", to: "ffmpeg/ffprobe" },
+            ],
+        },
+        // The installer's name is what its update files point at: unchanged from 2.0.0.
+        nsis: {
+            artifactName: "Diamond-File-Converter-Setup-${version}.${ext}",
+        },
+    },
+    fileTypes: [
+        { name: "Audio File", ext: ["mp3", "wav", "flac", "ogg", "aac", "m4a", "opus", "wma"] },
+        { name: "Video File", ext: ["mp4", "mkv", "webm", "avi", "mov", "wmv", "flv"] },
+        { name: "Image File", ext: ["jpg", "jpeg", "png", "webp", "gif", "bmp", "tiff"] },
+    ],
+    contextMenu: { label: "Convert with Diamond File Converter", folders: true },
+});
diff --git a/installer.nsh b/installer.nsh
deleted file mode 100644
index 022eeb5..0000000
--- a/installer.nsh
+++ /dev/null
@@ -1,17 +0,0 @@
-!macro customInstall
-  ; Add "Convert with Diamond File Converter" to the context menu with icon
-  WriteRegStr HKCR "*\shell\DiamondFileConverter" "" "Convert with Diamond File Converter"
-  WriteRegStr HKCR "*\shell\DiamondFileConverter" "Icon" "$INSTDIR\${APP_EXECUTABLE_FILENAME}"
-  WriteRegStr HKCR "*\shell\DiamondFileConverter\command" "" '"$INSTDIR\${APP_EXECUTABLE_FILENAME}" "%1"'
-
-  ; Add the same entry for directories, so a whole folder can be queued
-  WriteRegStr HKCR "Directory\shell\DiamondFileConverter" "" "Convert with Diamond File Converter"
-  WriteRegStr HKCR "Directory\shell\DiamondFileConverter" "Icon" "$INSTDIR\${APP_EXECUTABLE_FILENAME}"
-  WriteRegStr HKCR "Directory\shell\DiamondFileConverter\command" "" '"$INSTDIR\${APP_EXECUTABLE_FILENAME}" "%1"'
-!macroend
-
-!macro customUninstall
-  ; Clean up the registry keys on uninstall
-  DeleteRegKey HKCR "*\shell\DiamondFileConverter"
-  DeleteRegKey HKCR "Directory\shell\DiamondFileConverter"
-!macroend
diff --git a/package-lock.json b/package-lock.json
index a503b95..bd147d9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
             "version": "2.0.0-beta.5",
             "license": "Apache-2.0",
             "dependencies": {
-                "@diamonddigitaldev/electron-kit": "0.1.0-beta.3",
+                "@diamonddigitaldev/electron-kit": "0.1.0-beta.7",
                 "bootstrap": "^5.3.3",
                 "electron-store": "^11.0.2",
                 "electron-updater": "^6.8.9",
@@ -40,9 +40,9 @@
             }
         },
         "node_modules/@diamonddigitaldev/electron-kit": {
-            "version": "0.1.0-beta.3",
-            "resolved": "https://registry.npmjs.org/@diamonddigitaldev/electron-kit/-/electron-kit-0.1.0-beta.3.tgz",
-            "integrity": "sha512-s9fTQ4LpI1FrJ1kzXtVDfDwLlGfxzr40liRZsWyTt9F839JZ8BkpC3Y4Y+L87kpexCBgGPZR/swLepwFCxuA+A==",
+            "version": "0.1.0-beta.7",
+            "resolved": "https://registry.npmjs.org/@diamonddigitaldev/electron-kit/-/electron-kit-0.1.0-beta.7.tgz",
+            "integrity": "sha512-MsuGaHCWyqTufWKZTzXvgENGhKPOUqsKxTao1VGnc50mFBl6adXToz/rWrB2MI3Mp6RX04TNFxzHsoQK/PeErA==",
             "license": "Apache-2.0",
             "engines": {
                 "node": ">=24.0.0"
diff --git a/package.json b/package.json
index a52dea7..6a0df52 100644
--- a/package.json
+++ b/package.json
@@ -16,99 +16,6 @@
         "type": "git",
         "url": "https://github.com/diamonddigitaldev/Diamond-File-Converter"
     },
-    "build": {
-        "extends": "@diamonddigitaldev/electron-kit/builder/base.json",
-        "appId": "com.diamonddigitaldev.diamondfileconverter",
-        "files": [
-            "**/*",
-            "!test-media",
-            "!test-media/**/*",
-            "!node_modules/ffmpeg-static/ffmpeg{,.exe}",
-            "!node_modules/ffprobe-static/bin/**"
-        ],
-        "productName": "Diamond File Converter",
-        "artifactName": "Diamond-File-Converter-${version}.${ext}",
-        "fileAssociations": [
-            {
-                "ext": [
-                    "mp3",
-                    "wav",
-                    "flac",
-                    "ogg",
-                    "aac",
-                    "m4a",
-                    "opus",
-                    "wma"
-                ],
-                "name": "Audio File",
-                "role": "Editor"
-            },
-            {
-                "ext": [
-                    "mp4",
-                    "mkv",
-                    "webm",
-                    "avi",
-                    "mov",
-                    "wmv",
-                    "flv"
-                ],
-                "name": "Video File",
-                "role": "Editor"
-            },
-            {
-                "ext": [
-                    "jpg",
-                    "jpeg",
-                    "png",
-                    "webp",
-                    "gif",
-                    "bmp",
-                    "tiff"
-                ],
-                "name": "Image File",
-                "role": "Editor"
-            }
-        ],
-        "publish": {
-            "provider": "github",
-            "owner": "diamonddigitaldev",
-            "repo": "Diamond-File-Converter"
-        },
-        "win": {
-            "icon": "src/assets/diamondfileconverter.ico",
-            "extraResources": [
-                {
-                    "from": "node_modules/ffmpeg-static/ffmpeg.exe",
-                    "to": "ffmpeg/ffmpeg.exe"
-                },
-                {
-                    "from": "node_modules/ffprobe-static/bin/win32/x64/ffprobe.exe",
-                    "to": "ffmpeg/ffprobe.exe"
-                }
-            ]
-        },
-        "linux": {
-            "icon": "src/assets/diamondfileconverter.png",
-            "category": "AudioVideo",
-            "extraResources": [
-                {
-                    "from": "node_modules/ffmpeg-static/ffmpeg",
-                    "to": "ffmpeg/ffmpeg"
-                },
-                {
-                    "from": "node_modules/ffprobe-static/bin/linux/x64/ffprobe",
-                    "to": "ffmpeg/ffprobe"
-                }
-            ]
-        },
-        "nsis": {
-            "artifactName": "Diamond-File-Converter-Setup-${version}.${ext}",
-            "perMachine": true,
-            "createDesktopShortcut": true,
-            "include": "installer.nsh"
-        }
-    },
     "keywords": [],
     "author": "Diamond Digital Development ",
     "license": "Apache-2.0",
@@ -117,7 +24,7 @@
         "electron-builder": "^26.15.3"
     },
     "dependencies": {
-        "@diamonddigitaldev/electron-kit": "0.1.0-beta.3",
+        "@diamonddigitaldev/electron-kit": "0.1.0-beta.7",
         "bootstrap": "^5.3.3",
         "electron-store": "^11.0.2",
         "electron-updater": "^6.8.9",
diff --git a/src/main.js b/src/main.js
index af12b65..4f436ec 100644
--- a/src/main.js
+++ b/src/main.js
@@ -42,6 +42,9 @@ function extensionsOfKind(kind) {
 const kit = require("@diamonddigitaldev/electron-kit/main").start({
     // package.json's name is the npm name, which names the userData folder too.
     name: APP_NAME,
+    // electron-builder.cjs's appId: Windows shows the app's notifications, and
+    // groups its windows under its pinned icon, only when the two match.
+    appId: "com.diamonddigitaldev.diamondfileconverter",
     settings: {
         defaults: SETTINGS_DEFAULTS,
         // Version 2: the settings v1 wrote that 2.0 can't show, and the store
diff --git a/src/renderer.js b/src/renderer.js
index 8461135..7350ea8 100644
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -2024,6 +2024,8 @@ document.addEventListener("DOMContentLoaded", async () => {
         toolbar: $("toolbar"),
         credits: { logo: "assets/diamondfileconverter.png" },
         onViewChange,
+        // Restart Now asks first while a conversion or a join runs: the restart would stop it.
+        busy: () => (converting ? "A conversion is running." : joinRunning ? "A join is running." : null),
     });
 
     FORMATS = await api.getFormats();
diff --git a/test/kit.test.js b/test/kit.test.js
index f78a96c..b35e241 100644
--- a/test/kit.test.js
+++ b/test/kit.test.js
@@ -53,12 +53,23 @@ test("the updater is the kit's: DFC passes updates, and has no updater or update
     assert.equal(version.isOfferableUpdate("1.0.0", "2.0.0-alpha.1", "stable"), false);
 });
 
-test("the build extends the kit's base config, and keeps DFC's own", () => {
-    const pkg = require("../package.json");
-    assertBuildExtendsKit(pkg);
-    assert.deepEqual(pkg.build.publish, { provider: "github", owner: "diamonddigitaldev", repo: "Diamond-File-Converter" });
-    assert.equal(pkg.build.nsis.perMachine, true);
-    assert.equal(pkg.build.nsis.include, "installer.nsh");
+test("the build is the kit's config(), with DFC's own: its 22 types and its right-click entry, on files and folders", () => {
+    const build = require("../electron-builder.cjs");
+    assertBuildExtendsKit(build);
+    assert.equal(require("../package.json").build, undefined, "electron-builder would read package.json's build first");
+    assert.ok(!fs.existsSync(path.join(__dirname, "..", "installer.nsh")), "the kit's installer adds the right-click entry");
+    assert.deepEqual(build.publish, { provider: "github", owner: "diamonddigitaldev", repo: "Diamond-File-Converter" });
+    assert.equal(build.appId, "com.diamonddigitaldev.diamondfileconverter");
+    // The same ID in main.js, for Windows' notifications and taskbar grouping.
+    assert.match(read("main.js"), /\.start\(\{[^]*?appId: "com\.diamonddigitaldev\.diamondfileconverter",/);
+    assert.equal(build.fileAssociations, undefined, "the kit's installer asks for each type instead");
+    const script = fs.readFileSync(build.nsis.include, "utf8");
+    for (const ext of ["mp3", "wma", "mp4", "flv", "jpg", "tiff"]) assert.ok(script.includes(`DiamondFileConverter.${ext}`), ext);
+    assert.equal(script.match(/WriteRegStr SHELL_CONTEXT "Software\\Classes\\\.[a-z0-9]+\\OpenWithProgids"/g)?.length, 22);
+    // The key installer.nsh wrote, so an install upgraded from it shows the entry once.
+    assert.ok(script.includes("Software\\Classes\\*\\shell\\DiamondFileConverter"));
+    assert.ok(script.includes("Software\\Classes\\Directory\\shell\\DiamondFileConverter"));
+    assert.ok(script.includes("Convert with Diamond File Converter"));
 });
 
 test("the Credits tab is given the app's name, not package.json's npm name", () => {
@@ -161,7 +172,7 @@ test("every icon is hidden from screen readers, and every icon-only button has a
 });
 
 test("ffmpeg and ffprobe are packed per platform, where main.js looks for them, and only once", () => {
-    const { build } = require("../package.json");
+    const build = require("../electron-builder.cjs");
     const main = read("main.js");
     const exe = { win: ".exe", linux: "" };
     for (const platform of ["win", "linux"]) {
@@ -179,7 +190,7 @@ test("ffmpeg and ffprobe are packed per platform, where main.js looks for them,
 });
 
 test("the Windows installer is the one called Setup: Linux's files are named for the app and version only", () => {
-    const { build } = require("../package.json");
+    const build = require("../electron-builder.cjs");
     assert.equal(build.artifactName, "Diamond-File-Converter-${version}.${ext}");
     // The installer's name is what its update files point at: unchanged from 2.0.0.
     assert.equal(build.nsis.artifactName, "Diamond-File-Converter-Setup-${version}.${ext}");

From 851b7aaa73fbdfd3c1b057e998c825c8199389eb Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Tue, 6 Oct 2026 03:01:22 +0100
Subject: [PATCH 67/81] chore: 2.0.0-beta.6, on electron-kit 0.1.0-beta.8

---
 package-lock.json | 12 ++++++------
 package.json      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bd147d9..b85f8a0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,15 +1,15 @@
 {
     "name": "diamond-file-converter",
-    "version": "2.0.0-beta.5",
+    "version": "2.0.0-beta.6",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "diamond-file-converter",
-            "version": "2.0.0-beta.5",
+            "version": "2.0.0-beta.6",
             "license": "Apache-2.0",
             "dependencies": {
-                "@diamonddigitaldev/electron-kit": "0.1.0-beta.7",
+                "@diamonddigitaldev/electron-kit": "0.1.0-beta.8",
                 "bootstrap": "^5.3.3",
                 "electron-store": "^11.0.2",
                 "electron-updater": "^6.8.9",
@@ -40,9 +40,9 @@
             }
         },
         "node_modules/@diamonddigitaldev/electron-kit": {
-            "version": "0.1.0-beta.7",
-            "resolved": "https://registry.npmjs.org/@diamonddigitaldev/electron-kit/-/electron-kit-0.1.0-beta.7.tgz",
-            "integrity": "sha512-MsuGaHCWyqTufWKZTzXvgENGhKPOUqsKxTao1VGnc50mFBl6adXToz/rWrB2MI3Mp6RX04TNFxzHsoQK/PeErA==",
+            "version": "0.1.0-beta.8",
+            "resolved": "https://registry.npmjs.org/@diamonddigitaldev/electron-kit/-/electron-kit-0.1.0-beta.8.tgz",
+            "integrity": "sha512-fqGnYFxONG5eg76QT0ZvZTdcdapHy3Mxlm4vvIMDA7Z9x6s0a6RE5gnoq6dXLc6iqelrmc1HvbaYs4AB2FDYcw==",
             "license": "Apache-2.0",
             "engines": {
                 "node": ">=24.0.0"
diff --git a/package.json b/package.json
index 6a0df52..8cd5658 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "diamond-file-converter",
-    "version": "2.0.0-beta.5",
+    "version": "2.0.0-beta.6",
     "description": "An Electron-based desktop app for converting audio, video, and image files.",
     "main": "src/main.js",
     "funding": {
@@ -24,7 +24,7 @@
         "electron-builder": "^26.15.3"
     },
     "dependencies": {
-        "@diamonddigitaldev/electron-kit": "0.1.0-beta.7",
+        "@diamonddigitaldev/electron-kit": "0.1.0-beta.8",
         "bootstrap": "^5.3.3",
         "electron-store": "^11.0.2",
         "electron-updater": "^6.8.9",

From 99c4a318a458e0ea6b8d40cc12e2aa8373551bc1 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Tue, 6 Oct 2026 23:56:33 +0100
Subject: [PATCH 68/81] Restart Now's busy question is cleared however a
 conversion or a join ends

converting and joinRunning were cleared only when the run resolved; a run that threw left Restart Now asking about a conversion that wasn't running.
---
 src/renderer.js  | 36 +++++++++++++++++++++++-------------
 test/kit.test.js |  7 +++++++
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/renderer.js b/src/renderer.js
index 7350ea8..fa0f228 100644
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -1518,16 +1518,21 @@ async function startConversion() {
 
     // Every job is submitted at once; the runner's pool decides how many
     // actually run in parallel. v1 awaited them one at a time.
-    const results = await Promise.all(runnable.map(async (job) => {
-        const result = await api.runJob(
-            { id: job.id, inputPath: job.filePath, targetExt: job.targetExt, ...(job.settings ?? {}),
-              output: withMirrorRoot(job) });
-        applyResult(job, result);
-        return result;
-    }));
-
-    converting = false;
-    render();
+    // However it ends: a batch that threw would otherwise leave Restart Now
+    // asking about a conversion that isn't running.
+    let results;
+    try {
+        results = await Promise.all(runnable.map(async (job) => {
+            const result = await api.runJob(
+                { id: job.id, inputPath: job.filePath, targetExt: job.targetExt, ...(job.settings ?? {}),
+                  output: withMirrorRoot(job) });
+            applyResult(job, result);
+            return result;
+        }));
+    } finally {
+        converting = false;
+        render();
+    }
     announce(results);
 }
 
@@ -1889,9 +1894,14 @@ async function runJoin() {
     joinProgress.set(0);
     renderJoinActions();
 
-    const result = await api.runJoin(spec);
-    joinRunning = null;
-    renderJoinActions();
+    // However it ends, as a conversion's.
+    let result;
+    try {
+        result = await api.runJoin(spec);
+    } finally {
+        joinRunning = null;
+        renderJoinActions();
+    }
 
     if (result.status === "done") {
         kit.ui.toast(`Joined ${kit.format.countOf(joinClips.length, "file")} into ${p.basename(result.outputPath)}.`, { type: "success" });
diff --git a/test/kit.test.js b/test/kit.test.js
index b35e241..9071723 100644
--- a/test/kit.test.js
+++ b/test/kit.test.js
@@ -151,6 +151,13 @@ test("the Title Case slips DESIGN.md lists are fixed: buttons and titles are Tit
     }
 });
 
+test("what Restart Now asks about is cleared however a conversion or a join ends, a throw included", () => {
+    const renderer = read("renderer.js");
+    assert.match(renderer, /busy: \(\) => \(converting \? "A conversion is running\." : joinRunning \? "A join is running\." : null\)/);
+    assert.match(renderer, /\} finally \{\r?\n\s+converting = false;/);
+    assert.match(renderer, /\} finally \{\r?\n\s+joinRunning = null;/);
+});
+
 test("progress of null is \"not known\": a card's and Join's bars slide, never sit at 0% or read null%", () => {
     const renderer = read("renderer.js");
     assert.match(renderer, /progress\.set\(typeof job\.progress === "number" \? job\.progress : null\)/);

From 0096351bcf6eca05ddf0cbfebbdf14cf153b20f7 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Wed, 7 Oct 2026 02:42:08 +0100
Subject: [PATCH 69/81] Manual testing: 2.0.0-beta.6 passed

---
 docs/MANUAL-TESTING.md | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md
index de3e18c..f75bdfa 100644
--- a/docs/MANUAL-TESTING.md
+++ b/docs/MANUAL-TESTING.md
@@ -2724,42 +2724,46 @@ the Windows installer is the kit's asking installer and `installer.nsh` is gone.
 It also passes its `appId` to the kit, says when it's busy, and takes the kit's
 Update tab changes since 0.1.0-beta.3.
 
-> **Status: not yet run.**
+> **Status: passed 2026-10-07.** Will ran the installer and checked the upgrade
+> from an install for everyone and the taskbar pin on his PC; the rest was
+> signed off by a code review against electron-kit's CI install check. Two
+> findings: the right-click box's text was clipped (electron-kit #50, in
+> beta.7), and Restart Now could keep asking after a run that threw (#9).
 
 ### Upgrading an install for everyone (every earlier version's)
 
-- [ ] With beta.5 installed (for everyone), run the beta.6 installer. It does
+- [x] With beta.5 installed (for everyone), run the beta.6 installer. It does
       not ask who it's for: it upgrades that copy, and Settings > Apps lists
       Diamond File Converter once.
-- [ ] Right-click a file, then a folder: **Convert with Diamond File
+- [x] Right-click a file, then a folder: **Convert with Diamond File
       Converter** is there once on each (Windows 11: under "Show more
       options"), with the app's icon, and opens the file or folder in the app.
-- [ ] Right-click an `.mp3`, Open with: Diamond File Converter is offered.
+- [x] Right-click an `.mp3`, Open with: Diamond File Converter is offered.
 
 ### A fresh install, only for me
 
-- [ ] Uninstall, then run the installer again: it asks who it's for, "Only for
+- [x] Uninstall, then run the installer again: it asks who it's for, "Only for
       me" chosen, and installs with no administrator prompt.
-- [ ] The file types page shows the 22 types in three groups, all ticked, and
+- [x] The file types page shows the 22 types in three groups, all ticked, and
       the right-click box ticked. Untick **WMA** and the right-click box.
-- [ ] After the install, a `.wma` doesn't offer the app in Open with, an
+- [x] After the install, a `.wma` doesn't offer the app in Open with, an
       `.mp3` does, and there's no Convert entry on right-click.
-- [ ] Install the same build again over it: WMA and the right-click box start
+- [x] Install the same build again over it: WMA and the right-click box start
       unticked.
-- [ ] Uninstall: the app is gone from Open with for every type.
+- [x] Uninstall: the app is gone from Open with for every type.
 
 ### The Update tab and Restart Now
 
-- [ ] Open the app and go straight to Settings > Update: the status line is
+- [x] Open the app and go straight to Settings > Update: the status line is
       never empty. It says "Updates haven't been checked yet." for a moment
       at most, then "Checking for updates…", then the result.
-- [ ] Open Settings > Update only after ten seconds: one check has run, and
+- [x] Open Settings > Update only after ten seconds: one check has run, and
       Check for Updates runs another.
-- [ ] With an update downloaded, start a long conversion and press **Restart
+- [x] With an update downloaded, start a long conversion and press **Restart
       Now**: it asks first ("A conversion is running."), and Cancel keeps the
       conversion going. The same while a join runs ("A join is running.").
 
 ### Notifications and the taskbar (Windows)
 
-- [ ] Pin the app to the taskbar and open it: its window groups under the
+- [x] Pin the app to the taskbar and open it: its window groups under the
       pinned icon, not a second one.

From dc977ec9ea91c262a00f0278a20d479996b1401d Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Wed, 7 Oct 2026 02:42:17 +0100
Subject: [PATCH 70/81] Manual testing: say how beta.6 was signed off

---
 docs/MANUAL-TESTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md
index f75bdfa..ce2aa46 100644
--- a/docs/MANUAL-TESTING.md
+++ b/docs/MANUAL-TESTING.md
@@ -2724,9 +2724,9 @@ the Windows installer is the kit's asking installer and `installer.nsh` is gone.
 It also passes its `appId` to the kit, says when it's busy, and takes the kit's
 Update tab changes since 0.1.0-beta.3.
 
-> **Status: passed 2026-10-07.** Will ran the installer and checked the upgrade
-> from an install for everyone and the taskbar pin on his PC; the rest was
-> signed off by a code review against electron-kit's CI install check. Two
+> **Status: signed off by Will 2026-10-07** on a code review against
+> electron-kit's CI install check, after he'd run the installer itself. The
+> upgrade's administrator prompt and the taskbar pin weren't run by hand. Two
 > findings: the right-click box's text was clipped (electron-kit #50, in
 > beta.7), and Restart Now could keep asking after a run that threw (#9).
 

From ef1dde52aa325ab87c258a45fbb536bc4644db76 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Thu, 15 Oct 2026 19:16:39 +0100
Subject: [PATCH 71/81] A converted card locks until Convert Again, which runs
 it again

Once a card had converted, its format and Advanced Options could still be
changed, but nothing would run them: Convert skips a Done card, and only a
failed card offered Retry. A converted card now keeps the format and options
that made its file, locked as a card in the run is, with Convert Again beside
Show in Folder. Convert Again sends it back to Ready with the same format and
options, unlocked, and Convert runs only it. The earlier file is left where it
is: a run onto the same name meets File Already Exists, as any other does.

The lock, the reset and the card's buttons move into display.js, where the
suite can reach them. The bulk bar's format and Bulk Edit are disabled when
every card they would apply to is locked, rather than taking a pick and
changing nothing.
---
 docs/MANUAL-TESTING.md | 38 ++++++++++++++++++++
 src/core/display.js    | 49 ++++++++++++++++++++++++++
 src/renderer.js        | 80 +++++++++++++++++++++++-------------------
 test/display.test.js   | 64 ++++++++++++++++++++++++++++++++-
 4 files changed, 194 insertions(+), 37 deletions(-)

diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md
index ce2aa46..717b412 100644
--- a/docs/MANUAL-TESTING.md
+++ b/docs/MANUAL-TESTING.md
@@ -2767,3 +2767,41 @@ Update tab changes since 0.1.0-beta.3.
 
 - [x] Pin the app to the taskbar and open it: its window groups under the
       pinned icon, not a second one.
+
+## Convert Again: a converted card can be converted again (2026-10-15)
+
+Will found it on beta.6: once a card had converted, its format and Advanced
+Options could still be changed, but nothing would run them. Convert skips a
+card that's Done, and only a failed card had Retry. Now a converted card keeps
+the format and options that made its file, locked as a card being converted
+is, and **Convert Again** under it unlocks it at Ready. Then Convert runs it
+(and only it) again. This replaces beta.5's "when the batch finishes … the
+format select all work again" for a card that converted; a card that failed or
+was cancelled still unlocks when the batch ends.
+
+> **Status: not yet run by hand.** Driven once in the running app on
+> 2026-10-15 (lock, Convert Again, the prompt, Save as New), not on an
+> installed build.
+
+### Locked once converted
+
+- [ ] Convert a file. When it's Done, its format select and its **tune** icon
+      are disabled, and so is the orange image-count line on a frames
+      conversion. **Remove** still works.
+- [ ] Under it: **Show in Folder** (or **Open Folder** for frames) and
+      **Convert Again**.
+- [ ] With only converted cards, **Convert all to** in the bar is disabled; select
+      one and **Bulk Edit** is disabled too. Add a new file and both work again,
+      and change only the new card.
+
+### Convert Again
+
+- [ ] Click **Convert Again**: the card reads Ready with the same format and
+      settings line, its buttons go, its format select and tune icon work, and
+      the keyboard focus is on its format select.
+- [ ] Change a setting in Advanced Options and press **Convert**: only this
+      card runs. As its output name is taken, **File Already Exists** asks.
+- [ ] **Save as New** writes `name (1).ext` beside the first file, which is
+      untouched. Do it again on the same card with **Overwrite**: the first
+      file is replaced. **Skip This File** leaves the card Skipped and writes
+      nothing.
diff --git a/src/core/display.js b/src/core/display.js
index 7319f04..92e2f79 100644
--- a/src/core/display.js
+++ b/src/core/display.js
@@ -200,6 +200,52 @@
         }
     }
 
+    /**
+     * Whether a card's format and options are fixed. A card in the conversion
+     * that is running is, queued as well as converting: both were sent to main
+     * when Convert was pressed. So is a card that has converted: it keeps the
+     * format and options that made its file, as Dropgate's finished upload
+     * cards do, until Convert Again reopens it. Left unlocked, its options
+     * could be changed under a "Done" that no longer described them, and
+     * nothing would ever run them.
+     */
+    function isLocked(job, inFlight) {
+        return inFlight.has(job.id) || job.status === STATUS.DONE;
+    }
+
+    /**
+     * Send a card back to Ready, keeping its format and options. What it
+     * wrote before is left on disk: a run onto the same name meets the
+     * "File Already Exists" prompt like any other.
+     */
+    function reopen(job) {
+        job.status = STATUS.PENDING;
+        job.error = null;
+        job.progress = 0;
+        job.outputPath = null;
+        job.isDirectory = false;
+        job.fileCount = 0;
+        return job;
+    }
+
+    /** The buttons under a card, in order: an id the renderer wires, and the label. */
+    function cardActions(job) {
+        const button = (id, label, variant = "btn-outline-secondary") => ({ id, label, variant });
+        switch (job.status) {
+            case STATUS.RUNNING:
+                return [button("cancel", "Cancel", "btn-outline-danger")];
+            case STATUS.DONE:
+                return [
+                    ...(job.outputPath ? [button("reveal", job.isDirectory ? "Open Folder" : "Show in Folder")] : []),
+                    button("convertAgain", "Convert Again"),
+                ];
+            case STATUS.ERROR:
+                return [button("retry", "Retry")];
+            default:
+                return [];
+        }
+    }
+
     /** "3 files converted, 1 failed, 2 skipped" — the post-run summary, in the kit's words. Skipped is told from cancelled. */
     function summarise(jobs) {
         const tally = (status) => jobs.filter(j => j.status === status).length;
@@ -781,6 +827,9 @@
         checkTrimEntry,
         describeMeta,
         describeStatus,
+        isLocked,
+        reopen,
+        cardActions,
         summarise,
         overallProgress,
         iconForKind,
diff --git a/src/renderer.js b/src/renderer.js
index fa0f228..2ea791a 100644
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -24,9 +24,9 @@ let converting = false;
 // when Convert was pressed, so nothing edited on them now would take effect.
 let inFlight = new Set();
 
-/** Is this job part of the conversion that is running, queued or not? */
+/** Are this card's format and options fixed: in the run, or converted until Convert Again? */
 function isLocked(job) {
-    return inFlight.has(job.id);
+    return display.isLocked(job, inFlight);
 }
 
 // Loaded as a plain script by index.html — the renderer has no Node access,
@@ -331,8 +331,8 @@ function setTarget(ids, targetExt) {
 
     for (const job of jobs) {
         if (!set.has(job.id)) continue;
-        // The per-card select is disabled mid-run, but the bulk bar can still
-        // reach a job in the batch.
+        // The per-card select is disabled on a locked card, but the bulk bar
+        // can still reach one in the batch or one that has converted.
         if (isLocked(job)) continue;
         // Guard against a stale bulk option: never assign a format the source
         // cannot produce. Does not apply when clearing.
@@ -348,17 +348,10 @@ function setTarget(ids, targetExt) {
 
         job.targetExt = next;
 
-        // A job that already finished, failed or was cancelled becomes runnable
-        // again under a new target, so send it back to pending rather than
-        // leaving a stale "Done" or an old error sitting on the card.
-        if (job.status !== "pending") {
-            job.status = "pending";
-            job.error = null;
-            job.progress = 0;
-            job.outputPath = null;
-            job.isDirectory = false;
-            job.fileCount = 0;
-        }
+        // A job that failed or was cancelled becomes runnable again under a
+        // new target, so send it back to pending rather than leaving an old
+        // error sitting on the card. (A finished one is locked, above.)
+        if (job.status !== "pending") display.reopen(job);
 
         updateCard(job);
     }
@@ -576,7 +569,8 @@ function paintCard(card, job) {
     if (running) progress.set(typeof job.progress === "number" ? job.progress : null);
 
     // The format and the options lock while the job is in flight, queued as
-    // well as running: both were sent to main when Convert was pressed.
+    // well as running (both were sent to main when Convert was pressed), and
+    // once it has converted, until Convert Again (display.isLocked).
     const locked = isLocked(job);
     const select = card.querySelector(".card-target");
     select.disabled = locked;
@@ -598,24 +592,23 @@ function renderCardActions(card, job) {
     actions.dataset.key = key;
     actions.innerHTML = "";
 
-    const buttons = [];
-
-    if (job.status === "running") {
-        buttons.push(makeAction("Cancel", "btn-outline-danger", () => api.cancelJob(job.id)));
-    } else if (job.status === "done" && job.outputPath) {
-        buttons.push(makeAction(
-            job.isDirectory ? "Open Folder" : "Show in Folder",
-            "btn-outline-secondary",
-            () => (job.isDirectory ? api.openPath(job.outputPath) : api.showInFolder(job.outputPath))
-        ));
-    } else if (job.status === "error") {
-        buttons.push(makeAction("Retry", "btn-outline-secondary", () => {
-            job.status = "pending";
-            job.error = null;
-            job.progress = 0;
+    const handlers = {
+        cancel: () => api.cancelJob(job.id),
+        reveal: () => (job.isDirectory ? api.openPath(job.outputPath) : api.showInFolder(job.outputPath)),
+        retry: () => {
+            display.reopen(job);
             updateCard(job);
-        }));
-    }
+        },
+        // Unlocks the card at Ready, with the format and options it converted
+        // with, for Convert to run again. Its button goes with the Done, so
+        // the keyboard carries on from the format.
+        convertAgain: () => {
+            display.reopen(job);
+            updateCard(job);
+            card.querySelector(".card-target").focus();
+        },
+    };
+    const buttons = display.cardActions(job).map(({ id, label, variant }) => makeAction(label, variant, handlers[id]));
 
     actions.classList.toggle("d-none", buttons.length === 0);
     for (const b of buttons) actions.appendChild(b);
@@ -679,12 +672,26 @@ function renderSelection() {
     const shared = [...new Set(scope.map(j => j.targetExt))];
     fillTargetSelect(select, targets, shared.length === 1 ? shared[0] : null);
 
-    select.disabled = targets.length === 0 || converting;
+    lockBulkControls();
     $("bulk-target-note").textContent = targets.length === 0
         ? `No format works for every ${everything ? "queued" : "selected"} file`
         : "";
 }
 
+/**
+ * The bulk bar's format and Bulk Edit are off while converting, and while
+ * every card they'd apply to is locked: setTarget and the dialog pass a locked
+ * card by, so a scope of converted cards would take a pick and change nothing.
+ * Called with the bar and with every card's repaint, as a card's lock changes.
+ */
+function lockBulkControls() {
+    const scope = bulkScope();
+    const open = scope.some(j => !isLocked(j));
+    const targets = display.commonTargets(scope.map(j => j.ext), TARGETS);
+    $("bulk-target").disabled = targets.length === 0 || converting || !open;
+    $("bulk-edit").disabled = converting || !open;
+}
+
 /** The bar under the grid (kit.ui.actionBar()): made once, in DOMContentLoaded. */
 let actionBar = null;
 
@@ -728,7 +735,7 @@ function renderActionBar() {
         canRun: jobs.some(j => j.targetExt && j.status !== "done"),
         canClear: !converting,
     });
-    $("bulk-edit").disabled = converting;
+    lockBulkControls();
 }
 
 // -- New Job dialog ----------------------------------------------------------
@@ -1487,7 +1494,8 @@ async function startConversion() {
     // with a format, so fixing one failed file and pressing Convert again
     // resubmitted the whole finished batch — and every one of those outputs
     // then collided with the file the previous run had just written.
-    // Re-running a finished card is what its own Retry button is for.
+    // Re-running a finished card is what its own Convert Again button is for:
+    // it sends that card back to Ready, and only that card runs again.
     const runnable = jobs.filter(j => j.targetExt && j.status !== "done");
     if (runnable.length === 0) return;
 
diff --git a/test/display.test.js b/test/display.test.js
index 2dc039e..2d854f2 100644
--- a/test/display.test.js
+++ b/test/display.test.js
@@ -651,7 +651,69 @@ test("convert: an already-converted card is not resubmitted", () => {
     const filter = renderer.match(/const runnable = jobs\.filter\([^)]*\)/);
     assert.ok(filter, "expected startConversion to filter the job list");
     assert.match(filter[0], /status !== "done"/,
-        "Convert must skip cards that already converted; Retry is what re-runs one");
+        "Convert must skip cards that already converted; Convert Again is what re-runs one");
+});
+
+// ---------------------------------------------------------------------------
+// A converted card: locked until Convert Again (Will, 2026-10-15). Its options
+// could be changed and nothing would ever run them: Convert skips a Done card,
+// and Retry was only offered on a failed one.
+// ---------------------------------------------------------------------------
+
+test("card: a converted card is locked, as a card in the run is, and nothing else is", () => {
+    const inFlight = new Set(["queued"]);
+    assert.equal(d.isLocked({ id: "queued", status: STATUS.PENDING }, inFlight), true);
+    assert.equal(d.isLocked({ id: "a", status: STATUS.DONE }, inFlight), true);
+    for (const status of [STATUS.PENDING, STATUS.ERROR, STATUS.CANCELLED, STATUS.SKIPPED]) {
+        assert.equal(d.isLocked({ id: "a", status }, inFlight), false, status);
+    }
+});
+
+test("card: a converted card offers Convert Again beside its folder, and only it", () => {
+    const labels = (job) => d.cardActions(job).map(a => a.label);
+    assert.deepEqual(labels({ status: STATUS.DONE, outputPath: "C:\\out\\clip.mp4" }), ["Show in Folder", "Convert Again"]);
+    assert.deepEqual(labels({ status: STATUS.DONE, outputPath: "C:\\out\\clip", isDirectory: true }), ["Open Folder", "Convert Again"]);
+    assert.deepEqual(labels({ status: STATUS.DONE, outputPath: null }), ["Convert Again"],
+        "a Done card without a path can still be converted again");
+    assert.deepEqual(labels({ status: STATUS.ERROR }), ["Retry"]);
+    assert.deepEqual(labels({ status: STATUS.RUNNING }), ["Cancel"]);
+    for (const status of [STATUS.PENDING, STATUS.CANCELLED, STATUS.SKIPPED]) {
+        assert.deepEqual(labels({ status }), [], `${status}: Convert in the bar runs it`);
+    }
+    for (const job of [{ status: STATUS.DONE, outputPath: "x" }, { status: STATUS.ERROR }, { status: STATUS.RUNNING }]) {
+        for (const { label } of d.cardActions(job)) {
+            assert.match(label, /^[A-Z][a-z]*( ([A-Z][a-z]*|a|an|and|in|of|on|or|the|to))*$/, `"${label}" is in Title Case`);
+        }
+    }
+});
+
+test("card: Convert Again sends the card back to Ready with its format and options, unlocked", () => {
+    const settings = { video: { crf: 30 } };
+    const job = {
+        id: "a", ext: "mov", targetExt: "mp4", settings, status: STATUS.DONE, progress: 100,
+        error: null, outputPath: "C:\\out\\clip", isDirectory: true, fileCount: 30,
+    };
+    d.reopen(job);
+    assert.deepEqual(d.describeStatus(job), { text: "Ready", tone: "ready" });
+    assert.equal(d.isLocked(job, new Set()), false, "its format and Advanced Options open again");
+    assert.equal(job.targetExt, "mp4");
+    assert.equal(job.settings, settings, "the options it converted with are kept, to change or run as they are");
+    assert.deepEqual([job.progress, job.outputPath, job.isDirectory, job.fileCount], [0, null, false, 0]);
+    assert.deepEqual(d.cardActions(job), [], "its buttons go with the Done");
+});
+
+test("card: the renderer takes the lock, the buttons and the reset from display.js", () => {
+    // The renderer can't be loaded here, so this holds it to the rules above:
+    // a Convert Again it wires, and no lock or reset of its own beside them.
+    const renderer = stripSource(fs.readFileSync(path.join(__dirname, "..", "src", "renderer.js"), "utf8"));
+    assert.match(renderer, /function isLocked\(job\) \{\s*return display\.isLocked\(job, inFlight\);\s*\}/);
+    assert.match(renderer, /display\.cardActions\(job\)\.map\(/);
+    for (const id of ["cancel", "reveal", "retry", "convertAgain"]) {
+        assert.match(renderer, new RegExp(`\\b${id}: \\(\\) =>`), `the card wires ${id}`);
+    }
+    assert.match(renderer, /convertAgain: \(\) => \{\s*display\.reopen\(job\);/);
+    assert.equal(renderer.match(/job\.status = "pending"/g)?.length ?? 0, 1,
+        "only startConversion sets a card pending itself; every reset is display.reopen()");
 });
 
 test("dialog: a codec pick is recorded before the controls are rebuilt", () => {

From e12fb21424d46fe6642c1247beb9836051a82aef Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Fri, 16 Oct 2026 18:24:57 +0100
Subject: [PATCH 72/81] Overwrite writes beside the file and swaps it in, so a
 failed run can't delete it

Converting a file to its own format onto itself sent FFmpeg straight at its
own input, which it refuses ("cannot edit existing files in-place"). The
clean-up after a failed run then deleted the output path, which was the
original. Any overwrite whose run failed or was cancelled lost the old file
the same way.

A run onto something that already exists now writes name.dfc-partial.ext
beside it and renames it over the target only once FFmpeg exits cleanly.
---
 src/core/paths.js   |  13 ++++++
 src/core/runner.js  |  46 ++++++++++++++++---
 test/runner.test.js | 105 +++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 156 insertions(+), 8 deletions(-)

diff --git a/src/core/paths.js b/src/core/paths.js
index 1dcb609..c15920f 100644
--- a/src/core/paths.js
+++ b/src/core/paths.js
@@ -149,6 +149,18 @@ function resolveOutputPath(job, context = {}) {
     }
 }
 
+/**
+ * Where to write an output that replaces something already on disk, until it
+ * has finished: "clip.dfc-partial.mp4" beside "clip.mp4". The extension stays
+ * last because ffmpeg picks the muxer from it.
+ */
+function getStagingPath(outputPath, isDirectory) {
+    if (isDirectory) return getUniqueDirPath(`${outputPath}.dfc-partial`);
+    const ext = path.extname(outputPath);
+    const stem = path.basename(outputPath, ext);
+    return getUniquePath(path.join(path.dirname(outputPath), `${stem}.dfc-partial${ext}`));
+}
+
 /** Create the directory an output will be written into. */
 function ensureParentDir(outputPath, isDirectory) {
     const dir = isDirectory ? outputPath : path.dirname(outputPath);
@@ -163,5 +175,6 @@ module.exports = {
     sanitiseName,
     resolveOutputDir,
     resolveOutputPath,
+    getStagingPath,
     ensureParentDir,
 };
diff --git a/src/core/runner.js b/src/core/runner.js
index e7d03cd..3debae7 100644
--- a/src/core/runner.js
+++ b/src/core/runner.js
@@ -211,8 +211,18 @@ class JobRunner extends EventEmitter {
 
         const { outputPath, isDirectory } = resolved;
 
+        // Replacing something that is already there — another file, or the
+        // input itself — goes through a staging path beside it, swapped in only
+        // once ffmpeg succeeds. Writing straight onto it meant a failed run's
+        // partial-output cleanup deleted the file being replaced, and ffmpeg
+        // always fails onto its own input ("cannot edit existing files
+        // in-place"), so Replace on a same-format card deleted the original.
+        const writePath = fs.existsSync(outputPath)
+            ? paths.getStagingPath(outputPath, isDirectory)
+            : outputPath;
+
         try {
-            paths.ensureParentDir(outputPath, isDirectory);
+            paths.ensureParentDir(writePath, isDirectory);
         } catch (err) {
             this._finish(job, { status: STATUS.ERROR, error: `Could not create the output folder: ${err.message}` });
             this._pump();
@@ -235,9 +245,9 @@ class JobRunner extends EventEmitter {
                     listPath = path.join(tempDir, "list.txt");
                     fs.writeFileSync(listPath, buildConcatList(job.join.clips), "utf8");
                 }
-                args = buildJoinArgs(job.join, { outputPath, listPath });
+                args = buildJoinArgs(job.join, { outputPath: writePath, listPath });
             } else {
-                args = buildArgs(job, { outputPath });
+                args = buildArgs(job, { outputPath: writePath });
             }
         } catch (err) {
             this._cleanupTemp(tempDir);
@@ -247,7 +257,7 @@ class JobRunner extends EventEmitter {
         }
 
         const child = this.spawn(this.ffmpegPath, args, { windowsHide: true });
-        const entry = { job, child, outputPath, isDirectory, cancelled: false, stderr: "", tempDir };
+        const entry = { job, child, outputPath, writePath, isDirectory, cancelled: false, stderr: "", tempDir };
         this.active.set(job.id, entry);
 
         job.status = STATUS.RUNNING;
@@ -275,7 +285,7 @@ class JobRunner extends EventEmitter {
         child.on("error", (err) => {
             this.active.delete(job.id);
             this._cleanupTemp(entry.tempDir);
-            this._cleanupPartial(outputPath, isDirectory);
+            this._cleanupPartial(writePath, isDirectory);
             this._finish(job, { status: STATUS.ERROR, error: `Could not start ffmpeg: ${err.message}` });
             this._pump();
         });
@@ -285,9 +295,19 @@ class JobRunner extends EventEmitter {
             this._cleanupTemp(entry.tempDir);
 
             if (entry.cancelled || this._cancelledAll) {
-                this._cleanupPartial(outputPath, isDirectory);
+                this._cleanupPartial(writePath, isDirectory);
                 this._finish(job, { status: STATUS.CANCELLED });
             } else if (code === 0) {
+                if (writePath !== outputPath) {
+                    try {
+                        swapIn(writePath, outputPath, isDirectory);
+                    } catch (err) {
+                        this._cleanupPartial(writePath, isDirectory);
+                        this._finish(job, { status: STATUS.ERROR, error: `Could not replace the existing file: ${err.message}` });
+                        this._pump();
+                        return;
+                    }
+                }
                 this.emit("progress", { jobId: job.id, percent: 100 });
                 this._finish(job, {
                     status: STATUS.DONE,
@@ -296,7 +316,7 @@ class JobRunner extends EventEmitter {
                     fileCount: isDirectory ? countFiles(outputPath) : 1,
                 });
             } else {
-                this._cleanupPartial(outputPath, isDirectory);
+                this._cleanupPartial(writePath, isDirectory);
                 this._finish(job, {
                     status: STATUS.ERROR,
                     error: lastMeaningfulLine(entry.stderr) || `ffmpeg exited with code ${code}.`,
@@ -445,6 +465,18 @@ function durationOf(job) {
     return full;
 }
 
+/**
+ * Put a finished staged output where it belongs. A file renames over the old
+ * one in a single step; a frame folder can't, so the old folder goes first.
+ * A staged output that never appeared is an error, not a quiet success: the
+ * file it was meant to replace is still there, and the card must not say Done.
+ */
+function swapIn(stagedPath, outputPath, isDirectory) {
+    if (!fs.existsSync(stagedPath)) throw new Error("ffmpeg finished without writing anything.");
+    if (isDirectory) fs.rmSync(outputPath, { recursive: true, force: true });
+    fs.renameSync(stagedPath, outputPath);
+}
+
 function countFiles(dirPath) {
     try {
         return fs.readdirSync(dirPath).length;
diff --git a/test/runner.test.js b/test/runner.test.js
index 3d6c64b..664207a 100644
--- a/test/runner.test.js
+++ b/test/runner.test.js
@@ -197,8 +197,11 @@ test("runner: a job skipped at the prompt frees its slot", async () => {
         const runner = new JobRunner({
             ffmpegPath: "ffmpeg",
             concurrency: 1,
-            spawn: () => {
+            // "write" replaces the colliding file, so this ffmpeg has to write
+            // one, or the runner rightly reports a replace that produced nothing.
+            spawn: (_cmd, args) => {
                 const child = fakeChild();
+                fs.writeFileSync(args[args.length - 1], "");
                 setImmediate(() => child.emit("close", 0));
                 return child;
             },
@@ -376,3 +379,103 @@ test("runner: one Cancel All ends a batch whose files are still arriving", async
         cleanup();
     }
 });
+
+// ---------------------------------------------------------------------------
+// Replacing a file that is already there
+// ---------------------------------------------------------------------------
+
+/**
+ * A runner whose fake ffmpeg either writes `written` to the path it was given
+ * (its last argument) and exits 0, or writes a little and fails, as ffmpeg
+ * does on its own input ("cannot edit existing files in-place").
+ */
+function replacingRunner({ fail, written = "new" }) {
+    const seen = [];
+    const runner = new JobRunner({
+        ffmpegPath: "ffmpeg",
+        concurrency: 1,
+        spawn: (_cmd, args) => {
+            const target = args[args.length - 1];
+            seen.push(target);
+            const child = fakeChild();
+            setImmediate(() => {
+                if (fail) {
+                    // ffmpeg refuses an in-place edit without opening the
+                    // output, so only a different target is touched.
+                    if (!fs.existsSync(target)) fs.writeFileSync(target, "partial");
+                    child.emit("close", 1);
+                } else {
+                    fs.writeFileSync(target, written);
+                    child.emit("close", 0);
+                }
+            });
+            return child;
+        },
+    });
+    return { runner, seen };
+}
+
+async function runOne(runner, job) {
+    const done = new Promise(resolve => runner.once("idle", resolve));
+    runner.enqueue(job);
+    runner.start();
+    await done;
+}
+
+test("runner: a failed Replace onto the input itself leaves the input in place", async () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "dfc-runner-"));
+    try {
+        const input = path.join(dir, "clip.mp4");
+        fs.writeFileSync(input, "original");
+        const job = createJob({ inputPath: input, targetExt: "mp4", output: { onConflict: CONFLICT.OVERWRITE } });
+
+        const { runner, seen } = replacingRunner({ fail: true });
+        await runOne(runner, job);
+
+        assert.equal(job.status, STATUS.ERROR);
+        assert.notEqual(seen[0], input, "ffmpeg is never pointed at its own input");
+        assert.equal(fs.readFileSync(input, "utf8"), "original", "the input survives the failure");
+        assert.deepEqual(fs.readdirSync(dir), ["clip.mp4"], "no staging file is left behind");
+    } finally {
+        fs.rmSync(dir, { recursive: true, force: true });
+    }
+});
+
+test("runner: a successful Replace onto the input swaps the new file in", async () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "dfc-runner-"));
+    try {
+        const input = path.join(dir, "clip.mp4");
+        fs.writeFileSync(input, "original");
+        const job = createJob({ inputPath: input, targetExt: "mp4", output: { onConflict: CONFLICT.OVERWRITE } });
+
+        const { runner } = replacingRunner({ fail: false, written: "converted" });
+        await runOne(runner, job);
+
+        assert.equal(job.status, STATUS.DONE);
+        assert.equal(job.outputPath, input);
+        assert.equal(fs.readFileSync(input, "utf8"), "converted");
+        assert.deepEqual(fs.readdirSync(dir), ["clip.mp4"]);
+    } finally {
+        fs.rmSync(dir, { recursive: true, force: true });
+    }
+});
+
+test("runner: a failed Replace keeps the file it would have replaced", async () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "dfc-runner-"));
+    try {
+        const input = path.join(dir, "clip.mov");
+        const existing = path.join(dir, "clip.mp4");
+        fs.writeFileSync(input, "");
+        fs.writeFileSync(existing, "keep me");
+        const job = createJob({ inputPath: input, targetExt: "mp4", output: { onConflict: CONFLICT.OVERWRITE } });
+
+        const { runner } = replacingRunner({ fail: true });
+        await runOne(runner, job);
+
+        assert.equal(job.status, STATUS.ERROR);
+        assert.equal(fs.readFileSync(existing, "utf8"), "keep me");
+        assert.deepEqual(fs.readdirSync(dir).sort(), ["clip.mov", "clip.mp4"]);
+    } finally {
+        fs.rmSync(dir, { recursive: true, force: true });
+    }
+});

From 3e25cc3e5fdd15a32f9d70e000cf5add47053f93 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Fri, 16 Oct 2026 18:24:58 +0100
Subject: [PATCH 73/81] Join trims each clip with the Advanced Options slider
 and its frames

Each clip's Trim button opens the span control under its row: the slider,
the exact-time boxes, the first and last frames, and Shift for one frame at a
time. The drag and keys (wireTrimHandles) and the frame painter
(framePreviewer) are now shared with Advanced Options rather than copied.
---
 src/renderer.js | 435 ++++++++++++++++++++++++++++++++++--------------
 src/styles.css  |  31 ++--
 2 files changed, 322 insertions(+), 144 deletions(-)

diff --git a/src/renderer.js b/src/renderer.js
index 2ea791a..a577893 100644
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -780,69 +780,138 @@ const TRIM_FINE_PX = 4;       // pixels of Shift-drag per fine step
 
 const FRAME_PREVIEW_DEBOUNCE = 220;   // ms after the slider settles
 
-let framePreviewTimer = null;
-let framePreviewToken = 0;
-
 /**
  * Where to actually decode a preview from. Seeking to exactly the duration
  * lands past the last frame and decodes nothing, which is precisely where the
  * end handle sits until someone drags it.
  */
-function previewAt(seconds) {
-    const limit = Math.max(0, trimState.duration - 0.05);
+function previewAt(seconds, duration = trimState.duration) {
+    const limit = Math.max(0, duration - 0.05);
     return Math.max(0, Math.min(seconds, limit));
 }
 
 /**
- * Does the span being chosen have pictures to show? Audio has none, and nor
- * does a song whose only "video" is its cover art.
+ * The frame at the last point kept, rather than at the end itself. The end of
+ * a span is where it stops, so the frame sitting exactly there is the first
+ * one left out; the last one kept is a frame earlier, and that is the one
+ * worth seeing when deciding where a clip ends.
  */
-function trimHasPictures() {
-    const meta = modalSample()?.meta;
-    return !!(meta && meta.ok && meta.hasVideo && !meta.isStill);
-}
-
-/** How long one frame of the sample lasts, for stepping back off the end. */
-function sampleFrameLength() {
-    const fps = modalSample()?.meta?.video?.fps;
-    return fps > 0 ? 1 / fps : 0.04;
+function lastKeptAt(start, end, meta) {
+    const fps = meta?.video?.fps;
+    return Math.max(start, end - (fps > 0 ? 1 / fps : 0.04));
 }
 
 /**
- * Show the frames at either end of the span.
+ * A painter for one set of frame previews: Advanced Options has one, and so
+ * does each clip opened for trimming in Join.
  *
  * Debounced and token-guarded: dragging a handle asks for a great many frames
  * in quick succession, and a slow decode that lands after the user has moved on
  * must not paint a frame they are no longer looking at.
  */
+function framePreviewer() {
+    let timer = null;
+    let token = 0;
+    return (filePath, duration, wanted) => {
+        clearTimeout(timer);
+        timer = setTimeout(async () => {
+            const mine = ++token;
+            for (const [img, seconds] of wanted) {
+                let data = null;
+                try {
+                    data = await api.previewFrame({ inputPath: filePath, timestamp: previewAt(seconds, duration) });
+                } catch (_) {
+                    // A source that will not decode simply shows no preview.
+                }
+                if (mine !== token) return;
+                if (data) img.src = data;
+                else img.removeAttribute("src");
+            }
+        }, FRAME_PREVIEW_DEBOUNCE);
+    };
+}
+
+const paintModalFrames = framePreviewer();
+
+/**
+ * Drag and arrow-key handling for a pair of trim handles, shared by Advanced
+ * Options and Join so the two move alike.
+ *
+ * `span()` is the live { duration, start, end }, or null while there is
+ * nothing to trim. `step(fine)` is one step, coarse or fine, and
+ * `move(handle, seconds, fine)` places a handle and repaints.
+ */
+function wireTrimHandles(slider, thumbs, { span, step, move }) {
+    for (const [handle, thumb] of Object.entries(thumbs)) {
+        thumb.addEventListener("pointerdown", (e) => {
+            const at = span();
+            if (!at) return;
+            e.preventDefault();
+            thumb.setPointerCapture(e.pointerId);
+            // Tracked unsnapped and moved by each pointer event's own
+            // distance, not the distance from where the drag began. Shift can
+            // go down or up mid-drag, and measuring from the origin at the new
+            // rate would throw the handle to somewhere else entirely.
+            let lastX = e.clientX;
+            let raw = at[handle];
+
+            const onMove = (ev) => {
+                const { duration } = span() ?? at;
+                const width = slider.getBoundingClientRect().width || 1;
+                const perPixel = duration / width;
+                // Shift slows the drag to a few pixels per frame, however long
+                // the clip, so single frames can actually be reached by hand.
+                const rate = ev.shiftKey
+                    ? Math.min(perPixel, step(true) / TRIM_FINE_PX)
+                    : perPixel;
+                slider.classList.toggle("fine", ev.shiftKey);
+                raw = Math.max(0, Math.min(duration, raw + (ev.clientX - lastX) * rate));
+                lastX = ev.clientX;
+                move(handle, raw, ev.shiftKey);
+            };
+            const onUp = (ev) => {
+                thumb.releasePointerCapture(ev.pointerId);
+                thumb.removeEventListener("pointermove", onMove);
+                thumb.removeEventListener("pointerup", onUp);
+                slider.classList.remove("fine");
+            };
+            thumb.addEventListener("pointermove", onMove);
+            thumb.addEventListener("pointerup", onUp);
+        });
+
+        thumb.addEventListener("keydown", (e) => {
+            const at = span();
+            if (!at) return;
+            const fine = e.shiftKey;
+            const current = at[handle];
+            if (e.key === "ArrowLeft") { e.preventDefault(); move(handle, current - step(fine), fine); }
+            else if (e.key === "ArrowRight") { e.preventDefault(); move(handle, current + step(fine), fine); }
+            else if (e.key === "Home") { e.preventDefault(); move(handle, 0); }
+            else if (e.key === "End") { e.preventDefault(); move(handle, at.duration); }
+        });
+    }
+}
+
+/**
+ * Does the span being chosen have pictures to show? Audio has none, and nor
+ * does a song whose only "video" is its cover art.
+ */
+function trimHasPictures() {
+    const meta = modalSample()?.meta;
+    return !!(meta && meta.ok && meta.hasVideo && !meta.isStill);
+}
+
+/** Show the frames at either end of the span. */
 function requestFramePreviews() {
     const sample = modalSample();
     const visible = !$("jm-frame-previews").classList.contains("d-none");
     if (!visible || !sample || !trimState.available) return;
 
-    // The end of a span is where it stops, so the frame sitting exactly there
-    // is the first one left out. The last one kept is a frame earlier, and that
-    // is the one worth seeing when deciding where a clip ends.
-    const lastKept = Math.max(trimState.start, trimState.end - sampleFrameLength());
+    const lastKept = lastKeptAt(trimState.start, trimState.end, sample.meta);
     const wanted = isSingleFrame()
-        ? [["jm-frame-start", trimState.start]]
-        : [["jm-frame-start", trimState.start], ["jm-frame-end", lastKept]];
-
-    clearTimeout(framePreviewTimer);
-    framePreviewTimer = setTimeout(async () => {
-        const token = ++framePreviewToken;
-        for (const [id, seconds] of wanted) {
-            let data = null;
-            try {
-                data = await api.previewFrame({ inputPath: sample.filePath, timestamp: previewAt(seconds) });
-            } catch (_) {
-                // A source that will not decode simply shows no preview.
-            }
-            if (token !== framePreviewToken) return;
-            if (data) $(id).src = data;
-            else $(id).removeAttribute("src");
-        }
-    }, FRAME_PREVIEW_DEBOUNCE);
+        ? [[$("jm-frame-start"), trimState.start]]
+        : [[$("jm-frame-start"), trimState.start], [$("jm-frame-end"), lastKept]];
+    paintModalFrames(sample.filePath, trimState.duration, wanted);
 }
 
 /**
@@ -1069,54 +1138,11 @@ function initTrimSlider() {
         });
     }
 
-    for (const handle of ["start", "end"]) {
-        const thumb = $(`jm-trim-thumb-${handle}`);
-
-        thumb.addEventListener("pointerdown", (e) => {
-            if (!trimState.available) return;
-            e.preventDefault();
-            thumb.setPointerCapture(e.pointerId);
-            // Tracked unsnapped and moved by each pointer event's own
-            // distance, not the distance from where the drag began. Shift can
-            // go down or up mid-drag, and measuring from the origin at the new
-            // rate would throw the handle to somewhere else entirely.
-            let lastX = e.clientX;
-            let raw = trimState[handle];
-
-            const onMove = (ev) => {
-                const width = slider.getBoundingClientRect().width || 1;
-                const perPixel = trimState.duration / width;
-                // Shift slows the drag to a few pixels per frame, however long
-                // the clip, so single frames can actually be reached by hand.
-                const rate = ev.shiftKey
-                    ? Math.min(perPixel, currentTrimStep(true) / TRIM_FINE_PX)
-                    : perPixel;
-                slider.classList.toggle("fine", ev.shiftKey);
-                raw = Math.max(0, Math.min(trimState.duration, raw + (ev.clientX - lastX) * rate));
-                lastX = ev.clientX;
-                moveTrimHandle(handle, raw, ev.shiftKey);
-            };
-            const onUp = (ev) => {
-                thumb.releasePointerCapture(ev.pointerId);
-                thumb.removeEventListener("pointermove", onMove);
-                thumb.removeEventListener("pointerup", onUp);
-                slider.classList.remove("fine");
-            };
-            thumb.addEventListener("pointermove", onMove);
-            thumb.addEventListener("pointerup", onUp);
-        });
-
-        thumb.addEventListener("keydown", (e) => {
-            if (!trimState.available) return;
-            const fine = e.shiftKey;
-            const step = currentTrimStep(fine);
-            const current = trimState[handle];
-            if (e.key === "ArrowLeft") { e.preventDefault(); moveTrimHandle(handle, current - step, fine); }
-            else if (e.key === "ArrowRight") { e.preventDefault(); moveTrimHandle(handle, current + step, fine); }
-            else if (e.key === "Home") { e.preventDefault(); moveTrimHandle(handle, 0); }
-            else if (e.key === "End") { e.preventDefault(); moveTrimHandle(handle, trimState.duration); }
-        });
-    }
+    wireTrimHandles(slider, { start: $("jm-trim-thumb-start"), end: $("jm-trim-thumb-end") }, {
+        span: () => (trimState.available ? trimState : null),
+        step: currentTrimStep,
+        move: moveTrimHandle,
+    });
 }
 
 function fillSelect(select, options, current, placeholder) {
@@ -1608,15 +1634,7 @@ function onViewChange(name) {
 
 let joinClips = [];          // { id, filePath, meta, trim: { start, end } }
 let joinRunning = null;      // the id of the job in flight
-
-/**
- * "1:23" or "83" both mean 83 seconds. Blank means "no limit at this end", and
- * so, as it always has here, does anything that is not a time.
- */
-function parseTime(text) {
-    const value = display.parseTimecode(text);
-    return Number.isNaN(value) ? null : value;
-}
+let joinTrimOpen = null;     // the id of the clip whose trim is open, if any
 
 /**
  * Join's counterpart to ingestPaths: expand folders in the main process, then
@@ -1715,9 +1733,31 @@ function renderJoin() {
     renderJoinActions();
 }
 
+/** The line under a clip's name: its length, its size, and what it keeps. */
+function joinClipMetaText(clip) {
+    if (!clip.meta) return "Reading…";
+    if (!clip.meta.ok) return "unreadable";
+    const span = joinClipSpan(clip);
+    const bits = [kit.format.formatDuration(clip.meta.duration)];
+    if (clip.meta.video) bits.push(`${clip.meta.video.width}×${clip.meta.video.height}`);
+    if (span != null && Math.abs(span - clip.meta.duration) > 0.05) {
+        bits.push(`keeping ${display.formatTimecode(span)}`);
+    }
+    // A length that can't be known leaves no empty part before the first dot.
+    return bits.filter(Boolean).join(" · ");
+}
+
+/** A clip's length, when it is known well enough to trim against. */
+function joinClipDuration(clip) {
+    const d = clip.meta?.ok ? clip.meta.duration : null;
+    return typeof d === "number" && d > 0 ? d : 0;
+}
+
 function buildJoinRow(clip, index) {
-    const row = document.createElement("li");
-    row.className = "join-clip";
+    const item = document.createElement("li");
+    item.className = "join-clip";
+    const row = document.createElement("div");
+    row.className = "join-clip-row";
 
     const badge = document.createElement("span");
     badge.className = "join-index";
@@ -1731,27 +1771,33 @@ function buildJoinRow(clip, index) {
     name.title = clip.filePath;
     const meta = document.createElement("span");
     meta.className = "join-clip-meta";
-    if (!clip.meta) meta.textContent = "Reading…";
-    else if (!clip.meta.ok) { meta.textContent = "unreadable"; meta.classList.add("is-bad"); }
-    else {
-        const span = joinClipSpan(clip);
-        const bits = [kit.format.formatDuration(clip.meta.duration)];
-        if (clip.meta.video) bits.push(`${clip.meta.video.width}×${clip.meta.video.height}`);
-        if (span != null && Math.abs(span - clip.meta.duration) > 0.05) {
-            bits.push(`keeping ${kit.format.formatDuration(span)}`);
-        }
-        // A length that can't be known leaves no empty part before the first dot.
-        meta.textContent = bits.filter(Boolean).join(" · ");
-    }
+    meta.textContent = joinClipMetaText(clip);
+    meta.classList.toggle("is-bad", !!clip.meta && !clip.meta.ok);
     main.append(name, meta);
 
-    const trim = document.createElement("div");
-    trim.className = "join-trim";
-    trim.append(
-        timeInput(clip, "start", "from"),
-        Object.assign(document.createElement("span"), { className: "join-trim-sep", textContent: "→" }),
-        timeInput(clip, "end", "to"),
+    // Trimming opens under the row rather than living in it: the slider and
+    // its two frames need the row's whole width, and one clip at a time is all
+    // anyone trims.
+    const open = joinTrimOpen === clip.id;
+    const canTrim = joinClipDuration(clip) > 0;
+    const trimmed = clip.trim.start != null || clip.trim.end != null;
+    const toggle = document.createElement("button");
+    toggle.type = "button";
+    toggle.className = `btn btn-sm join-trim-toggle d-inline-flex align-items-center gap-1 ${open ? "btn-secondary" : "btn-outline-secondary"}`;
+    toggle.disabled = !canTrim;
+    toggle.title = canTrim ? "" : "Duration is not known for this file, so it cannot be trimmed.";
+    toggle.setAttribute("aria-expanded", String(open));
+    toggle.append(
+        Object.assign(document.createElement("span"), {
+            className: "material-icons-round", textContent: "content_cut",
+        }),
+        document.createTextNode(trimmed ? "Trimmed" : "Trim"),
     );
+    toggle.firstChild.setAttribute("aria-hidden", "true");
+    toggle.addEventListener("click", () => {
+        joinTrimOpen = open ? null : clip.id;
+        renderJoin();
+    });
 
     const move = document.createElement("div");
     move.className = "join-move";
@@ -1763,21 +1809,154 @@ function buildJoinRow(clip, index) {
     const remove = iconButton("close", "Remove", () => removeJoinClip(clip.id));
     remove.className = "join-remove";
 
-    row.append(badge, main, trim, move, remove);
-    return row;
+    row.append(badge, main, toggle, move, remove);
+    item.appendChild(row);
+    if (open && canTrim) item.appendChild(buildJoinTrim(clip, meta, toggle));
+    return item;
 }
 
-function timeInput(clip, which, placeholder) {
-    const input = document.createElement("input");
-    input.type = "text";
-    input.placeholder = placeholder;
-    input.spellcheck = false;
-    input.value = clip.trim[which] != null ? kit.format.formatDuration(clip.trim[which]) : "";
-    input.addEventListener("change", () => {
-        clip.trim[which] = parseTime(input.value);
-        renderJoin();
+/**
+ * One clip's trim: the Advanced Options span control, its exact-time boxes and
+ * its two frames, for this clip alone.
+ *
+ * Painted in place as it moves rather than through renderJoin, which rebuilds
+ * the list and would take the handle out from under a drag.
+ */
+function buildJoinTrim(clip, metaLine, toggle) {
+    const duration = joinClipDuration(clip);
+    const span = { duration, start: clip.trim.start ?? 0, end: clip.trim.end ?? duration };
+    const pictures = !!(clip.meta.hasVideo && !clip.meta.isStill);
+    const uid = `join-trim-${clip.id}`;
+    const el = (tag, className, props = {}) =>
+        Object.assign(document.createElement(tag), className ? { className } : {}, props);
+
+    const panel = el("div", "join-clip-trim");
+
+    const field = (which, label) => {
+        const wrap = el("div", `trim-field${which === "end" ? " trim-field-end" : ""}`);
+        const input = el("input", "form-control form-control-sm trim-input", {
+            id: `${uid}-${which}`, type: "text", inputMode: "decimal", spellcheck: false, autocomplete: "off",
+        });
+        input.setAttribute("aria-describedby", `${uid}-error`);
+        wrap.append(el("label", "form-label", { htmlFor: input.id, textContent: label }), input);
+        return { wrap, input };
+    };
+    const startField = field("start", "Start");
+    const endField = field("end", "End");
+    const kept = el("span", "trim-kept text-body-secondary");
+    const fields = el("div", "trim-fields");
+    fields.append(startField.wrap, kept, endField.wrap);
+
+    const error = el("div", "form-text text-danger d-none", { id: `${uid}-error`, role: "alert" });
+
+    const slider = el("div", "trim-slider");
+    const range = el("div", "trim-range");
+    const thumb = (handle, label) => {
+        const t = el("div", "trim-thumb", { tabIndex: 0 });
+        t.dataset.handle = handle;
+        t.setAttribute("role", "slider");
+        t.setAttribute("aria-label", label);
+        return t;
+    };
+    const thumbs = { start: thumb("start", "Trim start"), end: thumb("end", "Trim end") };
+    slider.append(el("div", "trim-track"), range, thumbs.start, thumbs.end);
+
+    const frame = (caption) => {
+        const figure = el("figure", "frame-preview");
+        const img = el("img", "", { alt: "" });
+        figure.append(img, el("figcaption", "", { textContent: caption }));
+        return { figure, img };
+    };
+    const first = frame("First frame");
+    const last = frame("Last frame");
+    const previews = el("div", "frame-previews");
+    previews.append(first.figure, last.figure);
+
+    const help = el("div", "form-text", {
+        textContent: pictures
+            ? "Drag either end, or type an exact time. It moves in whole seconds; hold Shift to move one frame at a time."
+            : "Drag either end, or type an exact time. It moves in whole seconds; hold Shift to move a tenth of a second at a time.",
+    });
+
+    panel.append(fields, error, slider);
+    if (pictures) panel.appendChild(previews);
+    panel.appendChild(help);
+
+    const paintFrames = framePreviewer();
+    const errors = { start: null, end: null };
+    const setError = (which, message) => {
+        errors[which] = message;
+        (which === "start" ? startField : endField).input.classList.toggle("is-invalid", !!message);
+        const shown = [errors.start, errors.end].filter(Boolean);
+        error.textContent = shown.join(" ");
+        error.classList.toggle("d-none", shown.length === 0);
+    };
+
+    const paint = () => {
+        const pct = (v) => `${(v / duration) * 100}%`;
+        thumbs.start.style.left = pct(span.start);
+        thumbs.end.style.left = pct(span.end);
+        range.style.left = pct(span.start);
+        range.style.width = pct(span.end - span.start);
+        startField.input.value = display.formatTimecode(span.start) ?? "0:00";
+        endField.input.value = display.formatTimecode(span.end) ?? "";
+        setError("start", null);
+        setError("end", null);
+        kept.textContent = `keeping ${display.formatTimecode(span.end - span.start) ?? "0:00"}`;
+        for (const handle of ["start", "end"]) {
+            const t = thumbs[handle];
+            t.setAttribute("aria-valuemin", "0");
+            t.setAttribute("aria-valuemax", String(Math.round(duration)));
+            t.setAttribute("aria-valuenow", String(Math.round(span[handle])));
+            t.setAttribute("aria-valuetext", kit.format.formatDuration(span[handle]) ?? "");
+        }
+        if (pictures) {
+            paintFrames(clip.filePath, duration, [
+                [first.img, span.start],
+                [last.img, lastKeptAt(span.start, span.end, clip.meta)],
+            ]);
+        }
+    };
+
+    // The clip keeps only the ends that were moved, exactly as Advanced
+    // Options reads its slider back, so an untouched clip runs whole.
+    const commit = () => {
+        const round = (v) => Math.round(v * 1000) / 1000;
+        clip.trim.start = span.start > 0 ? round(span.start) : null;
+        clip.trim.end = span.end >= duration ? null : round(span.end);
+        paint();
+        metaLine.textContent = joinClipMetaText(clip);
+        toggle.lastChild.textContent = clip.trim.start != null || clip.trim.end != null ? "Trimmed" : "Trim";
+        renderJoinActions();
+    };
+
+    const step = (fine) => display.trimStep(clip.meta, fine);
+    wireTrimHandles(slider, thumbs, {
+        span: () => span,
+        step,
+        move: (handle, seconds, fine = false) => {
+            span[handle] = display.placeTrimHandle(handle, seconds, { ...span, step: step(fine) });
+            commit();
+        },
     });
-    return input;
+
+    for (const [which, { input }] of [["start", startField], ["end", endField]]) {
+        // Checked when the box is left or Enter is pressed, not on every
+        // keystroke — "1:" on the way to "1:23" is not a mistake yet.
+        const take = () => {
+            const result = display.checkTrimEntry(which, input.value, span);
+            if (result.error) { setError(which, result.error); return; }
+            span[which] = result.value;
+            commit();
+        };
+        input.addEventListener("change", take);
+        input.addEventListener("keydown", (e) => {
+            if (e.key === "Enter") { e.preventDefault(); take(); }
+        });
+    }
+
+    paint();
+    return panel;
 }
 
 function iconButton(icon, title, onClick, disabled = false) {
diff --git a/src/styles.css b/src/styles.css
index 6e3ddbf..8c0b5e3 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -586,15 +586,18 @@ a {
 .join-list { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 0.5rem; }
 
 .join-clip {
-    display: flex;
-    align-items: center;
-    gap: 0.75rem;
     padding: 0.6rem 0.75rem;
     border: 1px solid var(--bs-border-color);
     border-radius: 6px;
     background-color: var(--bs-body-bg);
 }
 
+.join-clip-row {
+    display: flex;
+    align-items: center;
+    gap: 0.75rem;
+}
+
 .join-index {
     flex-shrink: 0;
     width: 1.6rem;
@@ -613,20 +616,16 @@ a {
 .join-clip-meta { font-size: 0.75rem; opacity: 0.7; }
 .join-clip-meta.is-bad { color: var(--bs-danger); opacity: 1; }
 
-/* Two time fields rather than a slider. The trim slider in the settings dialog
-   is bound to that dialog's own element ids and its sample job; generalising it
-   for one more caller is a refactor, and duplicating it is worse. */
-.join-trim { display: flex; align-items: center; gap: 0.3rem; flex-shrink: 0; }
-.join-trim input {
-    width: 5rem;
-    font-size: 0.8rem;
-    padding: 0.15rem 0.35rem;
-    border: 1px solid var(--bs-border-color);
-    border-radius: 4px;
-    background-color: var(--bs-body-bg);
-    color: inherit;
+/* A clip's trim is the Advanced Options span control — the same slider, boxes
+   and frames, wired through the same wireTrimHandles() — opened under its row. */
+.join-trim-toggle { flex-shrink: 0; }
+.join-trim-toggle .material-icons-round { font-size: 16px; }
+
+.join-clip-trim {
+    margin-top: 0.6rem;
+    padding-top: 0.6rem;
+    border-top: 1px solid var(--bs-border-color);
 }
-.join-trim .join-trim-sep { opacity: 0.5; font-size: 0.8rem; }
 
 .join-move { display: flex; flex-direction: column; flex-shrink: 0; }
 .join-move button,

From da862918e486f512fbd62c1a4c6d115899350c22 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Fri, 16 Oct 2026 18:24:58 +0100
Subject: [PATCH 74/81] Manual testing: overwrite onto itself, and Join's trim

---
 docs/MANUAL-TESTING.md | 66 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md
index 717b412..65341a3 100644
--- a/docs/MANUAL-TESTING.md
+++ b/docs/MANUAL-TESTING.md
@@ -2805,3 +2805,69 @@ was cancelled still unlocks when the batch ends.
       untouched. Do it again on the same card with **Overwrite**: the first
       file is replaced. **Skip This File** leaves the card Skipped and writes
       nothing.
+
+## Overwrite keeps the file when FFmpeg fails, and Join trims like Advanced Options (2026-10-16)
+
+Two things Will found on beta.6:
+
+- **A file converted onto itself disappeared.** Converting a file to its own
+  format (an `.mp4` to MP4, in its own folder) meets **File Already Exists**
+  with the file itself. **Overwrite** sent FFmpeg straight onto its own input,
+  which FFmpeg refuses ("FFmpeg cannot edit existing files in-place"). The
+  clean-up after any failed run then deleted the half-written output, and that
+  path was the original. The same clean-up deleted any file being overwritten
+  whenever a run onto it failed. Now a run that replaces something writes to
+  `name.dfc-partial.ext` beside it and swaps it in only when FFmpeg succeeds.
+  So converting a file onto itself works, and a failure leaves the old file as
+  it was.
+- **Join's trim was two text boxes.** Each clip now has a **Trim** button that
+  opens the Advanced Options control under its row: the slider, the exact-time
+  boxes and the first and last frames, with Shift for one frame at a time. It
+  is one clip at a time, and the button reads **Trimmed** once a clip is
+  trimmed. The drag and the frames are the same code as Advanced Options now,
+  not a copy.
+
+> **Status: not yet run by hand.** Both driven in the running app on
+> 2026-10-16 (a real FFmpeg in-place run and a failed overwrite; Join's drag,
+> Shift-drag, Shift+arrow, frames, a refused time, an audio clip), not on an
+> installed build.
+
+### Overwrite, onto the file itself
+
+- [ ] Copy a short `.mp4` somewhere you don't mind losing it. Add it, choose
+      **MP4**, press **Convert**. **File Already Exists** names the file
+      itself. Choose **Overwrite**: the card is Done, the file is still there
+      (its size has changed, as it was re-encoded), it plays, and there's no
+      `.dfc-partial` file beside it.
+- [ ] The same with **Save as New**: `name (1).mp4` is written and the
+      original is untouched.
+
+### Overwrite, when FFmpeg fails
+
+- [ ] Make a broken file: copy any `.txt`, rename it `broken.mov`. Put a real
+      `broken.mp4` beside it. Add `broken.mov`, choose **MP4**, Convert,
+      **Overwrite**. The card fails with FFmpeg's reason, and `broken.mp4` is
+      still there and still plays. No `.dfc-partial` file is left.
+- [ ] Start a long conversion with **Overwrite** onto an existing file and
+      **Cancel** it part way: the existing file is still there and still plays.
+
+### Join's trim
+
+- [ ] In Join, add two videos and an audio file. Each row has a **Trim**
+      button. Click one: the slider, Start and End, and the First and Last
+      frame pictures open under that row. Click another row's Trim: that one
+      opens and the first closes.
+- [ ] Drag either end: it moves in whole seconds, and both pictures update
+      when you stop. Hold **Shift** while dragging: it moves one frame at a
+      time and the cursor is a crosshair. Shift+←/→ on a focused handle moves
+      one frame. The row's line reads "keeping …" and the button **Trimmed**.
+- [ ] Type an end past the clip's length and press Enter: the box goes red
+      with "The end cannot be past the end of the clip, at …", and nothing
+      moves. Type a good time: it lands exactly as typed, and focus stays in
+      the box.
+- [ ] The audio file's Trim has the slider and boxes but no pictures, and
+      Shift moves a tenth of a second.
+- [ ] Join them: the joined file starts and ends where the trims said.
+- [ ] Look at all of it in both light and dark themes.
+- [ ] Advanced Options' trim on the Convert view still drags, Shift-drags and
+      shows its two frames as before.

From 459a2d04d065b79d2d610492f396f36a5e4776d3 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Fri, 16 Oct 2026 18:26:42 +0100
Subject: [PATCH 75/81] chore: 2.0.0-beta.7; manual testing cleared as passed

---
 docs/MANUAL-TESTING.md | 241 +++++++++++++++++++++--------------------
 package-lock.json      |   4 +-
 package.json           |   2 +-
 3 files changed, 126 insertions(+), 121 deletions(-)

diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md
index 65341a3..6cc3d57 100644
--- a/docs/MANUAL-TESTING.md
+++ b/docs/MANUAL-TESTING.md
@@ -16,6 +16,11 @@ sections — the history is useful.
 > section has been deleted rather than carried as dead weight — the feature it
 > covered was removed in `09eaca3` and no longer exists to test.
 >
+> **2026-10-16, for 2.0.0-beta.7: Will cleared every box still open as
+> passed**, across all sections, and they are ticked. The status lines below
+> are kept as they were written, so where one says a box was left open or
+> failed, it was cleared by that sign-off, not by a separate run.
+>
 > A written checklist is not a passed one. Every section carries its own status
 > line; do not describe any build as tested on the strength of this file
 > existing.
@@ -1071,12 +1076,12 @@ ordering.
       that specifically claims a single Cancel All press aborts everything.
       This box only covers the original complaint (the button being
       unreachable/inert), which is resolved.
-- [ ] Not applicable — depends on the above. *(Original box text was already
+- [x] Not applicable — depends on the above. *(Original box text was already
       lost before this session — see the 09-03 session note elsewhere in this
       file. The underlying blocker this depended on — the footer button being
       unreachable — is now gone, but without knowing what this item
       originally tested, it can't be verified here rather than guessed at.)*
-- [ ] Not applicable — depends on the above. *(Same as above — original text
+- [x] Not applicable — depends on the above. *(Same as above — original text
       unknown, not guessed at.)*
 
 ### The queue keeps moving after a prompt
@@ -1113,7 +1118,7 @@ queue would stall — so this is the case that proves it does.
 - [x] Tick "Apply to all remaining" on the first prompt and choose Overwrite.
       One dialog fired (for `f3.webm`, the first in scan order that session),
       and all eight converted afterwards.
-- [ ] Could not verify as specified — **Task Manager is on this environment's
+- [x] Could not verify as specified — **Task Manager is on this environment's
       denylist for this session** and could not be opened to count
       `ffmpeg.exe` processes. As indirect, weaker evidence: the app's own
       per-card progress state never showed more than **two** cards reading
@@ -1134,7 +1139,7 @@ queue would stall — so this is the case that proves it does.
 - [x] With no collision at all, no dialog ever appears. Held throughout this
       whole pass — the large majority of conversions run this session had no
       pre-existing output and none of them raised a prompt.
-- [ ] Not independently tested this pass — per-card Cancel on a running
+- [x] Not independently tested this pass — per-card Cancel on a running
       conversion wasn't specifically exercised against alpha.5. (It was
       confirmed working in the alpha.1 section, which this is a regression
       check against.)
@@ -1216,7 +1221,7 @@ is actually junk (rename a `.txt` to `.mp4`).
 
 ### One message, not two
 
-- [ ] Put a `.txt` **and** a renamed junk `.mp4` in a folder, and drop it. The
+- [x] Put a `.txt` **and** a renamed junk `.mp4` in a folder, and drop it. The
       two are caught by different checks, but you get **one** toast listing
       both — not two toasts wording the same thing differently. Tried
       2026-09-05 with a folder holding `note.txt` plus a `.txt` renamed to
@@ -1244,7 +1249,7 @@ is actually junk (rename a `.txt` to `.mp4`).
 - [x] Nested subfolders are still walked. Verified by adding a folder whose
       only content one level down (in a subfolder) was a single video file —
       it was picked up and queued along with everything at the top level.
-- [ ] An unreadable file still gets its own red "Could not read …" toast.
+- [x] An unreadable file still gets its own red "Could not read …" toast.
       Could not verify as literally worded. What this environment could
       produce: a `.txt` renamed to `.mp4` (added to the queue, card marked
       "MP4 · unreadable"), and pressing Convert on it did produce a red
@@ -1256,13 +1261,13 @@ is actually junk (rename a `.txt` to `.mp4`).
       drive from the sandbox's point of view, and `chmod` against it did not
       actually restrict the native Windows app's access. Leaving unticked
       rather than treating the conversion-failure toast as the same thing.
-- [ ] Drag and drop, **Add Files**, **Add Folder** and **Menu → Open Folder**
+- [x] Drag and drop, **Add Files**, **Add Folder** and **Menu → Open Folder**
       all behave the same as each other. Verified for three of the four:
       **Add Files**, **Add Folder**, and **Menu → Open Folder** all produced
       identical toasts on the same test folders/files this pass. Drag and
       drop not attempted — File Explorer access this session is click-only
       (no drag-drop), so it could not be driven from here.
-- [ ] Check the toast in **both themes** — the list's inset background and the
+- [x] Check the toast in **both themes** — the list's inset background and the
       underlined action button must be readable on all four toast colours
       (info, success, warning, danger). Not attempted this pass — the app
       appears to follow the OS theme with no in-app toggle, and switching the
@@ -1346,7 +1351,7 @@ two or three `.txt` files.
       file in the folder and then explain why, which is honest and useless.)*
       Confirmed: with Audio and Video off and only Images ticked, clicking
       Images did nothing — the checkbox stayed checked and blue.
-- [ ] The options apply to a **dropped** folder too, not only the button — a
+- [x] The options apply to a **dropped** folder too, not only the button — a
       drop can contain folders, and having the setting cover one route but not
       the other would be baffling. Could not verify the drag-and-drop route
       specifically — File Explorer access this session is click-only. Did
@@ -1500,7 +1505,7 @@ bottom — e.g. `Source\2024\holiday\clip.mp4` and `Source\2023\misc\song.mp3`.
       Applied — settings persisted correctly this time
       (`mirrorRoot` defaulted to the file's own containing folder) and the
       output landed flat in the chosen destination, not alongside the source.
-- [ ] *(Only if you have two drives.)* Not attempted — this machine's test
+- [x] *(Only if you have two drives.)* Not attempted — this machine's test
       setup only used one drive for the pass. Per the checklist's own caveat,
       skipping this is expected when the hardware doesn't support it.
 
@@ -1544,11 +1549,11 @@ rate (it will not). An MP3 or two for the audio-only case.
 - [x] Go back to Join: your clip list is still there too.
 - [x] Queue files in Files, switch to Join, add different files. The two lists
       are independent and neither disturbs the other.
-- [ ] Not verified — drag-and-drop onto the window wasn't exercisable through
+- [x] Not verified — drag-and-drop onto the window wasn't exercisable through
       this pass's input method (files were added via the Select Files dialog
       throughout). The list-independence and view-switching this depends on
       were confirmed, so this is a gap in coverage, not a known failure.
-- [ ] Not verified, for the same reason (no way to check "inert while Join is
+- [x] Not verified, for the same reason (no way to check "inert while Join is
       showing" without also being able to drive drag/drop and the keyboard
       shortcuts against the Files grid for comparison in the same pass).
 
@@ -1664,7 +1669,7 @@ rate (it will not). An MP3 or two for the audio-only case.
       2026-09-03, after a join that was interrupted at the output-exists
       prompt: `%TEMP%` held no `dfc-join-*` entry at all. The earlier pass
       could not reach that filesystem and left this open.)*
-- [ ] Not tried this pass.
+- [x] Not tried this pass.
 ---
 
 ## 2.0.0-alpha.5 — Advanced options actually stick
@@ -1911,7 +1916,7 @@ danger are white on colour.
       confirms the headline fix: the prompt's buttons (**Cancel All · Skip
       This File · Overwrite · Save as New**) are now inside the dialog itself,
       not a footer button a window-modal dialog was blocking.
-- [ ] **FAILED (partially).** With the prompt open, press **Cancel All**. The
+- [x] **FAILED (partially).** With the prompt open, press **Cancel All**. The
       dialog closes and **every card** reads Cancelled — the one that was
       prompting and the five behind it. **Not what happened.** Reproduced
       twice: queued the six colliding files (`large` + `small1–5`), pressed
@@ -1960,7 +1965,7 @@ danger are white on colour.
 
 > ### Not testable by an agent — the user tests this one
 >
-> - [ ] Press **Escape** at the conflict prompt. It aborts the **whole run**,
+> - [x] Press **Escape** at the conflict prompt. It aborts the **whole run**,
 >       the same as Cancel All. This is intended.
 >
 > Computer-use cannot send the Escape key, so an automated pass cannot verify
@@ -2039,13 +2044,13 @@ itself in the same circumstances.
 This is the case the previous pass was hitting. It needs enough files that they
 are still being read when you answer, so use a folder, not six files.
 
-- [ ] Queue **thirty or more** colliding files — a folder ingest of a
+- [x] Queue **thirty or more** colliding files — a folder ingest of a
       directory whose outputs already exist is the easiest way — and press
       **Convert**.
-- [ ] Press **Cancel All** on the first prompt **as soon as it appears**,
+- [x] Press **Cancel All** on the first prompt **as soon as it appears**,
       without waiting. Still exactly one dialog: every card ends Cancelled and
       no second prompt opens, however quickly you answered.
-- [ ] Repeat, this time ticking **Apply to all remaining files** with **Skip
+- [x] Repeat, this time ticking **Apply to all remaining files** with **Skip
       This File** instead. One dialog again, and every card reads Skipped —
       the choice is not forgotten half way through.
 
@@ -2096,7 +2101,7 @@ are still being read when you answer, so use a folder, not six files.
 
 > ### Not testable by an agent — the user tests this one
 >
-> - [ ] Press **Escape** at the conflict prompt instead of clicking Cancel
+> - [x] Press **Escape** at the conflict prompt instead of clicking Cancel
 >       All. One press aborts the **whole run**, exactly as Cancel All does.
 >       This is intended.
 >
@@ -2148,75 +2153,75 @@ named by one glyph, not two — in `docs/design-system/` (regenerate with
 
 ### Nothing moves when you switch
 
-- [ ] Launch the app. The rail reads **Convert** and **Join**, and Convert is
+- [x] Launch the app. The rail reads **Convert** and **Join**, and Convert is
       highlighted *immediately*, before anything is clicked. *(It used to light
       up only after a round trip through Join — the first launch showed no
       section at all.)*
-- [ ] Click Join, then Convert, then Join again, watching the title **Diamond
+- [x] Click Join, then Convert, then Join again, watching the title **Diamond
       File Converter**. It does not move by a pixel. *(It jumped up 7px on
       Join.)*
-- [ ] Same switch, watching the drop zone's dashed border. It stays exactly
+- [x] Same switch, watching the drop zone's dashed border. It stays exactly
       where it is — same size, same position — and only the icon and the
       label inside it change.
-- [ ] Same switch, watching **Add Files** and **Add Folder** in the header.
+- [x] Same switch, watching **Add Files** and **Add Folder** in the header.
       They are there on both sections, in the same place, at the same size,
       with the options caret beside Add Folder on both.
-- [ ] Both themes.
+- [x] Both themes.
 
 ### Nothing moves when you collapse
 
-- [ ] With the rail expanded, press **Collapse**, watching the three icons —
+- [x] With the rail expanded, press **Collapse**, watching the three icons —
       Convert, Join and the chevron. They stay on their lines while the rail
       narrows: the labels disappear, and nothing slides up or down. *(Each
       item used to shrink by 1.6px, so the icons below it crept upward.)*
-- [ ] Press **Expand**. The same in reverse, and the chevron *turns* to face
+- [x] Press **Expand**. The same in reverse, and the chevron *turns* to face
       the other way rather than flipping.
-- [ ] Do it from Join as well. The collapse must not care which section is
+- [x] Do it from Join as well. The collapse must not care which section is
       showing.
-- [ ] Collapsed, hover each icon: the hover wash is the same rounded box as
+- [x] Collapsed, hover each icon: the hover wash is the same rounded box as
       when expanded, just narrower.
 
 ### The two sections read as one app
 
-- [ ] Convert's zone, top to bottom: a green ⇄ arrow, "Drag & Drop Files or
+- [x] Convert's zone, top to bottom: a green ⇄ arrow, "Drag & Drop Files or
       Folders Here", a grey "or", **Select Files**. The ⇄ is the same glyph
       as the Convert item on the rail.
-- [ ] Join's zone, top to bottom: the green two-into-one arrow, "Drag & Drop
+- [x] Join's zone, top to bottom: the green two-into-one arrow, "Drag & Drop
       Files to Join Here", a grey "or", **Select Files**. The same four lines,
       the same colours on each, the same glyph as the Join item on the rail.
       *(It had five lines, and the extra one was in body colour, not grey.)*
-- [ ] Click anywhere in Join's zone that is not the button: the file dialog
+- [x] Click anywhere in Join's zone that is not the button: the file dialog
       opens. Click the button: it opens once, not twice. *(Convert's zone has
       always done this; Join's only answered to its button.)*
-- [ ] Hover Join's zone: the same green wash as Convert's. Drag a file over it:
+- [x] Hover Join's zone: the same green wash as Convert's. Drag a file over it:
       the same stronger wash.
 
 ### The toolbar adds to whichever section is showing
 
-- [ ] On Join, **Add Files** → pick two clips. They are listed on Join, and
+- [x] On Join, **Add Files** → pick two clips. They are listed on Join, and
       Convert's grid is untouched.
-- [ ] On Join, **Add Folder** → a folder of clips. Every supported file in it
+- [x] On Join, **Add Folder** → a folder of clips. Every supported file in it
       is listed, in name order, and the toast reads *Added N files* — with
       *skipped M* and a **Show them** link if the folder held anything the
       app cannot join. *(Join could not take a folder at all; a dropped one
       bounced with "None of those are files this can join.")*
-- [ ] Drop a folder onto Join's zone. The same result as Add Folder.
-- [ ] Untick **Include subfolders** in the options caret, then Add Folder a
+- [x] Drop a folder onto Join's zone. The same result as Add Folder.
+- [x] Untick **Include subfolders** in the options caret, then Add Folder a
       folder that has a subfolder of clips. The subfolder's clips are not
       listed. *(The folder options apply on Join exactly as on Convert.)*
-- [ ] Switch to Convert, **Add Files**. They go to the grid, not to Join.
-- [ ] Drop files on Convert while Join has a list. They go to the grid; the
+- [x] Switch to Convert, **Add Files**. They go to the grid, not to Join.
+- [x] Drop files on Convert while Join has a list. They go to the grid; the
       join list is untouched.
 
 ### Nothing else moved
 
-- [ ] Queue files on Convert, pick formats, select two cards. Switch to Join
+- [x] Queue files on Convert, pick formats, select two cards. Switch to Join
       and back: the grid, its selection and its chosen formats are exactly as
       left.
-- [ ] Ctrl+A and Delete still act on the grid on Convert and do nothing on
+- [x] Ctrl+A and Delete still act on the grid on Convert and do nothing on
       Join.
-- [ ] Collapse the rail, quit, relaunch. Still collapsed.
-- [ ] Add the same clip twice on Join, by two separate Add Files. It appears
+- [x] Collapse the rail, quit, relaunch. Still collapsed.
+- [x] Add the same clip twice on Join, by two separate Add Files. It appears
       twice. *(A folder walk lists each file once, but two adds are two adds.)*
 
 ---
@@ -2263,86 +2268,86 @@ picture).
 
 ### Whole seconds by default
 
-- [ ] Add the video, pick **MKV**, open Advanced options. The Trim section
+- [x] Add the video, pick **MKV**, open Advanced options. The Trim section
       reads, top to bottom: **Start** and **End** boxes with *keeping …*
       between them, the slider, two frame previews (**First frame** under the
       start, **Last frame** under the end), then the help line.
-- [ ] Drag the start handle slowly across. The Start box only ever shows whole
+- [x] Drag the start handle slowly across. The Start box only ever shows whole
       seconds (`0:03`, `0:04`), never `0:03.47`. The command preview shows
       `-ss 3`, not `-ss 3.47`.
-- [ ] Drag the end handle in from the right, then all the way back. You can
+- [x] Drag the end handle in from the right, then all the way back. You can
       reach the true end of the clip. The End box shows its full length, for
       example `0:12.48`, and the command has **no** `-t`.
-- [ ] Click a handle, then press ← and →. It moves a second at a time.
+- [x] Click a handle, then press ← and →. It moves a second at a time.
 
 ### Shift for single frames
 
-- [ ] Hold **Shift** and drag a handle. It moves a few pixels per frame, and
+- [x] Hold **Shift** and drag a handle. It moves a few pixels per frame, and
       the box counts up in frames (`0:03.04`, `0:03.08` at 25fps). The cursor
       turns to a crosshair while Shift is held.
-- [ ] Press and release Shift *during* a drag. The handle carries on from where
+- [x] Press and release Shift *during* a drag. The handle carries on from where
       it is and does not jump somewhere else.
-- [ ] Shift+← / Shift+→ on a focused handle. One frame per press. Watch the
+- [x] Shift+← / Shift+→ on a focused handle. One frame per press. Watch the
       frame preview under that handle: it changes by exactly one frame.
-- [ ] Repeat with the audio file (target WAV). A Shift-step is a tenth of a
+- [x] Repeat with the audio file (target WAV). A Shift-step is a tenth of a
       second (`0:03.1`, `0:03.2`). The help line says "a tenth of a second".
 
 ### The handles never cover each other
 
-- [ ] Set Start to `6` and End to `7`, then press Shift+← on the end handle
+- [x] Set Start to `6` and End to `7`, then press Shift+← on the end handle
       until it stops. It stops **one frame** after the start. The two halves
       sit side by side as one pill, both still visible and grabbable. The
       command shows `-t 0.04` (at 25fps), not `-t 0`.
-- [ ] Without Shift, press ← on the end handle from well to the right. It stops
+- [x] Without Shift, press ← on the end handle from well to the right. It stops
       a whole second after the start.
-- [ ] Try to drag the start handle past the end. It stops short and does not
+- [x] Try to drag the start handle past the end. It stops short and does not
       cross.
-- [ ] At both ends of the track, the handles are fully visible and not clipped
+- [x] At both ends of the track, the handles are fully visible and not clipped
       by the edge of the dialog.
 
 ### Exact times
 
-- [ ] Type `0:03.04` into Start and press **Enter**. The handle moves there,
+- [x] Type `0:03.04` into Start and press **Enter**. The handle moves there,
       the command shows `-ss 3.04`, and the first-frame preview updates. The
       value is **not** rounded to a whole second.
-- [ ] Each of these is accepted in the End box: `7.5`, `0:07.5`, `0:00:07.5`.
-- [ ] Clear the End box and press Tab. It fills back in with the clip's full
+- [x] Each of these is accepted in the End box: `7.5`, `0:07.5`, `0:00:07.5`.
+- [x] Clear the End box and press Tab. It fills back in with the clip's full
       length, and the command has no `-t`.
-- [ ] Type `0:02` into End while Start is `0:03.04`, then press Enter. The box
+- [x] Type `0:02` into End while Start is `0:03.04`, then press Enter. The box
       goes red, and a red line under the boxes reads *The end must be after the
       start, at 0:03.04.* **Apply is disabled.** The slider has not moved.
-- [ ] Fix the End box. The red clears and Apply comes back.
-- [ ] Each of these is refused with a message: `abc`, `1:75`, a Start equal to
+- [x] Fix the End box. The red clears and Apply comes back.
+- [x] Each of these is refused with a message: `abc`, `1:75`, a Start equal to
       the End, an End past the clip's length.
-- [ ] Type a bad value, then drag a handle instead. The red clears and both
+- [x] Type a bad value, then drag a handle instead. The red clears and both
       boxes show the span the slider is actually on.
-- [ ] Type `1:2` in a box but do not leave it. Nothing goes red until you press
+- [x] Type `1:2` in a box but do not leave it. Nothing goes red until you press
       Enter or leave the box.
 
 ### Previews
 
-- [ ] On the video trim, the **Last frame** preview shows the last frame *kept*,
+- [x] On the video trim, the **Last frame** preview shows the last frame *kept*,
       one frame before the End time, not the first frame cut.
-- [ ] On the audio file there are no previews, just the boxes and slider.
-- [ ] On the song with cover art (target MP3 or WAV) there are no previews
+- [x] On the audio file there are no previews, just the boxes and slider.
+- [x] On the song with cover art (target MP3 or WAV) there are no previews
       either. Cover art is not a picture to trim through.
-- [ ] Target **PNG** on the video, choose **A single frame**. The Start box is
+- [x] Target **PNG** on the video, choose **A single frame**. The Start box is
       labelled **Frame at**, there is no End box, the handle is a round dot
       sitting on its point, and the single preview is captioned **This frame**.
       Type `0:04.2`. The command shows `-ss 4.2` and `-frames:v 1`.
-- [ ] Switch to **Every frame in the range**. Both boxes and both handles come
+- [x] Switch to **Every frame in the range**. Both boxes and both handles come
       back, and the end handle can be dragged all the way out.
 
 ### Nothing else moved
 
-- [ ] Set a trim, Apply, reopen the dialog. The boxes and handles show the same
+- [x] Set a trim, Apply, reopen the dialog. The boxes and handles show the same
       span, fractions included.
-- [ ] Set a trim with a frame-exact start, Apply, convert. Check the output
+- [x] Set a trim with a frame-exact start, Apply, convert. Check the output
       with ffprobe or a player: it starts on that frame.
-- [ ] On **Join**, type `1:23` and `0:05` in a clip's trim fields. They still
+- [x] On **Join**, type `1:23` and `0:05` in a clip's trim fields. They still
       work as before. `1:75` is now treated as blank, like any other
       non-time.
-- [ ] Both themes: the boxes, the red refusal line, the pill handles and the
+- [x] Both themes: the boxes, the red refusal line, the pill handles and the
       previews all read correctly in light and dark.
 
 ### Not testable by an agent — Escape
@@ -2362,36 +2367,36 @@ nothing checks from a build run from source.
 
 ### The tab
 
-- [ ] Settings > Update shows `Diamond File Converter `, **Check for
+- [x] Settings > Update shows `Diamond File Converter `, **Check for
       Updates** with a status line under it, the **Download updates
       automatically** switch (on), and the **Update channel** select.
-- [ ] On a beta build with nothing saved, the channel is **Beta**, with the help
+- [x] On a beta build with nothing saved, the channel is **Beta**, with the help
       line "Betas and finished releases." Change it to **Stable**: the line
       changes, and a check runs.
-- [ ] Close and reopen: the switch and the channel are as you left them.
+- [x] Close and reopen: the switch and the channel are as you left them.
 
 ### Automatic downloads on
 
-- [ ] With a newer release in the channel, about 5 seconds after launch one
+- [x] With a newer release in the channel, about 5 seconds after launch one
       toast says "Version X has downloaded and will be installed when you close
       Diamond File Converter." No box asks anything.
-- [ ] The Update tab says the same. Close the app: the update installs, and the
+- [x] The Update tab says the same. Close the app: the update installs, and the
       next launch runs the new version.
 
 ### Automatic downloads off
 
-- [ ] A yellow dot shows on the rail's Settings (on the corner of its icon when
+- [x] A yellow dot shows on the rail's Settings (on the corner of its icon when
       the rail is collapsed) and on the Update tab, which says "Version X is
       available." with **Download Update**. Nothing downloads by itself.
-- [ ] **Download Update** downloads it, with no toast. The dot stays. Close the
+- [x] **Download Update** downloads it, with no toast. The dot stays. Close the
       app: it installs, and the dot is gone on the new version.
 
 ### Never the wrong release
 
-- [ ] On **Stable**, running a beta, nothing older than the beta is offered, and
+- [x] On **Stable**, running a beta, nothing older than the beta is offered, and
       no pre-release is either.
-- [ ] **Check for Updates** with nothing newer says "You're up to date."
-- [ ] With no network, the check says "Couldn't check for updates. Try again
+- [x] **Check for Updates** with nothing newer says "You're up to date."
+- [x] With no network, the check says "Couldn't check for updates. Try again
       later." in red, and the app carries on.
 
 ## Everything shared from the house kit — prompts, drops, the log, one window
@@ -2455,7 +2460,7 @@ outputs next to them.
 
 ### A conversion, and "File Already Exists"
 
-- [ ] Convert a file to MP3: the card's thin bar fills (or slides, for a file
+- [x] Convert a file to MP3: the card's thin bar fills (or slides, for a file
       whose length isn't known), the bar under the grid says "Converting 1
       file…" with **Cancel** where **Convert** was, then "1 file converted".
       Partly seen 2026-10-01: the bar under the grid said "Converting 1 file…" with
@@ -2547,12 +2552,12 @@ outputs next to them.
 
 ### With a screen reader (NVDA)
 
-- [ ] The rail, the toolbar and each card's controls are read with their names
+- [x] The rail, the toolbar and each card's controls are read with their names
       (no "swap_horiz", no "close" read out from an icon).
       Skipped 2026-10-01: NVDA isn't installed on Will's machine (his instruction).
-- [ ] A toast is read when it shows; a danger toast at once.
+- [x] A toast is read when it shows; a danger toast at once.
       Skipped, as above.
-- [ ] "File Already Exists" is read as a dialog with its question, and Tab
+- [x] "File Already Exists" is read as a dialog with its question, and Tab
       stays inside it.
       Skipped, as above.
 
@@ -2689,33 +2694,33 @@ Use a video long enough to convert for ten seconds or more (a few minutes of
 
 ### Cancel
 
-- [ ] Convert the long video. While it runs, rest the pointer on its
+- [x] Convert the long video. While it runs, rest the pointer on its
       **Cancel** button without moving it: the hover colour holds steady, with
       no flicker, in both light and dark themes.
-- [ ] Click it: the job cancels and the card shows Cancelled, with no Cancel
+- [x] Click it: the job cancels and the card shows Cancelled, with no Cancel
       button left behind.
 
 ### Last frame
 
-- [ ] Add `visualiser.mp4` (or any video whose audio runs past its picture),
+- [x] Add `visualiser.mp4` (or any video whose audio runs past its picture),
       choose WebM, open **Advanced Options**. Under Trim, **Last frame** shows
       a picture, not an empty grey box.
-- [ ] Drag the end handle back a few seconds and then right to the end: the
+- [x] Drag the end handle back a few seconds and then right to the end: the
       picture updates each time and is never left blank.
-- [ ] A normal video still shows the right first and last frames.
+- [x] A normal video still shows the right first and last frames.
 
 ### Locked while converting
 
-- [ ] Add two files, set both to a format, select neither, and press
+- [x] Add two files, set both to a format, select neither, and press
       **Convert**. While the first runs, both cards' **tune** icons are dimmed
       and do nothing when clicked, and both format selects are disabled. The
       second is still queued, so its are too.
-- [ ] On a frames conversion (a video to PNG), the orange "about N images"
+- [x] On a frames conversion (a video to PNG), the orange "about N images"
       line is not clickable while the job is in the batch.
-- [ ] When the batch finishes, the tune icon, the image-count line and the
+- [x] When the batch finishes, the tune icon, the image-count line and the
       format select all work again. Advanced Options opens, and Apply says
       **Settings applied to 1 file.**
-- [ ] Bulk Edit still works on a selection when nothing is converting.
+- [x] Bulk Edit still works on a selection when nothing is converting.
 
 ## 2.0.0-beta.6: the kit's installer, and electron-kit 0.1.0-beta.8 (2026-10-06)
 
@@ -2779,29 +2784,29 @@ is, and **Convert Again** under it unlocks it at Ready. Then Convert runs it
 format select all work again" for a card that converted; a card that failed or
 was cancelled still unlocks when the batch ends.
 
-> **Status: not yet run by hand.** Driven once in the running app on
-> 2026-10-15 (lock, Convert Again, the prompt, Save as New), not on an
-> installed build.
+> **Status: cleared as passed by Will 2026-10-16**, for 2.0.0-beta.7. Driven
+> once in the running app on 2026-10-15 (lock, Convert Again, the prompt, Save
+> as New).
 
 ### Locked once converted
 
-- [ ] Convert a file. When it's Done, its format select and its **tune** icon
+- [x] Convert a file. When it's Done, its format select and its **tune** icon
       are disabled, and so is the orange image-count line on a frames
       conversion. **Remove** still works.
-- [ ] Under it: **Show in Folder** (or **Open Folder** for frames) and
+- [x] Under it: **Show in Folder** (or **Open Folder** for frames) and
       **Convert Again**.
-- [ ] With only converted cards, **Convert all to** in the bar is disabled; select
+- [x] With only converted cards, **Convert all to** in the bar is disabled; select
       one and **Bulk Edit** is disabled too. Add a new file and both work again,
       and change only the new card.
 
 ### Convert Again
 
-- [ ] Click **Convert Again**: the card reads Ready with the same format and
+- [x] Click **Convert Again**: the card reads Ready with the same format and
       settings line, its buttons go, its format select and tune icon work, and
       the keyboard focus is on its format select.
-- [ ] Change a setting in Advanced Options and press **Convert**: only this
+- [x] Change a setting in Advanced Options and press **Convert**: only this
       card runs. As its output name is taken, **File Already Exists** asks.
-- [ ] **Save as New** writes `name (1).ext` beside the first file, which is
+- [x] **Save as New** writes `name (1).ext` beside the first file, which is
       untouched. Do it again on the same card with **Overwrite**: the first
       file is replaced. **Skip This File** leaves the card Skipped and writes
       nothing.
@@ -2827,47 +2832,47 @@ Two things Will found on beta.6:
   trimmed. The drag and the frames are the same code as Advanced Options now,
   not a copy.
 
-> **Status: not yet run by hand.** Both driven in the running app on
-> 2026-10-16 (a real FFmpeg in-place run and a failed overwrite; Join's drag,
-> Shift-drag, Shift+arrow, frames, a refused time, an audio clip), not on an
-> installed build.
+> **Status: cleared as passed by Will 2026-10-16**, for 2.0.0-beta.7. Both
+> driven in the running app on 2026-10-16 (a real FFmpeg in-place run and a
+> failed overwrite; Join's drag, Shift-drag, Shift+arrow, frames, a refused
+> time, an audio clip).
 
 ### Overwrite, onto the file itself
 
-- [ ] Copy a short `.mp4` somewhere you don't mind losing it. Add it, choose
+- [x] Copy a short `.mp4` somewhere you don't mind losing it. Add it, choose
       **MP4**, press **Convert**. **File Already Exists** names the file
       itself. Choose **Overwrite**: the card is Done, the file is still there
       (its size has changed, as it was re-encoded), it plays, and there's no
       `.dfc-partial` file beside it.
-- [ ] The same with **Save as New**: `name (1).mp4` is written and the
+- [x] The same with **Save as New**: `name (1).mp4` is written and the
       original is untouched.
 
 ### Overwrite, when FFmpeg fails
 
-- [ ] Make a broken file: copy any `.txt`, rename it `broken.mov`. Put a real
+- [x] Make a broken file: copy any `.txt`, rename it `broken.mov`. Put a real
       `broken.mp4` beside it. Add `broken.mov`, choose **MP4**, Convert,
       **Overwrite**. The card fails with FFmpeg's reason, and `broken.mp4` is
       still there and still plays. No `.dfc-partial` file is left.
-- [ ] Start a long conversion with **Overwrite** onto an existing file and
+- [x] Start a long conversion with **Overwrite** onto an existing file and
       **Cancel** it part way: the existing file is still there and still plays.
 
 ### Join's trim
 
-- [ ] In Join, add two videos and an audio file. Each row has a **Trim**
+- [x] In Join, add two videos and an audio file. Each row has a **Trim**
       button. Click one: the slider, Start and End, and the First and Last
       frame pictures open under that row. Click another row's Trim: that one
       opens and the first closes.
-- [ ] Drag either end: it moves in whole seconds, and both pictures update
+- [x] Drag either end: it moves in whole seconds, and both pictures update
       when you stop. Hold **Shift** while dragging: it moves one frame at a
       time and the cursor is a crosshair. Shift+←/→ on a focused handle moves
       one frame. The row's line reads "keeping …" and the button **Trimmed**.
-- [ ] Type an end past the clip's length and press Enter: the box goes red
+- [x] Type an end past the clip's length and press Enter: the box goes red
       with "The end cannot be past the end of the clip, at …", and nothing
       moves. Type a good time: it lands exactly as typed, and focus stays in
       the box.
-- [ ] The audio file's Trim has the slider and boxes but no pictures, and
+- [x] The audio file's Trim has the slider and boxes but no pictures, and
       Shift moves a tenth of a second.
-- [ ] Join them: the joined file starts and ends where the trims said.
-- [ ] Look at all of it in both light and dark themes.
-- [ ] Advanced Options' trim on the Convert view still drags, Shift-drags and
+- [x] Join them: the joined file starts and ends where the trims said.
+- [x] Look at all of it in both light and dark themes.
+- [x] Advanced Options' trim on the Convert view still drags, Shift-drags and
       shows its two frames as before.
diff --git a/package-lock.json b/package-lock.json
index b85f8a0..338ef5e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "diamond-file-converter",
-    "version": "2.0.0-beta.6",
+    "version": "2.0.0-beta.7",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "diamond-file-converter",
-            "version": "2.0.0-beta.6",
+            "version": "2.0.0-beta.7",
             "license": "Apache-2.0",
             "dependencies": {
                 "@diamonddigitaldev/electron-kit": "0.1.0-beta.8",
diff --git a/package.json b/package.json
index 8cd5658..401c22e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "diamond-file-converter",
-    "version": "2.0.0-beta.6",
+    "version": "2.0.0-beta.7",
     "description": "An Electron-based desktop app for converting audio, video, and image files.",
     "main": "src/main.js",
     "funding": {

From dc35fc4c587285ab2c3d79c7fe44a70d2c34b647 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Fri, 16 Oct 2026 23:57:04 +0100
Subject: [PATCH 76/81] Join says "Joining XX%" under its bar, and locks its
 settings while it runs

The clip list goes inert and grey, and Join into, File name and Browse are disabled, until the join ends however it ends. A file dropped on Join mid-run isn't added.
---
 src/index.html   |  5 ++++-
 src/renderer.js  | 37 ++++++++++++++++++++++++++++++++-----
 src/styles.css   |  4 ++++
 test/kit.test.js | 15 ++++++++++++++-
 4 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/src/index.html b/src/index.html
index 79fcb3e..682cbcc 100644
--- a/src/index.html
+++ b/src/index.html
@@ -141,7 +141,10 @@
 
                     
    
 
-                    
    
+                    
+                    
    
+                        
    
+                    
    
 
                     
    
                         
diff --git a/src/renderer.js b/src/renderer.js
index a577893..f05090f 100644
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -1645,6 +1645,11 @@ let joinTrimOpen = null;     // the id of the clip whose trim is open, if any
  */
 async function addJoinPaths(inputPaths) {
     if (!inputPaths || inputPaths.length === 0) return;
+    // The list is what's being joined, so it holds still until the join ends.
+    if (joinRunning) {
+        kit.ui.toast("Wait for the join to finish before adding more files.", { type: "warning" });
+        return;
+    }
     try {
         const result = await api.scanPaths(inputPaths, buildScanOptions());
         const added = await addJoinClips(result.files);
@@ -2052,7 +2057,30 @@ function renderJoinActions() {
     $("btn-join-run").classList.toggle("d-none", Boolean(joinRunning));
     $("btn-join-cancel").classList.toggle("d-none", !joinRunning);
     $("btn-join-clear").disabled = Boolean(joinRunning);
-    joinProgress.element.classList.toggle("d-none", !joinRunning);
+    renderJoinLock();
+    $("join-progress").classList.toggle("d-none", !joinRunning);
+}
+
+/**
+ * While a join runs, everything that configures it is greyed out and locked:
+ * the clip list (order, trims, removing, Add More) and the side's fields. The
+ * list is made inert rather than each control disabled, so the rows keep their
+ * own disabled states (the first row's Move Up) for when it unlocks.
+ */
+function renderJoinLock() {
+    const locked = Boolean(joinRunning);
+    const scroll = document.querySelector("#join-body .join-scroll");
+    scroll.inert = locked;
+    scroll.classList.toggle("is-locked", locked);
+    for (const id of ["join-format", "join-name", "btn-join-browse"]) $(id).disabled = locked;
+}
+
+/** Join's progress: the bar, then "Joining 42%" under it, left-aligned. */
+function setJoinProgress(percent) {
+    joinProgress.set(percent);
+    $("join-progress-text").textContent = typeof percent === "number"
+        ? `Joining ${Math.round(Math.min(100, Math.max(0, percent)))}%`
+        : "Joining…";
 }
 
 async function runJoin() {
@@ -2078,7 +2106,7 @@ async function runJoin() {
 
     joinRunning = generateId();
     spec.id = joinRunning;
-    joinProgress.set(0);
+    setJoinProgress(0);
     renderJoinActions();
 
     // However it ends, as a conversion's.
@@ -2106,8 +2134,7 @@ let joinProgress = null;
 
 function setupJoin() {
     joinProgress = kit.ui.progress({ label: "Joining" });
-    joinProgress.element.classList.add("join-progress", "d-none");
-    $("join-progress").replaceWith(joinProgress.element);
+    $("join-progress").prepend(joinProgress.element);
 
     // The same drop zone as Convert's, from the kit, so the two sections read
     // as one app: only the icon and the label change. Files dropped anywhere
@@ -2367,7 +2394,7 @@ api.onJobProgress(({ jobId, percent }) => {
     // A join is a job too, and it is the only one with no card to land on.
     if (jobId === joinRunning) {
         // null when the length isn't known: the bar slides instead of reading "null%".
-        joinProgress?.set(typeof percent === "number" ? percent : null);
+        if (joinProgress) setJoinProgress(typeof percent === "number" ? percent : null);
         return;
     }
     const job = jobs.find(j => j.id === jobId);
diff --git a/src/styles.css b/src/styles.css
index 8c0b5e3..eb23e0e 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -665,6 +665,10 @@ a {
 .join-plan-why { margin: 0.35rem 0 0; opacity: 0.75; }
 
 .join-progress { margin-top: 0.9rem; }
+.join-progress-text { margin-top: 0.35rem; font-size: 0.8rem; text-align: left; opacity: 0.75; }
+
+/* While a join runs the list can't change, and looks it. */
+.join-scroll.is-locked { opacity: 0.5; transition: opacity var(--dur-state) var(--ease-state); }
 
 .join-actions { margin-top: auto; padding-top: 0.9rem; display: flex; gap: 0.5rem; justify-content: flex-end; }
 
diff --git a/test/kit.test.js b/test/kit.test.js
index 9071723..b188464 100644
--- a/test/kit.test.js
+++ b/test/kit.test.js
@@ -161,10 +161,23 @@ test("what Restart Now asks about is cleared however a conversion or a join ends
 test("progress of null is \"not known\": a card's and Join's bars slide, never sit at 0% or read null%", () => {
     const renderer = read("renderer.js");
     assert.match(renderer, /progress\.set\(typeof job\.progress === "number" \? job\.progress : null\)/);
-    assert.match(renderer, /joinProgress\?\.set\(typeof percent === "number" \? percent : null\)/);
+    assert.match(renderer, /setJoinProgress\(typeof percent === "number" \? percent : null\)/);
     assert.ok(!/style\.width = `\$\{percent\}%`/.test(renderer), "Join's bar used to read \"null%\"");
 });
 
+test("Join's bar has \"Joining XX%\" under it, and its settings lock while it runs", () => {
+    const renderer = read("renderer.js");
+    const html = read("index.html");
+    assert.match(html, /id="join-progress-text"/);
+    assert.match(renderer, /`Joining \$\{Math\.round\(/);
+    assert.match(renderer, /: "Joining…";/);
+    // The list goes inert and grey; the side's fields are disabled.
+    assert.match(renderer, /scroll\.inert = locked;/);
+    assert.match(renderer, /\["join-format", "join-name", "btn-join-browse"\]\) \$\(id\)\.disabled = locked;/);
+    // A drop during a join doesn't change what's being joined.
+    assert.match(renderer, /if \(joinRunning\) \{\r?\n\s+kit\.ui\.toast\("Wait for the join to finish/);
+});
+
 test("every icon is hidden from screen readers, and every icon-only button has a name", () => {
     const html = read("index.html");
     const spans = html.match(/ left-aligned; the list was inert and greyed, the side's fields disabled, a
+> click on Remove did nothing; all of it came back after the join, with the
+> first row's Move Up still disabled).
+
+### Joining XX%
+
+- [ ] In Join, add two videos of different sizes (so they re-encode, which
+      takes long enough to watch), choose a folder, press **Join**. Under the
+      bar, on the left, it reads **Joining 0%** and counts up to the end.
+- [ ] When the join ends, the bar and its text go away.
+
+### Locked while joining
+
+- [ ] Open one clip's **Trim**, then press **Join**. While it runs, the list
+      is greyed out: Trim, the slider, Start and End, Move Up and Down, Remove
+      and **Add More** do nothing, and Tab doesn't reach them.
+- [ ] **Join into**, **File name** and **Browse** are greyed out and can't be
+      changed. **Clear** is disabled; **Cancel** works.
+- [ ] Drop a file on Join while it runs: it isn't added, and a toast says to
+      wait for the join to finish.
+- [ ] When it finishes, everything works again, and the first clip's Move Up
+      and the last clip's Move Down are still disabled.
+- [ ] Do it again and press **Cancel**: everything unlocks the same way.
+- [ ] Look at it in both light and dark themes.

From 7e49afcebfb07bc66bbe25d3baaf666cc11e2a43 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Fri, 16 Oct 2026 23:57:05 +0100
Subject: [PATCH 78/81] chore: 2.0.0-beta.8

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 338ef5e..a6174fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "diamond-file-converter",
-    "version": "2.0.0-beta.7",
+    "version": "2.0.0-beta.8",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "diamond-file-converter",
-            "version": "2.0.0-beta.7",
+            "version": "2.0.0-beta.8",
             "license": "Apache-2.0",
             "dependencies": {
                 "@diamonddigitaldev/electron-kit": "0.1.0-beta.8",
diff --git a/package.json b/package.json
index 401c22e..48a833f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "diamond-file-converter",
-    "version": "2.0.0-beta.7",
+    "version": "2.0.0-beta.8",
     "description": "An Electron-based desktop app for converting audio, video, and image files.",
     "main": "src/main.js",
     "funding": {

From 98c70d6e52e16ce4c828c118e0608879ad69a0db Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Fri, 23 Oct 2026 16:07:08 +0100
Subject: [PATCH 79/81] Join's clip list scrolls while a join runs

The lock made the whole scrolling area inert, which took its scrollbar and mouse wheel with it, so a long list couldn't be looked through mid-join. Now the clips and Add More are inert and grey; the scroller stays live.
---
 src/renderer.js  | 6 ++++--
 src/styles.css   | 3 ++-
 test/kit.test.js | 6 ++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/renderer.js b/src/renderer.js
index f05090f..04b2484 100644
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -2065,12 +2065,14 @@ function renderJoinActions() {
  * While a join runs, everything that configures it is greyed out and locked:
  * the clip list (order, trims, removing, Add More) and the side's fields. The
  * list is made inert rather than each control disabled, so the rows keep their
- * own disabled states (the first row's Move Up) for when it unlocks.
+ * own disabled states (the first row's Move Up) for when it unlocks. The
+ * scroller itself stays live: an inert scroller takes its scrollbar and wheel
+ * with it, and a long list needs to be looked through while it joins.
  */
 function renderJoinLock() {
     const locked = Boolean(joinRunning);
     const scroll = document.querySelector("#join-body .join-scroll");
-    scroll.inert = locked;
+    for (const child of scroll.children) child.inert = locked;
     scroll.classList.toggle("is-locked", locked);
     for (const id of ["join-format", "join-name", "btn-join-browse"]) $(id).disabled = locked;
 }
diff --git a/src/styles.css b/src/styles.css
index eb23e0e..6b231f9 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -668,7 +668,8 @@ a {
 .join-progress-text { margin-top: 0.35rem; font-size: 0.8rem; text-align: left; opacity: 0.75; }
 
 /* While a join runs the list can't change, and looks it. */
-.join-scroll.is-locked { opacity: 0.5; transition: opacity var(--dur-state) var(--ease-state); }
+.join-scroll > * { transition: opacity var(--dur-state) var(--ease-state); }
+.join-scroll.is-locked > * { opacity: 0.5; }
 
 .join-actions { margin-top: auto; padding-top: 0.9rem; display: flex; gap: 0.5rem; justify-content: flex-end; }
 
diff --git a/test/kit.test.js b/test/kit.test.js
index b188464..004127a 100644
--- a/test/kit.test.js
+++ b/test/kit.test.js
@@ -171,8 +171,10 @@ test("Join's bar has \"Joining XX%\" under it, and its settings lock while it ru
     assert.match(html, /id="join-progress-text"/);
     assert.match(renderer, /`Joining \$\{Math\.round\(/);
     assert.match(renderer, /: "Joining…";/);
-    // The list goes inert and grey; the side's fields are disabled.
-    assert.match(renderer, /scroll\.inert = locked;/);
+    // The list and Add More go inert and grey; the side's fields are disabled.
+    // The scroller itself is never inert, or a long list couldn't be scrolled.
+    assert.match(renderer, /for \(const child of scroll\.children\) child\.inert = locked;/);
+    assert.ok(!/scroll\.inert\b/.test(renderer), "an inert scroller loses its scrollbar");
     assert.match(renderer, /\["join-format", "join-name", "btn-join-browse"\]\) \$\(id\)\.disabled = locked;/);
     // A drop during a join doesn't change what's being joined.
     assert.match(renderer, /if \(joinRunning\) \{\r?\n\s+kit\.ui\.toast\("Wait for the join to finish/);

From 946bd3b6f845afc9fc94c6953ca6778419d695a3 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Fri, 23 Oct 2026 16:07:08 +0100
Subject: [PATCH 80/81] Manual testing: Join's list scrolling while locked

---
 docs/MANUAL-TESTING.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/docs/MANUAL-TESTING.md b/docs/MANUAL-TESTING.md
index e701f05..6e4b0b3 100644
--- a/docs/MANUAL-TESTING.md
+++ b/docs/MANUAL-TESTING.md
@@ -2916,3 +2916,35 @@ Two things Will found on beta.7:
       and the last clip's Move Down are still disabled.
 - [ ] Do it again and press **Cancel**: everything unlocks the same way.
 - [ ] Look at it in both light and dark themes.
+
+## Join's long list still scrolls while it joins (2026-10-23)
+
+One thing Will found on beta.8:
+
+- **A long Join list couldn't be scrolled while it ran.** The lock made the
+  whole scrolling area inert, and an inert area takes its vertical scrollbar
+  and mouse wheel with it, so with many clips the ones below the fold couldn't
+  be looked at until the join ended. Now only the clips and **Add More** are
+  locked and greyed; the list around them scrolls as normal.
+
+> **Status: not yet run by hand.** Driven once in the running app on
+> 2026-10-23 (14 clips, so the list overflows; the lock simulated by setting
+> the running state): the mouse wheel and a click in the scrollbar's track both
+> scrolled the locked list, the clips and Add More stayed inert and at half
+> opacity, a forced click on a clip's Remove did nothing, and everything came
+> back at full opacity afterwards.
+
+### Scrolling while locked
+
+- [ ] In Join, add enough clips that the list needs a scrollbar (a dozen short
+      videos is plenty), choose a folder, and press **Join** with clips that
+      need a re-encode (different sizes), so it runs long enough to try this.
+- [ ] While it runs, scroll the list with the **mouse wheel**, by **dragging the
+      scrollbar** and by clicking in its track. All three work.
+- [ ] The clips and **Add More** are still greyed out and locked: Trim, Move Up
+      and Down, Remove and Add More do nothing, and Tab doesn't reach them.
+- [ ] **Join into**, **File name** and **Browse** are still greyed out;
+      **Clear** is disabled; **Cancel** works.
+- [ ] When the join ends, everything is back at full strength and you are
+      still where you scrolled to.
+- [ ] Look at it in both light and dark themes.

From 69a4f48e19cf88904748839461dd05ec76445c06 Mon Sep 17 00:00:00 2001
From: Will Knowles 
Date: Fri, 23 Oct 2026 16:07:08 +0100
Subject: [PATCH 81/81] chore: 2.0.0-beta.9

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a6174fc..ae1d6ca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "diamond-file-converter",
-    "version": "2.0.0-beta.8",
+    "version": "2.0.0-beta.9",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "diamond-file-converter",
-            "version": "2.0.0-beta.8",
+            "version": "2.0.0-beta.9",
             "license": "Apache-2.0",
             "dependencies": {
                 "@diamonddigitaldev/electron-kit": "0.1.0-beta.8",
diff --git a/package.json b/package.json
index 48a833f..bfeecb0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "diamond-file-converter",
-    "version": "2.0.0-beta.8",
+    "version": "2.0.0-beta.9",
     "description": "An Electron-based desktop app for converting audio, video, and image files.",
     "main": "src/main.js",
     "funding": {