Merge pull request #749 from damongolding/task/release

damongolding · web-flow · commit d55a1547c98e · 2026-05-08T15:28:39.000+01:00
Task/release
diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,7 @@ RUN bun run css && bun run js && bun run url-builder
 
 
 # Go Builder
-FROM --platform=$BUILDPLATFORM golang:1.26.2-bookworm AS build
+FROM --platform=$BUILDPLATFORM golang:1.26.3-bookworm AS build
 
 ARG VERSION=demo
 ARG TARGETOS
diff --git a/config.schema.json b/config.schema.json
@@ -448,12 +448,12 @@
                   },
                   "wind": {
                     "type": "boolean",
-                    "description": "Show the current wind speed",
+                    "description": "Show the current wind speed and wind direction (N, NE, E, etc.)",
                     "default": false
                   },
                   "wind_direction": {
                     "type": "boolean",
-                    "description": "Show wind direction as a compass heading (N, NE, E, etc.) instead of degrees",
+                    "description": "Also show wind direction as degrees",
                     "default": false
                   },
                   "visibility": {
diff --git a/frontend/bun.lock b/frontend/bun.lock
diff --git a/frontend/package.json b/frontend/package.json
@@ -26,14 +26,14 @@
     }
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.4.13",
+    "@biomejs/biome": "^2.4.14",
     "autoprefixer": "^10.5.0",
     "choices.js": "^11.2.3",
     "date-fns": "^4.1.0",
-    "dompurify": "^3.4.1",
+    "dompurify": "^3.4.2",
     "esbuild": "^0.28.0",
     "htmx.org": "^2.0.10",
-    "postcss": "^8.5.12",
+    "postcss": "^8.5.14",
     "postcss-cli": "^11.0.1",
     "postcss-nested": "^7.0.2",
     "typescript": "^5.9.3"
diff --git a/frontend/src/css/vars.css b/frontend/src/css/vars.css
@@ -1,4 +1,6 @@
 :root {
+	color-scheme: only light !important;
+	
     /* colours */
     --light-grey: #f7f9f8;
     --mid-grey: #6d727a;
diff --git a/frontend/src/css/weather.css b/frontend/src/css/weather.css
@@ -100,3 +100,30 @@
     gap: 0.2rem;
     align-items: center;
 }
+
+.weather--temperature-range--value--high,
+.weather--temperature-range--value--low {
+    position: relative;
+}
+
+.weather--temperature-range--value--high::before {
+    position: absolute;
+    top: -0.0625rem;
+    left: 50%;
+    width: 0.5rem;
+    height: 0.0625rem;
+    content: "";
+    background-color: rgba(255, 255, 255, 0.5);
+    transform: translateX(-50%);
+}
+
+.weather--temperature-range--value--low::before {
+    position: absolute;
+    bottom: -0.125rem;
+    left: 50%;
+    width: 0.5rem;
+    height: 0.0625rem;
+    content: "";
+    background-color: rgba(255, 255, 255, 0.5);
+    transform: translateX(-50%);
+}
diff --git a/frontend/src/ts/kiosk.ts b/frontend/src/ts/kiosk.ts
@@ -391,6 +391,15 @@ function addEventListeners(): void {
         }
     });
 
