cmd/errors.go

@@ -17,7 +17,7 @@ import (
 
 var (
 	ErrInvalidFileCountRange = errors.New("maximum file count limit must be greater than or equal to minimum file count limit")
-	ErrInvalidFileCountValue = errors.New("file count limits must be non-negative integers no greater than 2147483647")
+	ErrInvalidFileCountValue = errors.New("file count limits must be positive integers no greater than 2147483647")
 	ErrInvalidPort           = errors.New("listen port must be an integer between 1 and 65535 inclusive")
 	ErrNoMediaFound          = errors.New("no supported media formats found which match all criteria")
 )

cmd/files.go

@@ -7,7 +7,6 @@ package cmd
 import (
 	"errors"
 	"fmt"
-	"io/fs"
 	"math/big"
 	"regexp"
 
@@ -178,8 +177,6 @@ func pathIsValid(path string, paths []string) bool {
 	for i := 0; i < len(paths); i++ {
 		if strings.HasPrefix(path, paths[i]) {
 			matchesPrefix = true
-
-			break
 		}
 	}
 
@@ -230,6 +227,8 @@ func hasSupportedFiles(path string, formats *types.Types) (bool, error) {
 }
 
 func walkPath(path string, fileChannel chan<- string, stats *scanStatsChannels, formats *types.Types) error {
+	var wg sync.WaitGroup
+
 	errorChannel := make(chan error)
 	done := make(chan bool, 1)
 
@@ -238,7 +237,8 @@ func walkPath(path string, fileChannel chan<- string, stats *scanStatsChannels,
 		return err
 	}
 
-	var directories, files = 0, 0
+	var directories = 0
+	var files = 0
 
 	for _, node := range nodes {
 		if node.IsDir() {
@@ -259,52 +259,53 @@ func walkPath(path string, fileChannel chan<- string, stats *scanStatsChannels,
 		skipFiles = true
 	}
 
-	var wg sync.WaitGroup
+	for _, node := range nodes {
+		fullPath := filepath.Join(path, node.Name())
 
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		for _, node := range nodes {
+		switch {
+		case node.IsDir() && Recursive:
 			wg.Add(1)
 
-			go func(node fs.DirEntry) {
-				defer wg.Done()
+			go func() {
+				defer func() {
+					wg.Done()
+				}()
+				err := walkPath(fullPath, fileChannel, stats, formats)
+				if err != nil {
+					errorChannel <- err
 
-				fullPath := filepath.Join(path, node.Name())
-
-				switch {
-				case node.IsDir() && Recursive:
-					err := walkPath(fullPath, fileChannel, stats, formats)
-					if err != nil {
-						errorChannel <- err
-
-						return
-					}
-				case !node.IsDir() && !skipFiles:
-					path, err := normalizePath(fullPath)
-					if err != nil {
-						errorChannel <- err
-
-						return
-					}
-
-					if formats.Validate(path) || Fallback {
-						fileChannel <- path
-
-						stats.filesMatched <- 1
-
-						return
-					}
-
-					stats.filesSkipped <- 1
+					return
 				}
-			}(node)
+			}()
+		case !node.IsDir() && !skipFiles:
+			wg.Add(1)
+
+			go func() {
+				defer func() {
+					wg.Done()
+				}()
+				path, err := normalizePath(fullPath)
+				if err != nil {
+					errorChannel <- err
+
+					return
+				}
+
+				if formats.Validate(path) || Fallback {
+					fileChannel <- path
+
+					stats.filesMatched <- 1
+
+					return
+				}
+
+				stats.filesSkipped <- 1
+			}()
 		}
-	}()
+	}
 
 	go func() {
 		wg.Wait()
-
 		done <- true
 	}()
 
@@ -365,7 +366,6 @@ func scanPaths(paths []string, sort string, index *fileIndex, formats *types.Typ
 
 	go func() {
 		wg.Wait()
-
 		done <- true
 	}()
 
@@ -391,7 +391,6 @@ Poll:
 
 	if stats.filesMatched < 1 {
 		fmt.Println("No files matched")
-
 		return []string{}, nil
 	}
 

cmd/root.go

@@ -12,7 +12,7 @@ import (
 )
 
 const (
-	ReleaseVersion string = "2.4.0"
+	ReleaseVersion string = "2.3.0"
 )
 
 var (
@@ -52,7 +52,7 @@ var (
 		Args:  cobra.MinimumNArgs(1),
 		PreRunE: func(cmd *cobra.Command, args []string) error {
 			switch {
-			case MaxFileCount < 0 || MinFileCount < 0 || MaxFileCount > math.MaxInt32 || MinFileCount > math.MaxInt32:
+			case MaxFileCount < 1 || MinFileCount < 1 || MaxFileCount > math.MaxInt32 || MinFileCount > math.MaxInt32:
 				return ErrInvalidFileCountValue
 			case MinFileCount > MaxFileCount:
 				return ErrInvalidFileCountRange
@@ -97,7 +97,7 @@ func init() {
 	rootCmd.Flags().StringVar(&IndexFile, "index-file", "", "path to optional persistent index file")
 	rootCmd.Flags().BoolVarP(&Info, "info", "i", false, "expose informational endpoints")
 	rootCmd.Flags().IntVar(&MaxFileCount, "max-file-count", math.MaxInt32, "skip directories with file counts above this value")
-	rootCmd.Flags().IntVar(&MinFileCount, "min-file-count", 0, "skip directories with file counts below this value")
+	rootCmd.Flags().IntVar(&MinFileCount, "min-file-count", 1, "skip directories with file counts below this value")
 	rootCmd.Flags().IntVar(&PageLength, "page-length", 0, "pagination length for info pages")
 	rootCmd.Flags().IntVarP(&Port, "port", "p", 8080, "port to listen on")
 	rootCmd.Flags().StringVar(&Prefix, "prefix", "/", "root path for http handlers (for reverse proxying)")

cmd/web.go

@@ -10,7 +10,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"log"
 	"net"
 	"net/http"
 	"os"
@@ -405,8 +404,6 @@ func redirectRoot() httprouter.Handle {
 }
 
 func ServePage(args []string) error {
-	log.SetFlags(0)
-
 	timeZone := os.Getenv("TZ")
 	if timeZone != "" {
 		var err error

types/images/images.go

@@ -55,7 +55,7 @@ func (t Format) Body(rootUrl, fileUri, filePath, fileName, prefix, mime string)
 		return "", err
 	}
 
-	return fmt.Sprintf(`<a href="%s"><img style="color: transparent;" onload="this.style.color='inherit'" onerror="this.style.color='inherit'" src="%s" width="%d" height="%d" type="%s" alt="Roulette selected: %s"></a>`,
+	return fmt.Sprintf(`<a href="%s"><img src="%s" width="%d" height="%d" type="%s" alt="Roulette selected: %s"></a>`,
 		rootUrl,
 		fileUri,
 		dimensions.width,