Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ the last one gets `LLM_MAX_RETRIES`, and a model that fails over is skipped for
a 400 from a model that rejects `response_format`; set `LLM_JSON_MODE=false` if your models
do not support JSON mode. Translations run as background jobs, and if a job still fails, the
**Resume translation** button continues from the last finished batch instead of starting over.
Completed jobs disappear from the list after 24 hours; failed jobs stay until they are
resumed or dismissed. Finished jobs can also be dismissed one by one or with **Clear finished**.

```env
LLM_MODEL=google/gemma-4-26b-a4b-it:free
Expand Down
266 changes: 178 additions & 88 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 15 additions & 1 deletion server/routes/subtitle.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Router } from 'express';
import { resolve, sep } from 'path';
import { existsSync } from 'fs';
import { getConfigError } from '../services/translator.js';
import { createTranslationJob, getJob, listJobs, retryJob } from '../services/jobs.js';
import { clearFinishedJobs, createTranslationJob, dismissJob, getJob, listJobs, retryJob } from '../services/jobs.js';
import { extractSubtitles } from '../services/ffmpeg.js';
import { DATA_DIR, MOVIES_DIR } from '../utils/paths.js';
const router = Router();
Expand Down Expand Up @@ -76,6 +76,20 @@ router.get('/jobs', (req, res) => {
res.json(listJobs());
});

// Removes all finished (done or failed) jobs
router.delete('/jobs', (req, res) => {
res.json({ removed: clearFinishedJobs() });
});

router.delete('/jobs/:id', (req, res) => {
try {
dismissJob(req.params.id);
res.status(204).end();
} catch (error) {
res.status(error.status || 500).json({ message: error.message });
}
});

router.post('/jobs/:id/retry', (req, res) => {
try {
res.status(202).json(retryJob(req.params.id));
Expand Down
50 changes: 50 additions & 0 deletions server/services/jobs.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { isConfigured as isPlexConfigured, updateLibrary } from './plexService.j

const MAX_FINISHED_JOBS = 20;
const MAX_FAILED_JOBS = 50; // failed jobs keep resume progress, so they are pruned last
const DONE_JOB_TTL_MS = 24 * 60 * 60 * 1000; // completed jobs disappear after a day

// In-memory job store: survives page reloads, not server restarts
const jobs = new Map();
Expand Down Expand Up @@ -40,11 +41,24 @@ function pruneOldest(list, keep) {
}
}

/**
* Drops completed jobs older than DONE_JOB_TTL_MS. Failed jobs are kept until
* they are retried or dismissed, since they hold resumable progress.
*/
function dropExpired(now = Date.now()) {
for (const job of jobs.values()) {
if (job.status === 'done' && now - Date.parse(job.finishedAt) > DONE_JOB_TTL_MS) {
jobs.delete(job.id);
}
}
}

/**
* Drops the oldest finished jobs. Completed jobs go first; failed jobs hold
* resumable progress and get a separate, larger limit.
*/
function pruneFinished() {
dropExpired();
const all = [...jobs.values()];
const done = all.filter(job => job.status === 'done');
const failed = all.filter(job => job.status === 'error');
Expand Down Expand Up @@ -171,11 +185,47 @@ export function retryJob(id) {
}

export function getJob(id) {
dropExpired();
const job = jobs.get(id);
return job ? toPublic(job) : null;
}

/** Most recent first. */
export function listJobs() {
dropExpired();
return [...jobs.values()].reverse().map(toPublic);
}

/**
* Removes a finished (done or failed) job. Dismissing a failed job discards
* its resume progress.
*/
export function dismissJob(id) {
const job = jobs.get(id);
if (!job) {
const error = new Error('Job not found');
error.status = 404;
throw error;
}
if (isActive(job)) {
const error = new Error('Active jobs cannot be dismissed');
error.status = 409;
throw error;
}
jobs.delete(id);
}

/**
* Removes every finished (done or failed) job; queued and running ones stay.
* @returns {number} How many jobs were removed
*/
export function clearFinishedJobs() {
let removed = 0;
for (const job of jobs.values()) {
if (!isActive(job)) {
jobs.delete(job.id);
removed++;
}
}
return removed;
}
49 changes: 45 additions & 4 deletions src/components/TranslationJobs.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect, useRef } from 'react';
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { AlertCircle, CheckCircle2, Clock, Loader2, RotateCw } from 'lucide-react';
import { AlertCircle, CheckCircle2, Clock, Loader2, RotateCw, X } from 'lucide-react';
import * as api from '../lib/api';
import type { TranslationJob } from '../types';

Expand Down Expand Up @@ -31,6 +31,26 @@ function JobProgress({ job }: { job: TranslationJob }) {
);
}

function DismissButton({ job, className }: { job: TranslationJob; className: string }) {
const queryClient = useQueryClient();
const dismissMutation = useMutation({
mutationFn: () => api.dismissJob(job.id),
onSettled: () => queryClient.invalidateQueries({ queryKey: ['jobs'] }),
});

return (
<button
onClick={() => dismissMutation.mutate()}
disabled={dismissMutation.isPending}
className={`absolute right-2 top-2 rounded-full p-1 disabled:opacity-50 ${className}`}
title={job.status === 'error' ? 'Dismiss (discards resume progress)' : 'Dismiss'}
aria-label="Dismiss"
>
<X className="h-4 w-4" />
</button>
);
}

function JobItem({ job }: { job: TranslationJob }) {
const queryClient = useQueryClient();
const retryMutation = useMutation({
Expand All @@ -57,7 +77,8 @@ function JobItem({ job }: { job: TranslationJob }) {

if (job.status === 'done') {
return (
<div className="rounded-lg bg-green-50 p-4 flex items-start gap-3">
<div className="relative rounded-lg bg-green-50 p-4 pr-10 flex items-start gap-3">
<DismissButton job={job} className="text-green-700 hover:bg-green-100" />
<CheckCircle2 className="h-5 w-5 text-green-600 flex-shrink-0 mt-0.5" />
<div className="min-w-0">
<div className="font-medium text-green-800">Translation Complete!</div>
Expand All @@ -70,7 +91,8 @@ function JobItem({ job }: { job: TranslationJob }) {
}

return (
<div className="rounded-lg bg-red-50 p-4 flex items-start gap-3">
<div className="relative rounded-lg bg-red-50 p-4 pr-10 flex items-start gap-3">
<DismissButton job={job} className="text-red-700 hover:bg-red-100" />
<AlertCircle className="h-5 w-5 text-red-600 flex-shrink-0 mt-0.5" />
<div className="w-full min-w-0">
<div className="font-medium text-red-800">Translation Failed</div>
Expand Down Expand Up @@ -108,7 +130,8 @@ function JobItem({ job }: { job: TranslationJob }) {

/**
* Lists translation jobs kept by the server, so progress survives page reloads.
* Polls only while a job is queued or running.
* Polls only while a job is queued or running. Completed jobs expire on the
* server after a day; finished jobs can also be dismissed here.
*/
export function TranslationJobs() {
const queryClient = useQueryClient();
Expand All @@ -119,6 +142,11 @@ export function TranslationJobs() {
});

// Refresh API usage whenever a job finishes
const clearMutation = useMutation({
mutationFn: api.clearFinishedJobs,
onSettled: () => queryClient.invalidateQueries({ queryKey: ['jobs'] }),
});

const activeCount = jobs?.filter(isActive).length ?? 0;
const previousActive = useRef(activeCount);
useEffect(() => {
Expand All @@ -134,8 +162,21 @@ export function TranslationJobs() {

if (!jobs?.length) return null;

const finishedCount = jobs.length - activeCount;

return (
<div className="space-y-3">
{finishedCount > 0 && (
<div className="flex justify-end">
<button
onClick={() => clearMutation.mutate()}
disabled={clearMutation.isPending}
className="text-sm font-medium text-slate-500 hover:text-slate-700 disabled:opacity-50"
>
Clear finished ({finishedCount})
</button>
</div>
)}
{jobs.slice(0, 5).map(job => <JobItem key={job.id} job={job} />)}
</div>
);
Expand Down
10 changes: 10 additions & 0 deletions src/lib/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,16 @@ export const retryJob = async (id: string): Promise<TranslationJob> => {
return data;
};

/** Removes a finished (done or failed) job from the list. */
export const dismissJob = async (id: string): Promise<void> => {
await api.delete(`/jobs/${id}`);
};

/** Removes every finished (done or failed) job; active jobs stay. */
export const clearFinishedJobs = async (): Promise<void> => {
await api.delete('/jobs');
};

export const getJobs = async (): Promise<TranslationJob[]> => {
const { data } = await api.get<TranslationJob[]>('/jobs');
return data;
Expand Down
54 changes: 53 additions & 1 deletion test/jobs.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { mockAxiosPost, httpError, deeplResponse, makeTempDir, writeSRT, waitFor

delete process.env.TRANSLATION_PROVIDER;
process.env.DEEPL_API_KEY = 'test-key';
const { createTranslationJob, retryJob, getJob, listJobs } = await import('../server/services/jobs.js');
const { createTranslationJob, retryJob, getJob, listJobs, dismissJob, clearFinishedJobs } = await import('../server/services/jobs.js');

const dir = makeTempDir();

Expand Down Expand Up @@ -99,3 +99,55 @@ test('prunes completed jobs before failed ones', async () => {
assert.ok(list.some(job => job.id === failed.id), 'the failed job survives pruning');
assert.equal(list[0].file, 'bulk-24.en.srt', 'most recent first');
});

test('completed jobs expire after a day, failed ones stay', async (t) => {
clearFinishedJobs();
let failing = true;
mockAxiosPost((url, body) => {
if (failing) throw httpError(456, { message: 'Quota exceeded' });
return deeplResponse(body);
});
const failed = startJob(newFile('expire-failed'));
await waitFor(() => isFinished(failed.id));
failing = false;
const done = startJob(newFile('expire-done'));
await waitFor(() => isFinished(done.id));

const realNow = Date.now();
t.mock.method(Date, 'now', () => realNow + 23 * 60 * 60 * 1000);
assert.ok(getJob(done.id), 'still listed before 24 hours');

t.mock.method(Date, 'now', () => realNow + 25 * 60 * 60 * 1000);
assert.equal(getJob(done.id), null);
assert.deepEqual(listJobs().map(job => job.id), [failed.id]);
});

test('dismisses finished jobs but not active ones', async () => {
clearFinishedJobs();
let release;
const blocked = new Promise(resolve => { release = resolve; });
mockAxiosPost(async (url, body) => {
await blocked;
return deeplResponse(body);
});
const job = startJob(newFile('dismiss'));

assert.throws(() => dismissJob(job.id), { status: 409 });
assert.equal(clearFinishedJobs(), 0, 'active jobs are not cleared');

release();
await waitFor(() => isFinished(job.id));
dismissJob(job.id);
assert.equal(getJob(job.id), null);
assert.throws(() => dismissJob(job.id), { status: 404 });
});

test('clears every finished job', async () => {
clearFinishedJobs();
mockAxiosPost((url, body) => deeplResponse(body));
const jobs = [startJob(newFile('clear-1')), startJob(newFile('clear-2'))];
await waitFor(() => jobs.every(job => isFinished(job.id)));

assert.equal(clearFinishedJobs(), 2);
assert.deepEqual(listJobs(), []);
});
19 changes: 18 additions & 1 deletion test/routes.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
import fs from 'fs';
import path from 'path';
import express from 'express';
import { mockAxiosPost, deeplResponse, makeTempDir, writeSRT } from './helpers.js';
import { mockAxiosPost, deeplResponse, makeTempDir, writeSRT, sleep } from './helpers.js';

// paths.js reads the media directories at import time
const dataDir = makeTempDir();
Expand Down Expand Up @@ -86,3 +86,20 @@ test('rejects path traversal in extract_subtitles', async () => {
assert.equal(response.status, 400);
assert.match(response.body.message, /Invalid video path/);
});

test('dismisses a job and clears finished jobs', async () => {
mockAxiosPost((url, body) => deeplResponse(body));
const { body: job } = await post('/translate_subtitle', { ...valid, target_lang: 'IT' });
while ((await (await fetch(`${baseUrl}/jobs/${job.id}`)).json()).status !== 'done') {
await sleep(10);
}

const dismissed = await fetch(`${baseUrl}/jobs/${job.id}`, { method: 'DELETE' });
assert.equal(dismissed.status, 204);
assert.equal((await fetch(`${baseUrl}/jobs/${job.id}`)).status, 404);
assert.equal((await fetch(`${baseUrl}/jobs/${job.id}`, { method: 'DELETE' })).status, 404);

const cleared = await (await fetch(`${baseUrl}/jobs`, { method: 'DELETE' })).json();
assert.equal(typeof cleared.removed, 'number');
assert.deepEqual(await (await fetch(`${baseUrl}/jobs`)).json(), []);
});
Loading