diff --git a/src/backend/middlewares/GalleryMWs.ts b/src/backend/middlewares/GalleryMWs.ts index a33e03b5..e36114a4 100644 --- a/src/backend/middlewares/GalleryMWs.ts +++ b/src/backend/middlewares/GalleryMWs.ts @@ -16,6 +16,7 @@ import {VideoDTO} from '../../common/entities/VideoDTO'; import {Utils} from '../../common/Utils'; import {QueryParams} from '../../common/QueryParams'; import {VideoProcessing} from '../model/fileprocessing/VideoProcessing'; +import {DiskMangerWorker} from '../model/threading/DiskMangerWorker'; export class GalleryMWs { @@ -120,7 +121,7 @@ export class GalleryMWs { try { const query: RandomQuery = {}; if (req.query.directory) { - query.directory = req.query.directory; + query.directory = DiskMangerWorker.normalizeDirPath(req.query.directory); } if (req.query.recursive === 'true') { query.recursive = true; diff --git a/src/backend/model/database/sql/GalleryManager.ts b/src/backend/model/database/sql/GalleryManager.ts index 465cff31..59faf04b 100644 --- a/src/backend/model/database/sql/GalleryManager.ts +++ b/src/backend/model/database/sql/GalleryManager.ts @@ -100,7 +100,7 @@ export class GalleryManager implements IGalleryManager, ISQLGalleryManager { }); if (queryFilter.recursive) { - qb.orWhere('directory.name LIKE :text COLLATE utf8_general_ci', {text: '%' + queryFilter.directory + '%'}); + qb.orWhere('directory.path LIKE :text COLLATE utf8_general_ci', {text: queryFilter.directory + '%'}); } })); }