+    htmx.on("htmx:afterRequest", (e: HTMXEvent) => {
+        const path = e.detail?.pathInfo?.requestPath || "";
+
+        // Only restart polling for asset endpoints
+        if (path.startsWith("/asset/")) {
+            startPolling();
+        }
+    });
+
     htmx.on("htmx:timeout", (e: HTMXEvent) => {
         let currentTimeout = timeouts[e.detail.pathInfo.requestPath];
 
@@ -517,6 +526,13 @@ async function cleanupFrames(): Promise<void> {
  * @throws {Error} If request lock is already set
  */
 function setRequestLock(e: HTMXEvent): void {
+    const path = e.detail?.pathInfo?.requestPath || "";
+
+    // Do not lock for non-asset requests (e.g. GIFS, live photos)
+    if (!path.startsWith("/asset/")) {
+        return;
+    }
+
     if (requestInFlight) {
         e.preventDefault();
         return;
diff --git a/frontend/src/ts/menu.ts b/frontend/src/ts/menu.ts
@@ -185,11 +185,11 @@ function initMenu(
 }
 
 export {
-    initMenu,
     disableAssetNavigationButtons,
     enableAssetNavigationButtons,
-    showAssetOverlay,
     hideAssetOverlay,
+    initMenu,
+    showAssetOverlay,
     toggleAssetOverlay,
     toggleRedirectsOverlay,
 };
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/damongolding/immich-kiosk
 
-go 1.26.2
+go 1.26.3
 
 require (
 	charm.land/lipgloss/v2 v2.0.3
@@ -13,13 +13,13 @@ require (
 	github.com/goodsign/monday v1.0.2
 	github.com/google/go-querystring v1.2.0
 	github.com/google/uuid v1.6.0
-	github.com/klauspost/compress v1.18.5
-	github.com/labstack/echo/v5 v5.1.0
+	github.com/klauspost/compress v1.18.6
+	github.com/labstack/echo/v5 v5.1.1
 	github.com/mcuadros/go-defaults v1.2.0
 	github.com/nicksnyder/go-i18n/v2 v2.6.1
 	github.com/oapi-codegen/runtime v1.4.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/pelletier/go-toml/v2 v2.3.0
+	github.com/pelletier/go-toml/v2 v2.3.1
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/spf13/viper v1.21.0
 	github.com/stretchr/testify v1.11.1
diff --git a/go.sum b/go.sum
@@ -171,8 +171,8 @@ github.com/jdkato/prose v1.2.1/go.mod h1:AiRHgVagnEx2JbQRQowVBKjG0bcs/vtkGCH1dYA
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE=
-github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE=
-github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
+github.com/klauspost/compress v1.18.6 h1:2jupLlAwFm95+YDR+NwD2MEfFO9d4z4Prjl1XXDjuao=
+github.com/klauspost/compress v1.18.6/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@@ -182,8 +182,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kyokomi/emoji/v2 v2.2.13 h1:GhTfQa67venUUvmleTNFnb+bi7S3aocF7ZCXU9fSO7U=
 github.com/kyokomi/emoji/v2 v2.2.13/go.mod h1:JUcn42DTdsXJo1SWanHh4HKDEyPaR5CqkmoirZZP9qE=
-github.com/labstack/echo/v5 v5.1.0 h1:MvIRydoN+p9cx/zq8Lff6YXqUW2ZaEsOMISzEGSMrBI=
-github.com/labstack/echo/v5 v5.1.0/go.mod h1:SyvlSdObGjRXeQfCCXW/sybkZdOOQZBmpKF0bvALaeo=
+github.com/labstack/echo/v5 v5.1.1 h1:4QkvKoS8ps5ch49t8b72QS9Z581ytgxhTzxuB/CBA2I=
+github.com/labstack/echo/v5 v5.1.1/go.mod h1:SyvlSdObGjRXeQfCCXW/sybkZdOOQZBmpKF0bvALaeo=
 github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=
 github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mailru/easyjson v0.9.1 h1:LbtsOm5WAswyWbvTEOqhypdPeZzHavpZx96/n553mR8=
@@ -250,8 +250,8 @@ github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2D
 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.3.0 h1:k59bC/lIZREW0/iVaQR8nDHxVq8OVlIzYCOJf421CaM=
-github.com/pelletier/go-toml/v2 v2.3.0/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
+github.com/pelletier/go-toml/v2 v2.3.1 h1:MYEvvGnQjeNkRF1qUuGolNtNExTDwct51yp7olPtrEc=
+github.com/pelletier/go-toml/v2 v2.3.1/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
 github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
 github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
diff --git a/internal/kiosk/kiosk.go b/internal/kiosk/kiosk.go
@@ -67,6 +67,8 @@ const (
 	MimeTypeWebp string = "image/webp"
 	MimeTypeAvif string = "image/avif" // currently unsupported
 	MimeTypeBmp  string = "image/bmp"  // currently unsupported
+
+	StatusStopHTMXPolling = 286
 )
 
 var (
diff --git a/internal/routes/routes_video.go b/internal/routes/routes_video.go
@@ -218,9 +218,28 @@ func LivePhoto(demoMode bool, password string) echo.HandlerFunc {
 
 	return func(c *echo.Context) error {
 
+		const maxPollCount = 5
+
 		liveID := c.Param("liveID")
 		if liveID == "" {
-			return echo.NewHTTPError(http.StatusBadRequest, "Live photo ID is required")
+			log.Debug("Live photo ID is required")
+			return c.NoContent(kiosk.StatusStopHTMXPolling)
+		}
+
+		pollCount := 0
+		pollCountQuery := c.QueryParam("poll_count")
+		if pollCountQuery != "" {
+			var pollCountErr error
+			pollCount, pollCountErr = strconv.Atoi(pollCountQuery)
+			if pollCountErr != nil || pollCount < 0 {
+				log.Warn("Invalid poll_count for live photo", "ID", liveID, "poll_count", pollCountQuery)
+				return c.NoContent(kiosk.StatusStopHTMXPolling)
+			}
+		}
+
+		if pollCount >= maxPollCount {
+			log.Warn("Max retries reached for live photo", "ID", liveID)
+			return c.NoContent(kiosk.StatusStopHTMXPolling)
 		}
 
 		video, err := VideoManager.GetVideo(liveID)
@@ -233,7 +252,7 @@ func LivePhoto(demoMode bool, password string) echo.HandlerFunc {
 			videoOrientation = kiosk.PortraitOrientation
 		}
 
-		return Render(c, http.StatusOK, partials.LivePhoto(video.ID, video.ContentType, videoOrientation, password))
+		return Render(c, kiosk.StatusStopHTMXPolling, partials.LivePhoto(video.ID, video.ContentType, videoOrientation, password))
 	}
 
 }
diff --git a/internal/templates/components/image/layout.templ b/internal/templates/components/image/layout.templ
@@ -100,6 +100,9 @@ templ renderLivePhoto(viewData common.ViewData, imageData common.ViewImageData)
 		hx-get={ "/live/" + imageData.ImmichAsset.LivePhotoVideoID }
 		hx-swap="outerHTML"
 		hx-trigger="load, every 1s"
+		hx-request='{"timeout":5000}'
+		hx-vals="js:{poll_count: parseInt(this.dataset.pollCount || 0)}"
+		hx-on::after-request="this.dataset.pollCount = parseInt(this.dataset.pollCount || 0) + 1"
 	></div>
 }
 
diff --git a/internal/templates/partials/weather.templ b/internal/templates/partials/weather.templ
@@ -22,6 +22,17 @@ func formatTemp(temp float64, roundTemp bool) string {
 	return strings.TrimRight(strings.TrimRight(s, "0"), ".")
 }
 
+// formatWind formats a wind speed value
+func formatWind(wind float64, roundWind bool) string {
+	if roundWind {
+		return strconv.Itoa(int(math.Round(wind)))
+	}
+
+	// Use metric formatting for both metric, standard and invalid measurement systems
+	s := fmt.Sprintf("%.2f", wind)
+	return strings.TrimRight(strings.TrimRight(s, "0"), ".")
+}
+
 templ weatherIcon(ID int) {
 	switch ID {
 		case 801, 802, 803, 804:
@@ -109,9 +120,13 @@ templ WeatherLocation(weatherData weather.Location, locationPos int, systemLang
 			if weatherData.Show.TemperatureRange && len(weatherData.Forecast.Daily) > 0 {
 				<div class="weather--stat weather--temperature-range">
 					<div class="weather--stat--value weather--temperature-range--value">
-						{ formatTemp(weatherData.Forecast.Next24hHigh, weatherData.RoundTemp) }°
+						<span class="weather--temperature-range--value--high">
+							{ formatTemp(weatherData.Forecast.Next24hHigh, weatherData.RoundTemp) }
+						</span>°
 						<span class="asset--metadata--exif--seperator">&#124;</span>
-						{ formatTemp(weatherData.Forecast.Next24hLow, weatherData.RoundTemp) }°
+						<span class="weather--temperature-range--value--low">
+							{ formatTemp(weatherData.Forecast.Next24hLow, weatherData.RoundTemp) }
+						</span>°
 					</div>
 					<div class="weather--stat--icon weather--temperature-range--icon">
 						<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" width="320" height="512">
@@ -138,15 +153,14 @@ templ WeatherLocation(weatherData weather.Location, locationPos int, systemLang
 					<div class="weather--stat--value weather--wind--value">
 						{{
 							windUnit := "m/s"
-							if weatherData.Unit == "imperial" {
+							if strings.EqualFold(weatherData.Unit, "imperial") {
 								windUnit = "mph"
 							}
 						}}
 						if weatherData.Show.WindDirection {
-							{ weatherData.Wind.CompassDirection() }<span class="asset--metadata--exif--seperator">&#124;</span>{ weatherData.Wind.Speed }{ windUnit }
-						} else {
-							{ weatherData.Wind.Deg }&deg;<span class="asset--metadata--exif--seperator">&#124;</span>{ weatherData.Wind.Speed }{ windUnit }
+							{ weatherData.Wind.Deg }&deg;<span class="asset--metadata--exif--seperator">&#124;</span>
 						}
+						{ weatherData.Wind.CompassDirection() }<span class="asset--metadata--exif--seperator">&#124;</span>{ formatWind(weatherData.Wind.Speed, false) }{ windUnit }
 					</div>
 					<div class="weather--stat--icon weather--wind--icon">
 						@weatherIcon(771)
diff --git a/internal/templates/views/views_home.templ b/internal/templates/views/views_home.templ
@@ -37,7 +37,6 @@ templ Home(viewData common.ViewData, secret string) {
 					hx-include=".kiosk-history--entry"
 					hx-trigger={ triggers(viewData.DisableNavigation) }
 					hx-on::before-send="kiosk.setRequestLock(event)"
-					hx-on::after-request="kiosk.startPolling()"
 					hx-on::after-swap="kiosk.releaseRequestLock(), kiosk.cleanupFrames()"
 				>
 					@partials.SpinnerRotate()
diff --git a/internal/weather/weather.go b/internal/weather/weather.go
@@ -26,6 +26,8 @@ const (
 	WeatherRotation      = "rotate"
 	WeatherParam         = "weather"
 	WeatherRotationParam = "weather_rotation"
+
+	VarCompassDirection = "Var"
 )
 
 var (
@@ -296,8 +298,8 @@ func AddWeatherLocationWithForecast(ctx context.Context, location config.Weather
 // Returns "Var" if the degree value is outside the 0–360 range.
 func (w Wind) CompassDirection() string {
 	if w.Deg < 0 || w.Deg > 360 {
-        return "Var"
-    }
+		return VarCompassDirection
+	}
 	directions := []string{"N", "NE", "E", "SE", "S", "SW", "W", "NW"}
 	idx := int(math.Round(float64(w.Deg)/45)) % 8
 	return directions[idx]
diff --git a/internal/weather/weather_test.go b/internal/weather/weather_test.go
diff --git a/taskfile.yml b/taskfile.yml
