Administrator/Multi-Debrid-Downloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 596 Wiki Activity

Ship UI productivity upgrades and extraction progress flow in v1.4.0

Browse Source
This commit is contained in:
Sucukdeluxe
2026-02-27 16:23:19 +01:00
parent 7b5218ad98
commit 4fc0ce26f3
10 changed files with 372 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/constants.ts
+1
View File
@@ -33,6 +33,7 @@ export function defaultSettings(): AppSettings {
megaPassword: "",
bestToken: "",
allDebridToken: "",
archivePasswordList: "",
rememberToken: true,
providerPrimary: "realdebrid",
providerSecondary: "megadebrid",
src/main/download-manager.ts
+25 -6
View File
@@ -654,7 +654,7 @@ export class DownloadManager extends EventEmitter {
continue;
}
logger.info(`Nachtraegliches Cleanup geprueft: pkg=${pkg.name}, targets=${targets.size}, marker=${pkg.itemIds.some((id) => /entpack/i.test(this.session.items[id]?.fullStatus || ""))}`);
logger.info(`Nachträgliches Cleanup geprüft: pkg=${pkg.name}, targets=${targets.size}, marker=${pkg.itemIds.some((id) => /entpack/i.test(this.session.items[id]?.fullStatus || ""))}`);
let removed = 0;
for (const targetPath of targets) {
@@ -670,20 +670,20 @@ export class DownloadManager extends EventEmitter {
}
if (removed > 0) {
logger.info(`Nachtraegliches Archive-Cleanup fuer ${pkg.name}: ${removed} Datei(en) geloescht`);
logger.info(`Nachträgliches Archive-Cleanup für ${pkg.name}: ${removed} Datei(en) gelöscht`);
if (!this.directoryHasAnyFiles(pkg.outputDir)) {
const removedDirs = this.removeEmptyDirectoryTree(pkg.outputDir);
if (removedDirs > 0) {
logger.info(`Nachtraegliches Cleanup entfernte leere Download-Ordner fuer ${pkg.name}: ${removedDirs}`);
logger.info(`Nachträgliches Cleanup entfernte leere Download-Ordner für ${pkg.name}: ${removedDirs}`);
}
}
} else {
logger.info(`Nachtraegliches Archive-Cleanup fuer ${pkg.name}: keine Dateien entfernt`);
logger.info(`Nachträgliches Archive-Cleanup für ${pkg.name}: keine Dateien entfernt`);
}
}
})
.catch((error) => {
logger.warn(`Nachtraegliches Archive-Cleanup fehlgeschlagen: ${compactErrorText(error)}`);
logger.warn(`Nachträgliches Archive-Cleanup fehlgeschlagen: ${compactErrorText(error)}`);
});
}
@@ -1900,6 +1900,17 @@ export class DownloadManager extends EventEmitter {
if (this.settings.autoExtract && failed === 0 && success > 0 && !alreadyMarkedExtracted) {
pkg.status = "extracting";
this.emitState();
const updateExtractingStatus = (text: string): void => {
for (const entry of completedItems) {
entry.fullStatus = text;
entry.updatedAt = nowMs();
}
};
updateExtractingStatus("Entpacken 0%");
this.emitState();
try {
const result = await extractPackageArchives({
packageDir: pkg.outputDir,
@@ -1907,7 +1918,15 @@ export class DownloadManager extends EventEmitter {
cleanupMode: this.settings.cleanupMode,
conflictMode: this.settings.extractConflictMode,
removeLinks: this.settings.removeLinkFilesAfterExtract,
removeSamples: this.settings.removeSamplesAfterExtract
removeSamples: this.settings.removeSamplesAfterExtract,
passwordList: this.settings.archivePasswordList,
onProgress: (progress) => {
const label = progress.phase === "done"
? "Entpacken 100%"
: `Entpacken ${progress.percent}% (${progress.current}/${progress.total})`;
updateExtractingStatus(label);
this.emitState();
}
});
logger.info(`Post-Processing Entpacken Ende: pkg=${pkg.name}, extracted=${result.extracted}, failed=${result.failed}, lastError=${result.lastError || ""}`);
if (result.failed > 0) {
src/main/extractor.ts
+50 -9
View File
@@ -19,6 +19,16 @@ export interface ExtractOptions {
conflictMode: ConflictMode;
removeLinks: boolean;
removeSamples: boolean;
passwordList?: string;
onProgress?: (update: ExtractProgressUpdate) => void;
}
export interface ExtractProgressUpdate {
current: number;
total: number;
percent: number;
archiveName: string;
phase: "extracting" | "done";
}
function findArchiveCandidates(packageDir: string): string[] {
@@ -49,12 +59,18 @@ function cleanErrorText(text: string): string {
return String(text || "").replace(/\s+/g, " ").trim().slice(0, 240);
}
function archivePasswords(): string[] {
const custom = String(process.env.RD_ARCHIVE_PASSWORDS || "")
function archivePasswords(listInput: string): string[] {
const custom = String(listInput || "")
.split(/\r?\n/g)
.map((part) => part.trim())
.filter(Boolean);
const fromEnv = String(process.env.RD_ARCHIVE_PASSWORDS || "")
.split(/[;,\n]/g)
.map((part) => part.trim())
.filter(Boolean);
return Array.from(new Set([...DEFAULT_ARCHIVE_PASSWORDS, ...custom]));
return Array.from(new Set(["", ...custom, ...fromEnv, ...DEFAULT_ARCHIVE_PASSWORDS]));
}
function winRarCandidates(): string[] {
@@ -188,9 +204,14 @@ async function resolveExtractorCommand(): Promise<string> {
throw new Error(resolveFailureReason);
}
async function runExternalExtract(archivePath: string, targetDir: string, conflictMode: ConflictMode): Promise<void> {
async function runExternalExtract(
archivePath: string,
targetDir: string,
conflictMode: ConflictMode,
passwordCandidates: string[]
): Promise<void> {
const command = await resolveExtractorCommand();
const passwords = archivePasswords();
const passwords = passwordCandidates;
let lastError = "";
fs.mkdirSync(targetDir, { recursive: true });
@@ -449,17 +470,32 @@ export async function extractPackageArchives(options: ExtractOptions): Promise<{
const candidates = findArchiveCandidates(options.packageDir);
logger.info(`Entpacken gestartet: packageDir=${options.packageDir}, targetDir=${options.targetDir}, archives=${candidates.length}, cleanupMode=${options.cleanupMode}, conflictMode=${options.conflictMode}`);
if (candidates.length === 0) {
logger.info(`Entpacken uebersprungen (keine Archive gefunden): ${options.packageDir}`);
logger.info(`Entpacken übersprungen (keine Archive gefunden): ${options.packageDir}`);
return { extracted: 0, failed: 0, lastError: "" };
}
const conflictMode = effectiveConflictMode(options.conflictMode);
const passwordCandidates = archivePasswords(options.passwordList || "");
const beforeFingerprint = captureDirFingerprint(options.targetDir);
let extracted = 0;
let failed = 0;
let lastError = "";
const extractedArchives: string[] = [];
const emitProgress = (current: number, archiveName: string, phase: "extracting" | "done"): void => {
if (!options.onProgress) {
return;
}
const total = Math.max(1, candidates.length);
const percent = Math.max(0, Math.min(100, Math.floor((current / total) * 100)));
options.onProgress({ current, total, percent, archiveName, phase });
};
emitProgress(0, "", "extracting");
for (const archivePath of candidates) {
const archiveName = path.basename(archivePath);
emitProgress(extracted + failed, archiveName, "extracting");
logger.info(`Entpacke Archiv: ${path.basename(archivePath)} -> ${options.targetDir}`);
try {
const ext = path.extname(archivePath).toLowerCase();
@@ -467,23 +503,26 @@ export async function extractPackageArchives(options: ExtractOptions): Promise<{
try {
extractZipArchive(archivePath, options.targetDir, options.conflictMode);
} catch {
await runExternalExtract(archivePath, options.targetDir, options.conflictMode);
await runExternalExtract(archivePath, options.targetDir, options.conflictMode, passwordCandidates);
}
} else {
await runExternalExtract(archivePath, options.targetDir, options.conflictMode);
await runExternalExtract(archivePath, options.targetDir, options.conflictMode, passwordCandidates);
}
extracted += 1;
extractedArchives.push(archivePath);
logger.info(`Entpacken erfolgreich: ${path.basename(archivePath)}`);
emitProgress(extracted + failed, archiveName, "extracting");
} catch (error) {
failed += 1;
const errorText = String(error);
lastError = errorText;
logger.error(`Entpack-Fehler ${path.basename(archivePath)}: ${errorText}`);
emitProgress(extracted + failed, archiveName, "extracting");
if (isNoExtractorError(errorText)) {
const remaining = candidates.length - (extracted + failed);
if (remaining > 0) {
failed += remaining;
emitProgress(candidates.length, archiveName, "extracting");
}
break;
}
@@ -497,7 +536,7 @@ export async function extractPackageArchives(options: ExtractOptions): Promise<{
lastError = "Keine entpackten Dateien erkannt";
failed += extracted;
extracted = 0;
logger.error(`Entpacken ohne neue Ausgabe erkannt: ${options.targetDir}. Cleanup wird NICHT ausgefuehrt.`);
logger.error(`Entpacken ohne neue Ausgabe erkannt: ${options.targetDir}. Cleanup wird NICHT ausgeführt.`);
} else {
const removedArchives = cleanupArchives(extractedArchives, options.cleanupMode);
if (options.cleanupMode !== "none") {
@@ -529,6 +568,8 @@ export async function extractPackageArchives(options: ExtractOptions): Promise<{
}
}
emitProgress(candidates.length, "", "done");
logger.info(`Entpacken beendet: extracted=${extracted}, failed=${failed}, targetDir=${options.targetDir}`);
return { extracted, failed, lastError };
src/main/storage.ts
+3 -1
View File
@@ -55,6 +55,7 @@ export function normalizeSettings(settings: AppSettings): AppSettings {
megaPassword: asText(settings.megaPassword),
bestToken: asText(settings.bestToken),
allDebridToken: asText(settings.allDebridToken),
archivePasswordList: String(settings.archivePasswordList ?? "").replace(/\r\n/g, "\n"),
rememberToken: Boolean(settings.rememberToken),
autoProviderFallback: Boolean(settings.autoProviderFallback),
outputDir: asText(settings.outputDir) || defaults.outputDir,
@@ -115,7 +116,8 @@ function sanitizeCredentialPersistence(settings: AppSettings): AppSettings {
megaLogin: "",
megaPassword: "",
bestToken: "",
allDebridToken: ""
allDebridToken: "",
archivePasswordList: ""
};
}