self-hosted/pigallery2
1
0
Fork 0
mirror of https://github.com/bpatrik/pigallery2.git synced 2024-12-23 01:27:14 +02:00
Code Issues Releases Activity

Add more local filter options #778

Browse Source
This commit is contained in:
Patrik J. Braun 2023-11-30 21:11:49 +01:00
parent 7f7954d5d2
commit 2ef88aed0e
1 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/frontend/app/ui/gallery/filter/filter.service.ts
View File

@ -2,7 +2,7 @@ import {Injectable} from '@angular/core';
import {BehaviorSubject, Observable} from 'rxjs'; import {BehaviorSubject, Observable} from 'rxjs';
import {PhotoDTO} from '../../../../../common/entities/PhotoDTO'; import {PhotoDTO} from '../../../../../common/entities/PhotoDTO';
import {DirectoryContent} from '../contentLoader.service'; import {DirectoryContent} from '../contentLoader.service';
import {debounceTime, map, switchMap} from 'rxjs/operators'; import {map, switchMap} from 'rxjs/operators';
export enum FilterRenderType { export enum FilterRenderType {
enum = 1, enum = 1,
@ -65,16 +65,6 @@ export class FilterService {
mapFn: (m: PhotoDTO): number => m.metadata.rating, mapFn: (m: PhotoDTO): number => m.metadata.rating,
renderType: FilterRenderType.enum, renderType: FilterRenderType.enum,
}, },
{
name: $localize`Camera`,
mapFn: (m: PhotoDTO): string => m.metadata.cameraData?.model,
renderType: FilterRenderType.enum,
},
{
name: $localize`Lens`,
mapFn: (m: PhotoDTO): string => m.metadata.cameraData?.lens,
renderType: FilterRenderType.enum,
},
{ {
name: $localize`City`, name: $localize`City`,
mapFn: (m: PhotoDTO): string => m.metadata.positionData?.city, mapFn: (m: PhotoDTO): string => m.metadata.positionData?.city,
@ -90,6 +80,45 @@ export class FilterService {
mapFn: (m: PhotoDTO): string => m.metadata.positionData?.country, mapFn: (m: PhotoDTO): string => m.metadata.positionData?.country,
renderType: FilterRenderType.enum, renderType: FilterRenderType.enum,
}, },
{
name: $localize`Camera`,
mapFn: (m: PhotoDTO): string => m.metadata.cameraData?.model,
renderType: FilterRenderType.enum,
},
{
name: $localize`Lens`,
mapFn: (m: PhotoDTO): string => m.metadata.cameraData?.lens,
renderType: FilterRenderType.enum,
},
{
name: $localize`ISO`,
mapFn: (m: PhotoDTO): number => m.metadata.cameraData?.ISO,
renderType: FilterRenderType.enum,
},
{
name: $localize`Aperture`,
mapFn: (m: PhotoDTO): string => m.metadata.cameraData?.fStop ? `f/${m.metadata.cameraData?.fStop}` : undefined,
renderType: FilterRenderType.enum,
},
{
name: $localize`Shutter speed`,
mapFn: (m: PhotoDTO): string => {
const f = m.metadata.cameraData?.exposure;
if (typeof f === 'undefined') {
return undefined;
}
if (f > 1) {
return `${f} s`;
}
return `1/${Math.round(1 / f)} s`;
},
renderType: FilterRenderType.enum,
},
{
name: $localize`Focal length`,
mapFn: (m: PhotoDTO): string => m.metadata.cameraData?.focalLength ? `${m.metadata.cameraData?.focalLength} mm` : undefined,
renderType: FilterRenderType.enum,
},
]; ];
public readonly activeFilters = new BehaviorSubject({ public readonly activeFilters = new BehaviorSubject({
@ -279,7 +308,7 @@ export class FilterService {
for (const f of afilters.selectedFilters) { for (const f of afilters.selectedFilters) {
/* Update filter options */ /* Update filter options */
const valueMap: { [key: string]: any } = {}; const valueMap: { [key: string]: { name: string | number, count: number, selected: boolean } } = {};
f.options.forEach((o) => { f.options.forEach((o) => {
valueMap[o.name] = o; valueMap[o.name] = o;
o.count = 0; // reset count so unknown option can be removed at the end o.count = 0; // reset count so unknown option can be removed at the end
@ -307,10 +336,13 @@ export class FilterService {
valueMap[key].count++; valueMap[key].count++;
}); });
} }
f.options = Object.values(valueMap) f.options = Object.values(valueMap)
.filter((o) => o.count > 0) .filter((o) => o.count > 0)
.sort((a, b) => b.count - a.count); // sort by count and alpha. if counts are the same
.sort((a, b) =>
a.count == b.count ?
Number.isFinite(a.name) && Number.isFinite(b.name) ? (a.name as number) - (b.name as number) : a.name.toString().localeCompare(b.name.toString()) :
b.count - a.count);
/* Apply filters */ /* Apply filters */
f.options.forEach((opt) => { f.options.forEach((opt) => {