mirror of
https://github.com/ksyasuda/SubMiner.git
synced 2026-05-13 08:12:54 -07:00
430373f010
* feat(tokenizer): use Yomitan word classes for subtitle POS filtering - Carry matched headword wordClasses from termsFind into YomitanScanToken - Map recognized Yomitan wordClasses to SubMiner coarse POS before annotation - MeCab enrichment now fills only missing POS fields, preserving existing coarse pos1 - Exclude standalone grammar particles, して helper fragments, and single-kana surfaces from annotations - Respect source-text punctuation gaps when counting N+1 sentence words - Preserve known-word highlight on excluded kanji-containing tokens - Add backlog tasks 304 (N+1 boundary bug) and 305 (wordClasses POS, done) * fix(tokenizer): preserve annotation and enrichment behavior * fix: restore jlpt subtitle underlines * fix: exclude kana-only n+1 targets * fix: refresh overlay on Hyprland fullscreen * fix: address fullscreen and n-plus-one review notes * fix: address CodeRabbit review comments * fix: accept modified digits for multi-line sentence mining * Cancel pending Linux MPV fullscreen overlay refresh bursts - return a cancel handle from the Linux refresh burst scheduler - clear pending refresh bursts when overlays hide or windows close - tighten the burst test polling to wait for the async refresh * fix: suppress N+1 for kana-only candidates and fix minSentenceWords coun - Treat kana-only tokens with surrounding subtitle punctuation (…, ―, etc.) as kana-only so they are not promoted to N+1 targets - Exclude unknown tokens filtered from N+1 targeting from the minSentenceWords count so filtered kana-only unknowns cannot satisfy sentence length threshold - Add regression tests for kana-only candidate suppression and filtered-unknown padding cases * Suppress subtitle annotations for grammar fragments - Hide annotation metadata for auxiliary inflection and ja-nai endings - Preserve lexical `くれる` forms and add regression coverage * Fix kana-only N+1 tokenizer regression test - Use a pure-kana fixture for the subtitle token N+1 case - Update task notes for the latest CodeRabbit follow-up * Fix managed playback exit and tokenizer grammar splits - Ignore background stats daemons during regular app startup - Split standalone grammar endings before applying annotations - Clear helper-span annotations for auxiliary-only tokens * fix: refresh current subtitle after known-word mining * fix: suppress sigh interjection annotations * fix: preserve jlpt underline color after lookup * Replace grammar-ending permutations with shared matcher; preserve word a - Extract `grammar-ending.ts` with `isStandaloneGrammarEndingText` / `isSubtitleGrammarEndingText` pattern matchers - Replace `STANDALONE_GRAMMAR_ENDINGS` set in parser-selection-stage with shared matcher - Replace generated phrase sets in subtitle-annotation-filter with shared matcher - Remove stale duplicate subtitle-exclusion constants and helpers from annotation-stage - Manual clipboard card updates now write only to the sentence audio field, leaving word/expression audio untouched * fix: CI changelog, annotation options threading, and Jellyfin quit - Add `type: fixed` / `area:` frontmatter to `changes/319` to pass `changelog:lint` - Thread `TokenizerAnnotationOptions` through `stripSubtitleAnnotationMetadata` so `sourceText` is honored - Include `jellyfinPlay` in `shouldQuitOnDisconnectWhenOverlayRuntimeInitialized` predicate - Make mouse test `elementFromPoint` stubs coordinate-sensitive - Make Lua test `.tmp` mkdir portable on Windows * Preserve overlay across macOS flaps and mpv playlist changes - keep visible overlays alive during transient macOS tracker loss - reuse the running mpv overlay path on playlist navigation - update regression coverage and changelog fragments * fix: restore stats daemon deferral * fix: keep subtitle prefetch alive after cache hits * Fix JLPT underline color drift and AniList skipped-threshold sync - Replace JLPT `text-decoration` underlines with `border-bottom` so Chromium selection/hover cannot repaint them to another annotation's color - Lock JLPT underline color for combined annotation selectors (known, n+1, frequency) and character hover/selection states - Trigger AniList post-watch check on every mpv time-position update to catch skipped completion thresholds - Fall back to filename-parser season/episode when guessit omits them * fix: address coderabbit feedback * fix: sync AniList after seeked completion * fix: preserve ordinal frequency annotations * fix: preserve known highlighting for filtered tokens * fix: address PR #57 CodeRabbit feedback - Acquire AniList post-watch in-flight lock before async gating to prevent duplicate writes - Isolate manual watched mark result from AniList post-watch callback failures - Report known-word cache clears as mutations during immediate append when state existed - Add regression tests for each fix * fix: stop AniList setup reopening on Linux when keyring token exists - Gate setup success on token persistence: `saveToken` now returns `boolean`; on failure, keeps the setup window open instead of reporting success - Config reload passes `allowSetupPrompt: false` so playback reloads don't re-open the setup window - Add regression test for persistence-failure path * fix: suppress known highlights for subtitle particles * fix: retry transient AniList safeStorage failures * fix: hide overlay focus ring * fix: align Hyprland fullscreen overlays * fix: restore subtitle playback keybindings * fix: align Hyprland overlay windows to mpv and stop pinning them - Force-apply exact Hyprland move/resize/setprop dispatches when bounds are provided - Stop pinning overlay windows; toggle pin off when Hyprland reports pinned=true - Compensate stats overlay outer placement for Electron/Wayland content insets - Make stats overlay window and page opaque so mpv cannot show through transparent insets - Constrain stats app to h-screen with internal scroll so content covers mpv from y=0 - Lock overlay/stats window titles against page-title-updated events - Add regression coverage for placement dispatches, inset compensation, and CSS overlay mode * fix: retain frequency rank for honorific prefix-noun tokens - Add `shouldAllowHonorificPrefixNounFrequency` to exempt お/ご/御 + noun merged tokens from frequency exclusion - Add regression test for `ご機嫌` asserting rank 5484 is preserved after MeCab enrichment and annotation - Close TASK-341 * fix: map openCharacterDictionary session action to --open-character-dict - Add missing Lua CLI dispatch entry for openCharacterDictionary - Add regression test for Alt+Meta+A binding and CLI flag forwarding * fix: keep macOS overlay interactive while mpv remains active - Overlay no longer hides or becomes click-through during tracker refreshes when mpv is the focused window - Preserve already-visible overlay when tracker is temporarily not ready but mpv target signal is active - Add regression tests for active-mpv tracker refresh and transient tracker-not-ready paths * fix: address coderabbit subtitle follow-ups * fix: resolve media detail from sessions when lifetime summary is absent - Change `getMediaDetail` JOIN to LEFT JOIN on `imm_lifetime_media` and fall back to aggregated session metrics when no lifetime row exists - Add filter `AND (lm.video_id IS NOT NULL OR s.session_id IS NOT NULL)` to keep results valid - Add regression test covering the session-visible / media-detail-missing mismatch * fix: address PR-57 CodeRabbit findings and CI failures - use filtered word counts in media detail session token aggregation - cancel fullscreen refresh burst on exit via updateLinuxMpvFullscreenOverlayRefreshBurst - guard Hyprland JSON.parse in try/catch; exclude windowtitle from geometry events - narrow focus suppression from :focus to :focus-visible - apply JLPT lock selectors to word-name-match tokens (N1–N5) * fix: macOS overlay z-order and Yomitan compound token known highlighting - Release always-on-top when tracked mpv loses foreground on macOS - Skip visible overlay blur restacking on macOS to avoid covering unrelated windows - Prefer Yomitan internal parse tokens over fragmented scanner output for known-word decisions - Add regression tests for both behaviors * fix: macOS visible-overlay blur no longer invokes Windows-only blur call - Split win32/darwin branches in handleOverlayWindowBlurred so darwin visible blur returns early without calling onWindowsVisibleOverlayBlur - Add regression test asserting Windows callback stays inactive on macOS visible overlay blur - Close TASK-347
399 lines
11 KiB
Lua
399 lines
11 KiB
Lua
local M = {}
|
|
|
|
local unpack_fn = table.unpack or unpack
|
|
|
|
local KEY_NAME_MAP = {
|
|
Space = "SPACE",
|
|
Tab = "TAB",
|
|
Enter = "ENTER",
|
|
Escape = "ESC",
|
|
Backspace = "BS",
|
|
Delete = "DEL",
|
|
ArrowUp = "UP",
|
|
ArrowDown = "DOWN",
|
|
ArrowLeft = "LEFT",
|
|
ArrowRight = "RIGHT",
|
|
Slash = "/",
|
|
Backslash = "\\",
|
|
Minus = "-",
|
|
Equal = "=",
|
|
Comma = ",",
|
|
Period = ".",
|
|
Quote = "'",
|
|
Semicolon = ";",
|
|
BracketLeft = "[",
|
|
BracketRight = "]",
|
|
Backquote = "`",
|
|
}
|
|
|
|
local MODIFIER_MAP = {
|
|
ctrl = "Ctrl",
|
|
alt = "Alt",
|
|
shift = "Shift",
|
|
meta = "Meta",
|
|
}
|
|
|
|
function M.create(ctx)
|
|
local mp = ctx.mp
|
|
local utils = ctx.utils
|
|
local state = ctx.state
|
|
local process = ctx.process
|
|
local environment = ctx.environment
|
|
local subminer_log = ctx.log.subminer_log
|
|
local show_osd = ctx.log.show_osd
|
|
|
|
local function read_file(path)
|
|
local handle = io.open(path, "r")
|
|
if not handle then
|
|
return nil
|
|
end
|
|
local content = handle:read("*a")
|
|
handle:close()
|
|
return content
|
|
end
|
|
|
|
local function remove_binding_names(names)
|
|
for _, name in ipairs(names) do
|
|
mp.remove_key_binding(name)
|
|
end
|
|
for index = #names, 1, -1 do
|
|
names[index] = nil
|
|
end
|
|
end
|
|
|
|
local function key_code_to_mpv_name(code)
|
|
if KEY_NAME_MAP[code] then
|
|
return KEY_NAME_MAP[code]
|
|
end
|
|
|
|
local letter = code:match("^Key([A-Z])$")
|
|
if letter then
|
|
return string.lower(letter)
|
|
end
|
|
|
|
local digit = code:match("^Digit([0-9])$")
|
|
if digit then
|
|
return digit
|
|
end
|
|
|
|
local function_key = code:match("^(F%d+)$")
|
|
if function_key then
|
|
return function_key
|
|
end
|
|
|
|
return nil
|
|
end
|
|
|
|
local function key_spec_to_mpv_binding(key)
|
|
if type(key) ~= "table" then
|
|
return nil
|
|
end
|
|
|
|
if type(key.code) ~= "string" then
|
|
return nil
|
|
end
|
|
if type(key.modifiers) ~= "table" then
|
|
return nil
|
|
end
|
|
|
|
local shifted_letter = key.code:match("^Key([A-Z])$")
|
|
local has_shift = false
|
|
for _, modifier in ipairs(key.modifiers) do
|
|
if modifier == "shift" then
|
|
has_shift = true
|
|
break
|
|
end
|
|
end
|
|
|
|
local key_name = key_code_to_mpv_name(key.code)
|
|
if shifted_letter and has_shift then
|
|
key_name = shifted_letter
|
|
end
|
|
if not key_name then
|
|
return nil
|
|
end
|
|
|
|
local parts = {}
|
|
for _, modifier in ipairs(key.modifiers) do
|
|
if not (modifier == "shift" and shifted_letter) then
|
|
local mapped = MODIFIER_MAP[modifier]
|
|
if mapped then
|
|
parts[#parts + 1] = mapped
|
|
end
|
|
end
|
|
end
|
|
parts[#parts + 1] = key_name
|
|
return table.concat(parts, "+")
|
|
end
|
|
|
|
local function build_cli_args(action_id, payload)
|
|
if action_id == "toggleVisibleOverlay" then
|
|
return { "--toggle-visible-overlay" }
|
|
elseif action_id == "toggleStatsOverlay" then
|
|
return { "--toggle-stats-overlay" }
|
|
elseif action_id == "copySubtitle" then
|
|
return { "--copy-subtitle" }
|
|
elseif action_id == "copySubtitleMultiple" then
|
|
return { "--copy-subtitle-count", tostring(payload and payload.count or 1) }
|
|
elseif action_id == "updateLastCardFromClipboard" then
|
|
return { "--update-last-card-from-clipboard" }
|
|
elseif action_id == "triggerFieldGrouping" then
|
|
return { "--trigger-field-grouping" }
|
|
elseif action_id == "triggerSubsync" then
|
|
return { "--trigger-subsync" }
|
|
elseif action_id == "mineSentence" then
|
|
return { "--mine-sentence" }
|
|
elseif action_id == "mineSentenceMultiple" then
|
|
return { "--mine-sentence-count", tostring(payload and payload.count or 1) }
|
|
elseif action_id == "toggleSecondarySub" then
|
|
return { "--toggle-secondary-sub" }
|
|
elseif action_id == "toggleSubtitleSidebar" then
|
|
return { "--toggle-subtitle-sidebar" }
|
|
elseif action_id == "markAudioCard" then
|
|
return { "--mark-audio-card" }
|
|
elseif action_id == "openRuntimeOptions" then
|
|
return { "--open-runtime-options" }
|
|
elseif action_id == "openJimaku" then
|
|
return { "--open-jimaku" }
|
|
elseif action_id == "openYoutubePicker" then
|
|
return { "--open-youtube-picker" }
|
|
elseif action_id == "openSessionHelp" then
|
|
return { "--open-session-help" }
|
|
elseif action_id == "openCharacterDictionary" then
|
|
return { "--open-character-dictionary" }
|
|
elseif action_id == "openControllerSelect" then
|
|
return { "--open-controller-select" }
|
|
elseif action_id == "openControllerDebug" then
|
|
return { "--open-controller-debug" }
|
|
elseif action_id == "openPlaylistBrowser" then
|
|
return { "--open-playlist-browser" }
|
|
elseif action_id == "replayCurrentSubtitle" then
|
|
return { "--replay-current-subtitle" }
|
|
elseif action_id == "playNextSubtitle" then
|
|
return { "--play-next-subtitle" }
|
|
elseif action_id == "shiftSubDelayPrevLine" then
|
|
return { "--shift-sub-delay-prev-line" }
|
|
elseif action_id == "shiftSubDelayNextLine" then
|
|
return { "--shift-sub-delay-next-line" }
|
|
elseif action_id == "cycleRuntimeOption" then
|
|
local runtime_option_id = payload and payload.runtimeOptionId or nil
|
|
if type(runtime_option_id) ~= "string" or runtime_option_id == "" then
|
|
return nil
|
|
end
|
|
local direction = payload and payload.direction == -1 and "prev" or "next"
|
|
return { "--cycle-runtime-option", runtime_option_id .. ":" .. direction }
|
|
end
|
|
|
|
return nil
|
|
end
|
|
|
|
local function invoke_cli_action(action_id, payload)
|
|
if not process.check_binary_available() then
|
|
show_osd("Error: binary not found")
|
|
return
|
|
end
|
|
|
|
local cli_args = build_cli_args(action_id, payload)
|
|
if not cli_args then
|
|
subminer_log("warn", "session-bindings", "No CLI mapping for action: " .. tostring(action_id))
|
|
return
|
|
end
|
|
|
|
local args = { state.binary_path }
|
|
for _, arg in ipairs(cli_args) do
|
|
args[#args + 1] = arg
|
|
end
|
|
local runner = process.run_binary_command_async
|
|
if type(runner) ~= "function" then
|
|
runner = function(binary_args, callback)
|
|
mp.command_native_async({
|
|
name = "subprocess",
|
|
args = binary_args,
|
|
playback_only = false,
|
|
capture_stdout = true,
|
|
capture_stderr = true,
|
|
}, function(success, result, error)
|
|
local ok = success and (result == nil or result.status == 0)
|
|
if callback then
|
|
callback(ok, result, error)
|
|
end
|
|
end)
|
|
end
|
|
end
|
|
runner(args, function(ok, result, error)
|
|
if ok then
|
|
return
|
|
end
|
|
local reason = error or (result and result.stderr) or "unknown error"
|
|
subminer_log("warn", "session-bindings", "Session action failed: " .. tostring(reason))
|
|
show_osd("Session action failed")
|
|
end)
|
|
end
|
|
|
|
local function clear_numeric_selection(show_cancelled)
|
|
if state.session_numeric_selection and state.session_numeric_selection.timeout then
|
|
state.session_numeric_selection.timeout:kill()
|
|
end
|
|
state.session_numeric_selection = nil
|
|
remove_binding_names(state.session_numeric_binding_names)
|
|
if show_cancelled then
|
|
show_osd("Cancelled")
|
|
end
|
|
end
|
|
|
|
local function build_modifier_prefixes(modifiers)
|
|
local prefixes = { "" }
|
|
if type(modifiers) ~= "table" then
|
|
return prefixes
|
|
end
|
|
|
|
for _, modifier in ipairs(modifiers) do
|
|
local mapped = MODIFIER_MAP[modifier]
|
|
if mapped then
|
|
local existing_count = #prefixes
|
|
for index = 1, existing_count do
|
|
prefixes[#prefixes + 1] = prefixes[index] .. mapped .. "+"
|
|
end
|
|
end
|
|
end
|
|
return prefixes
|
|
end
|
|
|
|
local function start_numeric_selection(action_id, timeout_ms, starter_modifiers)
|
|
clear_numeric_selection(false)
|
|
local modifier_prefixes = build_modifier_prefixes(starter_modifiers)
|
|
for digit = 1, 9 do
|
|
local digit_string = tostring(digit)
|
|
for _, prefix in ipairs(modifier_prefixes) do
|
|
local key_name = prefix .. digit_string
|
|
local modifier_name = prefix:gsub("[^%w]", "-")
|
|
local name = "subminer-session-digit-" .. modifier_name .. digit_string
|
|
state.session_numeric_binding_names[#state.session_numeric_binding_names + 1] = name
|
|
mp.add_forced_key_binding(key_name, name, function()
|
|
clear_numeric_selection(false)
|
|
invoke_cli_action(action_id, { count = digit })
|
|
end)
|
|
end
|
|
end
|
|
|
|
state.session_numeric_binding_names[#state.session_numeric_binding_names + 1] =
|
|
"subminer-session-digit-cancel"
|
|
mp.add_forced_key_binding("ESC", "subminer-session-digit-cancel", function()
|
|
clear_numeric_selection(true)
|
|
end)
|
|
|
|
state.session_numeric_selection = {
|
|
action_id = action_id,
|
|
timeout = mp.add_timeout((timeout_ms or 3000) / 1000, function()
|
|
clear_numeric_selection(false)
|
|
show_osd(action_id == "copySubtitleMultiple" and "Copy timeout" or "Mine timeout")
|
|
end),
|
|
}
|
|
|
|
show_osd(
|
|
action_id == "copySubtitleMultiple"
|
|
and "Copy how many lines? Press 1-9 (Esc to cancel)"
|
|
or "Mine how many lines? Press 1-9 (Esc to cancel)"
|
|
)
|
|
end
|
|
|
|
local function execute_mpv_command(command)
|
|
if type(command) ~= "table" or command[1] == nil then
|
|
return
|
|
end
|
|
mp.commandv(unpack_fn(command))
|
|
end
|
|
|
|
local function handle_binding(binding, numeric_selection_timeout_ms)
|
|
if binding.actionType == "mpv-command" then
|
|
execute_mpv_command(binding.command)
|
|
return
|
|
end
|
|
|
|
if binding.actionId == "copySubtitleMultiple" or binding.actionId == "mineSentenceMultiple" then
|
|
start_numeric_selection(binding.actionId, numeric_selection_timeout_ms, binding.key.modifiers)
|
|
return
|
|
end
|
|
|
|
invoke_cli_action(binding.actionId, binding.payload)
|
|
end
|
|
|
|
local function load_artifact()
|
|
local artifact_path = environment.resolve_session_bindings_artifact_path()
|
|
local raw = read_file(artifact_path)
|
|
if not raw or raw == "" then
|
|
return nil, "Missing session binding artifact: " .. tostring(artifact_path)
|
|
end
|
|
|
|
local parsed, parse_error = utils.parse_json(raw)
|
|
if not parsed then
|
|
return nil, "Failed to parse session binding artifact: " .. tostring(parse_error)
|
|
end
|
|
if type(parsed) ~= "table" or type(parsed.bindings) ~= "table" then
|
|
return nil, "Invalid session binding artifact"
|
|
end
|
|
|
|
return parsed, nil
|
|
end
|
|
|
|
local function clear_bindings()
|
|
clear_numeric_selection(false)
|
|
remove_binding_names(state.session_binding_names)
|
|
end
|
|
|
|
local function register_bindings()
|
|
local artifact, load_error = load_artifact()
|
|
if not artifact then
|
|
subminer_log("warn", "session-bindings", load_error)
|
|
return false
|
|
end
|
|
|
|
clear_numeric_selection(false)
|
|
|
|
local previous_binding_names = state.session_binding_names
|
|
local next_binding_names = {}
|
|
state.session_binding_generation = (state.session_binding_generation or 0) + 1
|
|
local generation = state.session_binding_generation
|
|
|
|
local timeout_ms = tonumber(artifact.numericSelectionTimeoutMs) or 3000
|
|
for index, binding in ipairs(artifact.bindings) do
|
|
local key_name = key_spec_to_mpv_binding(binding.key)
|
|
if key_name then
|
|
local name = "subminer-session-binding-" .. tostring(generation) .. "-" .. tostring(index)
|
|
next_binding_names[#next_binding_names + 1] = name
|
|
mp.add_forced_key_binding(key_name, name, function()
|
|
handle_binding(binding, timeout_ms)
|
|
end)
|
|
else
|
|
subminer_log(
|
|
"warn",
|
|
"session-bindings",
|
|
"Skipped unsupported key code from artifact: " .. tostring(binding.key and binding.key.code or "unknown")
|
|
)
|
|
end
|
|
end
|
|
|
|
remove_binding_names(previous_binding_names)
|
|
state.session_binding_names = next_binding_names
|
|
|
|
subminer_log(
|
|
"info",
|
|
"session-bindings",
|
|
"Registered " .. tostring(#next_binding_names) .. " shared session bindings"
|
|
)
|
|
return true
|
|
end
|
|
|
|
local function reload_bindings()
|
|
return register_bindings()
|
|
end
|
|
|
|
return {
|
|
register_bindings = register_bindings,
|
|
reload_bindings = reload_bindings,
|
|
clear_bindings = clear_bindings,
|
|
}
|
|
end
|
|
|
|
return M
|