Darkmode

api.yaml

@@ -179,11 +179,15 @@ paths:
             minimum: 1
             example: 256
 
+        - name: color
+          in: query
+          schema:
+            $ref: "#/components/schemas/Color"
+
         - name: background_color
           in: query
           schema:
-            type: string
-            example: "#000000"
+            $ref: "#/components/schemas/Color"
 
         - name: transparency_mask
           in: query
@@ -944,6 +948,10 @@ components:
     SceneId:
       type: string
       example: Tqcqtc6h69
+
+    Color:
+      type: string
+      example: "#ff0000"
 
     ViewportWidth:
       type: number

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 {

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

internal/layout/album.go

@@ -27,7 +27,6 @@ type AlbumEvent struct {
 func LayoutAlbumEvent(layout Layout, rect render.Rect, event *AlbumEvent, scene *render.Scene, source *image.Source) render.Rect {
 
 	if event.FirstOnDay {
-		font := scene.Fonts.Main.Face(70, canvas.Black, canvas.FontRegular, canvas.FontNormal)
 		dateFormat := "Monday, Jan 2"
 		if event.First {
 			dateFormat = "Monday, Jan 2, 2006"
@@ -39,7 +38,7 @@ func LayoutAlbumEvent(layout Layout, rect render.Rect, event *AlbumEvent, scene
 				W: rect.W,
 				H: 40,
 			},
-			&font,
+			&scene.Fonts.Header,
 			event.StartTime.Format(dateFormat),
 		)
 		text.VAlign = canvas.Bottom

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)

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))

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),
 		}

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 {

internal/render/scene.go

@@ -26,6 +26,7 @@ type Render struct {
 	TileSize          int         `json:"tile_size"`
 	MaxSolidPixelArea float64     `json:"max_solid_pixel_area"`
 	BackgroundColor   color.Color `json:"background_color"`
+	Color             color.Color `json:"color"`
 	TransparencyMask  bool        `json:"transparency_mask"`
 	LogDraws          bool