fix(jellyfin): show overlay, inject plugin, and fix stats title on playback (#77)

* 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
2026-05-26 00:55:16 -07:00 · 2026-05-24 18:40:56 -07:00
parent da3c971ee6
commit b1bdeabca8
193 changed files with 7975 additions and 771 deletions
@@ -7,6 +7,7 @@ local OVERLAY_RESTART_PING_MAX_ATTEMPTS = 20
 local AUTO_PLAY_READY_LOADING_OSD = "Loading subtitle tokenization..."
 local AUTO_PLAY_READY_READY_OSD = "Subtitle tokenization ready"
 local DEFAULT_AUTO_PLAY_READY_TIMEOUT_SECONDS = 15
+local DUPLICATE_VISIBLE_OVERLAY_TOGGLE_SECONDS = 0.25

 function M.create(ctx)
 	local mp = ctx.mp
@@ -31,6 +32,16 @@ function M.create(ctx)
 		return options_helper.coerce_bool(raw_visible_overlay, false)
 	end

+	local function resolve_auto_start_visibility_action()
+		if resolve_visible_overlay_startup() then
+			if state.suppress_ready_overlay_restore then
+				return nil
+			end
+			return "show-visible-overlay"
+		end
+		return "hide-visible-overlay"
+	end
+
 	local function resolve_pause_until_ready()
 		local raw_pause_until_ready = opts.auto_start_pause_until_ready
 		if raw_pause_until_ready == nil then
@@ -67,6 +78,89 @@ function M.create(ctx)
 		return DEFAULT_AUTO_PLAY_READY_TIMEOUT_SECONDS
 	end

+	local function record_visible_overlay_action(action)
+		if action == "show-visible-overlay" then
+			state.visible_overlay_requested = true
+			state.suppress_ready_overlay_restore = false
+		elseif action == "hide-visible-overlay" then
+			state.visible_overlay_requested = false
+		elseif action == "toggle-visible-overlay" and state.visible_overlay_requested ~= nil then
+			state.visible_overlay_requested = not state.visible_overlay_requested
+			if state.visible_overlay_requested then
+				state.suppress_ready_overlay_restore = false
+			end
+		end
+	end
+
+	local function record_visible_overlay_visibility(visible)
+		if visible then
+			state.visible_overlay_requested = true
+			state.suppress_ready_overlay_restore = false
+			return
+		end
+		state.visible_overlay_requested = false
+		state.suppress_ready_overlay_restore = true
+	end
+
+	local function record_start_visibility_args(args)
+		for _, arg in ipairs(args) do
+			if arg == "--show-visible-overlay" then
+				record_visible_overlay_action("show-visible-overlay")
+				return
+			end
+			if arg == "--hide-visible-overlay" then
+				record_visible_overlay_action("hide-visible-overlay")
+				return
+			end
+		end
+	end
+
+	local function should_run_visibility_action(action)
+		if action == "show-visible-overlay" and state.visible_overlay_requested == true then
+			return false
+		end
+		if action == "hide-visible-overlay" and state.visible_overlay_requested == false then
+			return false
+		end
+		return true
+	end
+
+	local function run_visibility_action_if_needed(action, overrides, callback)
+		if action == nil then
+			if callback then
+				callback(true)
+			end
+			return
+		end
+		if not should_run_visibility_action(action) then
+			subminer_log("debug", "process", "Skipping duplicate visible overlay action: " .. tostring(action))
+			if callback then
+				callback(true)
+			end
+			return
+		end
+		run_control_command_async(action, overrides, callback)
+	end
+
+	local function should_ignore_duplicate_visible_overlay_toggle()
+		if type(mp.get_time) ~= "function" then
+			return false
+		end
+		local now = mp.get_time()
+		if type(now) ~= "number" then
+			return false
+		end
+
+		local previous = state.last_visible_overlay_toggle_time
+		state.last_visible_overlay_toggle_time = now
+		if type(previous) ~= "number" then
+			return false
+		end
+
+		local elapsed = now - previous
+		return elapsed >= 0 and elapsed < DUPLICATE_VISIBLE_OVERLAY_TOGGLE_SECONDS
+	end
+
 	local function normalize_socket_path(path)
 		if type(path) ~= "string" then
 			return nil
@@ -129,7 +223,7 @@ function M.create(ctx)

 	local function release_auto_play_ready_gate(reason)
 		if not state.auto_play_ready_gate_armed then
-			return
+			return false
 		end
 		local should_resume_playback = state.auto_play_ready_should_resume_playback == true
 		disarm_auto_play_ready_gate({ resume_playback = false })
@@ -140,6 +234,7 @@ function M.create(ctx)
 		else
 			subminer_log("info", "process", "Startup gate ready; leaving playback paused: " .. tostring(reason or "ready"))
 		end
+		return true
 	end

 	local function arm_auto_play_ready_gate()
@@ -179,9 +274,12 @@ function M.create(ctx)
 	end

 	local function notify_auto_play_ready()
-		release_auto_play_ready_gate("tokenization-ready")
+		local released_ready_gate = release_auto_play_ready_gate("tokenization-ready")
 		local force_ready_overlay_restore = state.force_ready_overlay_restore == true
 		state.force_ready_overlay_restore = false
+		if not released_ready_gate and not force_ready_overlay_restore then
+			return
+		end
 		if state.suppress_ready_overlay_restore and not force_ready_overlay_restore then
 			return
 		end
@@ -189,7 +287,7 @@ function M.create(ctx)
 			state.suppress_ready_overlay_restore = false
 		end
 		if state.overlay_running and (force_ready_overlay_restore or resolve_visible_overlay_startup()) then
-			run_control_command_async("show-visible-overlay", {
+			run_visibility_action_if_needed("show-visible-overlay", {
 				socket_path = opts.socket_path,
 			})
 		end
@@ -224,7 +322,7 @@ function M.create(ctx)

 			local should_show_visible = overrides.show_visible_overlay
 			if should_show_visible == nil then
-				should_show_visible = resolve_visible_overlay_startup()
+				should_show_visible = resolve_visible_overlay_startup() and not state.suppress_ready_overlay_restore
 			end
 			if should_show_visible then
 				table.insert(args, "--show-visible-overlay")
@@ -315,6 +413,9 @@ function M.create(ctx)
 			capture_stderr = true,
 		}, function(success, result, error)
 			local ok = success and (result == nil or result.status == 0)
+			if ok then
+				record_visible_overlay_action(action)
+			end
 			if callback then
 				callback(ok, result, error)
 			end
@@ -399,9 +500,6 @@ function M.create(ctx)

 	local function start_overlay(overrides)
 		overrides = overrides or {}
-		if overrides.auto_start_trigger == true then
-			state.suppress_ready_overlay_restore = false
-		end

 		if not binary.ensure_binary_available() then
 			subminer_log("error", "binary", "SubMiner binary not found")
@@ -424,10 +522,8 @@ function M.create(ctx)
 				elseif not state.auto_play_ready_gate_armed then
 					disarm_auto_play_ready_gate()
 				end
-				local visibility_action = resolve_visible_overlay_startup()
-						and "show-visible-overlay"
-					or "hide-visible-overlay"
-				run_control_command_async(visibility_action, {
+				local visibility_action = resolve_auto_start_visibility_action()
+				run_visibility_action_if_needed(visibility_action, {
 					socket_path = socket_path,
 					log_level = overrides.log_level,
 				})
@@ -470,6 +566,7 @@ function M.create(ctx)
 			state.overlay_running = true

 			local command = build_subprocess_command(args)
+			record_start_visibility_args(args)
 			mp.command_native_async({
 				name = "subprocess",
 				args = command.args,
@@ -495,13 +592,11 @@ function M.create(ctx)
 				end

 				if overrides.auto_start_trigger == true then
-					local visibility_action = resolve_visible_overlay_startup()
-							and "show-visible-overlay"
-						or "hide-visible-overlay"
-						run_control_command_async(visibility_action, {
-							socket_path = socket_path,
-							log_level = overrides.log_level,
-						})
+					local visibility_action = resolve_auto_start_visibility_action()
+					run_visibility_action_if_needed(visibility_action, {
+						socket_path = socket_path,
+						log_level = overrides.log_level,
+					})
 				end

 			end)
@@ -546,7 +641,8 @@ function M.create(ctx)
 		show_osd("Stopped")
 	end

-	local function hide_visible_overlay()
+	local function hide_visible_overlay(options)
+		options = options or {}
 		if not binary.ensure_binary_available() then
 			subminer_log("error", "binary", "SubMiner binary not found")
 			return
@@ -566,7 +662,9 @@ function M.create(ctx)
 			end
 		end)

-		disarm_auto_play_ready_gate()
+		disarm_auto_play_ready_gate({
+			resume_playback = options.resume_playback ~= false,
+		})
 	end

 	local function toggle_overlay()
@@ -575,7 +673,28 @@ function M.create(ctx)
 			show_osd("Error: binary not found")
 			return
 		end
+		if should_ignore_duplicate_visible_overlay_toggle() then
+			subminer_log("debug", "process", "Ignoring duplicate visible overlay toggle")
+			return
+		end
+		if state.visible_overlay_requested == true then
+			state.suppress_ready_overlay_restore = true
+			hide_visible_overlay({ resume_playback = false })
+			return
+		end
+		if state.visible_overlay_requested == false then
+			state.suppress_ready_overlay_restore = false
+			disarm_auto_play_ready_gate({ resume_playback = false })
+			run_control_command_async("show-visible-overlay", nil, function(ok)
+				if not ok then
+					subminer_log("warn", "process", "Show-visible-overlay command failed")
+					show_osd("Toggle failed")
+				end
+			end)
+			return
+		end
 		state.suppress_ready_overlay_restore = true
+		disarm_auto_play_ready_gate({ resume_playback = false })

 		run_control_command_async("toggle-visible-overlay", nil, function(ok)
 			if not ok then
@@ -705,6 +824,7 @@ function M.create(ctx)
 		build_command_args = build_command_args,
 		has_matching_mpv_ipc_socket = has_matching_mpv_ipc_socket,
 		run_control_command_async = run_control_command_async,
+		record_visible_overlay_visibility = record_visible_overlay_visibility,
 		run_binary_command_async = run_binary_command_async,
 		parse_start_script_message_overrides = parse_start_script_message_overrides,
 		ensure_texthooker_running = ensure_texthooker_running,