From 966df032a61067d83f06445bca5771624130365a Mon Sep 17 00:00:00 2001
From: Seednode <git@seedno.de>
Date: Sat, 18 Feb 2023 14:08:11 -0600
Subject: [PATCH] Added retry to new file selection, with 10s timeout

---
 cmd/files.go   |  16 +++++-----------
 cmd/version.go |   2 +-
 cmd/web.go     |  20 ++++++++++++++++----
 stats.file     | Bin 1648 -> 0 bytes
 4 files changed, 22 insertions(+), 16 deletions(-)
 delete mode 100644 stats.file

diff --git a/cmd/files.go b/cmd/files.go
index 86262f9..26675e0 100644
--- a/cmd/files.go
+++ b/cmd/files.go
@@ -517,39 +517,33 @@ func prepareDirectory(directory []string) []string {
 	last = cleanFilename(last)
 
 	if first == last {
-		return append([]string{}, directory[0])
+		return []string{directory[0]}
 	} else {
 		return directory
 	}
 }
 
 func prepareDirectories(files *Files, sort string) []string {
-	i, l := 0, 0
-
-	files.mutex.RLock()
+	directories := []string{}
 
 	keys := make([]string, len(files.list))
 
+	i := 0
 	for k := range files.list {
 		keys[i] = k
 		i++
-		l += len(files.list[k])
 	}
 
-	directories := make([]string, l)
-
 	if sort == "asc" || sort == "desc" {
 		for i := 0; i < len(keys); i++ {
-			copy(directories, prepareDirectory(files.list[keys[i]]))
+			directories = append(directories, prepareDirectory(files.list[keys[i]])...)
 		}
 	} else {
 		for i := 0; i < len(keys); i++ {
-			copy(directories, files.list[keys[i]])
+			directories = append(directories, files.list[keys[i]]...)
 		}
 	}
 
-	files.mutex.RUnlock()
-
 	return directories
 }
 
diff --git a/cmd/version.go b/cmd/version.go
index e21f671..0536d0b 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var Version = "0.38.1"
+var Version = "0.38.2"
 
 func init() {
 	rootCmd.AddCommand(versionCmd)
diff --git a/cmd/web.go b/cmd/web.go
index fcf1088..d003691 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -35,9 +35,10 @@ var (
 )
 
 const (
-	LogDate            string = `2006-01-02T15:04:05.000-07:00`
-	Prefix             string = `/src`
-	RedirectStatusCode int    = http.StatusSeeOther
+	LogDate            string        = `2006-01-02T15:04:05.000-07:00`
+	Prefix             string        = `/src`
+	RedirectStatusCode int           = http.StatusSeeOther
+	Timeout            time.Duration = 10 * time.Second
 )
 
 type Regexes struct {
@@ -682,7 +683,18 @@ func serveHtmlHandler(paths []string, Regexes *Regexes, index *Index) http.Handl
 				}
 			}
 
-			if filePath == "" {
+		loop:
+			for timeout := time.After(Timeout); ; {
+				select {
+				case <-timeout:
+					break loop
+				default:
+				}
+
+				if filePath != "" {
+					break loop
+				}
+
 				filePath, err = newFile(paths, filters, sortOrder, Regexes, index)
 				switch {
 				case err != nil && err == ErrNoImagesFound:
diff --git a/stats.file b/stats.file
deleted file mode 100644
index 232038bde6b13153ba9844bdf4323d07ef5fc386..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1648
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