From e38cbc007949e5de25eb548408657c360cf312b4 Mon Sep 17 00:00:00 2001 From: desertwitch Date: Tue, 26 Oct 2021 21:50:43 +0200 Subject: [PATCH] fix #346 RangeError running jobs on large DBs --- src/backend/model/jobs/jobs/FileJob.ts | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/backend/model/jobs/jobs/FileJob.ts b/src/backend/model/jobs/jobs/FileJob.ts index eca1724f..45d0c3e8 100644 --- a/src/backend/model/jobs/jobs/FileJob.ts +++ b/src/backend/model/jobs/jobs/FileJob.ts @@ -102,12 +102,16 @@ export abstract class FileJob path.join(ProjectPath.ImageFolder, f.directory.path, f.directory.name, f.name))); + const scannedAndFiltered = await this.filterMediaFiles(scanned.media); + for (const item of scannedAndFiltered) { + this.fileQueue.push(path.join(ProjectPath.ImageFolder, item.directory.path, item.directory.name, item.name)); + } } if (this.scanFilter.noMetaFile !== true) { - this.fileQueue.push(...(await this.filterMetaFiles(scanned.metaFile)) - .map(f => path.join(ProjectPath.ImageFolder, f.directory.path, f.directory.name, f.name))); + const scannedAndFiltered = await this.filterMetaFiles(scanned.metaFile); + for (const item of scannedAndFiltered) { + this.fileQueue.push(path.join(ProjectPath.ImageFolder, item.directory.path, item.directory.name, item.name)); + } } } @@ -136,7 +140,8 @@ export abstract class FileJob path.join(ProjectPath.ImageFolder, f.directory.path, f.directory.name, f.name)))); + for (const item of result) { + this.fileQueue.push(path.join(ProjectPath.ImageFolder, item.directory.path, item.directory.name, item.name)); + } } }