Merge pull request #738 from damongolding/task/release

0.37.0

Author: damongolding

config.schema.json

@@ -151,8 +151,15 @@
     "memory_weight": {
       "type": "number"
     },
-    "date_filter": {
-      "type": "string"
+    "filter_date": {
+      "type": "string",
+      "description": "Filter to limit assets to a certain date range"
+    },
+    "filter_newest": {
+      "type": "integer",
+      "minimum": 0,
+      "maximum": 1000,
+      "description": "Filter to limit assets to the newest X"
     },
     "show_videos": {
       "type": "boolean"

frontend/bun.lock

@@ -30,10 +30,10 @@
     "autoprefixer": "^10.5.0",
     "choices.js": "^11.2.2",
     "date-fns": "^4.1.0",
-    "dompurify": "^3.4.0",
+    "dompurify": "^3.4.1",
     "esbuild": "^0.28.0",
-    "htmx.org": "^2.0.8",
-    "postcss": "^8.5.9",
+    "htmx.org": "^2.0.10",
+    "postcss": "^8.5.10",
     "postcss-cli": "^11.0.1",
     "postcss-nested": "^7.0.2",
     "typescript": "^5.9.3"

frontend/package.json

@@ -20,6 +20,7 @@
 
     svg {
         max-width: 2rem;
+        max-height: 2rem;
         fill: #fff;
     }
 

frontend/public/assets/images/spinner_rotate.gif

@@ -20,6 +20,7 @@
 
     svg {
         max-width: 2rem;
+        max-height: 2rem;
         fill: #fff;
     }
 

frontend/src/css/error.css

@@ -9,3 +9,28 @@
     max-height: 80px;
     transform: translate(-50%);
 }
+
+.kiosk--spinner-rotate {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    display: block;
+    width: 5rem;
+    max-width: 80px;
+    height: 5rem;
+    max-height: 80px;
+    margin-top: -2.5rem;
+    margin-left: -2.5rem;
+    animation: rotate-spinner 3.96s cubic-bezier(0.5, 0.65, 0.55, 0.4) infinite;
+    will-change: transform;
+}
+
+@keyframes rotate-spinner {
+    from {
+        transform: rotate(360deg);
+    }
+
+    to {
+        transform: rotate(0deg);
+    }
+}

frontend/src/css/message.css

@@ -341,8 +341,10 @@ type Config struct {
 	PastMemoryDays int     `json:"pastMemoryDays" yaml:"past_memory_days" mapstructure:"past_memory_days" query:"past_memory_days" form:"past_memory_days" default:"0"`
 	MemoryWeight   float64 `json:"memoryWeight" yaml:"memory_weight" mapstructure:"memory_weight" default:"1.0"`
 
-	// DateFilter filter certain asset bucket assets by date
-	DateFilter string `json:"dateFilter" yaml:"date_filter" mapstructure:"date_filter" query:"date_filter" form:"date_filter" default:""`
+	// FilterDate filter certain asset bucket assets by date range
+	FilterDate string `json:"filterDate" yaml:"filter_date" mapstructure:"filter_date" query:"filter_date" form:"filter_date" default:""`
+	// FilterNewest filter certain asset bucket assets by the newest X assets
+	FilterNewest int `json:"filterNewest" yaml:"filter_newest" mapstructure:"filter_newest" query:"filter_newest" form:"filter_newest" default:"0"`
 
 	// ShowClearCacheButton display a button to clear cache
 	ShowClearCacheButton bool `json:"showClearCacheButton" yaml:"show_clear_cache_button" mapstructure:"show_clear_cache_button" query:"show_clear_cache_button" form:"show_clear_cache_button" default:"false"`
@@ -644,6 +646,7 @@ func (c *Config) Load() error {
 	c.checkRedirects()
 	c.checkOffline()
 	c.checkBurnIn()
+	c.checkFilterNewest()
 
 	return nil
 }
@@ -704,6 +707,7 @@ func (c *Config) ConfigWithOverrides(queries url.Values, e *echo.Context) error
 		return err
 	}
 
+	c.checkFilterNewest()
 	c.checkExcludedAlbums()
 
 	// Disabled features in demo mode

frontend/src/css/spinner.css

@@ -679,3 +679,15 @@ func (c *Config) checkRating() {
 		c.Rating = -1
 	}
 }
+
+func (c *Config) checkFilterNewest() {
+	if c.FilterNewest < 0 {
+		log.Warn("FilterNewest must be 0 or greater; setting to 0", "value", c.FilterNewest)
+		c.FilterNewest = 0
+	}
+
+	if c.FilterNewest > 1000 {
+		log.Warn("FilterNewest must be 1000 or less; setting to 1000", "value", c.FilterNewest)
+		c.FilterNewest = 1000
+	}
+}

internal/config/config.go

@@ -272,8 +272,9 @@ type UpsertTagResponse []struct {
 
 type SearchMetadataResponse struct {
 	Assets struct {
-		NextPage string `json:"nextPage"`
-		Total    int    `json:"total"`
+		Items    []Asset `json:"items"`
+		NextPage string  `json:"nextPage"`
+		Total    int     `json:"total"`
 	} `json:"assets"`
 }
 
@@ -371,7 +372,7 @@ type AllPeopleResponse struct {
 	HasNextPage bool     `json:"hasNextPage"`
 }
 
-type apiCall func(context.Context, string, string, []byte, ...map[string]string) ([]byte, string, error)
+type apiCall func(context.Context, string, string, []byte, ...map[string]string) ([]byte, string, bool, error)
 
 type APIResponse interface {
 	Asset |