dtoro/mule-image
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(folders): root shows whole library + sidecar counts recurse

Browse Source 
Two paired fixes for the folder tree on the timeline:

* +page.svelte: drop the `Path === ''` post-filter for the root entry.
  PhotoPrism's indexer always nests photos under YYYY/MM, so "photos
  whose Path is empty" is always the empty set in practice — the root
  entry looked broken instead of "whole library". Treat `/` as the
  unscoped view and rely on subfolder selections (now wildcarded via
  filters.svelte.ts) for narrowing.

* sidecar/handlers_folders.go: the per-folder count fan-out used
  `q=path:<x>`, the same exact-match operator that just got fixed in
  the web filter. Result: every year-level folder reported count=0
  in the sidebar. Switch to `q=path:"<x>*"` so the count reflects
  the whole subtree (dedupe by UID still in place).
This commit is contained in:
Claudio
2026-05-17 23:25:43 +02:00
parent 8083328f2d
commit 505fef5dfc
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sidecar/handlers_folders.go
View File

@@ -231,12 +231,20 @@ func handleFolderCounts(pp *ppClient) gin.HandlerFunc {
go func() {
defer wg.Done()
defer func() { <-sem }()
// `path:` is non-recursive in PhotoPrism's q-DSL: matches
// direct children only. `merged=false` returns one row per
// File on disk, so HEIC + companion JPG count twice unless
// we dedupe by UID — which is what the old client-side
// code did, and what we keep doing here.
q := url.QueryEscape("path:" + path)
// `path:<x>` is an exact match in PhotoPrism's q-DSL —
// it matches only photos whose `photo_path` field equals
// <x>, not descendants. The indexer always nests photos
// under YYYY/MM, so an internal tree node like `2024` has
// zero direct children and reports a count of 0 unless we
// recurse. `path:<x>*` is the documented wildcard form and
// matches both `<x>` itself (no harm if empty) and every
// `<x>/...` descendant.
//
// `merged=false` still returns one row per File on disk,
// so HEIC + companion JPG count twice unless we dedupe by
// UID — which is what the old client-side code did, and
// what we keep doing here.
q := url.QueryEscape(`path:"` + path + `*"`)
resp, err := pp.call(c.Request.Context(), http.MethodGet,
"/api/v1/photos?count=1000&offset=0&merged=false&q="+q, token, nil)
if err != nil || !resp.OK {

12
web/src/routes/+page.svelte
View File

@@ -177,12 +177,14 @@
// scoped server-side via the q-DSL and must not be re-filtered here,
// or labels / search will silently drop subfolder photos when the
// store hasn't fully hydrated from the URL yet.
//
// Root (`/`) historically also restricted to `Path === ''` — i.e.
// photos sitting directly at the originals root with no subfolder.
// PhotoPrism's indexer however always nests photos under YYYY/MM, so
// that view was always empty in practice. Treat root as "the whole
// library" instead; subfolders still scope normally.
function applyFolderScope(list: PpPhoto[], f: typeof filters): PpPhoto[] {
if (f.folderPath !== '/') return list;
if (f.section !== 'all-photos') return list;
if (f.heapUid) return list;
if (f.search) return list;
return list.filter((p) => !p.Path);
return list;
}
const pageCount = $derived(photosQuery.data?.pages.length ?? 0);