Administrator/real-debrid-downloader
1
0
Fork 0
Code Issues Pull Requests Actions 132 Packages Projects Releases 239 Wiki Activity

Fix hybrid-extract: check per-archive prefix instead of whole package

Browse Source 
The previous fix blocked ALL multi-part extractions when any item in the
package was pending. Now checks only parts of the SAME archive (by prefix
match on fileName/targetPath), so E01 can extract while E06 downloads.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Sucukdeluxe 2026-03-03 14:59:03 +01:00
parent 804fbe2bdc
commit d7d256f716
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/download-manager.ts
View File

@ -4988,25 +4988,43 @@ export class DownloadManager extends EventEmitter {
} }
} }
// Pre-compute: does the package still have any non-terminal items?
const packageHasPendingItems = pkg.itemIds.some((itemId) => {
const item = this.session.items[itemId];
return item != null && item.status !== "completed" && item.status !== "failed" && item.status !== "cancelled";
});
for (const candidate of candidates) { for (const candidate of candidates) {
const partsOnDisk = collectArchiveCleanupTargets(candidate, dirFiles); const partsOnDisk = collectArchiveCleanupTargets(candidate, dirFiles);
const allPartsCompleted = partsOnDisk.every((part) => completedPaths.has(pathKey(part))); const allPartsCompleted = partsOnDisk.every((part) => completedPaths.has(pathKey(part)));
if (allPartsCompleted) { if (allPartsCompleted) {
const candidateBase = path.basename(candidate).toLowerCase(); const candidateBase = path.basename(candidate).toLowerCase();
// For multi-part archives (.part1.rar), require ALL package items to be terminal. // For multi-part archives (.part1.rar), check if parts of THIS SPECIFIC archive
// partsOnDisk only contains parts found ON DISK — pending parts that haven't been // are still pending. We match by archive prefix so E01 parts don't block E02.
// downloaded yet (no targetPath, no fileName) would slip through the regular checks. const multiMatch = candidateBase.match(/^(.*)\.part0*1\.rar$/i);
if (/\.part0*1\.rar$/i.test(candidateBase) && packageHasPendingItems) { if (multiMatch) {
logger.info(`Hybrid-Extract: ${path.basename(candidate)} übersprungen – Paket hat noch ausstehende Items`); const prefix = multiMatch[1].toLowerCase();
const escapedPrefix = prefix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
const partPattern = new RegExp(`^${escapedPrefix}\\.part\\d+\\.rar$`, "i");
const hasRelatedPending = pkg.itemIds.some((itemId) => {
const item = this.session.items[itemId];
if (!item || item.status === "completed" || item.status === "failed" || item.status === "cancelled") {
return false;
}
// Check fileName (set early from link URL)
if (item.fileName && partPattern.test(item.fileName)) {
return true;
}
// Check targetPath basename (set when download starts)
if (item.targetPath && partPattern.test(path.basename(item.targetPath))) {
return true;
}
// Item has no identity at all — might be an unresolved part, be conservative
if (!item.fileName && !item.targetPath) {
return true;
}
return false;
});
if (hasRelatedPending) {
logger.info(`Hybrid-Extract: ${path.basename(candidate)} übersprungen – zugehörige Parts noch ausstehend`);
continue; continue;
} }
}
const hasUnstartedParts = [...pendingPaths].some((pendingPath) => { const hasUnstartedParts = [...pendingPaths].some((pendingPath) => {
const pendingName = path.basename(pendingPath).toLowerCase(); const pendingName = path.basename(pendingPath).toLowerCase();