Restore: Find album backups in originals folder as well

photoprism · Feb 21, 2021 · 32ef030 · 32ef030
1 parent d8d5ff8
commit 32ef030
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/internal/config/fs.go b/internal/config/fs.go
@@ -363,3 +363,8 @@ func (c *Config) SqliteBin() string {
 func (c *Config) AlbumsPath() string {
 	return filepath.Join(c.StoragePath(), "albums")
 }
+
+// OriginalsAlbumsPath returns the optional album YAML backup folder inside originals.
+func (c *Config) OriginalsAlbumsPath() string {
+	return filepath.Join(c.OriginalsPath(), "albums")
+}
diff --git a/internal/config/fs_test.go b/internal/config/fs_test.go
@@ -91,6 +91,18 @@ func TestConfig_TestdataPath(t *testing.T) {
 	assert.Equal(t, "/go/src/github.com/photoprism/photoprism/storage/testdata/testdata", c.TestdataPath())
 }
 
+func TestConfig_AlbumsPath(t *testing.T) {
+	c := NewConfig(CliTestContext())
+
+	assert.Equal(t, "/go/src/github.com/photoprism/photoprism/storage/testdata/albums", c.AlbumsPath())
+}
+
+func TestConfig_OriginalsAlbumsPath(t *testing.T) {
+	c := NewConfig(CliTestContext())
+
+	assert.Equal(t, "/go/src/github.com/photoprism/photoprism/storage/testdata/originals/albums", c.OriginalsAlbumsPath())
+}
+
 func TestConfig_CreateDirectories(t *testing.T) {
 	testConfigMutex.Lock()
 	defer testConfigMutex.Unlock()

diff --git a/internal/photoprism/albums.go b/internal/photoprism/albums.go
@@ -61,6 +61,11 @@ func RestoreAlbums(force bool) (count int, result error) {
 
 	albums, err := filepath.Glob(regexp.QuoteMeta(c.AlbumsPath()) + "/**/*.yml")
 
+	if oAlbums, oErr := filepath.Glob(regexp.QuoteMeta(c.OriginalsAlbumsPath()) + "/**/*.yml"); oErr == nil {
+		err = nil
+		albums = append(albums, oAlbums...)
+	}
+
 	if err != nil {
 		return count, err
 	}
@@ -73,8 +78,10 @@ func RestoreAlbums(force bool) (count int, result error) {
 		a := entity.Album{}
 
 		if err := a.LoadFromYaml(fileName); err != nil {
-			log.Errorf("album: %s (load yaml)", err)
+			log.Errorf("restore: %s in %s", err, txt.Quote(filepath.Base(fileName)))
 			result = err
+		} else if len(a.Photos) == 0 && a.AlbumFilter == "" {
+			log.Debugf("restore: skipping %s", txt.Quote(filepath.Base(fileName)))
 		} else if err := a.Create(); err != nil {
 			log.Warnf("%s: %s already exists", a.AlbumType, txt.Quote(a.AlbumTitle))
 		} else {