xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00
Code Actions Projects Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Patrik J. Braun 2021-12-11 16:25:12 +01:00
commit 46c9a6fb00
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/model/jobs/jobs/FileJob.ts
View File

@ -102,12 +102,16 @@ export abstract class FileJob<S extends { indexedOnly: boolean } = { indexedOnly
this.directoryQueue.push(path.join(item.path, item.name));
}
if (this.scanFilter.noPhoto !== true || this.scanFilter.noVideo !== true) {
this.fileQueue.push(...(await this.filterMediaFiles(scanned.media))
.map(f => 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<S extends { indexedOnly: boolean } = { indexedOnly
.leftJoinAndSelect('media.directory', 'directory')
.getMany();
this.fileQueue.push(...(result
.map(f => 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));
}
}
}