From ac5a9d5ee435ae9233f25740128049dbb329a9d2 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Mon, 22 Feb 2021 21:21:14 +0100 Subject: [PATCH] Demo: Restore albums from YAML backups --- docker/demo/Dockerfile | 1 + internal/photoprism/albums.go | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/demo/Dockerfile b/docker/demo/Dockerfile index 13bca41a7..4796b0c1f 100644 --- a/docker/demo/Dockerfile +++ b/docker/demo/Dockerfile @@ -27,6 +27,7 @@ ENV PHOTOPRISM_JPEG_QUALITY 95 ENV PHOTOPRISM_SITE_CAPTION "Demo" # Import example photos +RUN photoprism restore -a RUN photoprism index RUN photoprism moments diff --git a/internal/photoprism/albums.go b/internal/photoprism/albums.go index 54cf40669..0f329b20f 100644 --- a/internal/photoprism/albums.go +++ b/internal/photoprism/albums.go @@ -80,10 +80,12 @@ func RestoreAlbums(force bool) (count int, result error) { if err := a.LoadFromYaml(fileName); err != nil { log.Errorf("restore: %s in %s", err, txt.Quote(filepath.Base(fileName))) result = err - } else if len(a.Photos) == 0 && a.AlbumFilter == "" { + } else if a.AlbumType == "" || len(a.Photos) == 0 && a.AlbumFilter == "" { log.Debugf("restore: skipping %s", txt.Quote(filepath.Base(fileName))) + } else if err := a.Find(); err == nil { + log.Infof("%s: %s already exists", a.AlbumType, txt.Quote(a.AlbumTitle)) } else if err := a.Create(); err != nil { - log.Warnf("%s: %s already exists", a.AlbumType, txt.Quote(a.AlbumTitle)) + log.Errorf("%s: %s in %s", a.AlbumType, err, txt.Quote(filepath.Base(fileName))) } else { count++ }