mirror of
https://github.com/ksyasuda/SubMiner.git
synced 2026-07-07 13:08:54 -07:00
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
This commit is contained in:
GitHub
@@ -5,9 +5,10 @@ import {
|
||||
confirmDayGroupDelete,
|
||||
confirmEpisodeDelete,
|
||||
confirmSessionDelete,
|
||||
setDeleteConfirmPresenter,
|
||||
} from './delete-confirm';
|
||||
|
||||
test('confirmSessionDelete uses the shared session delete warning copy', () => {
|
||||
test('confirmSessionDelete uses the shared session delete warning copy', async () => {
|
||||
const calls: string[] = [];
|
||||
const originalConfirm = globalThis.confirm;
|
||||
globalThis.confirm = ((message?: string) => {
|
||||
@@ -16,14 +17,183 @@ test('confirmSessionDelete uses the shared session delete warning copy', () => {
|
||||
}) as typeof globalThis.confirm;
|
||||
|
||||
try {
|
||||
assert.equal(confirmSessionDelete(), true);
|
||||
assert.equal(await confirmSessionDelete(), true);
|
||||
assert.deepEqual(calls, ['Delete this session and all associated data?']);
|
||||
} finally {
|
||||
globalThis.confirm = originalConfirm;
|
||||
}
|
||||
});
|
||||
|
||||
test('confirmDayGroupDelete includes the day label and count in the warning copy', () => {
|
||||
test('confirmSessionDelete suspends stats overlay layering around native confirm', async () => {
|
||||
const calls: string[] = [];
|
||||
const originalConfirm = globalThis.confirm;
|
||||
const originalElectronAPI = (
|
||||
globalThis as typeof globalThis & {
|
||||
electronAPI?: {
|
||||
stats?: {
|
||||
beginNativeDialog?: () => void;
|
||||
endNativeDialog?: () => void;
|
||||
};
|
||||
};
|
||||
}
|
||||
).electronAPI;
|
||||
(
|
||||
globalThis as typeof globalThis & {
|
||||
electronAPI?: {
|
||||
stats?: {
|
||||
beginNativeDialog?: () => void;
|
||||
endNativeDialog?: () => void;
|
||||
};
|
||||
};
|
||||
}
|
||||
).electronAPI = {
|
||||
stats: {
|
||||
beginNativeDialog: () => calls.push('begin-native-dialog'),
|
||||
endNativeDialog: () => calls.push('end-native-dialog'),
|
||||
},
|
||||
};
|
||||
globalThis.confirm = ((message?: string) => {
|
||||
calls.push(`confirm:${message ?? ''}`);
|
||||
return true;
|
||||
}) as typeof globalThis.confirm;
|
||||
|
||||
try {
|
||||
assert.equal(await confirmSessionDelete(), true);
|
||||
assert.deepEqual(calls, [
|
||||
'begin-native-dialog',
|
||||
'confirm:Delete this session and all associated data?',
|
||||
'end-native-dialog',
|
||||
]);
|
||||
} finally {
|
||||
globalThis.confirm = originalConfirm;
|
||||
(
|
||||
globalThis as typeof globalThis & {
|
||||
electronAPI?: {
|
||||
stats?: {
|
||||
beginNativeDialog?: () => void;
|
||||
endNativeDialog?: () => void;
|
||||
};
|
||||
};
|
||||
}
|
||||
).electronAPI = originalElectronAPI;
|
||||
}
|
||||
});
|
||||
|
||||
test('confirmSessionDelete uses parented Electron confirm when available', async () => {
|
||||
const calls: string[] = [];
|
||||
const originalConfirm = globalThis.confirm;
|
||||
const originalElectronAPI = (
|
||||
globalThis as typeof globalThis & {
|
||||
electronAPI?: {
|
||||
stats?: {
|
||||
confirmNativeDialog?: (message: string) => boolean;
|
||||
beginNativeDialog?: () => void;
|
||||
endNativeDialog?: () => void;
|
||||
};
|
||||
};
|
||||
}
|
||||
).electronAPI;
|
||||
(
|
||||
globalThis as typeof globalThis & {
|
||||
electronAPI?: {
|
||||
stats?: {
|
||||
confirmNativeDialog?: (message: string) => boolean;
|
||||
beginNativeDialog?: () => void;
|
||||
endNativeDialog?: () => void;
|
||||
};
|
||||
};
|
||||
}
|
||||
).electronAPI = {
|
||||
stats: {
|
||||
confirmNativeDialog: (message) => {
|
||||
calls.push(`native-confirm:${message}`);
|
||||
return false;
|
||||
},
|
||||
beginNativeDialog: () => calls.push('begin-native-dialog'),
|
||||
endNativeDialog: () => calls.push('end-native-dialog'),
|
||||
},
|
||||
};
|
||||
globalThis.confirm = ((message?: string) => {
|
||||
calls.push(`browser-confirm:${message ?? ''}`);
|
||||
return true;
|
||||
}) as typeof globalThis.confirm;
|
||||
|
||||
try {
|
||||
assert.equal(await confirmSessionDelete(), false);
|
||||
assert.deepEqual(calls, ['native-confirm:Delete this session and all associated data?']);
|
||||
} finally {
|
||||
globalThis.confirm = originalConfirm;
|
||||
(
|
||||
globalThis as typeof globalThis & {
|
||||
electronAPI?: {
|
||||
stats?: {
|
||||
confirmNativeDialog?: (message: string) => boolean;
|
||||
beginNativeDialog?: () => void;
|
||||
endNativeDialog?: () => void;
|
||||
};
|
||||
};
|
||||
}
|
||||
).electronAPI = originalElectronAPI;
|
||||
}
|
||||
});
|
||||
|
||||
test('confirmSessionDelete uses the registered stats presenter before native or browser confirm', async () => {
|
||||
const calls: string[] = [];
|
||||
const originalConfirm = globalThis.confirm;
|
||||
const originalElectronAPI = (
|
||||
globalThis as typeof globalThis & {
|
||||
electronAPI?: {
|
||||
stats?: {
|
||||
confirmNativeDialog?: (message: string) => boolean;
|
||||
};
|
||||
};
|
||||
}
|
||||
).electronAPI;
|
||||
(
|
||||
globalThis as typeof globalThis & {
|
||||
electronAPI?: {
|
||||
stats?: {
|
||||
confirmNativeDialog?: (message: string) => boolean;
|
||||
};
|
||||
};
|
||||
}
|
||||
).electronAPI = {
|
||||
stats: {
|
||||
confirmNativeDialog: (message) => {
|
||||
calls.push(`native-confirm:${message}`);
|
||||
return true;
|
||||
},
|
||||
},
|
||||
};
|
||||
globalThis.confirm = ((message?: string) => {
|
||||
calls.push(`browser-confirm:${message ?? ''}`);
|
||||
return true;
|
||||
}) as typeof globalThis.confirm;
|
||||
|
||||
const unregister = setDeleteConfirmPresenter(async (message) => {
|
||||
calls.push(`presenter:${message}`);
|
||||
return false;
|
||||
});
|
||||
|
||||
try {
|
||||
assert.equal(await confirmSessionDelete(), false);
|
||||
assert.deepEqual(calls, ['presenter:Delete this session and all associated data?']);
|
||||
} finally {
|
||||
unregister();
|
||||
globalThis.confirm = originalConfirm;
|
||||
(
|
||||
globalThis as typeof globalThis & {
|
||||
electronAPI?: {
|
||||
stats?: {
|
||||
confirmNativeDialog?: (message: string) => boolean;
|
||||
};
|
||||
};
|
||||
}
|
||||
).electronAPI = originalElectronAPI;
|
||||
}
|
||||
});
|
||||
|
||||
test('confirmDayGroupDelete includes the day label and count in the warning copy', async () => {
|
||||
const calls: string[] = [];
|
||||
const originalConfirm = globalThis.confirm;
|
||||
globalThis.confirm = ((message?: string) => {
|
||||
@@ -32,14 +202,14 @@ test('confirmDayGroupDelete includes the day label and count in the warning copy
|
||||
}) as typeof globalThis.confirm;
|
||||
|
||||
try {
|
||||
assert.equal(confirmDayGroupDelete('Today', 3), true);
|
||||
assert.equal(await confirmDayGroupDelete('Today', 3), true);
|
||||
assert.deepEqual(calls, ['Delete all 3 sessions from Today and all associated data?']);
|
||||
} finally {
|
||||
globalThis.confirm = originalConfirm;
|
||||
}
|
||||
});
|
||||
|
||||
test('confirmDayGroupDelete uses singular for one session', () => {
|
||||
test('confirmDayGroupDelete uses singular for one session', async () => {
|
||||
const calls: string[] = [];
|
||||
const originalConfirm = globalThis.confirm;
|
||||
globalThis.confirm = ((message?: string) => {
|
||||
@@ -48,14 +218,14 @@ test('confirmDayGroupDelete uses singular for one session', () => {
|
||||
}) as typeof globalThis.confirm;
|
||||
|
||||
try {
|
||||
assert.equal(confirmDayGroupDelete('Yesterday', 1), true);
|
||||
assert.deepEqual(calls, ['Delete all 1 session from Yesterday and all associated data?']);
|
||||
assert.equal(await confirmDayGroupDelete('Yesterday', 1), true);
|
||||
assert.deepEqual(calls, ['Delete this session from Yesterday and all associated data?']);
|
||||
} finally {
|
||||
globalThis.confirm = originalConfirm;
|
||||
}
|
||||
});
|
||||
|
||||
test('confirmBucketDelete asks about merging multiple sessions of the same episode', () => {
|
||||
test('confirmBucketDelete asks about merging multiple sessions of the same episode', async () => {
|
||||
const calls: string[] = [];
|
||||
const originalConfirm = globalThis.confirm;
|
||||
globalThis.confirm = ((message?: string) => {
|
||||
@@ -64,7 +234,7 @@ test('confirmBucketDelete asks about merging multiple sessions of the same episo
|
||||
}) as typeof globalThis.confirm;
|
||||
|
||||
try {
|
||||
assert.equal(confirmBucketDelete('My Episode', 3), true);
|
||||
assert.equal(await confirmBucketDelete('My Episode', 3), true);
|
||||
assert.deepEqual(calls, [
|
||||
'Delete all 3 sessions of "My Episode" from this day and all associated data?',
|
||||
]);
|
||||
@@ -73,7 +243,7 @@ test('confirmBucketDelete asks about merging multiple sessions of the same episo
|
||||
}
|
||||
});
|
||||
|
||||
test('confirmBucketDelete uses a clean singular form for one session', () => {
|
||||
test('confirmBucketDelete uses a clean singular form for one session', async () => {
|
||||
const calls: string[] = [];
|
||||
const originalConfirm = globalThis.confirm;
|
||||
globalThis.confirm = ((message?: string) => {
|
||||
@@ -82,7 +252,7 @@ test('confirmBucketDelete uses a clean singular form for one session', () => {
|
||||
}) as typeof globalThis.confirm;
|
||||
|
||||
try {
|
||||
assert.equal(confirmBucketDelete('Solo Episode', 1), false);
|
||||
assert.equal(await confirmBucketDelete('Solo Episode', 1), false);
|
||||
assert.deepEqual(calls, [
|
||||
'Delete this session of "Solo Episode" from this day and all associated data?',
|
||||
]);
|
||||
@@ -91,7 +261,7 @@ test('confirmBucketDelete uses a clean singular form for one session', () => {
|
||||
}
|
||||
});
|
||||
|
||||
test('confirmEpisodeDelete includes the episode title in the shared warning copy', () => {
|
||||
test('confirmEpisodeDelete includes the episode title in the shared warning copy', async () => {
|
||||
const calls: string[] = [];
|
||||
const originalConfirm = globalThis.confirm;
|
||||
globalThis.confirm = ((message?: string) => {
|
||||
@@ -100,7 +270,7 @@ test('confirmEpisodeDelete includes the episode title in the shared warning copy
|
||||
}) as typeof globalThis.confirm;
|
||||
|
||||
try {
|
||||
assert.equal(confirmEpisodeDelete('Episode 4'), false);
|
||||
assert.equal(await confirmEpisodeDelete('Episode 4'), false);
|
||||
assert.deepEqual(calls, ['Delete "Episode 4" and all its sessions?']);
|
||||
} finally {
|
||||
globalThis.confirm = originalConfirm;
|
||||
|
||||
@@ -1,30 +1,76 @@
|
||||
export function confirmSessionDelete(): boolean {
|
||||
return globalThis.confirm('Delete this session and all associated data?');
|
||||
type NativeDialogBridge = {
|
||||
electronAPI?: {
|
||||
stats?: {
|
||||
confirmNativeDialog?: (message: string) => boolean;
|
||||
beginNativeDialog?: () => void;
|
||||
endNativeDialog?: () => void;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
type DeleteConfirmPresenter = (message: string) => boolean | Promise<boolean>;
|
||||
|
||||
let deleteConfirmPresenter: DeleteConfirmPresenter | null = null;
|
||||
|
||||
export function setDeleteConfirmPresenter(presenter: DeleteConfirmPresenter): () => void {
|
||||
deleteConfirmPresenter = presenter;
|
||||
return () => {
|
||||
if (deleteConfirmPresenter === presenter) {
|
||||
deleteConfirmPresenter = null;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
export function confirmDayGroupDelete(dayLabel: string, count: number): boolean {
|
||||
return globalThis.confirm(
|
||||
`Delete all ${count} session${count === 1 ? '' : 's'} from ${dayLabel} and all associated data?`,
|
||||
async function confirmWithStatsNativeDialogLayer(message: string): Promise<boolean> {
|
||||
if (deleteConfirmPresenter) {
|
||||
return deleteConfirmPresenter(message);
|
||||
}
|
||||
|
||||
const statsApi = (globalThis as typeof globalThis & NativeDialogBridge).electronAPI?.stats;
|
||||
if (statsApi?.confirmNativeDialog) {
|
||||
return statsApi.confirmNativeDialog(message);
|
||||
}
|
||||
|
||||
statsApi?.beginNativeDialog?.();
|
||||
try {
|
||||
return globalThis.confirm(message);
|
||||
} finally {
|
||||
statsApi?.endNativeDialog?.();
|
||||
}
|
||||
}
|
||||
|
||||
export function confirmSessionDelete(): Promise<boolean> {
|
||||
return confirmWithStatsNativeDialogLayer('Delete this session and all associated data?');
|
||||
}
|
||||
|
||||
export function confirmDayGroupDelete(dayLabel: string, count: number): Promise<boolean> {
|
||||
if (count === 1) {
|
||||
return confirmWithStatsNativeDialogLayer(
|
||||
`Delete this session from ${dayLabel} and all associated data?`,
|
||||
);
|
||||
}
|
||||
return confirmWithStatsNativeDialogLayer(
|
||||
`Delete all ${count} sessions from ${dayLabel} and all associated data?`,
|
||||
);
|
||||
}
|
||||
|
||||
export function confirmAnimeGroupDelete(title: string, count: number): boolean {
|
||||
return globalThis.confirm(
|
||||
export function confirmAnimeGroupDelete(title: string, count: number): Promise<boolean> {
|
||||
return confirmWithStatsNativeDialogLayer(
|
||||
`Delete all ${count} session${count === 1 ? '' : 's'} for "${title}" and all associated data?`,
|
||||
);
|
||||
}
|
||||
|
||||
export function confirmEpisodeDelete(title: string): boolean {
|
||||
return globalThis.confirm(`Delete "${title}" and all its sessions?`);
|
||||
export function confirmEpisodeDelete(title: string): Promise<boolean> {
|
||||
return confirmWithStatsNativeDialogLayer(`Delete "${title}" and all its sessions?`);
|
||||
}
|
||||
|
||||
export function confirmBucketDelete(title: string, count: number): boolean {
|
||||
export function confirmBucketDelete(title: string, count: number): Promise<boolean> {
|
||||
if (count === 1) {
|
||||
return globalThis.confirm(
|
||||
return confirmWithStatsNativeDialogLayer(
|
||||
`Delete this session of "${title}" from this day and all associated data?`,
|
||||
);
|
||||
}
|
||||
return globalThis.confirm(
|
||||
return confirmWithStatsNativeDialogLayer(
|
||||
`Delete all ${count} sessions of "${title}" from this day and all associated data?`,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -62,6 +62,9 @@ interface StatsElectronAPI {
|
||||
ankiBrowse: (noteId: number) => Promise<void>;
|
||||
ankiNotesInfo: (noteIds: number[]) => Promise<StatsAnkiNoteInfo[]>;
|
||||
hideOverlay: () => void;
|
||||
confirmNativeDialog?: (message: string) => boolean;
|
||||
beginNativeDialog?: () => void;
|
||||
endNativeDialog?: () => void;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user