self-hosted/pigallery2
1
0
Fork 0
mirror of https://github.com/bpatrik/pigallery2.git synced 2025-12-01 22:52:06 +02:00
Code Issues Releases Activity

Let the navigator show exact directory searches the same way as if they were normal directory listings #1015

Browse Source
This commit is contained in:
Patrik J. Braun
2025-08-04 22:34:56 +02:00
parent 6a95d2bcdc
commit 770e04e202
1 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/frontend/app/ui/gallery/navigator/navigator.gallery.component.ts
View File

@@ -93,14 +93,32 @@ export class GalleryNavigatorComponent {
this.routes = this.contentLoaderService.content.pipe(
map((c) => {
this.parentPath = null;
if (!c.directory) {
if (!c.directory && !this.isExactDirectorySearch(c)) {
return [];
}
const path = c.directory.path.replace(new RegExp('\\\\', 'g'), '/');
let path: string;
let name: string;
if (c.directory) {
path = c.directory.path;
name = c.directory.name;
} else {
// Handle exact directory search
const searchQuery = c.searchResult.searchQuery as TextSearch;
path = searchQuery.text.replace(/^\.\//, ''); // Remove leading ./ if present
const lastSlashIndex = path.lastIndexOf('/');
if (lastSlashIndex !== -1) {
name = path.substring(lastSlashIndex + 1);
path = path.substring(0, lastSlashIndex);
} else {
name = path;
path = '';
}
}
path = path.replace(new RegExp('\\\\', 'g'), '/');
const dirs = path.split('/');
dirs.push(c.directory.name);
dirs.push(name);
// removing empty strings
for (let i = 0; i < dirs.length; i++) {
@@ -152,12 +170,22 @@ export class GalleryNavigatorComponent {
);
}
private isExactDirectorySearch(content: ContentWrapperWithError): boolean {
const searchQuery = content.searchResult?.searchQuery as TextSearch;
return !!content.searchResult &&
searchQuery?.type === SearchQueryTypes.directory &&
searchQuery?.matchType === TextSearchQueryMatchTypes.exact_match &&
!searchQuery?.negate;
}
get isDirectory(): boolean {
return !!this.contentLoaderService.content.value.directory;
const content = this.contentLoaderService.content.value;
return !!content.directory || this.isExactDirectorySearch(content);
}
get isSearch(): boolean {
return !!this.contentLoaderService.content.value.searchResult;
const content = this.contentLoaderService.content.value;
return !!content.searchResult && !this.isExactDirectorySearch(content);
}
get ItemCount(): number {
@@ -299,4 +327,3 @@ interface NavigatorPath {
route: string;
title?: string;
}