mirror of
https://github.com/ksyasuda/SubMiner.git
synced 2026-07-27 16:49:51 -07:00
sudacode
58d54311d8
- merge-catalog: stop dropping anilist_id on every new anime insert (bun:sqlite .get() returns null, so the old !== undefined guard always fired); the guard was dead anyway since a colliding id is caught earlier - sync-command: throw instead of fail() inside runHostSync so the finally block runs and temp dirs holding snapshot data are cleaned up on failure - ssh: shell-quote the user-supplied --remote-cmd in the probe, and reject option-like (-prefixed) SSH hosts that ssh/scp would parse as flags - sync-db: close the remote handle if opening the local DB throws - sync-shared: treat EPERM from process.kill(pid, 0) as alive, not dead - cli-parser: trim the sync host before the mode-exclusivity check - tests: cover anilist_id preservation, anilist-based anime matching, and the SSH host/shell-quote guards
106 lines
3.8 KiB
TypeScript
106 lines
3.8 KiB
TypeScript
import fs from 'node:fs';
|
|
import { Database } from 'bun:sqlite';
|
|
import {
|
|
LexiconResolver,
|
|
mergeAnime,
|
|
mergeExcludedWords,
|
|
mergeMediaMetadata,
|
|
mergeVideos,
|
|
} from './merge-catalog.js';
|
|
import { mergeSessions } from './merge-sessions.js';
|
|
import { copyRemoteOnlyRollups, refreshRollupsForNewSessions } from './merge-rollups.js';
|
|
import {
|
|
assertMergeableSchema,
|
|
createEmptyMergeSummary,
|
|
type SyncMergeSummary,
|
|
} from './sync-shared.js';
|
|
|
|
export type { SyncMergeSummary } from './sync-shared.js';
|
|
export { createDbSnapshot, findLiveStatsDaemonPid } from './sync-shared.js';
|
|
|
|
/**
|
|
* Merge a snapshot of another machine's immersion database into the local
|
|
* one. Insert-only union keyed on natural keys (session_uuid, video_key,
|
|
* normalized_title_key, word/kanji identity); lifetime and rollup aggregates
|
|
* are updated incrementally so history older than the session retention
|
|
* window is preserved on both sides. Idempotent: re-merging the same
|
|
* snapshot is a no-op.
|
|
*/
|
|
export function mergeSnapshotIntoDb(localDbPath: string, snapshotPath: string): SyncMergeSummary {
|
|
if (!fs.existsSync(localDbPath)) {
|
|
throw new Error(`Local stats database not found: ${localDbPath}`);
|
|
}
|
|
if (!fs.existsSync(snapshotPath)) {
|
|
throw new Error(`Snapshot database not found: ${snapshotPath}`);
|
|
}
|
|
|
|
const remote = new Database(snapshotPath, { readonly: true });
|
|
let local: Database;
|
|
try {
|
|
local = new Database(localDbPath, { readwrite: true, create: false });
|
|
} catch (error) {
|
|
remote.close();
|
|
throw error;
|
|
}
|
|
try {
|
|
assertMergeableSchema(remote, 'Snapshot');
|
|
assertMergeableSchema(local, 'Local');
|
|
|
|
const summary = createEmptyMergeSummary();
|
|
local.run('PRAGMA foreign_keys = ON');
|
|
local.run('PRAGMA busy_timeout = 5000');
|
|
local.run('BEGIN IMMEDIATE');
|
|
try {
|
|
const animeIdMap = mergeAnime(local, remote, summary);
|
|
const { videoIdMap, addedVideoIds } = mergeVideos(local, remote, animeIdMap, summary);
|
|
mergeMediaMetadata(local, remote, videoIdMap, addedVideoIds);
|
|
mergeExcludedWords(local, remote, summary);
|
|
|
|
const lexicon = new LexiconResolver(local, remote, summary);
|
|
const { newSessionIds } = mergeSessions(
|
|
local,
|
|
remote,
|
|
videoIdMap,
|
|
animeIdMap,
|
|
lexicon,
|
|
summary,
|
|
);
|
|
lexicon.applyFrequencyDeltas();
|
|
refreshRollupsForNewSessions(local, newSessionIds, summary);
|
|
copyRemoteOnlyRollups(local, remote, videoIdMap, summary);
|
|
|
|
local.run('COMMIT');
|
|
return summary;
|
|
} catch (error) {
|
|
local.run('ROLLBACK');
|
|
throw error;
|
|
}
|
|
} finally {
|
|
local.close();
|
|
remote.close();
|
|
}
|
|
}
|
|
|
|
export function formatMergeSummary(summary: SyncMergeSummary): string {
|
|
const lines = [
|
|
`Sessions merged: ${summary.sessionsMerged} (${summary.sessionsAlreadyPresent} already present, ${summary.activeSessionsSkipped} unfinished skipped)`,
|
|
];
|
|
const detail: string[] = [];
|
|
if (summary.animeAdded) detail.push(`${summary.animeAdded} series`);
|
|
if (summary.videosAdded) detail.push(`${summary.videosAdded} videos`);
|
|
if (summary.wordsAdded) detail.push(`${summary.wordsAdded} words`);
|
|
if (summary.kanjiAdded) detail.push(`${summary.kanjiAdded} kanji`);
|
|
if (summary.subtitleLinesAdded) detail.push(`${summary.subtitleLinesAdded} subtitle lines`);
|
|
if (summary.excludedWordsAdded) detail.push(`${summary.excludedWordsAdded} excluded words`);
|
|
if (detail.length > 0) lines.push(`Added: ${detail.join(', ')}`);
|
|
if (summary.dailyRollupsCopied || summary.monthlyRollupsCopied) {
|
|
lines.push(
|
|
`Historical rollups copied: ${summary.dailyRollupsCopied} daily, ${summary.monthlyRollupsCopied} monthly`,
|
|
);
|
|
}
|
|
if (summary.rollupGroupsRecomputed) {
|
|
lines.push(`Rollup groups recomputed: ${summary.rollupGroupsRecomputed}`);
|
|
}
|
|
return lines.join('\n');
|
|
}
|