Feature/relative splitview images

internal/common/common.go

@@ -14,6 +14,7 @@ import (
 	"github.com/charmbracelet/log"
 	"github.com/damongolding/immich-kiosk/internal/config"
 	"github.com/damongolding/immich-kiosk/internal/immich"
+	"github.com/damongolding/immich-kiosk/internal/kiosk"
 	"github.com/damongolding/immich-kiosk/internal/utils"
 	"github.com/labstack/echo/v4"
 )
@@ -99,7 +100,7 @@ type ViewImageData struct {
 	ImageData     string             // ImageData contains the image as base64 data
 	ImageBlurData string             // ImageBlurData contains the blurred image as base64 data
 	ImageDate     string             // ImageDate contains the date of the image
-	User          string
+	User          string             // User the user api key used
 }
 
 // ViewData contains all the data needed to render a view in the application
@@ -112,6 +113,13 @@ type ViewData struct {
 	config.Config                 // Config contains the instance configuration
 }
 
+type ViewImageDataOptions struct {
+	RelativeAssetWanted   bool
+	RelativeAssetBucket   kiosk.Source
+	RelativeAssetBucketID string
+	ImageOrientation      immich.ImageOrientation
+}
+
 // ContextCopy stores a copy of key HTTP context information including URL and headers
 type ContextCopy struct {
 	URL            url.URL     // The request URL

internal/config/config.go

@@ -430,14 +430,22 @@ func (c *Config) Load() error {
 	return nil
 }
 
+// ResetBuckets clears all the asset bucket slice fields (Person, Album, Date)
+// in the Config structure. This is typically used when applying new query parameters
+// to ensure old values don't persist. When querying specific buckets, the previous
+// values need to be cleared to avoid mixing unintended assets.
+func (c *Config) ResetBuckets() {
+	c.Person = []string{}
+	c.Album = []string{}
+	c.Date = []string{}
+}
+
 // ConfigWithOverrides overwrites base config with ones supplied via URL queries
 func (c *Config) ConfigWithOverrides(queries url.Values, e echo.Context) error {
 
 	// check for person or album in quries and empty baseconfig slice if found
 	if queries.Has("person") || queries.Has("album") || queries.Has("date") || queries.Has("memories") {
-		c.Person = []string{}
-		c.Album = []string{}
-		c.Date = []string{}
+		c.ResetBuckets()
 	}
 
 	err := e.Bind(c)

internal/immich/immich.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/damongolding/immich-kiosk/internal/config"
 	"github.com/damongolding/immich-kiosk/internal/immich_open_api"
+	"github.com/damongolding/immich-kiosk/internal/kiosk"
 )
 
 type ImageOrientation string
@@ -176,6 +177,8 @@ type ImmichAsset struct {
 	IsLandscape bool             `json:"-"`
 	MemoryTitle string           `json:"-"`
 	AppearsIn   []string         `json:"-"`
+	Bucket      kiosk.Source     `json:"-"`
+	BucketID    string           `json:"-"`
 }
 
 type ImmichAlbum struct {

internal/immich/immich_album.go

@@ -269,6 +269,9 @@ func (i *ImmichAsset) ImageFromAlbum(albumID string, albumAssetsOrder ImmichAsse
 
 			}
 
+			asset.Bucket = kiosk.SourceAlbums
+			asset.BucketID = album.ID
+
 			*i = asset
 
 			return nil

internal/immich/immich_date.go

@@ -120,7 +120,6 @@ func (i *ImmichAsset) RandomImageInDateRange(dateRange, requestID, deviceID stri
 				continue
 			}
 
-
 			if requestConfig.Kiosk.Cache {
 				// Remove the current image from the slice
 				immichAssetsToCache := append(immichAssets[:immichAssetIndex], immichAssets[immichAssetIndex+1:]...)
@@ -137,6 +136,9 @@ func (i *ImmichAsset) RandomImageInDateRange(dateRange, requestID, deviceID stri
 				}
 			}
 
+			asset.Bucket = kiosk.SourceDateRangeAlbum
+			asset.BucketID = dateRange
+
 			*i = asset
 
 			return nil

internal/immich/immich_favourites.go

@@ -189,7 +189,6 @@ func (i *ImmichAsset) RandomImageFromFavourites(requestID, deviceID string, allo
 				continue
 			}
 
-
 			if requestConfig.Kiosk.Cache {
 				// Remove the current image from the slice
 				immichAssetsToCache := append(immichAssets[:immichAssetIndex], immichAssets[immichAssetIndex+1:]...)
@@ -206,7 +205,11 @@ func (i *ImmichAsset) RandomImageFromFavourites(requestID, deviceID string, allo
 				}
 			}
 
+			asset.Bucket = kiosk.SourceAlbums
+			asset.BucketID = kiosk.AlbumKeywordFavourites
+
 			*i = asset
+
 			return nil
 		}
 

internal/immich/immich_memories.go

@@ -156,9 +156,10 @@ func (i *ImmichAsset) RandomMemoryLaneImage(requestID, deviceID string, isPrefet
 				}
 			}
 
-			*i = asset
+			asset.Bucket = kiosk.SourceMemories
+			asset.MemoryTitle = memories[pickedMemoryIndex].Title
 
-			i.MemoryTitle = memories[pickedMemoryIndex].Title
+			*i = asset
 
 			return nil
 		}

internal/immich/immich_person.go

@@ -149,7 +149,6 @@ func (i *ImmichAsset) RandomImageOfPerson(personID, requestID, deviceID string,
 				continue
 			}
 
-
 			if requestConfig.Kiosk.Cache {
 				// Remove the current image from the slice
 				immichAssetsToCache := append(immichAssets[:immichAssetIndex], immichAssets[immichAssetIndex+1:]...)
@@ -166,6 +165,9 @@ func (i *ImmichAsset) RandomImageOfPerson(personID, requestID, deviceID string,
 				}
 			}
 
+			asset.Bucket = kiosk.SourcePerson
+			asset.BucketID = personID
+
 			*i = asset
 
 			return nil

internal/immich/immich_random.go

@@ -109,7 +109,6 @@ func (i *ImmichAsset) RandomImage(requestID, deviceID string, isPrefetch bool) e
 				continue
 			}
 
-
 			if requestConfig.Kiosk.Cache {
 				// Remove the current image from the slice
 				immichAssetsToCache := append(immichAssets[:immichAssetIndex], immichAssets[immichAssetIndex+1:]...)
@@ -126,7 +125,10 @@ func (i *ImmichAsset) RandomImage(requestID, deviceID string, isPrefetch bool) e
 				}
 			}
 
+			asset.Bucket = kiosk.SourceRandom
+
 			*i = asset
+
 			return nil
 		}
 

internal/kiosk/kiosk.go

@@ -14,5 +14,10 @@ const (
 	SourceRandom         Source = "RANDOM"
 	SourceMemories       Source = "MEMORIES"
 
+	LayoutLandscape          string = "landscape"
+	LayoutPortrait           string = "portrait"
+	LayoutSplitview          string = "splitview"
+	LayoutSplitviewLandscape string = "splitview-landscape"
+
 	TagSkip string = "kiosk-skip"
 )

internal/routes/routes.go

@@ -38,6 +38,13 @@ type PersonOrAlbum struct {
 	ID   string
 }
 
+// requestMetadata holds information about the current request context
+type requestMetadata struct {
+	requestID string
+	deviceID  string
+	urlString string
+}
+
 func ShouldDrawFacesOnImages() bool {
 	return drawFacesOnImages == "true"
 }