xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2025-01-14 14:43:17 +08:00
Code Actions Projects Activity

Preview will show from all child directoris (not only direct childs)

Browse Source
This commit is contained in:
Alexey.Vlasov 2020-06-28 22:41:37 -07:00
parent 3deb8e26f5
commit 77551eadd9
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/backend/model/database/sql/GalleryManager.ts
View File

@ -290,18 +290,27 @@ export class GalleryManager implements IGalleryManager, ISQLGalleryManager {
} }
if (dir.directories) { if (dir.directories) {
for (let i = 0; i < dir.directories.length; i++) { for (let i = 0; i < dir.directories.length; i++) {
const dirName = GalleryManager.getAbsoluteDirName(dir.directories[i]);
dir.directories[i].media = await connection dir.directories[i].media = await connection
.getRepository(MediaEntity) .getRepository(MediaEntity)
.createQueryBuilder('media') .createQueryBuilder('media')
.innerJoinAndSelect('media.directory', 'directory')
.where('media.directory = :dir', { .where('media.directory = :dir', {
dir: dir.directories[i].id dir: dir.directories[i].id
}) })
.orderBy('media.metadata.creationDate', 'ASC') .orWhere("directory.path like :parentPath||'%'", {
parentPath: dirName
})
.orderBy('media.metadata.creationDate', 'DESC')
.limit(Config.Server.Indexing.folderPreviewSize) .limit(Config.Server.Indexing.folderPreviewSize)
.getMany(); .getMany();
dir.directories[i].isPartial = true; dir.directories[i].isPartial = true;
for (let j = 0; j < dir.directories[i].media.length; j++) { const dirs = dir.directories[i]
for (let j = 0; j < dirs.media.length; j++) {
const mediaDirName = GalleryManager.getAbsoluteDirName(dirs.media[j].directory);
const name = mediaDirName.substring(dirName.length);
dir.directories[i].media[j].name = name + dir.directories[i].media[j].name
dir.directories[i].media[j].directory = dir.directories[i]; dir.directories[i].media[j].directory = dir.directories[i];
dir.directories[i].media[j].readyThumbnails = []; dir.directories[i].media[j].readyThumbnails = [];
dir.directories[i].media[j].readyIcon = false; dir.directories[i].media[j].readyIcon = false;
@ -310,4 +319,9 @@ export class GalleryManager implements IGalleryManager, ISQLGalleryManager {
} }
} }
public static getAbsoluteDirName(dir: DirectoryEntity) {
const path = dir.path;
const currentRoot = (path === "./" ? "" : path) ;
return currentRoot + dir.name + "/";
}
} }

2
src/backend/model/diagnostics/ConfigDiagnostics.ts
View File

@ -30,7 +30,7 @@ export class ConfigDiagnostics {
if (databaseConfig.type !== ServerConfig.DatabaseType.memory) { if (databaseConfig.type !== ServerConfig.DatabaseType.memory) {
await SQLConnection.tryConnection(databaseConfig); await SQLConnection.tryConnection(databaseConfig);
} }
if (databaseConfig.type !== ServerConfig.DatabaseType.sqlite) { if (databaseConfig.type === ServerConfig.DatabaseType.sqlite) {
try { try {
await this.checkReadWritePermission(SQLConnection.getSQLiteDB(databaseConfig)); await this.checkReadWritePermission(SQLConnection.getSQLiteDB(databaseConfig));
} catch (e) { } catch (e) {