feat(config): add configuration window (#70)

launcher/config/args-normalizer.test.ts

@@ -124,6 +124,7 @@ test('applyInvocationsToArgs maps config and jellyfin invocation state', () => {
       action: 'show',
       logLevel: 'warn',
     },
+    settingsInvocation: null,
     mpvInvocation: null,
     appInvocation: null,
     dictionaryTriggered: false,
@@ -159,13 +160,14 @@ test('applyInvocationsToArgs maps config and jellyfin invocation state', () => {
   assert.equal(parsed.logLevel, 'warn');
 });
 
-test('applyInvocationsToArgs maps bare config invocation to settings window', () => {
+test('applyInvocationsToArgs maps settings invocation to settings window', () => {
   const parsed = createDefaultArgs({});
 
   applyInvocationsToArgs(parsed, {
     jellyfinInvocation: null,
-    configInvocation: {
-      action: undefined,
+    configInvocation: null,
+    settingsInvocation: {
+      logLevel: undefined,
     },
     mpvInvocation: null,
     appInvocation: null,
@@ -190,16 +192,54 @@ test('applyInvocationsToArgs maps bare config invocation to settings window', ()
     texthookerOpenBrowser: false,
   });
 
-  assert.equal(parsed.configSettings, true);
+  assert.equal(parsed.settings, true);
   assert.equal(parsed.configPath, false);
 });
 
+test('applyInvocationsToArgs fails when config invocation has no action', () => {
+  const parsed = createDefaultArgs({});
+
+  const error = withProcessExitIntercept(() => {
+    applyInvocationsToArgs(parsed, {
+      jellyfinInvocation: null,
+      configInvocation: {
+        action: undefined,
+      },
+      settingsInvocation: null,
+      mpvInvocation: null,
+      appInvocation: null,
+      dictionaryTriggered: false,
+      dictionaryTarget: null,
+      dictionaryLogLevel: null,
+      dictionaryCandidates: false,
+      dictionarySelect: false,
+      dictionaryAnilistId: null,
+      statsTriggered: false,
+      statsBackground: false,
+      statsStop: false,
+      statsCleanup: false,
+      statsCleanupVocab: false,
+      statsCleanupLifetime: false,
+      statsLogLevel: null,
+      doctorTriggered: false,
+      doctorLogLevel: null,
+      doctorRefreshKnownWords: false,
+      texthookerTriggered: false,
+      texthookerLogLevel: null,
+      texthookerOpenBrowser: false,
+    });
+  });
+
+  assert.equal(error.code, 1);
+});
+
 test('applyInvocationsToArgs maps texthooker browser-open request', () => {
   const parsed = createDefaultArgs({});
 
   applyInvocationsToArgs(parsed, {
     jellyfinInvocation: null,
     configInvocation: null,
+    settingsInvocation: null,
     mpvInvocation: null,
     appInvocation: null,
     dictionaryTriggered: false,

launcher/config/args-normalizer.ts

@@ -118,7 +118,7 @@ export function createDefaultArgs(
   const youtubeAudioLangs = uniqueNormalizedLangCodes([...primarySubLangs, ...secondarySubLangs]);
 
   const parsed: Args = {
-    backend: 'auto',
+    backend: mpvConfig.backend ?? 'auto',
     directory: '.',
     recursive: false,
     profile: '',
@@ -158,7 +158,7 @@ export function createDefaultArgs(
     doctorRefreshKnownWords: false,
     version: false,
     update: false,
-    configSettings: false,
+    settings: false,
     configPath: false,
     configShow: false,
     mpvIdle: false,
@@ -222,7 +222,7 @@ export function applyRootOptionsToArgs(
   if (options.rofi === true) parsed.useRofi = true;
   if (options.update === true) parsed.update = true;
   if (options.version === true) parsed.version = true;
-  if (options.config === true) parsed.configSettings = true;
+  if (options.settings === true) parsed.settings = true;
   if (options.startOverlay === true) parsed.autoStartOverlay = true;
   if (options.texthooker === false) parsed.useTexthooker = false;
   if (typeof options.args === 'string') parsed.mpvArgs = options.args;
@@ -311,10 +311,19 @@ export function applyInvocationsToArgs(parsed: Args, invocations: CliInvocations
       parsed.logLevel = parseLogLevel(invocations.configInvocation.logLevel);
     }
     const action = (invocations.configInvocation.action || '').toLowerCase();
-    if (!action) parsed.configSettings = true;
-    else if (action === 'path') parsed.configPath = true;
+    if (action === 'path') parsed.configPath = true;
     else if (action === 'show') parsed.configShow = true;
-    else fail(`Unknown config action: ${invocations.configInvocation.action}`);
+    else
+      fail(
+        `Unknown config action: ${invocations.configInvocation.action || '(none)'}. Expected path or show.`,
+      );
+  }
+
+  if (invocations.settingsInvocation) {
+    if (invocations.settingsInvocation.logLevel) {
+      parsed.logLevel = parseLogLevel(invocations.settingsInvocation.logLevel);
+    }
+    parsed.settings = true;
   }
 
   if (invocations.mpvInvocation) {

launcher/config/cli-parser-builder.ts

@@ -22,6 +22,7 @@ export interface CommandActionInvocation {
 export interface CliInvocations {
   jellyfinInvocation: JellyfinInvocation | null;
   configInvocation: CommandActionInvocation | null;
+  settingsInvocation: CommandActionInvocation | null;
   mpvInvocation: CommandActionInvocation | null;
   appInvocation: { appArgs: string[] } | null;
   dictionaryTriggered: boolean;
@@ -58,7 +59,7 @@ function applyRootOptions(program: Command): void {
     .option('--start', 'Explicitly start overlay')
     .option('--log-level <level>', 'Log level')
     .option('-v, --version', 'Show SubMiner version')
-    .option('--config', 'Open configuration window')
+    .option('--settings', 'Open settings window')
     .option('-u, --update', 'Check for updates')
     .option('-R, --rofi', 'Use rofi picker')
     .option('-S, --start-overlay', 'Auto-start overlay')
@@ -88,6 +89,7 @@ function getTopLevelCommand(argv: string[]): { name: string; index: number } | n
     'jf',
     'doctor',
     'config',
+    'settings',
     'mpv',
     'dictionary',
     'dict',
@@ -138,6 +140,7 @@ export function parseCliPrograms(
 } {
   let jellyfinInvocation: JellyfinInvocation | null = null;
   let configInvocation: CommandActionInvocation | null = null;
+  let settingsInvocation: CommandActionInvocation | null = null;
   let mpvInvocation: CommandActionInvocation | null = null;
   let appInvocation: { appArgs: string[] } | null = null;
   let dictionaryTriggered = false;
@@ -293,7 +296,7 @@ export function parseCliPrograms(
 
   commandProgram
     .command('config')
-    .description('Config helpers')
+    .description('Config file helpers (path|show)')
     .argument('[action]', 'path|show')
     .option('--log-level <level>', 'Log level')
     .action((action: string | undefined, options: Record<string, unknown>) => {
@@ -303,6 +306,16 @@ export function parseCliPrograms(
       };
     });
 
+  commandProgram
+    .command('settings')
+    .description('Open SubMiner settings window')
+    .option('--log-level <level>', 'Log level')
+    .action((options: Record<string, unknown>) => {
+      settingsInvocation = {
+        logLevel: typeof options.logLevel === 'string' ? options.logLevel : undefined,
+      };
+    });
+
   commandProgram
     .command('mpv')
     .description('MPV helpers')
@@ -356,6 +369,7 @@ export function parseCliPrograms(
     invocations: {
       jellyfinInvocation,
       configInvocation,
+      settingsInvocation,
       mpvInvocation,
       appInvocation,
       dictionaryTriggered,

launcher/config/mpv-config.ts

@@ -1,6 +1,29 @@
 import { parseMpvLaunchMode } from '../../src/shared/mpv-launch-mode.js';
+import type { Backend } from '../types.js';
 import type { LauncherMpvConfig } from '../types.js';
 
+function parseBackend(value: unknown): Backend | undefined {
+  if (typeof value !== 'string') return undefined;
+  const normalized = value.trim().toLowerCase();
+  if (
+    normalized === 'auto' ||
+    normalized === 'hyprland' ||
+    normalized === 'sway' ||
+    normalized === 'x11' ||
+    normalized === 'macos' ||
+    normalized === 'windows'
+  ) {
+    return normalized;
+  }
+  return undefined;
+}
+
+function parseNonEmptyString(value: unknown): string | undefined {
+  if (typeof value !== 'string') return undefined;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : undefined;
+}
+
 export function parseLauncherMpvConfig(root: Record<string, unknown>): LauncherMpvConfig {
   const mpvRaw = root.mpv;
   if (!mpvRaw || typeof mpvRaw !== 'object') return {};
@@ -8,5 +31,14 @@ export function parseLauncherMpvConfig(root: Record<string, unknown>): LauncherM
 
   return {
     launchMode: parseMpvLaunchMode(mpv.launchMode),
+    socketPath: parseNonEmptyString(mpv.socketPath),
+    backend: parseBackend(mpv.backend),
+    autoStartSubMiner:
+      typeof mpv.autoStartSubMiner === 'boolean' ? mpv.autoStartSubMiner : undefined,
+    pauseUntilOverlayReady:
+      typeof mpv.pauseUntilOverlayReady === 'boolean' ? mpv.pauseUntilOverlayReady : undefined,
+    subminerBinaryPath: parseNonEmptyString(mpv.subminerBinaryPath),
+    aniskipEnabled: typeof mpv.aniskipEnabled === 'boolean' ? mpv.aniskipEnabled : undefined,
+    aniskipButtonKey: parseNonEmptyString(mpv.aniskipButtonKey),
   };
 }

launcher/config/plugin-runtime-config.ts

@@ -1,126 +1,76 @@
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
 import { log } from '../log.js';
-import type { LogLevel, PluginRuntimeConfig } from '../types.js';
+import type { Backend, LogLevel, PluginRuntimeConfig } from '../types.js';
 import { DEFAULT_SOCKET_PATH } from '../types.js';
+import { buildSubminerPluginRuntimeScriptOptParts } from '../../src/shared/subminer-plugin-script-opts.js';
+import { parseLauncherMpvConfig } from './mpv-config.js';
+import { readLauncherMainConfigObject } from './shared-config-reader.js';
 
-function getPlatformPath(platform: NodeJS.Platform): typeof path.posix | typeof path.win32 {
-  return platform === 'win32' ? path.win32 : path.posix;
+function rootObject(root: Record<string, unknown> | null, key: string): Record<string, unknown> {
+  const value = root?.[key];
+  return value && typeof value === 'object' && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : {};
 }
 
-export function getPluginConfigCandidates(options?: {
-  platform?: NodeJS.Platform;
-  homeDir?: string;
-  xdgConfigHome?: string;
-  appDataDir?: string;
-}): string[] {
-  const platform = options?.platform ?? process.platform;
-  const homeDir = options?.homeDir ?? os.homedir();
-  const platformPath = getPlatformPath(platform);
+function booleanOrDefault(value: unknown, fallback: boolean): boolean {
+  return typeof value === 'boolean' ? value : fallback;
+}
 
-  if (platform === 'win32') {
-    const appDataDir =
-      options?.appDataDir?.trim() ||
-      process.env.APPDATA?.trim() ||
-      platformPath.join(homeDir, 'AppData', 'Roaming');
-    return [platformPath.join(appDataDir, 'mpv', 'script-opts', 'subminer.conf')];
+function nonEmptyStringOrDefault(value: unknown, fallback: string): string {
+  if (typeof value !== 'string') return fallback;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : fallback;
+}
+
+function validBackendOrDefault(value: unknown, fallback: Backend): Backend {
+  if (typeof value !== 'string') return fallback;
+  const normalized = value.trim().toLowerCase();
+  if (
+    normalized === 'auto' ||
+    normalized === 'hyprland' ||
+    normalized === 'sway' ||
+    normalized === 'x11' ||
+    normalized === 'macos' ||
+    normalized === 'windows'
+  ) {
+    return normalized;
   }
-
-  const xdgConfigHome =
-    options?.xdgConfigHome?.trim() ||
-    process.env.XDG_CONFIG_HOME ||
-    platformPath.join(homeDir, '.config');
-  return Array.from(
-    new Set([
-      platformPath.join(xdgConfigHome, 'mpv', 'script-opts', 'subminer.conf'),
-      platformPath.join(homeDir, '.config', 'mpv', 'script-opts', 'subminer.conf'),
-    ]),
-  );
+  return fallback;
 }
 
-export function parsePluginRuntimeConfigContent(
-  content: string,
-  logLevel: LogLevel = 'warn',
+export function parsePluginRuntimeConfigFromMainConfig(
+  root: Record<string, unknown> | null,
 ): PluginRuntimeConfig {
-  const runtimeConfig: PluginRuntimeConfig = {
-    socketPath: DEFAULT_SOCKET_PATH,
-    autoStart: true,
-    autoStartVisibleOverlay: true,
-    autoStartPauseUntilReady: true,
+  const mpvConfig = root ? parseLauncherMpvConfig(root) : {};
+  const texthooker = rootObject(root, 'texthooker');
+
+  return {
+    socketPath: mpvConfig.socketPath ?? DEFAULT_SOCKET_PATH,
+    binaryPath: mpvConfig.subminerBinaryPath ?? '',
+    backend: validBackendOrDefault(mpvConfig.backend, 'auto'),
+    autoStart: booleanOrDefault(mpvConfig.autoStartSubMiner, true),
+    autoStartVisibleOverlay: booleanOrDefault(root?.auto_start_overlay, false),
+    autoStartPauseUntilReady: booleanOrDefault(mpvConfig.pauseUntilOverlayReady, true),
+    texthookerEnabled: booleanOrDefault(texthooker.launchAtStartup, false),
+    aniskipEnabled: booleanOrDefault(mpvConfig.aniskipEnabled, true),
+    aniskipButtonKey: nonEmptyStringOrDefault(mpvConfig.aniskipButtonKey, 'TAB'),
   };
+}
 
-  const parseBooleanValue = (key: string, value: string): boolean => {
-    const normalized = value.trim().toLowerCase();
-    if (['yes', 'true', '1', 'on'].includes(normalized)) return true;
-    if (['no', 'false', '0', 'off'].includes(normalized)) return false;
-    log('warn', logLevel, `Invalid boolean value for ${key}: "${value}". Using false.`);
-    return false;
-  };
-
-  for (const line of content.split(/\r?\n/)) {
-    const trimmed = line.trim();
-    if (trimmed.length === 0 || trimmed.startsWith('#')) continue;
-    const keyValueMatch = trimmed.match(/^([a-z0-9_-]+)\s*=\s*(.+)$/i);
-    if (!keyValueMatch) continue;
-    const key = (keyValueMatch[1] || '').toLowerCase();
-    const value = (keyValueMatch[2] || '').split('#', 1)[0]?.trim() || '';
-    if (!value) continue;
-
-    if (key === 'socket_path') {
-      runtimeConfig.socketPath = value;
-      continue;
-    }
-    if (key === 'auto_start') {
-      runtimeConfig.autoStart = parseBooleanValue('auto_start', value);
-      continue;
-    }
-    if (key === 'auto_start_visible_overlay') {
-      runtimeConfig.autoStartVisibleOverlay = parseBooleanValue(
-        'auto_start_visible_overlay',
-        value,
-      );
-      continue;
-    }
-    if (key === 'auto_start_pause_until_ready') {
-      runtimeConfig.autoStartPauseUntilReady = parseBooleanValue(
-        'auto_start_pause_until_ready',
-        value,
-      );
-    }
-  }
-  return runtimeConfig;
+export function buildPluginRuntimeScriptOptParts(
+  runtimeConfig: PluginRuntimeConfig,
+  fallbackAppPath: string,
+): string[] {
+  return buildSubminerPluginRuntimeScriptOptParts(runtimeConfig, fallbackAppPath);
 }
 
 export function readPluginRuntimeConfig(logLevel: LogLevel): PluginRuntimeConfig {
-  const candidates = getPluginConfigCandidates();
-  const defaults: PluginRuntimeConfig = {
-    socketPath: DEFAULT_SOCKET_PATH,
-    autoStart: true,
-    autoStartVisibleOverlay: true,
-    autoStartPauseUntilReady: true,
-  };
-
-  for (const configPath of candidates) {
-    if (!fs.existsSync(configPath)) continue;
-    try {
-      const parsed = parsePluginRuntimeConfigContent(fs.readFileSync(configPath, 'utf8'));
-      log(
-        'debug',
-        logLevel,
-        `Using mpv plugin settings from ${configPath}: socket_path=${parsed.socketPath}, auto_start=${parsed.autoStart}, auto_start_visible_overlay=${parsed.autoStartVisibleOverlay}, auto_start_pause_until_ready=${parsed.autoStartPauseUntilReady}`,
-      );
-      return parsed;
-    } catch {
-      log('warn', logLevel, `Failed to read ${configPath}; using launcher defaults`);
-      return defaults;
-    }
-  }
+  const parsed = parsePluginRuntimeConfigFromMainConfig(readLauncherMainConfigObject());
 
   log(
     'debug',
     logLevel,
-    `No mpv subminer.conf found; using launcher defaults (socket_path=${defaults.socketPath}, auto_start=${defaults.autoStart}, auto_start_visible_overlay=${defaults.autoStartVisibleOverlay}, auto_start_pause_until_ready=${defaults.autoStartPauseUntilReady})`,
+    `Using mpv plugin settings from SubMiner config: socket_path=${parsed.socketPath}, backend=${parsed.backend}, auto_start=${parsed.autoStart}, auto_start_visible_overlay=${parsed.autoStartVisibleOverlay}, auto_start_pause_until_ready=${parsed.autoStartPauseUntilReady}, texthooker_enabled=${parsed.texthookerEnabled}, aniskip_enabled=${parsed.aniskipEnabled}, aniskip_button_key=${parsed.aniskipButtonKey}`,
   );
-  return defaults;
+  return parsed;
 }