From 7308379fc4106fed2707f1cc3838fa65a7942489 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Wed, 14 Sep 2022 10:33:24 +0200 Subject: [PATCH] Index: Delay check for raw files to improve performance #2702 Signed-off-by: Michael Mayer --- Dockerfile | 2 +- internal/photoprism/index.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 70107cdfe..00027baf3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Ubuntu 22.04 LTS (Jammy Jellyfish) -FROM photoprism/develop:220902-jammy +FROM photoprism/develop:220914-jammy ## Alternative Environments: # FROM photoprism/develop:bookworm # Debian 12 (Bookworm) diff --git a/internal/photoprism/index.go b/internal/photoprism/index.go index deb441cf9..1148cdff7 100644 --- a/internal/photoprism/index.go +++ b/internal/photoprism/index.go @@ -197,14 +197,14 @@ func (ind *Index) Start(o IndexOptions) fs.Done { return nil } - // Ignore RAW images? - if mf.IsRaw() && skipRaw { - log.Infof("index: skipped raw %s", clean.Log(mf.RootRelName())) + // Skip already indexed? + if ind.files.Indexed(relName, entity.RootOriginals, mf.modTime, o.Rescan) { return nil } - // Skip? - if ind.files.Indexed(relName, entity.RootOriginals, mf.modTime, o.Rescan) { + // Skip RAW image? + if mf.IsRaw() && skipRaw { + log.Infof("index: skipped raw %s", clean.Log(mf.RootRelName())) return nil }