From d343be7253f55e8440ff6253f6479739a112946f Mon Sep 17 00:00:00 2001
From: Seednode <git@seedno.de>
Date: Wed, 18 Jan 2023 09:58:14 -0600
Subject: [PATCH] Added support for time.Duration refresh intervals, instead of
 just integer seconds

---
 README.md      |  4 +++-
 cmd/version.go |  2 +-
 cmd/web.go     | 35 ++++++++++++++++++-----------------
 3 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
index d53065f..de4cfbd 100644
--- a/README.md
+++ b/README.md
@@ -58,10 +58,12 @@ Note: These patterns require sequentially-numbered files matching the following
 
 ## Refresh
 
-If a non-zero `refresh=<time in seconds>` query parameter is provided, the page will reload after that interval.
+If a non-zero `refresh=<integer><unit>` query parameter is provided, the page will reload after that interval.
 
 This can be used to generate a sort of slideshow of images.
 
+Supported units are `ns`, `us`/`µs`, `ms`, `s`, `m`, and `h`.
+
 ## Usage output
 ```
 Usage:
diff --git a/cmd/version.go b/cmd/version.go
index aa3cf03..3026607 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var Version = "0.28.3"
+var Version = "0.29.0"
 
 func init() {
 	rootCmd.AddCommand(versionCmd)
diff --git a/cmd/web.go b/cmd/web.go
index 576f3ef..93428a0 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -31,6 +31,7 @@ const (
 type Regexes struct {
 	Alphanumeric *regexp.Regexp
 	Filename     *regexp.Regexp
+	Units        *regexp.Regexp
 }
 
 type Filters struct {
@@ -86,16 +87,21 @@ func notFound(w http.ResponseWriter, r *http.Request, filePath string) error {
 	return nil
 }
 
-func getRefreshInterval(r *http.Request) string {
+func getRefreshInterval(r *http.Request, regexes *Regexes) (int64, string) {
 	refreshInterval := r.URL.Query().Get("refresh")
 
-	num, err := strconv.Atoi(refreshInterval)
-
-	if err != nil || num < 0 {
-		refreshInterval = "0"
+	if !regexes.Units.MatchString(refreshInterval) {
+		return 0, "0ms"
 	}
 
-	return refreshInterval
+	duration, err := time.ParseDuration(refreshInterval)
+	if err != nil {
+		return 0, "0ms"
+	}
+
+	durationInMs := duration.Milliseconds()
+
+	return durationInMs, refreshInterval
 }
 
 func getSortOrder(r *http.Request) string {
@@ -228,14 +234,14 @@ func getRealIp(r *http.Request) string {
 	}
 }
 
-func serveHtml(w http.ResponseWriter, r *http.Request, filePath string, dimensions *Dimensions, filters *Filters) error {
+func serveHtml(w http.ResponseWriter, r *http.Request, filePath string, dimensions *Dimensions, filters *Filters, regexes *Regexes) error {
 	fileName := filepath.Base(filePath)
 
 	w.Header().Add("Content-Type", "text/html")
 
 	sortOrder := getSortOrder(r)
 
-	refreshInterval := getRefreshInterval(r)
+	refreshTimer, refreshInterval := getRefreshInterval(r, regexes)
 
 	queryParams := generateQueryParams(filters, sortOrder, refreshInterval)
 
@@ -250,13 +256,7 @@ func serveHtml(w http.ResponseWriter, r *http.Request, filePath string, dimensio
 		dimensions.Width,
 		dimensions.Height))
 	htmlBody.WriteString(`</head><body>`)
-	if refreshInterval != "0" {
-		r, err := strconv.Atoi(refreshInterval)
-		if err != nil {
-			return err
-		}
-		refreshTimer := strconv.Itoa(r * 1000)
-
+	if refreshInterval != "0ms" {
 		htmlBody.WriteString(fmt.Sprintf("<script>window.onload = function(){setInterval(function(){window.location.href = '/%v';}, %v);};</script>",
 			queryParams,
 			refreshTimer))
@@ -350,7 +350,7 @@ func serveHtmlHandler(paths []string, regexes *Regexes, fileCache *[]string) htt
 
 		sortOrder := getSortOrder(r)
 
-		refreshInterval := getRefreshInterval(r)
+		_, refreshInterval := getRefreshInterval(r, regexes)
 
 		if r.URL.Path == "/" {
 			var filePath string
@@ -415,7 +415,7 @@ func serveHtmlHandler(paths []string, regexes *Regexes, fileCache *[]string) htt
 				log.Fatal(err)
 			}
 
-			err = serveHtml(w, r, filePath, dimensions, filters)
+			err = serveHtml(w, r, filePath, dimensions, filters, regexes)
 			if err != nil {
 				log.Fatal(err)
 			}
@@ -436,6 +436,7 @@ func ServePage(args []string) error {
 	regexes := &Regexes{
 		Filename:     regexp.MustCompile(`(.+)([0-9]{3})(\..+)`),
 		Alphanumeric: regexp.MustCompile(`^[a-zA-Z0-9]*$`),
+		Units:        regexp.MustCompile(`^[0-9]+(ns|us|µs|ms|s|m|h)$`),
 	}
 
 	rand.Seed(time.Now().UnixNano())
