Compare commits

..

No commits in common. "fc9342577f66a81c6ae851d83be831734ea3d836" and "f9530e015fbb985a799f997f9ba8976d51fc1fd5" have entirely different histories.

3 changed files with 42 additions and 76 deletions

View File

@ -1,6 +1,6 @@
{
"name": "real-debrid-downloader",
"version": "1.7.103",
"version": "1.7.102",
"description": "Desktop downloader",
"main": "build/main/main/main.js",
"author": "Sucukdeluxe",

View File

@ -748,31 +748,6 @@ const SCENE_NON_GROUP_SUFFIXES = new Set([
"remux"
]);
function isValidSceneGroupSuffix(suffix: string): boolean {
const normalizedSuffix = String(suffix || "").trim();
if (!normalizedSuffix) {
return false;
}
const lower = normalizedSuffix.toLowerCase();
if (SCENE_NON_GROUP_SUFFIXES.has(lower)) {
return false;
}
if (/^s\d{1,2}e\d{1,3}(?:e\d{1,3})?$/i.test(normalizedSuffix) || /^s\d{1,2}$/i.test(normalizedSuffix) || /^e\d{1,3}$/i.test(normalizedSuffix)) {
return false;
}
if (/^\d+p$/.test(lower) || /^\d+$/.test(lower)) {
return false;
}
if (/^\d/.test(normalizedSuffix)) {
return false;
}
if (/4s(?:f|j)/i.test(normalizedSuffix) && !/^(?:4sf|4sj)$/i.test(normalizedSuffix)) {
return false;
}
return /[a-z]/i.test(normalizedSuffix);
}
function hasSceneGroupSuffix(fileName: string): boolean {
const text = String(fileName || "").trim();
if (!text) {
@ -780,13 +755,29 @@ function hasSceneGroupSuffix(fileName: string): boolean {
}
if (SCENE_GROUP_SUFFIX_RE.test(text)) {
const directMatch = text.match(SCENE_GROUP_SUFFIX_FALLBACK_RE);
return isValidSceneGroupSuffix(String(directMatch?.[1] || ""));
return true;
}
const fallbackMatch = text.match(SCENE_GROUP_SUFFIX_FALLBACK_RE);
const suffix = String(fallbackMatch?.[1] || "").trim();
return isValidSceneGroupSuffix(suffix);
if (!suffix) {
return false;
}
const lower = suffix.toLowerCase();
if (SCENE_NON_GROUP_SUFFIXES.has(lower)) {
return false;
}
if (/^\d+p$/.test(lower) || /^\d+$/.test(lower)) {
return false;
}
if (/^\d/.test(suffix)) {
return false;
}
if (/4s(?:f|j)/i.test(suffix) && !/^(?:4sf|4sj)$/i.test(suffix)) {
return false;
}
return /[a-z]/i.test(suffix);
}
export function extractEpisodeToken(fileName: string): string | null {

View File

@ -6,7 +6,7 @@ import crypto from "node:crypto";
import { EventEmitter, once } from "node:events";
import AdmZip from "adm-zip";
import { afterEach, describe, expect, it, vi } from "vitest";
import { DownloadManager, buildAutoRenameBaseNameFromFoldersWithOptions, extractArchiveNameFromExtractorLogMessage, getAuthoritativeRealDebridTotal, resolveArchiveItemsFromList } from "../src/main/download-manager";
import { DownloadManager, extractArchiveNameFromExtractorLogMessage, getAuthoritativeRealDebridTotal, resolveArchiveItemsFromList } from "../src/main/download-manager";
import { planDownloadCompletion, validateDownloadedFileCompletion } from "../src/main/download-completion";
import { defaultSettings } from "../src/main/constants";
import { parseDebridLinkApiKeys } from "../src/shared/debrid-link-keys";
@ -78,31 +78,6 @@ describe("download completion planning", () => {
});
});
describe("auto rename base selection", () => {
it("ignores raw episode-suffix folders like 4sf-amilllt...-s03e10 as scene targets", () => {
expect(buildAutoRenameBaseNameFromFoldersWithOptions(
[
"4sf-amilllt.de.dl.web.7p-s03e10",
"A.Million.Little.Things.S03.GERMAN.DL.720p.WEB.H264-RWP",
"amilllt.de.dl.web.7p-s03e10"
],
"A.Million.Little.Things.S03E10.Vertraue.mir.GERMAN.DL.720p.WEB.H264-4SF",
{ forceEpisodeForSeasonFolder: true }
)).toBe("A.Million.Little.Things.S03E10.GERMAN.DL.720p.WEB.H264-RWP");
});
it("ignores compact archive folder stems like scn-alco7-S03E18 as scene targets", () => {
expect(buildAutoRenameBaseNameFromFoldersWithOptions(
[
"scn-alco7-S03E18",
"Alex.und.Co.S03.GERMAN.DL.720p.WEB.H264-SunDry"
],
"alex.und.co.s03e18.720p.web.h264-sundry",
{ forceEpisodeForSeasonFolder: true }
)).toBe("Alex.und.Co.S03E18.GERMAN.DL.720p.WEB.H264-SunDry");
});
});
async function waitFor(predicate: () => boolean, timeoutMs = 15000): Promise<void> {
const started = Date.now();
while (!predicate()) {