self-hosted/pigallery2
1
0
Fork 0
mirror of https://github.com/bpatrik/pigallery2.git synced 2025-02-03 13:22:05 +02:00
Code Issues Releases Activity

Improving Autocomplete to show more items from one type if there is not enough. Also list persons first with more photos #improvement

Browse Source
This commit is contained in:
Patrik J. Braun 2022-02-22 13:47:41 +01:00
parent 9c96dba032
commit 02edfb4963
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/backend/model/database/sql/SearchManager.ts
View File

@ -64,39 +64,42 @@ export class SearchManager implements ISQLSearchManager {
const connection = await SQLConnection.getConnection();
let result: AutoCompleteItem[] = [];
const photoRepository = connection.getRepository(PhotoEntity);
const mediaRepository = connection.getRepository(MediaEntity);
const personRepository = connection.getRepository(PersonEntry);
const directoryRepository = connection.getRepository(DirectoryEntity);
const partialResult: AutoCompleteItem[][] = [];
if (type === SearchQueryTypes.any_text || type === SearchQueryTypes.keyword) {
const acList: AutoCompleteItem[] = [];
(await photoRepository
.createQueryBuilder('photo')
.select('DISTINCT(photo.metadata.keywords)')
.where('photo.metadata.keywords LIKE :text COLLATE ' + SQL_COLLATE, {text: '%' + text + '%'})
.limit(Config.Client.Search.AutoComplete.maxItemsPerCategory)
.limit(Config.Client.Search.AutoComplete.targetItemsPerCategory * 2)
.getRawMany())
.map((r): Array<string> => (r.metadataKeywords as string).split(',') as Array<string>)
.forEach((keywords): void => {
result = result.concat(this.encapsulateAutoComplete(keywords
acList.push(...this.encapsulateAutoComplete(keywords
.filter((k): boolean => k.toLowerCase().indexOf(text.toLowerCase()) !== -1), SearchQueryTypes.keyword));
});
partialResult.push(acList);
}
if (type === SearchQueryTypes.any_text || type === SearchQueryTypes.person) {
result = result.concat(this.encapsulateAutoComplete((await personRepository
partialResult.push(this.encapsulateAutoComplete((await personRepository
.createQueryBuilder('person')
.select('DISTINCT(person.name)')
.where('person.name LIKE :text COLLATE ' + SQL_COLLATE, {text: '%' + text + '%'})
.limit(Config.Client.Search.AutoComplete.maxItemsPerCategory)
.orderBy('person.name')
.limit(Config.Client.Search.AutoComplete.targetItemsPerCategory * 2)
.orderBy('person.count', 'DESC')
.getRawMany())
.map(r => r.name), SearchQueryTypes.person));
}
if (type === SearchQueryTypes.any_text || type === SearchQueryTypes.position || type === SearchQueryTypes.distance) {
const acList: AutoCompleteItem[] = [];
(await photoRepository
.createQueryBuilder('photo')
.select('photo.metadata.positionData.country as country, ' +
@ -105,47 +108,57 @@ export class SearchManager implements ISQLSearchManager {
.orWhere('photo.metadata.positionData.state LIKE :text COLLATE ' + SQL_COLLATE, {text: '%' + text + '%'})
.orWhere('photo.metadata.positionData.city LIKE :text COLLATE ' + SQL_COLLATE, {text: '%' + text + '%'})
.groupBy('photo.metadata.positionData.country, photo.metadata.positionData.state, photo.metadata.positionData.city')
.limit(Config.Client.Search.AutoComplete.maxItemsPerCategory)
.limit(Config.Client.Search.AutoComplete.targetItemsPerCategory * 2)
.getRawMany())
.filter((pm): boolean => !!pm)
.map((pm): Array<string> => [pm.city || '', pm.country || '', pm.state || ''] as Array<string>)
.forEach((positions): void => {
result = result.concat(this.encapsulateAutoComplete(positions
acList.push(...this.encapsulateAutoComplete(positions
.filter((p): boolean => p.toLowerCase().indexOf(text.toLowerCase()) !== -1),
type === SearchQueryTypes.distance ? type : SearchQueryTypes.position));
});
partialResult.push(acList);
}
if (type === SearchQueryTypes.any_text || type === SearchQueryTypes.file_name) {
result = result.concat(this.encapsulateAutoComplete((await mediaRepository
partialResult.push(this.encapsulateAutoComplete((await mediaRepository
.createQueryBuilder('media')
.select('DISTINCT(media.name)')
.where('media.name LIKE :text COLLATE ' + SQL_COLLATE, {text: '%' + text + '%'})
.limit(Config.Client.Search.AutoComplete.maxItemsPerCategory)
.limit(Config.Client.Search.AutoComplete.targetItemsPerCategory * 2)
.getRawMany())
.map(r => r.name), SearchQueryTypes.file_name));
}
if (type === SearchQueryTypes.any_text || type === SearchQueryTypes.caption) {
result = result.concat(this.encapsulateAutoComplete((await photoRepository
partialResult.push(this.encapsulateAutoComplete((await photoRepository
.createQueryBuilder('media')
.select('DISTINCT(media.metadata.caption) as caption')
.where('media.metadata.caption LIKE :text COLLATE ' + SQL_COLLATE, {text: '%' + text + '%'})
.limit(Config.Client.Search.AutoComplete.maxItemsPerCategory)
.limit(Config.Client.Search.AutoComplete.targetItemsPerCategory * 2)
.getRawMany())
.map(r => r.caption), SearchQueryTypes.caption));
}
if (type === SearchQueryTypes.any_text || type === SearchQueryTypes.directory) {
result = result.concat(this.encapsulateAutoComplete((await directoryRepository
partialResult.push(this.encapsulateAutoComplete((await directoryRepository
.createQueryBuilder('dir')
.select('DISTINCT(dir.name)')
.where('dir.name LIKE :text COLLATE ' + SQL_COLLATE, {text: '%' + text + '%'})
.limit(Config.Client.Search.AutoComplete.maxItemsPerCategory)
.limit(Config.Client.Search.AutoComplete.targetItemsPerCategory * 2)
.getRawMany())
.map(r => r.name), SearchQueryTypes.directory));
}
let result: AutoCompleteItem[];
// if not enough items are available, load more from one category
if ([].concat(...partialResult).length < Config.Client.Search.AutoComplete.maxItems) {
result = [].concat(...(partialResult));
} else {
result = [].concat(...(partialResult.map(l => l.slice(0, Config.Client.Search.AutoComplete.targetItemsPerCategory))));
}
return SearchManager.autoCompleteItemsUnique(result);
}

4
src/common/config/public/ClientConfig.ts
View File

@ -15,7 +15,9 @@ export class AutoCompleteConfig {
@ConfigProperty()
enabled: boolean = true;
@ConfigProperty({type: 'unsignedInt'})
maxItemsPerCategory: number = 5;
targetItemsPerCategory: number = 5;
@ConfigProperty({type: 'unsignedInt'})
maxItems: number = 30;
@ConfigProperty({type: 'unsignedInt'})
cacheTimeout: number = 1000 * 60 * 60;
}