mirror of
https://github.com/ksyasuda/SubMiner.git
synced 2026-07-31 07:21:33 -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
407 lines
12 KiB
TypeScript
407 lines
12 KiB
TypeScript
import * as fs from 'fs';
|
|
import * as os from 'os';
|
|
import * as path from 'path';
|
|
import { SubsyncManualPayload, SubsyncManualRunRequest, SubsyncResult } from '../../types';
|
|
import {
|
|
CommandResult,
|
|
codecToExtension,
|
|
fileExists,
|
|
formatTrackLabel,
|
|
getTrackById,
|
|
hasPathSeparators,
|
|
MpvTrack,
|
|
runCommand,
|
|
SubsyncContext,
|
|
SubsyncResolvedConfig,
|
|
} from '../../subsync/utils';
|
|
import { isRemoteMediaPath } from '../../jimaku/utils';
|
|
|
|
interface FileExtractionResult {
|
|
path: string;
|
|
temporary: boolean;
|
|
}
|
|
|
|
function summarizeCommandFailure(command: string, result: CommandResult): string {
|
|
const parts = [
|
|
`code=${result.code ?? 'n/a'}`,
|
|
result.stderr ? `stderr: ${result.stderr}` : '',
|
|
result.stdout ? `stdout: ${result.stdout}` : '',
|
|
result.error ? `error: ${result.error}` : '',
|
|
]
|
|
.map((value) => value.trim())
|
|
.filter(Boolean);
|
|
|
|
if (parts.length === 0) return `command failed (${command})`;
|
|
return `command failed (${command}) ${parts.join(' | ')}`;
|
|
}
|
|
|
|
interface MpvClientLike {
|
|
connected: boolean;
|
|
currentAudioStreamIndex: number | null;
|
|
send: (payload: { command: (string | number)[] }) => void;
|
|
requestProperty: (name: string) => Promise<unknown>;
|
|
}
|
|
|
|
interface SubsyncCoreDeps {
|
|
getMpvClient: () => MpvClientLike | null;
|
|
getResolvedConfig: () => SubsyncResolvedConfig;
|
|
}
|
|
|
|
function parseTrackId(value: unknown): number | null {
|
|
if (typeof value === 'number') {
|
|
return Number.isInteger(value) ? value : null;
|
|
}
|
|
if (typeof value === 'string') {
|
|
const trimmed = value.trim();
|
|
if (!trimmed.length) return null;
|
|
const parsed = Number(trimmed);
|
|
return Number.isInteger(parsed) && String(parsed) === trimmed ? parsed : null;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
function normalizeTrackIds(tracks: unknown[]): MpvTrack[] {
|
|
return tracks.map((track) => {
|
|
if (!track || typeof track !== 'object') return track as MpvTrack;
|
|
const typed = track as MpvTrack & { id?: unknown };
|
|
const parsedId = parseTrackId(typed.id);
|
|
if (parsedId === null) {
|
|
const { id: _ignored, ...rest } = typed;
|
|
return rest as MpvTrack;
|
|
}
|
|
return { ...typed, id: parsedId };
|
|
});
|
|
}
|
|
|
|
function getSourceTrackIdentity(track: MpvTrack): string {
|
|
if (
|
|
track.external &&
|
|
typeof track['external-filename'] === 'string' &&
|
|
track['external-filename'].length > 0
|
|
) {
|
|
return `external:${track['external-filename'].toLowerCase()}`;
|
|
}
|
|
if (typeof track.id === 'number') {
|
|
return `id:${track.id}`;
|
|
}
|
|
if (typeof track.title === 'string' && track.title.length > 0) {
|
|
return `title:${track.title.toLowerCase()}`;
|
|
}
|
|
return 'unknown';
|
|
}
|
|
|
|
function dedupeSourceTracks(tracks: MpvTrack[]): MpvTrack[] {
|
|
const deduped = new Map<string, MpvTrack>();
|
|
for (const track of tracks) {
|
|
const identity = getSourceTrackIdentity(track);
|
|
const existing = deduped.get(identity);
|
|
if (!existing || (track.selected && !existing.selected)) {
|
|
deduped.set(identity, track);
|
|
}
|
|
}
|
|
return [...deduped.values()];
|
|
}
|
|
|
|
export interface TriggerSubsyncFromConfigDeps extends SubsyncCoreDeps {
|
|
isSubsyncInProgress: () => boolean;
|
|
setSubsyncInProgress: (inProgress: boolean) => void;
|
|
showMpvOsd: (text: string) => void;
|
|
runWithSubsyncSpinner: <T>(task: () => Promise<T>) => Promise<T>;
|
|
openManualPicker: (payload: SubsyncManualPayload) => void;
|
|
}
|
|
|
|
function getMpvClientForSubsync(deps: SubsyncCoreDeps): MpvClientLike {
|
|
const client = deps.getMpvClient();
|
|
if (!client || !client.connected) {
|
|
throw new Error('MPV not connected');
|
|
}
|
|
return client;
|
|
}
|
|
|
|
async function gatherSubsyncContext(client: MpvClientLike): Promise<SubsyncContext> {
|
|
const [videoPathRaw, sidRaw, secondarySidRaw, trackListRaw] = await Promise.all([
|
|
client.requestProperty('path'),
|
|
client.requestProperty('sid'),
|
|
client.requestProperty('secondary-sid'),
|
|
client.requestProperty('track-list'),
|
|
]);
|
|
|
|
const videoPath = typeof videoPathRaw === 'string' ? videoPathRaw : '';
|
|
if (!videoPath) {
|
|
throw new Error('No video is currently loaded');
|
|
}
|
|
|
|
const tracks = Array.isArray(trackListRaw) ? normalizeTrackIds(trackListRaw as MpvTrack[]) : [];
|
|
const subtitleTracks = tracks.filter((track) => track.type === 'sub');
|
|
const sid = parseTrackId(sidRaw);
|
|
const secondarySid = parseTrackId(secondarySidRaw);
|
|
|
|
const primaryTrack = subtitleTracks.find((track) => track.id === sid);
|
|
if (!primaryTrack) {
|
|
throw new Error('No active subtitle track found');
|
|
}
|
|
|
|
const secondaryTrack = subtitleTracks.find((track) => track.id === secondarySid) ?? null;
|
|
const sourceTracks = subtitleTracks
|
|
.filter((track) => track.id !== sid)
|
|
.filter((track) => {
|
|
if (!track.external) return true;
|
|
const filename = track['external-filename'];
|
|
return typeof filename === 'string' && filename.length > 0;
|
|
});
|
|
const uniqueSourceTracks = dedupeSourceTracks(sourceTracks);
|
|
|
|
return {
|
|
videoPath,
|
|
primaryTrack,
|
|
secondaryTrack,
|
|
sourceTracks: uniqueSourceTracks,
|
|
audioStreamIndex: client.currentAudioStreamIndex,
|
|
};
|
|
}
|
|
|
|
function ensureExecutablePath(pathOrName: string, name: string): string {
|
|
if (!pathOrName) {
|
|
throw new Error(`Missing ${name} path in config`);
|
|
}
|
|
|
|
if (hasPathSeparators(pathOrName) && !fileExists(pathOrName)) {
|
|
throw new Error(`Configured ${name} executable not found: ${pathOrName}`);
|
|
}
|
|
return pathOrName;
|
|
}
|
|
|
|
async function extractSubtitleTrackToFile(
|
|
ffmpegPath: string,
|
|
videoPath: string,
|
|
track: MpvTrack,
|
|
): Promise<FileExtractionResult> {
|
|
if (track.external) {
|
|
const externalPath = track['external-filename'];
|
|
if (typeof externalPath !== 'string' || externalPath.length === 0) {
|
|
throw new Error('External subtitle track has no file path');
|
|
}
|
|
if (!fileExists(externalPath)) {
|
|
throw new Error(`Subtitle file not found: ${externalPath}`);
|
|
}
|
|
return { path: externalPath, temporary: false };
|
|
}
|
|
|
|
const ffIndex = track['ff-index'];
|
|
const extension = codecToExtension(track.codec);
|
|
if (typeof ffIndex !== 'number' || !Number.isInteger(ffIndex) || ffIndex < 0) {
|
|
throw new Error('Internal subtitle track has no valid ff-index');
|
|
}
|
|
if (!extension) {
|
|
throw new Error(`Unsupported subtitle codec: ${track.codec ?? 'unknown'}`);
|
|
}
|
|
|
|
const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-subsync-'));
|
|
const outputPath = path.join(tempDir, `track_${ffIndex}.${extension}`);
|
|
const extraction = await runCommand(ffmpegPath, [
|
|
'-hide_banner',
|
|
'-nostdin',
|
|
'-y',
|
|
'-loglevel',
|
|
'error',
|
|
'-an',
|
|
'-vn',
|
|
'-i',
|
|
videoPath,
|
|
'-map',
|
|
`0:${ffIndex}`,
|
|
'-f',
|
|
extension,
|
|
outputPath,
|
|
]);
|
|
|
|
if (!extraction.ok || !fileExists(outputPath)) {
|
|
throw new Error(
|
|
`Failed to extract internal subtitle track with ffmpeg: ${summarizeCommandFailure(
|
|
'ffmpeg',
|
|
extraction,
|
|
)}`,
|
|
);
|
|
}
|
|
|
|
return { path: outputPath, temporary: true };
|
|
}
|
|
|
|
function cleanupTemporaryFile(extraction: FileExtractionResult): void {
|
|
if (!extraction.temporary) return;
|
|
try {
|
|
if (fileExists(extraction.path)) {
|
|
fs.unlinkSync(extraction.path);
|
|
}
|
|
} catch {}
|
|
try {
|
|
const dir = path.dirname(extraction.path);
|
|
if (fs.existsSync(dir)) {
|
|
fs.rmdirSync(dir);
|
|
}
|
|
} catch {}
|
|
}
|
|
|
|
function buildRetimedPath(subPath: string, replace: boolean): string {
|
|
if (replace) return subPath;
|
|
const parsed = path.parse(subPath);
|
|
return path.join(parsed.dir, `${parsed.name}_retimed${parsed.ext || '.srt'}`);
|
|
}
|
|
|
|
async function runAlassSync(
|
|
alassPath: string,
|
|
referenceFile: string,
|
|
inputSubtitlePath: string,
|
|
outputPath: string,
|
|
): Promise<CommandResult> {
|
|
return runCommand(alassPath, [referenceFile, inputSubtitlePath, outputPath]);
|
|
}
|
|
|
|
async function runFfsubsyncSync(
|
|
ffsubsyncPath: string,
|
|
videoPath: string,
|
|
inputSubtitlePath: string,
|
|
outputPath: string,
|
|
audioStreamIndex: number | null,
|
|
): Promise<CommandResult> {
|
|
const args = [videoPath, '-i', inputSubtitlePath, '-o', outputPath];
|
|
if (audioStreamIndex !== null) {
|
|
args.push('--reference-stream', `0:${audioStreamIndex}`);
|
|
}
|
|
return runCommand(ffsubsyncPath, args);
|
|
}
|
|
|
|
function loadSyncedSubtitle(client: MpvClientLike, pathToLoad: string): void {
|
|
if (!client.connected) {
|
|
throw new Error('MPV disconnected while loading subtitle');
|
|
}
|
|
client.send({ command: ['sub_add', pathToLoad] });
|
|
client.send({ command: ['set_property', 'sub-delay', 0] });
|
|
}
|
|
|
|
async function subsyncToReference(
|
|
engine: 'alass' | 'ffsubsync',
|
|
referenceFilePath: string,
|
|
context: SubsyncContext,
|
|
resolved: SubsyncResolvedConfig,
|
|
client: MpvClientLike,
|
|
): Promise<SubsyncResult> {
|
|
const ffmpegPath = ensureExecutablePath(resolved.ffmpegPath, 'ffmpeg');
|
|
const primaryExtraction = await extractSubtitleTrackToFile(
|
|
ffmpegPath,
|
|
context.videoPath,
|
|
context.primaryTrack,
|
|
);
|
|
const replacePrimary = resolved.replace !== false && !primaryExtraction.temporary;
|
|
const outputPath = buildRetimedPath(primaryExtraction.path, replacePrimary);
|
|
|
|
try {
|
|
let result: CommandResult;
|
|
if (engine === 'alass') {
|
|
const alassPath = ensureExecutablePath(resolved.alassPath, 'alass');
|
|
result = await runAlassSync(alassPath, referenceFilePath, primaryExtraction.path, outputPath);
|
|
} else {
|
|
const ffsubsyncPath = ensureExecutablePath(resolved.ffsubsyncPath, 'ffsubsync');
|
|
result = await runFfsubsyncSync(
|
|
ffsubsyncPath,
|
|
context.videoPath,
|
|
primaryExtraction.path,
|
|
outputPath,
|
|
context.audioStreamIndex,
|
|
);
|
|
}
|
|
|
|
if (!result.ok || !fileExists(outputPath)) {
|
|
const details = summarizeCommandFailure(engine, result);
|
|
return {
|
|
ok: false,
|
|
message: `${engine} synchronization failed: ${details}`,
|
|
};
|
|
}
|
|
|
|
loadSyncedSubtitle(client, outputPath);
|
|
return {
|
|
ok: true,
|
|
message: `Subtitle synchronized with ${engine}`,
|
|
};
|
|
} finally {
|
|
cleanupTemporaryFile(primaryExtraction);
|
|
}
|
|
}
|
|
|
|
function validateFfsubsyncReference(videoPath: string): void {
|
|
if (isRemoteMediaPath(videoPath)) {
|
|
throw new Error(
|
|
'FFsubsync cannot reliably sync stream URLs because it needs direct reference media access. Use Alass with a secondary subtitle source or play a local file.',
|
|
);
|
|
}
|
|
}
|
|
|
|
export async function runSubsyncManual(
|
|
request: SubsyncManualRunRequest,
|
|
deps: SubsyncCoreDeps,
|
|
): Promise<SubsyncResult> {
|
|
const client = getMpvClientForSubsync(deps);
|
|
const context = await gatherSubsyncContext(client);
|
|
const resolved = deps.getResolvedConfig();
|
|
|
|
if (request.engine === 'ffsubsync') {
|
|
try {
|
|
validateFfsubsyncReference(context.videoPath);
|
|
} catch (error) {
|
|
return {
|
|
ok: false,
|
|
message: `ffsubsync synchronization failed: ${(error as Error).message}`,
|
|
};
|
|
}
|
|
return subsyncToReference('ffsubsync', context.videoPath, context, resolved, client);
|
|
}
|
|
|
|
const sourceTrack = getTrackById(context.sourceTracks, request.sourceTrackId ?? null);
|
|
if (!sourceTrack) {
|
|
return { ok: false, message: 'Select a subtitle source track for alass' };
|
|
}
|
|
|
|
const ffmpegPath = ensureExecutablePath(resolved.ffmpegPath, 'ffmpeg');
|
|
let sourceExtraction: FileExtractionResult | null = null;
|
|
try {
|
|
sourceExtraction = await extractSubtitleTrackToFile(ffmpegPath, context.videoPath, sourceTrack);
|
|
return await subsyncToReference('alass', sourceExtraction.path, context, resolved, client);
|
|
} finally {
|
|
if (sourceExtraction) {
|
|
cleanupTemporaryFile(sourceExtraction);
|
|
}
|
|
}
|
|
}
|
|
|
|
export async function openSubsyncManualPicker(deps: TriggerSubsyncFromConfigDeps): Promise<void> {
|
|
const client = getMpvClientForSubsync(deps);
|
|
const context = await gatherSubsyncContext(client);
|
|
const payload: SubsyncManualPayload = {
|
|
ffsubsyncAvailable: !isRemoteMediaPath(context.videoPath),
|
|
sourceTracks: context.sourceTracks
|
|
.filter((track) => typeof track.id === 'number')
|
|
.map((track) => ({
|
|
id: track.id as number,
|
|
label: formatTrackLabel(track),
|
|
})),
|
|
};
|
|
deps.openManualPicker(payload);
|
|
}
|
|
|
|
export async function triggerSubsyncFromConfig(deps: TriggerSubsyncFromConfigDeps): Promise<void> {
|
|
if (deps.isSubsyncInProgress()) {
|
|
deps.showMpvOsd('Subsync already running');
|
|
return;
|
|
}
|
|
|
|
try {
|
|
await openSubsyncManualPicker(deps);
|
|
deps.showMpvOsd('Subsync: choose engine and source');
|
|
} catch (error) {
|
|
deps.showMpvOsd(`Subsync failed: ${(error as Error).message}`);
|
|
} finally {
|
|
deps.setSubsyncInProgress(false);
|
|
}
|
|
}
|