package.json

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

src/main/download-manager.ts

@@ -3281,16 +3281,23 @@ export class DownloadManager extends EventEmitter {
     }
     let renamed = 0;
 
-    // Collect additional folder candidates from package metadata (outputDir only).
+    // Collect additional folder candidates from package metadata (outputDir, item filenames)
-    // Item filenames are intentionally excluded: they contain episode tokens from
-    // OTHER files in the package, which pollute resolveEpisodeTokenForAutoRename
-    // and cause all files to receive the same wrong episode number.
     const packageExtraCandidates: string[] = [];
     if (pkg) {
       const outputBase = path.basename(pkg.outputDir || "");
       if (outputBase) {
         packageExtraCandidates.push(outputBase);
       }
+      for (const itemId of pkg.itemIds) {
+        const item = this.session.items[itemId];
+        if (item?.fileName) {
+          const itemBase = path.basename(item.fileName, path.extname(item.fileName));
+          const stripped = itemBase.replace(/\.part\d+$/i, "").replace(/\.vol\d+[+\d]*$/i, "");
+          if (stripped) {
+            packageExtraCandidates.push(stripped);
+          }
+        }
+      }
     }
 
     for (const sourcePath of videoFiles) {
@@ -10619,7 +10626,6 @@ export class DownloadManager extends EventEmitter {
             removeLinks: false,
             removeSamples: false,
             passwordList: this.settings.archivePasswordList,
-            signal: deferredController.signal,
             packageId,
             onlyArchives: new Set(nestedCandidates.map((p) => process.platform === "win32" ? path.resolve(p).toLowerCase() : path.resolve(p))),
             maxParallel: this.settings.maxParallelExtract || 2,

tests/download-manager.test.ts

@@ -2295,10 +2295,9 @@ describe("download manager", () => {
       await waitFor(() => !manager.getSnapshot().session.running, 25000);
 
       const item = Object.values(manager.getSnapshot().session.items)[0];
-      // Content-Length matches actual bytes sent, so completion validation passes
+      expect(item?.status).toBe("failed");
-      // (HTTP-level truth takes priority over provider-metadata filesize).
+      expect(item?.fullStatus || item?.lastError || "").toMatch(/download_underflow|range_ignored_on_resume/);
-      expect(item?.status).toBe("completed");
+      expect(item?.downloadedBytes).toBe(actual.length);
-      expect(item?.downloadedBytes).toBeGreaterThanOrEqual(actual.length);
     } finally {
       server.close();
       await once(server, "close");
@@ -3008,7 +3007,7 @@ describe("download manager", () => {
       server.close();
       await once(server, "close");
     }
-  }, 15000);
+  });
 
   it("reuses stored partial target path when queued item resumes", async () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
@@ -3134,10 +3133,7 @@ describe("download manager", () => {
       expect(item?.status).toBe("completed");
       expect(item?.targetPath).toBe(existingTargetPath);
       expect(sawResumeRange).toBe(true);
-      // Allow ALLOCATION_UNIT_SIZE (4096) tolerance for write-flush timing on Windows
+      expect(fs.statSync(existingTargetPath).size).toBe(binary.length);
-      const fileSize = fs.statSync(existingTargetPath).size;
-      expect(fileSize).toBeGreaterThanOrEqual(binary.length - 4096);
-      expect(fileSize).toBeLessThanOrEqual(binary.length);
     } finally {
       server.close();
       await once(server, "close");
@@ -3420,16 +3416,11 @@ describe("download manager", () => {
       const item = manager.getSnapshot().session.items[itemId];
       expect(item?.status).toBe("completed");
       expect(item?.provider).toBe("debridlink");
-      // downloadedBytes may reflect stat.size which can be within ALLOCATION_UNIT_SIZE
+      expect(item?.downloadedBytes).toBe(binary.length);
-      // tolerance of the expected total, or the original partial size if the settle
+      expect(unrestrictCalls).toBe(2);
-      // recovery finalized the item from disk before retry completed.
+      expect(badCalls).toBe(1);
-      expect(item?.downloadedBytes).toBeGreaterThanOrEqual(partialSize);
+      expect(goodCalls).toBeGreaterThanOrEqual(1);
-      expect(item?.downloadedBytes).toBeLessThanOrEqual(binary.length);
+      expect(fs.statSync(existingTargetPath).size).toBe(binary.length);
-      expect(unrestrictCalls).toBeGreaterThanOrEqual(1);
-      expect(badCalls).toBeGreaterThanOrEqual(1);
-      const fileSize = fs.statSync(existingTargetPath).size;
-      expect(fileSize).toBeGreaterThanOrEqual(partialSize);
-      expect(fileSize).toBeLessThanOrEqual(binary.length);
     } finally {
       server.close();
       await once(server, "close");
@@ -4663,8 +4654,8 @@ describe("download manager", () => {
       createdAt + 5_000
     );
 
-    expect(completedItems[0].fullStatus).toBe("Entpack-Fehler [show.s01e01.part1.rar]: Checksum/CRC-Fehler im Archiv");
+    expect(completedItems[0].fullStatus).toBe("Entpack-Fehler: Checksum error in the encrypted file");
-    expect(completedItems[1].fullStatus).toBe("Entpack-Fehler [show.s01e01.part1.rar]: Checksum/CRC-Fehler im Archiv");
+    expect(completedItems[1].fullStatus).toBe("Entpack-Fehler: Checksum error in the encrypted file");
     expect(completedItems[2].fullStatus).toBe("Fertig (200 MB)");
     expect(completedItems[3].fullStatus).toBe("Fertig (200 MB)");
   });
@@ -4712,8 +4703,8 @@ describe("download manager", () => {
       createdAt + 5_000
     );
 
-    expect(completedItems[0].fullStatus).toBe("Entpack-Fehler [show.s01e01.part1.rar]: Checksum/CRC-Fehler im Archiv");
+    expect(completedItems[0].fullStatus).toBe("Entpack-Fehler: Checksum error in the encrypted file");
-    expect(completedItems[1].fullStatus).toBe("Entpack-Fehler [show.s01e01.part1.rar]: Checksum/CRC-Fehler im Archiv");
+    expect(completedItems[1].fullStatus).toBe("Entpack-Fehler: Checksum error in the encrypted file");
     expect(completedItems[2].fullStatus).toBe("Fertig (180 MB)");
   });
 
@@ -5900,13 +5891,9 @@ describe("download manager", () => {
 
       const item = Object.values(manager.getSnapshot().session.items)[0];
       expect(item?.status).toBe("completed");
-      // On Windows with pre-allocation, the tiny error-page detection is masked
+      expect(directCalls).toBeGreaterThan(1);
-      // (stat reports pre-allocated size, not actual written bytes), so the first
-      // download may be accepted without a retry.
-      if (process.platform !== "win32") {
-        expect(directCalls).toBeGreaterThan(1);
-      }
       expect(fs.existsSync(item.targetPath)).toBe(true);
+      expect(fs.statSync(item.targetPath).size).toBe(binary.length);
     } finally {
       server.close();
       await once(server, "close");
@@ -7693,7 +7680,7 @@ describe("download manager", () => {
     const snapshot = manager.getSnapshot();
     expect(snapshot.session.packages[packageId]?.status).toBe("completed");
     expect(snapshot.session.items[itemId]?.fullStatus.startsWith("Entpackt - Done")).toBe(true);
-  }, 30000);
+  });
 
   it("does not fail startup post-processing when source package dir is missing but extract output exists", async () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
@@ -7760,7 +7747,7 @@ describe("download manager", () => {
     const snapshot = manager.getSnapshot();
     expect(snapshot.session.packages[packageId]?.status).toBe("completed");
     expect(snapshot.session.items[itemId]?.fullStatus.startsWith("Entpackt - Done")).toBe(true);
-  }, 20000);
+  });
 
   it("marks missing source package dir as extracted instead of failed", async () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
@@ -7825,7 +7812,7 @@ describe("download manager", () => {
     const snapshot = manager.getSnapshot();
     expect(snapshot.session.packages[packageId]?.status).toBe("completed");
     expect(snapshot.session.items[itemId]?.fullStatus).toBe("Entpackt (Quelle fehlt)");
-  }, 20000);
+  });
 
   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-"));
@@ -8515,7 +8502,7 @@ describe("download manager", () => {
     expect(snapshot.session.items[itemId]?.fullStatus.startsWith("Entpackt - Done")).toBe(true);
     expect(fs.existsSync(expectedPath)).toBe(true);
     expect(fs.existsSync(originalExtractedPath)).toBe(false);
-  }, 20000);
+  });
 
   it("tracks app runtime for session and all-time statistics", async () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
@@ -8648,7 +8635,7 @@ describe("download manager", () => {
     await waitFor(() => fs.existsSync(expectedPath), 12000);
     expect(fs.existsSync(expectedPath)).toBe(true);
     expect(fs.existsSync(originalExtractedPath)).toBe(false);
-  }, 20000);
+  });
 
   it("skips auto-rename when no SxxExx token exists in source filename", async () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
@@ -8677,7 +8664,7 @@ describe("download manager", () => {
     await waitFor(() => manager.getSnapshot().session.items[itemId]?.fullStatus.startsWith("Entpackt"), 12000);
     expect(fs.existsSync(originalExtractedPath)).toBe(true);
     expect(fs.existsSync(path.join(extractDir, unexpectedName))).toBe(false);
-  }, 20000);
+  });
 
   it("does not rename extracted scene files when auto-rename is disabled", async () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
@@ -8706,7 +8693,7 @@ describe("download manager", () => {
     await waitFor(() => manager.getSnapshot().session.items[itemId]?.fullStatus.startsWith("Entpackt"), 12000);
     expect(fs.existsSync(originalExtractedPath)).toBe(true);
     expect(fs.existsSync(path.join(extractDir, unexpectedName))).toBe(false);
-  }, 20000);
+  });
 
   it("moves extracted MKV files into a flat library folder per completed package", async () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
@@ -8813,7 +8800,7 @@ describe("download manager", () => {
     expect(fs.existsSync(existingPath)).toBe(true);
     expect(fs.readFileSync(existingPath, "utf8")).toBe("already-here");
     expect(fs.existsSync(suffixedPath)).toBe(true);
-  }, 20000);
+  });
 
   it("removes empty package folders after MKV flattening even with desktop.ini or thumbs.db", async () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));