0a607adb29
The completed-upload dedup guard (_completedUploadKeys, "file|hoster") is the single source of truth that keeps a finished job from being re-materialised as a "Bereit" preview by buildQueuePreview(). Three independent paths leaked ghosts back into the queue: A) removeJobFromIndex() unconditionally DELETED the dedup key. The removeFromQueueOnDone auto-remove path (handleProgress), the batch-done sweep, and the terminal-job prune all call removeJobFromIndex on a *finished* job, so the guard handleProgress had just added was immediately wiped and buildQueuePreview re-created the job as a preview both mid-session and after restart. removeJobFromIndex now takes keepCompletedKey; the three auto-removal call sites pass true (keep the guard), while the manual-delete sites keep the old behaviour (drop the guard so the user can re-add the file). D/E) The dedup guard lived only in memory, so every restart began with an empty set and buildQueuePreview rebuilt ghosts from the persisted selectedFiles. buildPersistedQueueState() now serialises the keys whose file is still in the snapshot (completedKeys) and restoreQueueStateFromConfig() re-seeds them. To keep deliberate re-uploads working, applyHosterSelection() clears the persisted key for every freshly (re-)added file: re-adding through the hoster modal is the explicit "upload this again" signal. Both retry paths (retrySelectedJobs, _retryFailedFromBuckets) mutate the existing job in place instead of relying on buildQueuePreview, so they are unaffected. H) buildQueuePreview() excluded error jobs from its existingKeys set, so a file+hoster that already had an 'error' row got a second 'preview' row stacked beside it. Error jobs now count as existing. B/C) parseUploadLogLine() took the filename from a fixed field index and trimmed it. A pipe inside the link shifted the field (entry lost from the log-based dedup) and trimming broke matching against the untrimmed OS basename used as the queue-job key. The filename is now the last non-empty field and is no longer trimmed, so log lines with pipes in the URL and leading-space filenames both match end-to-end. 362 tests pass, lint clean on all touched files. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
81 lines
4.3 KiB
JavaScript
81 lines
4.3 KiB
JavaScript
const { test } = require('node:test');
|
|
const assert = require('node:assert');
|
|
const { formatUploadLogLine, parseUploadLogLine } = require('../lib/upload-log');
|
|
const { partitionRestoredJobsByLog } = require('../lib/queue-dedup');
|
|
|
|
function previewJob(fileName, hoster) {
|
|
return { status: 'preview', fileName, hoster, file: `C:/dl/${fileName}` };
|
|
}
|
|
|
|
test('writer -> reader round trip: parsed ts is the same epoch frame as the source Date getTime', () => {
|
|
const d = new Date(2026, 5, 19, 12, 0, 30);
|
|
const line = formatUploadLogLine(d, 'voe.sx', 'https://voe.sx/x', 'a.mkv');
|
|
const parsed = parseUploadLogLine(line);
|
|
assert.equal(parsed.hoster, 'voe.sx');
|
|
assert.equal(parsed.fileName, 'a.mkv');
|
|
assert.equal(parsed.ts, d.getTime(), 'parser ts must equal the writer Date epoch (no tz shift)');
|
|
});
|
|
|
|
test('SEAM: a real appendUploadLog-format line drops a preview ghost vs a savedAt taken BEFORE completion', () => {
|
|
const completion = new Date(2026, 5, 19, 12, 0, 30);
|
|
const line = formatUploadLogLine(completion, 'voe.sx', 'link', 'a.mkv');
|
|
const parsed = parseUploadLogLine(line);
|
|
const savedAt = completion.getTime() - 5000;
|
|
const { removed, kept } = partitionRestoredJobsByLog([previewJob('a.mkv', 'voe.sx')], [parsed], savedAt);
|
|
assert.equal(removed.length, 1, 'a file logged after the snapshot is a ghost and must drop');
|
|
assert.equal(kept.length, 0);
|
|
});
|
|
|
|
test('SEAM: the same real line is KEPT vs a savedAt taken AFTER completion (intentional re-upload)', () => {
|
|
const completion = new Date(2026, 5, 19, 12, 0, 30);
|
|
const parsed = parseUploadLogLine(formatUploadLogLine(completion, 'voe.sx', 'link', 'a.mkv'));
|
|
const savedAt = completion.getTime() + 5000;
|
|
const { removed, kept } = partitionRestoredJobsByLog([previewJob('a.mkv', 'voe.sx')], [parsed], savedAt);
|
|
assert.equal(removed.length, 0, 'an older upload than the snapshot is a deliberate re-queue and must survive');
|
|
assert.equal(kept.length, 1);
|
|
});
|
|
|
|
test('parseUploadLogLine skips comments, blanks and malformed lines', () => {
|
|
assert.equal(parseUploadLogLine('# fileuploader log'), null);
|
|
assert.equal(parseUploadLogLine(''), null);
|
|
assert.equal(parseUploadLogLine(' '), null);
|
|
assert.equal(parseUploadLogLine('only|three|parts|here'), null);
|
|
assert.equal(parseUploadLogLine(null), null);
|
|
assert.equal(parseUploadLogLine(42), null);
|
|
});
|
|
|
|
test('parseUploadLogLine: missing/garbage timestamp yields ts=undefined (legacy lines still match by name)', () => {
|
|
const parsed = parseUploadLogLine('|voe.sx|link||a.mkv|');
|
|
assert.equal(parsed.hoster, 'voe.sx');
|
|
assert.equal(parsed.fileName, 'a.mkv');
|
|
assert.equal(parsed.ts, undefined);
|
|
});
|
|
|
|
test('parseUploadLogLine: a pipe in the link does NOT shift the filename field (entry not lost)', () => {
|
|
const line = formatUploadLogLine(new Date(2026, 5, 19, 12, 0, 0), 'byse.sx', 'https://h.io/a|b', 'movie.mkv');
|
|
const parsed = parseUploadLogLine(line);
|
|
assert.equal(parsed.hoster, 'byse.sx');
|
|
assert.equal(parsed.fileName, 'movie.mkv', 'filename is taken as the last non-empty field, robust to link pipes');
|
|
});
|
|
|
|
test('parseUploadLogLine: two pipes in the link still parse the correct filename', () => {
|
|
const line = formatUploadLogLine(new Date(2026, 5, 19, 12, 0, 0), 'byse.sx', 'https://h.io/a|b|c', 'movie.mkv');
|
|
const parsed = parseUploadLogLine(line);
|
|
assert.equal(parsed.fileName, 'movie.mkv');
|
|
});
|
|
|
|
test('parseUploadLogLine: a leading-space filename is preserved (matches the untrimmed queue-job key)', () => {
|
|
const line = formatUploadLogLine(new Date(2026, 5, 19, 12, 0, 0), 'voe.sx', 'https://h.io/a', ' movie.mkv');
|
|
const parsed = parseUploadLogLine(line);
|
|
assert.equal(parsed.fileName, ' movie.mkv', 'filename is NOT trimmed, so it matches the OS basename verbatim');
|
|
});
|
|
|
|
test('SEAM: a leading-space filename round-trips and the gate still drops its ghost', () => {
|
|
const completion = new Date(2026, 5, 19, 12, 0, 30);
|
|
const parsed = parseUploadLogLine(formatUploadLogLine(completion, 'voe.sx', 'l', ' spaced.mp4'));
|
|
const savedAt = completion.getTime() - 5000;
|
|
const job = { status: 'preview', fileName: ' spaced.mp4', hoster: 'voe.sx', file: 'C:/dl/ spaced.mp4' };
|
|
const { removed } = partitionRestoredJobsByLog([job], [parsed], savedAt);
|
|
assert.equal(removed.length, 1, 'leading-space filename now matches end-to-end (was a mismatch before)');
|
|
});
|