Fix flex layout not loading in some cases

SmilyOrg · Oct 27, 2024 · be7970d · be7970d
1 parent 6187244
commit be7970d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 21 deletions.
diff --git a/internal/image/info.go b/internal/image/info.go
@@ -39,11 +39,11 @@ func AngleToKm(a s1.Angle) float64 {
 	return a.Radians() * earthRadiusKm
 }
 
-func (info *Info) MakeValid() {
-	if info.Width == 0 || info.Height == 0 {
-		info.Width = 3
-		info.Height = 2
+func (info *Info) AspectRatio() float64 {
+	if info.Height == 0 {
+		return 3 / 2
 	}
+	return float64(info.Width) / float64(info.Height)
 }
 
 func (info *Info) Size() Size {

diff --git a/internal/image/source.go b/internal/image/source.go
@@ -376,18 +376,8 @@ func (source *Source) ListInfos(dirs []string, options ListOptions) (<-chan Sour
 }
 
 func (source *Source) ListInfosEmb(dirs []string, options ListOptions) <-chan InfoEmb {
-	out := make(chan InfoEmb, 1000)
-	go func() {
-		defer metrics.Elapsed("list infos embedded")()
-
-		infos := source.database.ListWithEmbeddings(dirs, options)
-		for info := range infos {
-			info.SourcedInfo.Info.MakeValid()
-			out <- info
-		}
-		close(out)
-	}()
-	return out
+	defer metrics.Elapsed("list infos embedded")()
+	return source.database.ListWithEmbeddings(dirs, options)
 }
 
 // Prefer using ImageId over this unless you absolutely need the path

diff --git a/internal/layout/common.go b/internal/layout/common.go
@@ -317,8 +317,7 @@ func addSectionToScene(section *Section, scene *render.Scene, bounds render.Rect
 			Id: info.Id,
 		}
 
-		aspectRatio := float64(info.Width) / float64(info.Height)
-		imageWidth := float64(config.ImageHeight) * aspectRatio
+		imageWidth := float64(config.ImageHeight) * info.AspectRatio()
 
 		if x+imageWidth > bounds.W {
 			scale := layoutFitRow(scene.Photos[rowIdx:], bounds, config.ImageSpacing)

diff --git a/internal/layout/flex.go b/internal/layout/flex.go
@@ -104,7 +104,7 @@ func LayoutFlex(infos <-chan image.SourcedInfo, layout Layout, scene *render.Sce
 		}
 		photo := dag.Photo{
 			Id:          info.Id,
-			AspectRatio: float32(info.Width) / float32(info.Height),
+			AspectRatio: float32(info.AspectRatio()),
 		}
 		photos = append(photos, photo)
 		layoutCounter.Set(len(photos))

diff --git a/internal/layout/highlights.go b/internal/layout/highlights.go
@@ -136,7 +136,7 @@ func LayoutHighlights(infos <-chan image.InfoEmb, layout Layout, scene *render.S
 		photo := HighlightPhoto{
 			Photo: dag.Photo{
 				Id:          info.Id,
-				AspectRatio: float32(info.Width) / float32(info.Height),
+				AspectRatio: float32(info.AspectRatio()),
 			},
 			Height: float32(simHeight),
 		}

diff --git a/internal/layout/search.go b/internal/layout/search.go
@@ -53,7 +53,7 @@ func LayoutSearch(infos <-chan image.SimilarityInfo, layout Layout, scene *rende
 			mostSimilar = info.Similarity
 		}
 
-		aspectRatio := float64(info.Width) / float64(info.Height)
+		aspectRatio := info.AspectRatio()
 		imageWidth := float64(imageHeight) * aspectRatio
 
 		if rect.X+imageWidth > rect.W {