mirror of
https://github.com/ksyasuda/SubMiner.git
synced 2026-05-27 00:55:16 -07:00
b1bdeabca8
* fix(jellyfin): show overlay, inject plugin, and fix stats title on playb - Show visible overlay automatically during Jellyfin playback so subtitleStyle applies - Inject bundled mpv plugin on auto-launch so keybindings work without overlay focus - Group Jellyfin playback stats under item metadata (jellyfin://host/item/id) instead of stream URLs so episodes merge with matching local titles - Mark ffsubsync unavailable in subsync modal for remote media paths - Drain queued second-instance commands even when onReady throws * fix(overlay): stabilize macOS focus handoff and sidebar Yomitan pause - Keep overlay visible during macOS foreground probe after overlay blur - Hold sidebar hover-pause while a Yomitan lookup popup remains open * fix(jellyfin): fix discovery loop, device identity, tray state, and Disc - Derive device identity from OS hostname; remove legacy configurable client/device fields - Prevent discovery playback from reloading active item, misreporting pause state, and duplicate overlay restores - Restart stale tray discovery sessions without re-login when server drops SubMiner cast target - Sync tray discovery checkbox state on Linux after CLI/startup/remote-session changes - Stop Discord presence falling back to stream URLs; prime title before tokenized stream loads - Fix picker library discovery when log level is above info - Fix config.example.jsonc trailing commas and array formatting * docs(release): trim and consolidate prerelease notes for 0.15.0 - Remove breaking changes section and several redundant bullet points - Consolidate per-platform updater notes into a single entry - Normalize em-dash separators to hyphens in section headers * fix(config): remove trailing commas from config.example.jsonc - Strip trailing commas throughout both config.example.jsonc copies - Reformat inline arrays to multi-line for JSON strictness - Update Jellyfin subtitle preload and playback launch tests and impl * fix(tokenizer): preserve known-word highlight when POS filters suppress - Known-word cache matches now set isKnown=true even for tokens excluded by POS filters - POS exclusion gate suppresses N+1, frequency, and JLPT only; known status is computed before the gate - Jellyfin subtitle preload continues after cleanup failures instead of aborting - Update config docs and option description to document the known-word bypass behavior * fix(jellyfin): send explicit hide/show overlay instead of toggle - Track overlay visibility in plugin state; y-t uses explicit hide/show commands when state is known - Prevent paused Jellyfin playback from resuming on overlay hide - Fix subtitle cache cleanup to only remove dirs after successful cleanup * fix(jellyfin): fix remote progress sync, seek reporting, and startup sto - arm active playback before loadfile with loadedMediaPath: null to suppress premature stop events - force immediate progress report on seek-like position jumps at the mpv time-pos level - send positionTicks and failed=false in reportStopped payload - remove EventName from HTTP timeline payloads (websocket-only field) - add startup grace window to drop stop events before media finishes loading * fix(jellyfin): fix overlay toggle sync, redirect reload, and AppImage bi - Sync visible-overlay state back to plugin via script messages to avoid toggle/hide drift - Collapse duplicate toggle events within 250ms to prevent hide-then-show on single keypress - Preserve manual hide across Jellyfin path-changing redirects even when media-title drops - Rearm managed subtitle defaults on path-changing redirects - Route toggleVisibleOverlay session binding through plugin toggle instead of app-side IPC - Show Linux/Hyprland overlay passively (showInactive) to avoid stealing mpv keyboard focus - Fix AppImage binary resolution to prefer $APPIMAGE env over mounted inner binary - Add stats window layer management so delete/update dialogs appear above stats window - Fix Jellyfin remote progress sync during Linux websocket reconnect windows * Fix CodeRabbit review feedback * fix(jellyfin): subtitle timing, resume progress, and overlay sync - Add per-stream subtitle delay persistence and auto timeline-offset correction - Strip server-selected subtitle stream from mpv load URL; suppress plugin subtitle rearm and auto-start during app-managed preload - Fix resume position lost when mpv resets on stop; use last known position for final progress/stopped reports - Keep Play vs Resume distinct to avoid early seek race on normal play - Fix discovery resume when remote play sends StartPositionTicks=0 despite saved progress - Deduplicate show/hide overlay commands using recorded visibility state - Rewrite docs-site Jellyfin page around cast-to-device UX * test: update lifecycle cleanup assertion * fix: clear aborted playback state, fix overlay passthrough, and guard du - Reset app_managed_playback_pending on lifecycle cleanup to prevent state leak into next item - Record visible overlay action only after command succeeds, not before - Non-native passive overlay now always click-through on re-show (fix isNonNativePassiveOverlay ordering) - Defer activeParsedSubtitleMediaPath assignment until after prefetch completes - Move autoplay gate release into the hide branch of toggleVisibleOverlay - Clear active Jellyfin playback when stopping media that never loaded - Reset managed subtitle delay and delay key when no external tracks are available - Await async removeDir in subtitle cache cleanup - Guard duplicate delete clicks in MediaDetailView and SessionsTab with refs - Escape key in DeleteConfirmDialog now calls stopPropagation and stopImmediatePropagation
199 lines
10 KiB
TypeScript
199 lines
10 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];
|
|
|
|
type AnilistPostWatchRunOptions = {
|
|
watchedSeconds?: number;
|
|
};
|
|
|
|
export function createBindMpvMainEventHandlersHandler(deps: {
|
|
reportJellyfinRemoteStopped: () => void;
|
|
syncOverlayMpvSubtitleSuppression: () => void;
|
|
onMpvConnected?: () => 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: (options?: AnilistPostWatchRunOptions) => 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;
|
|
markJellyfinRemotePlaybackLoaded?: (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(),
|
|
onConnected: () => deps.onMpvConnected?.(),
|
|
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();
|
|
} else {
|
|
deps.updateCurrentMediaPath('');
|
|
}
|
|
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: (options) => deps.maybeRunAnilistPostWatchUpdate(options),
|
|
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),
|
|
markJellyfinRemotePlaybackLoaded: (path) => deps.markJellyfinRemotePlaybackLoaded?.(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: (options) => deps.maybeRunAnilistPostWatchUpdate(options),
|
|
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);
|
|
};
|
|
}
|