@@ -218,6 +249,24 @@ export function buildFirstRunSetupHtml(model: FirstRunSetupHtmlModel): string {
.badge.warn { background: rgba(238, 212, 159, 0.18); color: var(--yellow); }
.badge.muted { background: rgba(184, 192, 224, 0.12); color: var(--muted); }
.badge.danger { background: rgba(237, 135, 150, 0.16); color: var(--red); }
+ .path-form {
+ display: grid;
+ gap: 8px;
+ margin-top: 12px;
+ }
+ .path-form input[type='text'] {
+ width: 100%;
+ box-sizing: border-box;
+ border: 1px solid rgba(202, 211, 245, 0.12);
+ border-radius: 10px;
+ padding: 9px 10px;
+ color: var(--text);
+ background: rgba(30, 32, 48, 0.72);
+ font: inherit;
+ }
+ .path-form input[type='text']::placeholder {
+ color: rgba(184, 192, 224, 0.65);
+ }
.actions {
display: grid;
grid-template-columns: 1fr 1fr;
@@ -282,6 +331,7 @@ export function buildFirstRunSetupHtml(model: FirstRunSetupHtmlModel): string {
${renderStatusBadge(yomitanBadgeLabel, yomitanBadgeTone)}
+ ${mpvExecutablePathCard}
${windowsShortcutCard}
@@ -303,6 +353,7 @@ export function parseFirstRunSetupSubmissionUrl(rawUrl: string): FirstRunSetupSu
const parsed = new URL(rawUrl);
const action = parsed.searchParams.get('action');
if (
+ action !== 'configure-mpv-executable-path' &&
action !== 'install-plugin' &&
action !== 'configure-windows-mpv-shortcuts' &&
action !== 'open-yomitan-settings' &&
@@ -311,6 +362,12 @@ export function parseFirstRunSetupSubmissionUrl(rawUrl: string): FirstRunSetupSu
) {
return null;
}
+ if (action === 'configure-mpv-executable-path') {
+ return {
+ action,
+ mpvExecutablePath: parsed.searchParams.get('mpvExecutablePath') ?? '',
+ };
+ }
if (action === 'configure-windows-mpv-shortcuts') {
return {
action,
diff --git a/src/main/runtime/windows-mpv-launch.test.ts b/src/main/runtime/windows-mpv-launch.test.ts
index b1f39f17..54d2e5f6 100644
--- a/src/main/runtime/windows-mpv-launch.test.ts
+++ b/src/main/runtime/windows-mpv-launch.test.ts
@@ -29,6 +29,19 @@ test('resolveWindowsMpvPath prefers SUBMINER_MPV_PATH', () => {
assert.equal(resolved, 'C:\\mpv\\mpv.exe');
});
+test('resolveWindowsMpvPath prefers configured executable path before PATH', () => {
+ const resolved = resolveWindowsMpvPath(
+ createDeps({
+ getEnv: () => undefined,
+ runWhere: () => ({ status: 0, stdout: 'C:\\tools\\mpv.exe\r\n' }),
+ fileExists: (candidate) => candidate === 'C:\\mpv\\mpv.exe',
+ }),
+ ' C:\\mpv\\mpv.exe ',
+ );
+
+ assert.equal(resolved, 'C:\\mpv\\mpv.exe');
+});
+
test('resolveWindowsMpvPath falls back to where.exe output', () => {
const resolved = resolveWindowsMpvPath(
createDeps({
@@ -132,7 +145,7 @@ test('launchWindowsMpv reports missing mpv path', () => {
assert.equal(result.ok, false);
assert.equal(result.mpvPath, '');
- assert.match(errors[0] ?? '', /Could not find mpv\.exe/i);
+ assert.match(errors[0] ?? '', /mpv\.executablePath/i);
});
test('launchWindowsMpv spawns detached mpv with targets', () => {
diff --git a/src/main/runtime/windows-mpv-launch.ts b/src/main/runtime/windows-mpv-launch.ts
index 44a71be3..0d966e86 100644
--- a/src/main/runtime/windows-mpv-launch.ts
+++ b/src/main/runtime/windows-mpv-launch.ts
@@ -13,7 +13,15 @@ function normalizeCandidate(candidate: string | undefined): string {
return typeof candidate === 'string' ? candidate.trim() : '';
}
-export function resolveWindowsMpvPath(deps: WindowsMpvLaunchDeps): string {
+export function resolveWindowsMpvPath(
+ deps: WindowsMpvLaunchDeps,
+ configuredMpvPath = '',
+): string {
+ const configPath = normalizeCandidate(configuredMpvPath);
+ if (configPath && deps.fileExists(configPath)) {
+ return configPath;
+ }
+
const envPath = normalizeCandidate(deps.getEnv('SUBMINER_MPV_PATH'));
if (envPath && deps.fileExists(envPath)) {
return envPath;
@@ -97,12 +105,13 @@ export function launchWindowsMpv(
extraArgs: string[] = [],
binaryPath?: string,
pluginEntrypointPath?: string,
+ configuredMpvPath?: string,
): { ok: boolean; mpvPath: string } {
- const mpvPath = resolveWindowsMpvPath(deps);
+ const mpvPath = resolveWindowsMpvPath(deps, configuredMpvPath);
if (!mpvPath) {
deps.showError(
'SubMiner mpv launcher',
- 'Could not find mpv.exe. Install mpv and add it to PATH, or set SUBMINER_MPV_PATH.',
+ 'Could not find mpv.exe. Set mpv.executablePath, set SUBMINER_MPV_PATH, or add mpv.exe to PATH.',
);
return { ok: false, mpvPath: '' };
}
diff --git a/src/types/config.ts b/src/types/config.ts
index fd44f4eb..a775a87f 100644
--- a/src/types/config.ts
+++ b/src/types/config.ts
@@ -50,6 +50,10 @@ export interface TexthookerConfig {
openBrowser?: boolean;
}
+export interface MpvConfig {
+ executablePath?: string;
+}
+
export type SubsyncMode = 'auto' | 'manual';
export interface SubsyncConfig {
@@ -90,6 +94,7 @@ export interface Config {
websocket?: WebSocketConfig;
annotationWebsocket?: AnnotationWebSocketConfig;
texthooker?: TexthookerConfig;
+ mpv?: MpvConfig;
controller?: ControllerConfig;
ankiConnect?: AnkiConnectConfig;
shortcuts?: ShortcutsConfig;
@@ -122,6 +127,9 @@ export interface ResolvedConfig {
websocket: Required
;
annotationWebsocket: Required;
texthooker: Required;
+ mpv: {
+ executablePath: string;
+ };
controller: {
enabled: boolean;
preferredGamepadId: string;