package.json

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

src/main/download-manager.ts

@@ -3411,7 +3411,7 @@ export class DownloadManager extends EventEmitter {
           continue;
         }
         const extension = path.extname(entry.name).toLowerCase();
-        if (SAMPLE_VIDEO_EXTENSIONS.has(extension)) {
+        if (extension === ".mkv") {
           continue;
         }
         try {
@@ -3563,7 +3563,7 @@ export class DownloadManager extends EventEmitter {
       return;
     }
 
-    const allMkvFiles = await this.collectFilesByExtensions(sourceDir, SAMPLE_VIDEO_EXTENSIONS);
+    const allMkvFiles = await this.collectFilesByExtensions(sourceDir, new Set([".mkv"]));
     if (allMkvFiles.length === 0) {
       logger.info(`MKV-Sammelordner: pkg=${pkg.name}, keine MKV gefunden`);
       return;
@@ -5127,35 +5127,9 @@ export class DownloadManager extends EventEmitter {
     const touchedPackageIds = new Set<string>();
     for (const item of Object.values(this.session.items)) {
       if (item.status !== "completed") continue;
-      if (isExtractedLabel(item.fullStatus || "")) continue;
+      if (!item.targetPath || !item.totalBytes || item.totalBytes <= 0) continue;
-      const targetPath = String(item.targetPath || "").trim();
-      const archiveLike = isArchiveLikePath(targetPath || item.fileName || "");
-      if (archiveLike) {
-        let statSize: number | null = null;
-        if (targetPath) {
-          try {
-            statSize = fs.statSync(targetPath).size;
-          } catch {
-            statSize = null;
-          }
-        }
-        const zeroByteArchive = statSize != null
-          ? statSize <= 0
-          : (item.downloadedBytes <= 0 && item.progressPercent >= 100) || /\b0\s*B\b/i.test(item.fullStatus || "");
-        if (zeroByteArchive) {
-          logger.warn(`revalidateCompleted: ${item.fileName} ist 0B/leer, setze auf queued`);
-          this.queueItemForRetry(item, {
-            hardReset: true,
-            reason: "Wartet (Auto-Retry: 0B-Datei)"
-          });
-          fixed += 1;
-          touchedPackageIds.add(item.packageId);
-          continue;
-        }
-      }
-      if (!targetPath || !item.totalBytes || item.totalBytes <= 0) continue;
       try {
-        const stat = fs.statSync(targetPath);
+        const stat = fs.statSync(item.targetPath);
         const expectedMinSize = item.totalBytes - ALLOCATION_UNIT_SIZE;
         const persistedShortfall = item.downloadedBytes < expectedMinSize && stat.size >= expectedMinSize;
         if (stat.size < expectedMinSize) {
@@ -5881,28 +5855,6 @@ export class DownloadManager extends EventEmitter {
     return task;
   }
 
-  private shouldRecoverDeferredPostProcessingOnStartup(pkg: PackageEntry, items: DownloadItem[]): boolean {
-    if (!this.settings.autoExtract) {
-      return false;
-    }
-    if (this.packagePostProcessTasks.has(pkg.id) || this.hasDeferredPostProcessPending(pkg.id)) {
-      return false;
-    }
-    const hasExtractedCompletedItem = items.some((item) =>
-      item.status === "completed" && isExtractedLabel(item.fullStatus || "")
-    );
-    if (!hasExtractedCompletedItem) {
-      return false;
-    }
-    return this.settings.autoRename4sf4sj
-      || this.settings.collectMkvToLibrary
-      || this.settings.removeLinkFilesAfterExtract
-      || this.settings.removeSamplesAfterExtract
-      || this.settings.cleanupMode !== "none"
-      || this.settings.completedCleanupPolicy === "package_done"
-      || this.settings.completedCleanupPolicy === "immediate";
-  }
-
   private recoverPostProcessingOnStartup(): void {
     const packageIds = [...this.session.packageOrder];
     if (packageIds.length === 0) {
@@ -5975,12 +5927,6 @@ export class DownloadManager extends EventEmitter {
           pkg.updatedAt = nowMs();
           changed = true;
         }
-        if (!needsExtraction && this.shouldRecoverDeferredPostProcessingOnStartup(pkg, items)) {
-          logger.info(`Deferred Post-Processing via Startup ausgelöst: pkg=${pkg.name}`);
-          void this.runDeferredPostExtraction(packageId, pkg, success, failed, true, 0).catch((err) =>
-            logger.warn(`runDeferredPostExtraction Fehler (recoverPostProcessing): ${compactErrorText(err)}`)
-          );
-        }
         continue;
       }
 
@@ -5994,12 +5940,6 @@ export class DownloadManager extends EventEmitter {
         pkg.updatedAt = nowMs();
         changed = true;
       }
-      if (this.shouldRecoverDeferredPostProcessingOnStartup(pkg, items)) {
-        logger.info(`Deferred Post-Processing via Startup ausgelöst: pkg=${pkg.name}`);
-        void this.runDeferredPostExtraction(packageId, pkg, success, failed, true, 0).catch((err) =>
-          logger.warn(`runDeferredPostExtraction Fehler (recoverPostProcessing): ${compactErrorText(err)}`)
-        );
-      }
     }
 
     if (changed) {
@@ -10346,10 +10286,6 @@ export class DownloadManager extends EventEmitter {
     const deferredVersion = this.getPackagePostProcessVersion(packageId);
     const shouldAbort = (): boolean => !this.isDeferredPostProcessStillCurrent(packageId, pkg, deferredVersion, deferredController.signal);
     const throwIfAborted = (): void => this.throwIfDeferredPostProcessAborted(packageId, pkg, deferredVersion, deferredController.signal);
-    const hasBlockingExtractError = pkg.itemIds.some((itemId) => {
-      const item = this.session.items[itemId];
-      return Boolean(item && item.status === "completed" && isExtractErrorLabel(item.fullStatus || ""));
-    });
 
     try {
       throwIfAborted();
@@ -10408,24 +10344,20 @@ export class DownloadManager extends EventEmitter {
         pkg.postProcessLabel = "Aufräumen...";
         this.emitState();
         throwIfAborted();
-        if (hasBlockingExtractError) {
+        const sourceAndTargetEqual = path.resolve(pkg.outputDir).toLowerCase() === path.resolve(pkg.extractDir).toLowerCase();
-          logger.info(`Deferred Archive-Cleanup uebersprungen: pkg=${pkg.name}, reason=extract_error`);
+        if (!sourceAndTargetEqual) {
-        } else {
+          const candidates = await findArchiveCandidates(pkg.outputDir);
-          const sourceAndTargetEqual = path.resolve(pkg.outputDir).toLowerCase() === path.resolve(pkg.extractDir).toLowerCase();
+          if (candidates.length > 0) {
-          if (!sourceAndTargetEqual) {
+            const removed = await cleanupArchives(candidates, this.settings.cleanupMode, { shouldAbort });
-            const candidates = await findArchiveCandidates(pkg.outputDir);
+            if (removed > 0) {
-            if (candidates.length > 0) {
+              logger.info(`Deferred Archive-Cleanup: pkg=${pkg.name}, entfernt=${removed}`);
-              const removed = await cleanupArchives(candidates, this.settings.cleanupMode, { shouldAbort });
-              if (removed > 0) {
-                logger.info(`Deferred Archive-Cleanup: pkg=${pkg.name}, entfernt=${removed}`);
-              }
             }
           }
         }
       }
 
       // ── Hybrid archive cleanup (wenn bereits als extracted markiert) ──
-      if (this.settings.autoExtract && alreadyMarkedExtracted && failed === 0 && success > 0 && this.settings.cleanupMode !== "none" && !hasBlockingExtractError) {
+      if (this.settings.autoExtract && alreadyMarkedExtracted && failed === 0 && success > 0 && this.settings.cleanupMode !== "none") {
         throwIfAborted();
         const removedArchives = await this.cleanupRemainingArchiveArtifacts(pkg.outputDir, shouldAbort);
         if (removedArchives > 0) {
@@ -10472,7 +10404,7 @@ export class DownloadManager extends EventEmitter {
       // ── MKV collection ──
       if (success > 0 && (pkg.status === "completed" || pkg.status === "failed")) {
         throwIfAborted();
-        pkg.postProcessLabel = "Verschiebe Videos...";
+        pkg.postProcessLabel = "Verschiebe MKVs...";
         this.emitState();
         await this.collectMkvFilesToLibrary(packageId, pkg, shouldAbort);
       }

src/renderer/App.tsx

@@ -5090,8 +5090,8 @@ export function App(): ReactElement {
                       <option value="middle">Mittel (50% CPU)</option>
                       <option value="low">Niedrig (25% CPU)</option>
                     </select></div>
-                    <label className="toggle-line"><input type="checkbox" checked={settingsDraft.collectMkvToLibrary} onChange={(e) => setBool("collectMkvToLibrary", e.target.checked)} /> Videos nach Paketabschluss in Sammelordner verschieben (flach)</label>
+                    <label className="toggle-line"><input type="checkbox" checked={settingsDraft.collectMkvToLibrary} onChange={(e) => setBool("collectMkvToLibrary", e.target.checked)} /> MKV nach Paketabschluss in Sammelordner verschieben (flach)</label>
-                    <label>Video-Sammelordner</label>
+                    <label>MKV-Sammelordner</label>
                     <div className="input-row">
                       <input value={settingsDraft.mkvLibraryDir} onChange={(e) => setText("mkvLibraryDir", e.target.value)} disabled={!settingsDraft.collectMkvToLibrary} />
                       <button className="btn" disabled={!settingsDraft.collectMkvToLibrary} onClick={() => { void performQuickAction(async () => { const s = await window.rd.pickFolder(); if (s) { setText("mkvLibraryDir", s); } }); }}>Wählen</button>

tests/download-manager.test.ts

@@ -576,78 +576,6 @@ describe("download manager", () => {
     };
   }
 
-  function createCompletedArchiveSessionFromArchive(
-    root: string,
-    packageName: string,
-    archiveEntries: Array<{ name: string; data: Buffer | string }>
-  ): {
-    session: ReturnType<typeof emptySession>;
-    packageId: string;
-    itemId: string;
-    outputDir: string;
-    extractDir: string;
-    archivePath: string;
-  } {
-    const outputDir = path.join(root, "downloads", packageName);
-    const extractDir = path.join(root, "extract", packageName);
-    fs.mkdirSync(outputDir, { recursive: true });
-
-    const zip = new AdmZip();
-    for (const entry of archiveEntries) {
-      zip.addFile(entry.name, typeof entry.data === "string" ? Buffer.from(entry.data) : entry.data);
-    }
-    const archivePath = path.join(outputDir, "episode.zip");
-    zip.writeZip(archivePath);
-    const archiveSize = fs.statSync(archivePath).size;
-
-    const session = emptySession();
-    const packageId = `${packageName}-pkg`;
-    const itemId = `${packageName}-item`;
-    const createdAt = Date.now() - 20_000;
-    session.packageOrder = [packageId];
-    session.packages[packageId] = {
-      id: packageId,
-      name: packageName,
-      outputDir,
-      extractDir,
-      status: "downloading",
-      itemIds: [itemId],
-      cancelled: false,
-      enabled: true,
-      createdAt,
-      updatedAt: createdAt
-    };
-    session.items[itemId] = {
-      id: itemId,
-      packageId,
-      url: `https://dummy/${packageName}`,
-      provider: "realdebrid",
-      status: "completed",
-      retries: 0,
-      speedBps: 0,
-      downloadedBytes: archiveSize,
-      totalBytes: archiveSize,
-      progressPercent: 100,
-      fileName: "episode.zip",
-      targetPath: archivePath,
-      resumable: true,
-      attempts: 1,
-      lastError: "",
-      fullStatus: "Fertig (100 MB)",
-      createdAt,
-      updatedAt: createdAt
-    };
-
-    return {
-      session,
-      packageId,
-      itemId,
-      outputDir,
-      extractDir,
-      archivePath
-    };
-  }
-
   it("retries interrupted streams and resumes download", async () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
     tempDirs.push(root);
@@ -6377,98 +6305,6 @@ describe("download manager", () => {
     }
   }, 35000);
 
-  it("cleans link, sample and residual artifacts before package_done cleanup removes the package", async () => {
-    const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
-    tempDirs.push(root);
-
-    const zip = new AdmZip();
-    zip.addFile("Season 1/Episode01.mkv", Buffer.from("video"));
-    zip.addFile("Season 1/episode.links.txt", Buffer.from("https://example.com/file"));
-    zip.addFile("Season 1/cover.jpg", Buffer.from("cover"));
-    zip.addFile("Season 1/sample/sample.mkv", Buffer.from("sample-video"));
-    zip.addFile("Season 1/sample/readme.txt", Buffer.from("sample-text"));
-    zip.addFile("padding.bin", crypto.randomBytes(8 * 1024));
-    const archiveBinary = zip.toBuffer();
-
-    const server = http.createServer((req, res) => {
-      if ((req.url || "") !== "/cleanup-package-full") {
-        res.statusCode = 404;
-        res.end("not-found");
-        return;
-      }
-      res.statusCode = 200;
-      res.setHeader("Accept-Ranges", "bytes");
-      res.setHeader("Content-Length", String(archiveBinary.length));
-      res.end(archiveBinary);
-    });
-
-    server.listen(0, "127.0.0.1");
-    await once(server, "listening");
-
-    const address = server.address();
-    if (!address || typeof address === "string") {
-      throw new Error("server address unavailable");
-    }
-    const directUrl = `http://127.0.0.1:${address.port}/cleanup-package-full`;
-
-    globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit): Promise<Response> => {
-      const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
-      if (url.includes("/unrestrict/link")) {
-        return new Response(
-          JSON.stringify({
-            download: directUrl,
-            filename: "cleanup-package-full.zip",
-            filesize: archiveBinary.length
-          }),
-          {
-            status: 200,
-            headers: { "Content-Type": "application/json" }
-          }
-        );
-      }
-      return originalFetch(input, init);
-    };
-
-    try {
-      const extractRoot = path.join(root, "extract");
-      const outputRoot = path.join(root, "downloads");
-      const mkvLibraryDir = path.join(root, "mkv-library");
-      const manager = new DownloadManager(
-        {
-          ...defaultSettings(),
-          token: "rd-token",
-          outputDir: outputRoot,
-          extractDir: extractRoot,
-          autoExtract: true,
-          autoRename4sf4sj: false,
-          collectMkvToLibrary: true,
-          mkvLibraryDir,
-          removeLinkFilesAfterExtract: true,
-          removeSamplesAfterExtract: true,
-          enableIntegrityCheck: false,
-          cleanupMode: "delete",
-          completedCleanupPolicy: "package_done"
-        },
-        emptySession(),
-        createStoragePaths(path.join(root, "state"))
-      );
-
-      manager.addPackages([{ name: "cleanup-package-full", links: ["https://dummy/cleanup-package-full"] }]);
-      await manager.start();
-      await waitFor(() => !manager.getSnapshot().session.running, 30000);
-      await waitFor(() => manager.getSnapshot().session.packageOrder.length === 0, 12000);
-
-      const flattenedPath = path.join(mkvLibraryDir, "Episode01.mkv");
-      expect(fs.existsSync(flattenedPath)).toBe(true);
-      expect(fs.existsSync(path.join(extractRoot, "cleanup-package-full"))).toBe(false);
-      expect(fs.existsSync(path.join(outputRoot, "cleanup-package-full"))).toBe(false);
-      expect(Object.keys(manager.getSnapshot().session.items)).toHaveLength(0);
-    } finally {
-      server.close();
-      await once(server, "close");
-    }
-  }, 35000);
-
   it("counts queued package cancellations in run summary", async () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
     tempDirs.push(root);
@@ -7246,179 +7082,6 @@ describe("download manager", () => {
     expect(snapshot.session.items[itemId]?.fullStatus).toBe("Entpackt (Quelle fehlt)");
   });
 
-  it("resumes deferred startup cleanup for already extracted packages and removes them when package_done is active", async () => {
-    const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
-    tempDirs.push(root);
-
-    const packageName = "startup-deferred-cleanup";
-    const {
-      session,
-      packageId,
-      itemId,
-      outputDir,
-      extractDir
-    } = createCompletedArchiveSessionFromArchive(root, packageName, [
-      { name: "Season 1/Episode01.mkv", data: Buffer.from("video") },
-      { name: "Season 1/episode.links.txt", data: Buffer.from("https://example.com/file") },
-      { name: "Season 1/sample/sample.mkv", data: Buffer.from("sample-video") },
-      { name: "Season 1/sample/readme.txt", data: Buffer.from("sample-text") }
-    ]);
-
-    session.packages[packageId].status = "completed";
-    session.items[itemId].fullStatus = "Entpackt - Done (<1s)";
-    fs.mkdirSync(path.join(extractDir, "Season 1", "sample"), { recursive: true });
-    fs.writeFileSync(path.join(extractDir, "Season 1", "Episode01.mkv"), "video", "utf8");
-    fs.writeFileSync(path.join(extractDir, "Season 1", "episode.links.txt"), "https://example.com/file", "utf8");
-    fs.writeFileSync(path.join(extractDir, "Season 1", "sample", "sample.mkv"), "sample-video", "utf8");
-    fs.writeFileSync(path.join(extractDir, "Season 1", "sample", "readme.txt"), "sample-text", "utf8");
-
-    const mkvLibraryDir = path.join(root, "mkv-library");
-    const manager = new DownloadManager(
-      {
-        ...defaultSettings(),
-        token: "rd-token",
-        outputDir: path.join(root, "downloads"),
-        extractDir: path.join(root, "extract"),
-        autoExtract: true,
-        autoRename4sf4sj: false,
-        collectMkvToLibrary: true,
-        mkvLibraryDir,
-        removeLinkFilesAfterExtract: true,
-        removeSamplesAfterExtract: true,
-        enableIntegrityCheck: false,
-        cleanupMode: "delete",
-        completedCleanupPolicy: "package_done"
-      },
-      session,
-      createStoragePaths(path.join(root, "state"))
-    );
-
-    const flattenedPath = path.join(mkvLibraryDir, "Episode01.mkv");
-    await waitFor(() => fs.existsSync(flattenedPath), 12000);
-    await waitFor(() => manager.getSnapshot().session.packageOrder.length === 0, 12000);
-
-    expect(fs.existsSync(flattenedPath)).toBe(true);
-    expect(fs.existsSync(extractDir)).toBe(false);
-    expect(fs.existsSync(outputDir)).toBe(false);
-    expect(manager.getSnapshot().session.items[itemId]).toBeUndefined();
-  }, 20000);
-
-  it("resumes deferred startup auto-rename for already extracted packages", async () => {
-    const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
-    tempDirs.push(root);
-
-    const packageName = "Asbest.S02.GERMAN.720p.WEB.AVC-4SF";
-    const sourceFileName = "4sf-asbest.web.7p-s02e01.mkv";
-    const expectedFileName = "Asbest.S02E01.GERMAN.720p.WEB.AVC-4SF.mkv";
-    const {
-      session,
-      packageId,
-      itemId,
-      extractDir,
-      originalExtractedPath
-    } = createCompletedArchiveSession(root, packageName, sourceFileName);
-
-    session.packages[packageId].status = "completed";
-    session.items[itemId].fullStatus = "Entpackt - Done (<1s)";
-    fs.mkdirSync(extractDir, { recursive: true });
-    fs.writeFileSync(originalExtractedPath, "video", "utf8");
-
-    const manager = new DownloadManager(
-      {
-        ...defaultSettings(),
-        token: "rd-token",
-        outputDir: path.join(root, "downloads"),
-        extractDir: path.join(root, "extract"),
-        autoExtract: true,
-        autoRename4sf4sj: true,
-        enableIntegrityCheck: false,
-        cleanupMode: "none"
-      },
-      session,
-      createStoragePaths(path.join(root, "state"))
-    );
-
-    const expectedPath = path.join(extractDir, expectedFileName);
-    await waitFor(() => fs.existsSync(expectedPath), 12000);
-
-    expect(fs.existsSync(expectedPath)).toBe(true);
-    expect(fs.existsSync(originalExtractedPath)).toBe(false);
-    expect(manager.getSnapshot().session.items[itemId]?.fullStatus.startsWith("Entpackt - Done")).toBe(true);
-  }, 20000);
-
-  it("does not requeue already extracted items on startup when source archives were intentionally removed", async () => {
-    const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
-    tempDirs.push(root);
-
-    const packageName = "startup-extracted-without-source";
-    const outputDir = path.join(root, "downloads", packageName);
-    const extractDir = path.join(root, "extract", packageName);
-    fs.mkdirSync(extractDir, { recursive: true });
-    fs.writeFileSync(path.join(extractDir, "Episode01.mkv"), "video", "utf8");
-
-    const session = emptySession();
-    const packageId = `${packageName}-pkg`;
-    const itemId = `${packageName}-item`;
-    const createdAt = Date.now() - 20_000;
-    const targetPath = path.join(outputDir, "episode.zip");
-    session.packageOrder = [packageId];
-    session.packages[packageId] = {
-      id: packageId,
-      name: packageName,
-      outputDir,
-      extractDir,
-      status: "completed",
-      itemIds: [itemId],
-      cancelled: false,
-      enabled: true,
-      createdAt,
-      updatedAt: createdAt
-    };
-    session.items[itemId] = {
-      id: itemId,
-      packageId,
-      url: `https://dummy/${packageName}`,
-      provider: "realdebrid",
-      status: "completed",
-      retries: 0,
-      speedBps: 0,
-      downloadedBytes: 12_345,
-      totalBytes: 12_345,
-      progressPercent: 100,
-      fileName: "episode.zip",
-      targetPath,
-      resumable: true,
-      attempts: 1,
-      lastError: "",
-      fullStatus: "Entpackt - Done (<1s)",
-      createdAt,
-      updatedAt: createdAt
-    };
-
-    const manager = new DownloadManager(
-      {
-        ...defaultSettings(),
-        token: "rd-token",
-        outputDir: path.join(root, "downloads"),
-        extractDir: path.join(root, "extract"),
-        autoExtract: true,
-        autoRename4sf4sj: false,
-        collectMkvToLibrary: false,
-        enableIntegrityCheck: false,
-        cleanupMode: "delete",
-        completedCleanupPolicy: "never"
-      },
-      session,
-      createStoragePaths(path.join(root, "state"))
-    );
-
-    await new Promise((resolve) => setTimeout(resolve, 400));
-
-    expect(manager.getSnapshot().session.items[itemId]?.status).toBe("completed");
-    expect(manager.getSnapshot().session.items[itemId]?.fullStatus).toBe("Entpackt - Done (<1s)");
-    expect(manager.getSnapshot().session.packages[packageId]?.status).toBe("completed");
-  }, 20000);
-
   it("stops deferred post-extraction cleanup after package reset", async () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
     tempDirs.push(root);
@@ -8081,41 +7744,6 @@ describe("download manager", () => {
     expect(fs.existsSync(originalExtractedPath)).toBe(false);
   }, 20000);
 
-  it("moves extracted AVI files into a flat library folder per completed package", async () => {
-    const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
-    tempDirs.push(root);
-
-    const packageName = "Flat-Pack-AVI";
-    const sourceFileName = "Season 1/Episode01.avi";
-    const { session, packageId, itemId, originalExtractedPath } = createCompletedArchiveSession(root, packageName, sourceFileName);
-    const mkvLibraryDir = path.join(root, "mkv-library");
-
-    const manager = new DownloadManager(
-      {
-        ...defaultSettings(),
-        token: "rd-token",
-        outputDir: path.join(root, "downloads"),
-        extractDir: path.join(root, "extract"),
-        autoExtract: true,
-        autoRename4sf4sj: false,
-        collectMkvToLibrary: true,
-        mkvLibraryDir,
-        enableIntegrityCheck: false,
-        cleanupMode: "none"
-      },
-      session,
-      createStoragePaths(path.join(root, "state"))
-    );
-
-    const flattenedPath = path.join(mkvLibraryDir, "Episode01.avi");
-    await waitFor(() => fs.existsSync(flattenedPath), 12000);
-
-    expect(manager.getSnapshot().session.packages[packageId]?.status).toBe("completed");
-    expect(manager.getSnapshot().session.items[itemId]?.fullStatus.startsWith("Entpackt - Done")).toBe(true);
-    expect(fs.existsSync(flattenedPath)).toBe(true);
-    expect(fs.existsSync(originalExtractedPath)).toBe(false);
-  }, 20000);
-
   it("keeps existing MKV names and appends a suffix while flattening", async () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
     tempDirs.push(root);
@@ -8317,131 +7945,6 @@ describe("download manager", () => {
     expect(fs.existsSync(extractDir)).toBe(false);
   }, 20000);
 
-  it("cleans duplicate-skipped MKV source trees with link and residual artifacts", async () => {
-    const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
-    tempDirs.push(root);
-
-    const packageName = "Flat-Duplicate-Cleanup-Extended";
-    const {
-      session,
-      extractDir
-    } = createCompletedArchiveSessionFromArchive(root, packageName, [
-      { name: "Season 1/Episode01.mkv", data: Buffer.from("video") },
-      { name: "Season 1/episode.links.txt", data: Buffer.from("https://example.com/file") },
-      { name: "Season 1/info.nfo", data: Buffer.from("info") },
-      { name: "Season 1/sample/sample.mkv", data: Buffer.from("sample-video") },
-      { name: "Season 1/sample/readme.txt", data: Buffer.from("sample-text") }
-    ]);
-
-    const mkvLibraryDir = path.join(root, "mkv-library");
-    fs.mkdirSync(mkvLibraryDir, { recursive: true });
-    fs.writeFileSync(path.join(mkvLibraryDir, "Episode01.mkv"), Buffer.from("video"));
-
-    new DownloadManager(
-      {
-        ...defaultSettings(),
-        token: "rd-token",
-        outputDir: path.join(root, "downloads"),
-        extractDir: path.join(root, "extract"),
-        autoExtract: true,
-        autoRename4sf4sj: false,
-        collectMkvToLibrary: true,
-        mkvLibraryDir,
-        removeLinkFilesAfterExtract: true,
-        removeSamplesAfterExtract: true,
-        enableIntegrityCheck: false,
-        cleanupMode: "delete"
-      },
-      session,
-      createStoragePaths(path.join(root, "state"))
-    );
-
-    await waitFor(() => !fs.existsSync(extractDir), 12000);
-
-    expect(fs.existsSync(path.join(mkvLibraryDir, "Episode01.mkv"))).toBe(true);
-    expect(fs.existsSync(extractDir)).toBe(false);
-  }, 20000);
-
-  it("waits for deferred archive cleanup before package_done removal without MKV collection", async () => {
-    const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
-    tempDirs.push(root);
-
-    const zip = new AdmZip();
-    zip.addFile("Episode01.mkv", Buffer.from("video"));
-    zip.addFile("padding.bin", crypto.randomBytes(8 * 1024));
-    const archiveBinary = zip.toBuffer();
-
-    const server = http.createServer((req, res) => {
-      if ((req.url || "") !== "/cleanup-archives-only") {
-        res.statusCode = 404;
-        res.end("not-found");
-        return;
-      }
-      res.statusCode = 200;
-      res.setHeader("Accept-Ranges", "bytes");
-      res.setHeader("Content-Length", String(archiveBinary.length));
-      res.end(archiveBinary);
-    });
-
-    server.listen(0, "127.0.0.1");
-    await once(server, "listening");
-
-    const address = server.address();
-    if (!address || typeof address === "string") {
-      throw new Error("server address unavailable");
-    }
-    const directUrl = `http://127.0.0.1:${address.port}/cleanup-archives-only`;
-
-    globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit): Promise<Response> => {
-      const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
-      if (url.includes("/unrestrict/link")) {
-        return new Response(
-          JSON.stringify({
-            download: directUrl,
-            filename: "cleanup-archives-only.zip",
-            filesize: archiveBinary.length
-          }),
-          {
-            status: 200,
-            headers: { "Content-Type": "application/json" }
-          }
-        );
-      }
-      return originalFetch(input, init);
-    };
-
-    try {
-      const outputRoot = path.join(root, "downloads");
-      const manager = new DownloadManager(
-        {
-          ...defaultSettings(),
-          token: "rd-token",
-          outputDir: outputRoot,
-          extractDir: path.join(root, "extract"),
-          autoExtract: true,
-          autoRename4sf4sj: false,
-          collectMkvToLibrary: false,
-          enableIntegrityCheck: false,
-          cleanupMode: "delete",
-          completedCleanupPolicy: "package_done"
-        },
-        emptySession(),
-        createStoragePaths(path.join(root, "state"))
-      );
-
-      manager.addPackages([{ name: "cleanup-archives-only", links: ["https://dummy/cleanup-archives-only"] }]);
-      await manager.start();
-      await waitFor(() => !manager.getSnapshot().session.running, 30000);
-      await waitFor(() => manager.getSnapshot().session.packageOrder.length === 0, 12000);
-
-      expect(fs.existsSync(path.join(outputRoot, "cleanup-archives-only", "cleanup-archives-only.zip"))).toBe(false);
-      expect(Object.keys(manager.getSnapshot().session.items)).toHaveLength(0);
-    } finally {
-      server.close();
-      await once(server, "close");
-    }
-  }, 35000);
-
   it("throws a controlled error for invalid queue import JSON", () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
     tempDirs.push(root);