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

Improve collector metadata progress and alignment

Browse Source 
Stream completed metadata checks into the collector while preserving generation-based stale-result protection. Derive row statuses from verified availability, move analysis feedback into the sidebar, center table values under their headers, and keep the header synchronized during horizontal scrolling.
This commit is contained in:
Sucukdeluxe
2026-08-26 16:05:09 +02:00
parent 0ba87c37ec
commit eed8d1e970
15 changed files with 309 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/app-controller.ts
+5 -2
View File
@@ -1001,8 +1001,11 @@ export class AppController {
return prepareCollectorContainers(filePaths, addedAt);
}
public enrichCollectorPackages(request: CollectorEnrichmentRequest): Promise<CollectorInspectionResult> {
return enrichCollectorPackages(request, this.settings);
public enrichCollectorPackages(
request: CollectorEnrichmentRequest,
onProgress?: (result: CollectorInspectionResult) => void
): Promise<CollectorInspectionResult> {
return enrichCollectorPackages(request, this.settings, {}, onProgress);
}
public async addContainers(filePaths: string[]): Promise<{ addedPackages: number; addedLinks: number }> {
src/main/collector-inspection.ts
+61 -13
View File
@@ -27,10 +27,42 @@ export interface CollectorInspectionDependencies {
checkDdownload?: typeof checkDdownloadOnline;
checkOneFichier?: (links: string[]) => Promise<Map<string, OneFichierCheckResult>>;
checkRapidgator?: typeof checkRapidgatorOnline;
resolveFilenames?: (links: string[]) => Promise<Map<string, string>>;
resolveFilenames?: (links: string[], onResolved?: (link: string, fileName: string) => void) => Promise<Map<string, string>>;
importContainers?: typeof importDlcContainers;
}
function collectorProgressResult(packages: CollectorPackage[], urls: ReadonlySet<string>): CollectorInspectionResult {
const fragments = packages.flatMap((pkg) => {
const links = pkg.links.filter((link) => urls.has(link.url)).map((link) => ({ ...link }));
return links.length > 0 ? [{ ...pkg, links }] : [];
});
return { packages: regroupEnrichedPackages(fragments), invalidCount: 0, duplicateCount: 0 };
}
function createCollectorProgressEmitter(
packages: CollectorPackage[],
onProgress?: (result: CollectorInspectionResult) => void
): { queue: (url: string) => void; flush: () => void } {
const pending = new Set<string>();
let timer: ReturnType<typeof setTimeout> | null = null;
const flush = (): void => {
if (timer) clearTimeout(timer);
timer = null;
if (!onProgress || pending.size === 0) return;
const urls = new Set(pending);
pending.clear();
onProgress(collectorProgressResult(packages, urls));
};
return {
queue: (url) => {
if (!onProgress) return;
pending.add(url);
if (!timer) timer = setTimeout(flush, 100);
},
flush
};
}
interface PreparedSourceLink {
url: string;
fileName: string;
@@ -177,7 +209,8 @@ function regroupEnrichedPackages(packages: CollectorPackage[]): CollectorPackage
export async function enrichCollectorPackages(
request: CollectorEnrichmentRequest,
settings: AppSettings,
dependencies: CollectorInspectionDependencies = {}
dependencies: CollectorInspectionDependencies = {},
onProgress?: (result: CollectorInspectionResult) => void
): Promise<CollectorInspectionResult> {
const packages = request.packages.map((pkg) => ({ ...pkg, links: pkg.links.map((link) => ({ ...link })) }));
const linksByUrl = new Map(packages.flatMap((pkg) => pkg.links).map((link) => [link.url, link]));
@@ -195,9 +228,21 @@ export async function enrichCollectorPackages(
const checkOneFichier = dependencies.checkOneFichier ?? checkOneFichierLinks;
const checkRapidgator = dependencies.checkRapidgator ?? checkRapidgatorOnline;
const checkDdownload = dependencies.checkDdownload ?? checkDdownloadOnline;
const resolveFilenames = dependencies.resolveFilenames ?? ((links) => new DebridService(settings).resolveFilenames(links));
const resolveFilenames = dependencies.resolveFilenames ?? ((links, onResolved) => new DebridService(settings).resolveFilenames(links, onResolved));
const progress = createCollectorProgressEmitter(packages, onProgress);
const oneFichierPromise = oneFichierLinks.length > 0
? checkOneFichier(oneFichierLinks).catch(() => new Map<string, OneFichierCheckResult>())
? checkOneFichier(oneFichierLinks).then((results) => {
for (const [url, result] of results) {
const link = linksByUrl.get(url);
if (!link) continue;
link.availability = result.online ? "online" : "offline";
link.status = result.online ? (result.fileName ? "ready" : "unknown") : "offline";
if (result.fileName) link.fileName = sanitizeFilename(result.fileName);
if (result.fileSizeBytes !== null && result.fileSizeBytes >= 0) link.fileSizeBytes = result.fileSizeBytes;
progress.queue(url);
}
return results;
}).catch(() => new Map<string, OneFichierCheckResult>())
: Promise.resolve(new Map<string, OneFichierCheckResult>());
const rapidgatorPromise = runWithConcurrency(rapidgatorLinks, 8, async (url) => {
const result = await checkRapidgator(url).catch(() => null);
@@ -207,6 +252,7 @@ export async function enrichCollectorPackages(
link.status = result.online ? (result.fileName ? "ready" : "unknown") : "offline";
if (result.fileName) link.fileName = sanitizeFilename(result.fileName);
if (result.fileSizeBytes !== null && result.fileSizeBytes >= 0) link.fileSizeBytes = result.fileSizeBytes;
progress.queue(url);
});
const ddownloadPromise = runWithConcurrency(ddownloadLinks, 4, async (url) => {
const result = await checkDdownload(url).catch(() => null);
@@ -216,9 +262,16 @@ export async function enrichCollectorPackages(
link.status = result.online ? (result.fileName ? "ready" : "unknown") : "offline";
if (result.fileName) link.fileName = sanitizeFilename(result.fileName);
if (result.fileSizeBytes !== null && result.fileSizeBytes >= 0) link.fileSizeBytes = result.fileSizeBytes;
progress.queue(url);
});
const genericPromise = genericLinks.length > 0
? resolveFilenames(genericLinks).catch(() => new Map<string, string>())
? resolveFilenames(genericLinks, (url, fileName) => {
const link = linksByUrl.get(url);
if (!link || !fileName) return;
link.fileName = sanitizeFilename(fileName);
link.status = "ready";
progress.queue(url);
}).catch(() => new Map<string, string>())
: Promise.resolve(new Map<string, string>());
const [oneFichierResults, genericResults] = await Promise.all([
oneFichierPromise,
@@ -226,20 +279,15 @@ export async function enrichCollectorPackages(
rapidgatorPromise,
ddownloadPromise
]).then(([oneFichier, generic]) => [oneFichier, generic] as const);
for (const [url, result] of oneFichierResults) {
const link = linksByUrl.get(url);
if (!link) continue;
link.availability = result.online ? "online" : "offline";
link.status = result.online ? (result.fileName ? "ready" : "unknown") : "offline";
if (result.fileName) link.fileName = sanitizeFilename(result.fileName);
if (result.fileSizeBytes !== null && result.fileSizeBytes >= 0) link.fileSizeBytes = result.fileSizeBytes;
}
void oneFichierResults;
for (const [url, fileName] of genericResults) {
const link = linksByUrl.get(url);
if (!link || !fileName) continue;
link.fileName = sanitizeFilename(fileName);
link.status = "ready";
progress.queue(url);
}
progress.flush();
return { packages: regroupEnrichedPackages(packages), invalidCount: 0, duplicateCount: 0 };
}
src/main/main.ts
+7 -2
View File
@@ -569,8 +569,13 @@ function registerIpcHandlers(): void {
const request = validateCollectorContainerPreparationRequest({ filePaths, addedAt });
return controller.prepareCollectorContainers(request.filePaths, request.addedAt);
});
handleTrusted(IPC_CHANNELS.ENRICH_COLLECTOR_PACKAGES, (_event: IpcMainInvokeEvent, value: unknown) => {
return controller.enrichCollectorPackages(validateCollectorEnrichmentRequest(value));
handleTrusted(IPC_CHANNELS.ENRICH_COLLECTOR_PACKAGES, (event: IpcMainInvokeEvent, value: unknown) => {
const request = validateCollectorEnrichmentRequest(value);
return controller.enrichCollectorPackages(request, (result) => {
if (!event.sender.isDestroyed()) {
event.sender.send(IPC_CHANNELS.COLLECTOR_ENRICHMENT_PROGRESS, { requestId: request.requestId, result });
}
});
});
handleTrusted(IPC_CHANNELS.GET_START_CONFLICTS, () => controller.getStartConflicts());
handleTrusted(IPC_CHANNELS.RESOLVE_START_CONFLICT, (_event: IpcMainInvokeEvent, packageId: string, policy: "keep" | "skip" | "overwrite") => {