mirror of
https://github.com/ksyasuda/SubMiner.git
synced 2026-05-13 20: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
189 lines
9.7 KiB
TypeScript
189 lines
9.7 KiB
TypeScript
import type { SubtitleData } from '../../types';
|
|
import {
|
|
createBindMpvClientEventHandlers,
|
|
createHandleMpvConnectionChangeHandler,
|
|
createHandleMpvSubtitleTimingHandler,
|
|
} from './mpv-client-event-bindings';
|
|
import {
|
|
createHandleMpvMediaPathChangeHandler,
|
|
createHandleMpvMediaTitleChangeHandler,
|
|
createHandleMpvPauseChangeHandler,
|
|
createHandleMpvSecondarySubtitleChangeHandler,
|
|
createHandleMpvSecondarySubtitleVisibilityHandler,
|
|
createHandleMpvSubtitleAssChangeHandler,
|
|
createHandleMpvSubtitleChangeHandler,
|
|
createHandleMpvSubtitleMetricsChangeHandler,
|
|
createHandleMpvTimePosChangeHandler,
|
|
} from './mpv-main-event-actions';
|
|
|
|
type MpvEventClient = Parameters<ReturnType<typeof createBindMpvClientEventHandlers>>[0];
|
|
|
|
export function createBindMpvMainEventHandlersHandler(deps: {
|
|
reportJellyfinRemoteStopped: () => void;
|
|
syncOverlayMpvSubtitleSuppression: () => void;
|
|
resetSubtitleSidebarEmbeddedLayout: () => void;
|
|
scheduleCharacterDictionarySync?: () => void;
|
|
hasInitialPlaybackQuitOnDisconnectArg: () => boolean;
|
|
isOverlayRuntimeInitialized: () => boolean;
|
|
shouldQuitOnDisconnectWhenOverlayRuntimeInitialized: () => boolean;
|
|
isQuitOnDisconnectArmed: () => boolean;
|
|
scheduleQuitCheck: (callback: () => void) => void;
|
|
isMpvConnected: () => boolean;
|
|
quitApp: () => void;
|
|
|
|
recordImmersionSubtitleLine: (text: string, start: number, end: number) => void;
|
|
hasSubtitleTimingTracker: () => boolean;
|
|
recordSubtitleTiming: (text: string, start: number, end: number) => void;
|
|
maybeRunAnilistPostWatchUpdate: () => Promise<void>;
|
|
logSubtitleTimingError: (message: string, error: unknown) => void;
|
|
|
|
setCurrentSubText: (text: string) => void;
|
|
getImmediateSubtitlePayload?: (text: string) => SubtitleData | null;
|
|
emitImmediateSubtitle?: (payload: SubtitleData) => void;
|
|
broadcastSubtitle: (payload: SubtitleData) => void;
|
|
onSubtitleChange: (text: string) => void;
|
|
refreshDiscordPresence: () => void;
|
|
|
|
setCurrentSubAssText: (text: string) => void;
|
|
broadcastSubtitleAss: (text: string) => void;
|
|
broadcastSecondarySubtitle: (text: string) => void;
|
|
onSubtitleTrackChange?: (sid: number | null) => void;
|
|
onSubtitleTrackListChange?: (trackList: unknown[] | null) => void;
|
|
|
|
updateCurrentMediaPath: (path: string) => void;
|
|
restoreMpvSubVisibility: () => void;
|
|
getCurrentAnilistMediaKey: () => string | null;
|
|
resetAnilistMediaTracking: (mediaKey: string | null) => void;
|
|
maybeProbeAnilistDuration: (mediaKey: string) => void;
|
|
ensureAnilistMediaGuess: (mediaKey: string) => void;
|
|
syncImmersionMediaState: () => void;
|
|
signalAutoplayReadyIfWarm?: (path: string) => void;
|
|
flushPlaybackPositionOnMediaPathClear?: (mediaPath: string) => void;
|
|
|
|
updateCurrentMediaTitle: (title: string) => void;
|
|
resetAnilistMediaGuessState: () => void;
|
|
notifyImmersionTitleUpdate: (title: string) => void;
|
|
|
|
recordPlaybackPosition: (time: number) => void;
|
|
recordMediaDuration: (durationSec: number) => void;
|
|
reportJellyfinRemoteProgress: (forceImmediate: boolean) => void;
|
|
onTimePosUpdate?: (time: number) => void;
|
|
onFullscreenChange?: (fullscreen: boolean) => void;
|
|
recordPauseState: (paused: boolean) => void;
|
|
|
|
updateSubtitleRenderMetrics: (patch: Record<string, unknown>) => void;
|
|
setPreviousSecondarySubVisibility: (visible: boolean) => void;
|
|
}) {
|
|
return (mpvClient: MpvEventClient): void => {
|
|
const handleMpvConnectionChange = createHandleMpvConnectionChangeHandler({
|
|
reportJellyfinRemoteStopped: () => deps.reportJellyfinRemoteStopped(),
|
|
refreshDiscordPresence: () => deps.refreshDiscordPresence(),
|
|
syncOverlayMpvSubtitleSuppression: () => deps.syncOverlayMpvSubtitleSuppression(),
|
|
hasInitialPlaybackQuitOnDisconnectArg: () => deps.hasInitialPlaybackQuitOnDisconnectArg(),
|
|
isOverlayRuntimeInitialized: () => deps.isOverlayRuntimeInitialized(),
|
|
shouldQuitOnDisconnectWhenOverlayRuntimeInitialized: () =>
|
|
deps.shouldQuitOnDisconnectWhenOverlayRuntimeInitialized(),
|
|
isQuitOnDisconnectArmed: () => deps.isQuitOnDisconnectArmed(),
|
|
scheduleQuitCheck: (callback) => deps.scheduleQuitCheck(callback),
|
|
isMpvConnected: () => deps.isMpvConnected(),
|
|
quitApp: () => deps.quitApp(),
|
|
});
|
|
const handleMpvConnectionChangeWithSidebarReset = ({
|
|
connected,
|
|
}: {
|
|
connected: boolean;
|
|
}): void => {
|
|
if (connected) {
|
|
deps.resetSubtitleSidebarEmbeddedLayout();
|
|
}
|
|
handleMpvConnectionChange({ connected });
|
|
};
|
|
const handleMpvSubtitleTiming = createHandleMpvSubtitleTimingHandler({
|
|
recordImmersionSubtitleLine: (text, start, end) =>
|
|
deps.recordImmersionSubtitleLine(text, start, end),
|
|
hasSubtitleTimingTracker: () => deps.hasSubtitleTimingTracker(),
|
|
recordSubtitleTiming: (text, start, end) => deps.recordSubtitleTiming(text, start, end),
|
|
maybeRunAnilistPostWatchUpdate: () => deps.maybeRunAnilistPostWatchUpdate(),
|
|
logError: (message, error) => deps.logSubtitleTimingError(message, error),
|
|
});
|
|
const handleMpvSubtitleChange = createHandleMpvSubtitleChangeHandler({
|
|
setCurrentSubText: (text) => deps.setCurrentSubText(text),
|
|
getImmediateSubtitlePayload: (text) => deps.getImmediateSubtitlePayload?.(text) ?? null,
|
|
emitImmediateSubtitle: (payload) => deps.emitImmediateSubtitle?.(payload),
|
|
broadcastSubtitle: (payload) => deps.broadcastSubtitle(payload),
|
|
onSubtitleChange: (text) => deps.onSubtitleChange(text),
|
|
refreshDiscordPresence: () => deps.refreshDiscordPresence(),
|
|
});
|
|
const handleMpvSubtitleAssChange = createHandleMpvSubtitleAssChangeHandler({
|
|
setCurrentSubAssText: (text) => deps.setCurrentSubAssText(text),
|
|
broadcastSubtitleAss: (text) => deps.broadcastSubtitleAss(text),
|
|
});
|
|
const handleMpvSecondarySubtitleChange = createHandleMpvSecondarySubtitleChangeHandler({
|
|
broadcastSecondarySubtitle: (text) => deps.broadcastSecondarySubtitle(text),
|
|
});
|
|
const handleMpvMediaPathChange = createHandleMpvMediaPathChangeHandler({
|
|
updateCurrentMediaPath: (path) => deps.updateCurrentMediaPath(path),
|
|
reportJellyfinRemoteStopped: () => deps.reportJellyfinRemoteStopped(),
|
|
restoreMpvSubVisibility: () => deps.restoreMpvSubVisibility(),
|
|
resetSubtitleSidebarEmbeddedLayout: () => deps.resetSubtitleSidebarEmbeddedLayout(),
|
|
getCurrentAnilistMediaKey: () => deps.getCurrentAnilistMediaKey(),
|
|
resetAnilistMediaTracking: (mediaKey) => deps.resetAnilistMediaTracking(mediaKey),
|
|
maybeProbeAnilistDuration: (mediaKey) => deps.maybeProbeAnilistDuration(mediaKey),
|
|
ensureAnilistMediaGuess: (mediaKey) => deps.ensureAnilistMediaGuess(mediaKey),
|
|
syncImmersionMediaState: () => deps.syncImmersionMediaState(),
|
|
flushPlaybackPositionOnMediaPathClear: (mediaPath) =>
|
|
deps.flushPlaybackPositionOnMediaPathClear?.(mediaPath),
|
|
signalAutoplayReadyIfWarm: (path) => deps.signalAutoplayReadyIfWarm?.(path),
|
|
scheduleCharacterDictionarySync: () => deps.scheduleCharacterDictionarySync?.(),
|
|
refreshDiscordPresence: () => deps.refreshDiscordPresence(),
|
|
});
|
|
const handleMpvMediaTitleChange = createHandleMpvMediaTitleChangeHandler({
|
|
updateCurrentMediaTitle: (title) => deps.updateCurrentMediaTitle(title),
|
|
resetAnilistMediaGuessState: () => deps.resetAnilistMediaGuessState(),
|
|
notifyImmersionTitleUpdate: (title) => deps.notifyImmersionTitleUpdate(title),
|
|
syncImmersionMediaState: () => deps.syncImmersionMediaState(),
|
|
refreshDiscordPresence: () => deps.refreshDiscordPresence(),
|
|
});
|
|
const handleMpvTimePosChange = createHandleMpvTimePosChangeHandler({
|
|
recordPlaybackPosition: (time) => deps.recordPlaybackPosition(time),
|
|
reportJellyfinRemoteProgress: (forceImmediate) =>
|
|
deps.reportJellyfinRemoteProgress(forceImmediate),
|
|
refreshDiscordPresence: () => deps.refreshDiscordPresence(),
|
|
maybeRunAnilistPostWatchUpdate: () => deps.maybeRunAnilistPostWatchUpdate(),
|
|
logError: (message, error) => deps.logSubtitleTimingError(message, error),
|
|
onTimePosUpdate: (time) => deps.onTimePosUpdate?.(time),
|
|
});
|
|
const handleMpvPauseChange = createHandleMpvPauseChangeHandler({
|
|
recordPauseState: (paused) => deps.recordPauseState(paused),
|
|
reportJellyfinRemoteProgress: (forceImmediate) =>
|
|
deps.reportJellyfinRemoteProgress(forceImmediate),
|
|
refreshDiscordPresence: () => deps.refreshDiscordPresence(),
|
|
});
|
|
const handleMpvSubtitleMetricsChange = createHandleMpvSubtitleMetricsChangeHandler({
|
|
updateSubtitleRenderMetrics: (patch) => deps.updateSubtitleRenderMetrics(patch),
|
|
});
|
|
const handleMpvSecondarySubtitleVisibility = createHandleMpvSecondarySubtitleVisibilityHandler({
|
|
setPreviousSecondarySubVisibility: (visible) =>
|
|
deps.setPreviousSecondarySubVisibility(visible),
|
|
});
|
|
|
|
createBindMpvClientEventHandlers({
|
|
onConnectionChange: handleMpvConnectionChangeWithSidebarReset,
|
|
onSubtitleChange: handleMpvSubtitleChange,
|
|
onSubtitleAssChange: handleMpvSubtitleAssChange,
|
|
onSecondarySubtitleChange: handleMpvSecondarySubtitleChange,
|
|
onSubtitleTrackChange: ({ sid }) => deps.onSubtitleTrackChange?.(sid),
|
|
onSubtitleTrackListChange: ({ trackList }) => deps.onSubtitleTrackListChange?.(trackList),
|
|
onSubtitleTiming: handleMpvSubtitleTiming,
|
|
onMediaPathChange: handleMpvMediaPathChange,
|
|
onMediaTitleChange: handleMpvMediaTitleChange,
|
|
onTimePosChange: handleMpvTimePosChange,
|
|
onDurationChange: ({ duration }) => deps.recordMediaDuration(duration),
|
|
onPauseChange: handleMpvPauseChange,
|
|
onFullscreenChange: ({ fullscreen }) => deps.onFullscreenChange?.(fullscreen),
|
|
onSubtitleMetricsChange: handleMpvSubtitleMetricsChange,
|
|
onSecondarySubtitleVisibility: handleMpvSecondarySubtitleVisibility,
|
|
})(mpvClient);
|
|
};
|
|
}
|