johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Indexer: Improve stacking settings and merging

Browse Source
This commit is contained in:
Michael Mayer
2020-12-11 17:21:13 +01:00
parent 8f80026b3e
commit 04c17fb77b
24 changed files with 397 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/entity/photo_optimize_test.go
View File

@@ -53,6 +53,7 @@ func TestPhoto_EstimateCountry(t *testing.T) {
func TestPhoto_Optimize(t *testing.T) {
t.Run("update", func(t *testing.T) {
photo := PhotoFixtures.Get("Photo19")
if updated, merged, err := photo.Optimize(false, false); err != nil {
t.Fatal(err)
} else if !updated {
@@ -64,16 +65,16 @@ func TestPhoto_Optimize(t *testing.T) {
if updated, merged, err := photo.Optimize(false, false); err != nil {
t.Fatal(err)
} else if updated {
t.Error("photo should NOT be updated")
t.Errorf("photo should NOT be updated, merged: %+v", merged)
} else if len(merged) > 0 {
t.Error("no photos should be merged")
t.Errorf("no photos should be merged")
}
})
t.Run("photo without id", func(t *testing.T) {
photo := Photo{}
bool, merged, err := photo.Optimize(false, false)
result, merged, err := photo.Optimize(false, false)
assert.Error(t, err)
assert.False(t, bool)
assert.False(t, result)
if len(merged) > 0 {
t.Error("no photos should be merged")