Remove html from text handler, add yaml/toml/sh/ps1

Add --prefix flag for easy reverse proxying
Fix handling directories with only one or two files
2023-09-13 23:32:02 -05:00 · 2023-09-13 23:24:29 -05:00 · 2023-09-13 22:08:01 -05:00 · 2023-09-13 20:45:28 -05:00 · 2023-09-13 17:02:43 -05:00
15 changed files with 153 additions and 455 deletions
--- a/README.md
+++ b/README.md
@ -18,6 +18,18 @@ x86_64 and ARM Docker images of latest version: `oci.seedno.de/seednode/roulette

 Dockerfile available [here](https://git.seedno.de/seednode/roulette/raw/branch/master/docker/Dockerfile).

+## Caching
+
+If the `-c|--cache` flag is passed, the indices of all specified paths will be cached on start.
+
+This will slightly increase the delay before the application begins responding to requests, but should significantly speed up subsequent requests.
+
+If any `include=`/`exclude=` filters are specified in a given request, the cache will be bypassed for that specific request.
+
+The cache can be regenerated at any time by accessing the `/clear_cache` endpoint.
+
+If `--cache-file` is set, the cache will be loaded from the specified file on start, and written to the file whenever it is re-generated.
+
 ## Filtering

 You can provide a comma-delimited string of alphanumeric patterns to match via the `include=` query parameter, assuming the `-f|--filter` flag is enabled.
@ -32,6 +44,39 @@ You can also combine these two parameters, with exclusions taking priority over

 Both filtering parameters ignore the file extension and full path; they only compare against the bare filename.

+## Info
+
+If the `-i|--info` flag is passed, six additional endpoints are registered.
+
+The first of these—`/html` and `/json`—return the contents of the index, in HTML and JSON formats respectively. 
+
+If `--page-length` is also set, these can be viewed in paginated form by appending `/n`, e.g. `/html/5` for the fifth page.
+
+This can prove useful when confirming whether the index is generated successfully, or whether a given file is in the index.
+
+The remaining four endpoints—`/available_extensions`, `/enabled_extensions`, `/available_mime_types` and `/enabled_mime_types`—return information about the registered file types.
+
+## Refresh
+
+If a positive-value `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 files.
+
+Minimum accepted value is 500ms, as anything lower seems to cause inconsistent behavior. This might be changed in a future release.
+
+Supported units are `ns`, `us`/`µs`, `ms`, `s`, `m`, and `h`.
+
+## Russian
+If the `--russian` flag is passed, everything functions exactly as you would expect.
+
+That is, files will be deleted after being served. This is not a joke, you *will* lose data.
+
+This uses `os.Remove()` and checks to ensure the specified file is inside one of the paths passed to `roulette`.
+
+That said, this has not been tested to any real extent, so only pass this flag on systems you don't care about.
+
+Enjoy!
+
 ## Sorting

 You can specify a sorting pattern via the `sort=` query parameter, assuming the `-s|--sort` flag is enabled.
@ -54,59 +99,6 @@ If any other (or no) value is provided, the selected file will be random.

 Note: These patterns require sequentially-numbered files matching the following pattern: `filename###.extension`.

-## Refresh
-
-If a positive-value `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 files.
-
-Minimum accepted value is 500ms, as anything lower seems to cause inconsistent behavior. This might be changed in a future release.
-
-Supported units are `ns`, `us`/`µs`, `ms`, `s`, `m`, and `h`.
-
-## Caching
-
-If the `-c|--cache` flag is passed, the indices of all specified paths will be cached on start.
-
-This will slightly increase the delay before the application begins responding to requests, but should significantly speed up subsequent requests.
-
-If any `include=`/`exclude=` filters are specified in a given request, the cache will be bypassed for that specific request.
-
-The cache can be regenerated at any time by accessing the `/clear_cache` endpoint.
-
-If `--cache-file` is set, the cache will be loaded from the specified file on start, and written to the file whenever it is re-generated.
-
-## Info
-
-If the `-i|--info` flag is passed, six additional endpoints are registered.
-
-The first of these—`/html` and `/json`—return the contents of the index, in HTML and JSON formats respectively. 
-
-If `--page-length` is also set, these can be viewed in paginated form by appending `/n`, e.g. `/html/5` for the fifth page.
-
-This can prove useful when confirming whether the index is generated successfully, or whether a given file is in the index.
-
-The remaining four endpoints—`/available_extensions`, `/enabled_extensions`, `/available_mime_types` and `/enabled_mime_types`—return information about the registered file types.
-
-## Statistics
-
-If the `--stats` flag is passed, an additional endpoint, `/stats`, is registered.
-
-When accessed, this endpoint returns a JSON document listing every file served, along with the number of times it has been served, its filesize, and timestamps of when it was served.
-
-If `--page-length` is also set, this can be viewed in paginated form by appending `/n`, e.g. `/stats/5` for the fifth page.
-
-## Russian
-If the `--russian` flag is passed, everything functions exactly as you would expect.
-
-That is, files will be deleted after being served. This is not a joke, you *will* lose data.
-
-This uses `os.Remove()` and checks to ensure the specified file is inside one of the paths passed to `roulette`.
-
-That said, this has not been tested to any real extent, so only pass this flag on systems you don't care about.
-
-Enjoy!
-
 ## Usage output
 ```
 Serves random media from the specified directories.
@ -122,6 +114,7 @@ Flags:
      --cache-file string         path to optional persistent cache file
  -f, --filter                    enable filtering
      --flash                     enable support for shockwave flash files (via ruffle.rs)
+      --handlers                  display registered handlers (for debugging)
  -h, --help                      help for roulette
      --images                    enable support for image files
  -i, --info                      expose informational endpoints
@ -129,13 +122,12 @@ Flags:
      --minimum-files uint32      skip directories with file counts below this value (default 1)
      --page-length uint32        pagination length for statistics and debug pages
  -p, --port uint16               port to listen on (default 8080)
+      --prefix string             path with which to prefix all listeners (for reverse proxying)
      --profile                   register net/http/pprof handlers
  -r, --recursive                 recurse into subdirectories
      --refresh-interval string   force refresh interval equal to this duration (minimum 500ms)
      --russian                   remove selected images after serving
  -s, --sort                      enable sorting
-      --stats                     expose stats endpoint
-      --stats-file string         path to optional persistent stats file
      --text                      enable support for text files
  -v, --verbose                   log accessed files and other information to stdout
  -V, --version                   display version and exit
--- a/cmd/cache.go
+++ b/cmd/cache.go
@ -152,5 +152,5 @@ func registerCacheHandlers(mux *httprouter.Router, args []string, cache *fileCac
 		cache.generate(args, formats)
 	}

-	mux.GET("/clear_cache", serveCacheClear(args, cache, formats))
+	register(mux, Prefix+"/clear_cache", serveCacheClear(args, cache, formats))
 }
--- a/cmd/files.go
+++ b/cmd/files.go
@ -73,15 +73,6 @@ func (splitPath *splitPath) decrement() {
 	splitPath.number = splitPath.number - 1
 }

-func contains(slice []string, value string) bool {
-	for _, v := range slice {
-		if v == value {
-			return true
-		}
-	}
-	return false
-}
-
 func humanReadableSize(bytes int) string {
 	const unit = 1000

@ -180,8 +171,8 @@ func appendPaths(path string, files *files, filters *filters, stats *scanStats,
 	return nil
 }

-func newFile(paths []string, filters *filters, sortOrder string, regexes *regexes, index *fileCache, formats *types.Types) (string, error) {
-	path, err := pickFile(paths, filters, sortOrder, index, formats)
+func newFile(paths []string, filters *filters, sortOrder string, regexes *regexes, cache *fileCache, formats *types.Types) (string, error) {
+	path, err := pickFile(paths, filters, sortOrder, cache, formats)
 	if err != nil {
 		return "", nil
 	}
@ -514,24 +505,6 @@ func fileList(paths []string, filters *filters, sort string, cache *fileCache, f
 	return fileList, false
 }

-func cleanFilename(filename string) string {
-	return filename[:len(filename)-(len(filepath.Ext(filename))+3)]
-}
-
-func prepareDirectory(directory []string) []string {
-	_, first := filepath.Split(directory[0])
-	first = cleanFilename(first)
-
-	_, last := filepath.Split(directory[len(directory)-1])
-	last = cleanFilename(last)
-
-	if first == last {
-		return []string{directory[0]}
-	} else {
-		return directory
-	}
-}
-
 func prepareDirectories(files *files, sort string) []string {
 	directories := []string{}

@ -543,15 +516,9 @@ func prepareDirectories(files *files, sort string) []string {
 		i++
 	}

-	if sort == "asc" || sort == "desc" {
-		for i := 0; i < len(keys); i++ {
-			directories = append(directories, prepareDirectory(files.list[keys[i]])...)
-		}
-	} else {
 	for i := 0; i < len(keys); i++ {
 		directories = append(directories, files.list[keys[i]]...)
 	}
-	}

 	return directories
 }
@ -560,11 +527,12 @@ func pickFile(args []string, filters *filters, sort string, cache *fileCache, fo
 	fileList, fromCache := fileList(args, filters, sort, cache, formats)

 	fileCount := len(fileList)
+
 	if fileCount < 1 {
 		return "", ErrNoMediaFound
 	}

-	r, err := rand.Int(rand.Reader, big.NewInt(int64(fileCount-2)))
+	r, err := rand.Int(rand.Reader, big.NewInt(int64(fileCount)))
 	if err != nil {
 		return "", err
 	}
@ -575,9 +543,10 @@ func pickFile(args []string, filters *filters, sort string, cache *fileCache, fo
 	}

 	for i := 0; i < fileCount; i++ {
-		if val >= fileCount {
+		switch {
+		case val >= fileCount:
 			val = 0
-		} else {
+		case val < fileCount-1:
 			val++
 		}

@ -627,7 +596,7 @@ func normalizePath(path string) (string, error) {
 	return absolutePath, nil
 }

-func normalizePaths(args []string, formats *types.Types) ([]string, error) {
+func validatePaths(args []string, formats *types.Types) ([]string, error) {
 	var paths []string

 	var pathList strings.Builder
--- a/cmd/info.go
+++ b/cmd/info.go
@ -65,7 +65,7 @@ func serveIndexHtml(args []string, cache *fileCache, paginate bool) httprouter.H
 				if Sorting {
 					shouldSort = "?sort=asc"
 				}
-				htmlBody.WriteString(fmt.Sprintf("<tr><td><a href=\"%s%s%s\">%s</a></td></tr>\n", mediaPrefix, v, shouldSort, v))
+				htmlBody.WriteString(fmt.Sprintf("<tr><td><a href=\"%s%s%s%s\">%s</a></td></tr>\n", Prefix, mediaPrefix, v, shouldSort, v))
 			}
 		}
 		if PageLength != 0 {
@ -274,19 +274,19 @@ func serveEnabledMimeTypes(formats *types.Types) httprouter.Handle {

 func registerInfoHandlers(mux *httprouter.Router, args []string, cache *fileCache, formats *types.Types) {
 	if Cache {
-		mux.GET("/html/", serveIndexHtml(args, cache, false))
+		register(mux, Prefix+"/html/", serveIndexHtml(args, cache, false))
 		if PageLength != 0 {
-			mux.GET("/html/:page", serveIndexHtml(args, cache, true))
+			register(mux, Prefix+"/html/:page", serveIndexHtml(args, cache, true))
 		}

-		mux.GET("/json", serveIndexJson(args, cache))
+		register(mux, Prefix+"/json", serveIndexJson(args, cache))
 		if PageLength != 0 {
-			mux.GET("/json/:page", serveIndexJson(args, cache))
+			register(mux, Prefix+"/json/:page", serveIndexJson(args, cache))
 		}
 	}

-	mux.GET("/available_extensions", serveAvailableExtensions())
-	mux.GET("/enabled_extensions", serveEnabledExtensions(formats))
-	mux.GET("/available_mime_types", serveAvailableMimeTypes())
-	mux.GET("/enabled_mime_types", serveEnabledMimeTypes(formats))
+	register(mux, Prefix+"/available_extensions", serveAvailableExtensions())
+	register(mux, Prefix+"/enabled_extensions", serveEnabledExtensions(formats))
+	register(mux, Prefix+"/available_mime_types", serveAvailableMimeTypes())
+	register(mux, Prefix+"/enabled_mime_types", serveEnabledMimeTypes(formats))
 }
--- a/cmd/profile.go
+++ b/cmd/profile.go
@ -11,9 +11,9 @@ import (
 )

 func registerProfileHandlers(mux *httprouter.Router) {
-	mux.HandlerFunc("GET", "/debug/pprof/", pprof.Index)
-	mux.HandlerFunc("GET", "/debug/pprof/cmdline", pprof.Cmdline)
-	mux.HandlerFunc("GET", "/debug/pprof/profile", pprof.Profile)
-	mux.HandlerFunc("GET", "/debug/pprof/symbol", pprof.Symbol)
-	mux.HandlerFunc("GET", "/debug/pprof/trace", pprof.Trace)
+	mux.HandlerFunc("GET", Prefix+"/debug/pprof/", pprof.Index)
+	mux.HandlerFunc("GET", Prefix+"/debug/pprof/cmdline", pprof.Cmdline)
+	mux.HandlerFunc("GET", Prefix+"/debug/pprof/profile", pprof.Profile)
+	mux.HandlerFunc("GET", Prefix+"/debug/pprof/symbol", pprof.Symbol)
+	mux.HandlerFunc("GET", Prefix+"/debug/pprof/trace", pprof.Trace)
 }
--- a/cmd/root.go
+++ b/cmd/root.go
@ -12,7 +12,7 @@ import (
 )

 const (
-	ReleaseVersion string = "0.78.2"
+	ReleaseVersion string = "0.82.0"
 )

 var (
@ -23,19 +23,19 @@ var (
 	CacheFile        string
 	Filtering        bool
 	Flash            bool
+	Handlers         bool
 	Images           bool
 	Info             bool
 	MaximumFileCount uint32
 	MinimumFileCount uint32
 	PageLength       uint32
 	Port             uint16
+	Prefix           string
 	Profile          bool
 	Recursive        bool
 	RefreshInterval  string
 	Russian          bool
 	Sorting          bool
-	Statistics       bool
-	StatisticsFile   string
 	Text             bool
 	Verbose          bool
 	Version          bool
@ -81,19 +81,19 @@ func init() {
 	rootCmd.Flags().StringVar(&CacheFile, "cache-file", "", "path to optional persistent cache file")
 	rootCmd.Flags().BoolVarP(&Filtering, "filter", "f", false, "enable filtering")
 	rootCmd.Flags().BoolVar(&Flash, "flash", false, "enable support for shockwave flash files (via ruffle.rs)")
+	rootCmd.Flags().BoolVar(&Handlers, "handlers", false, "display registered handlers (for debugging)")
 	rootCmd.Flags().BoolVar(&Images, "images", false, "enable support for image files")
 	rootCmd.Flags().BoolVarP(&Info, "info", "i", false, "expose informational endpoints")
 	rootCmd.Flags().Uint32Var(&MaximumFileCount, "maximum-files", 1<<32-1, "skip directories with file counts above this value")
 	rootCmd.Flags().Uint32Var(&MinimumFileCount, "minimum-files", 1, "skip directories with file counts below this value")
 	rootCmd.Flags().Uint32Var(&PageLength, "page-length", 0, "pagination length for statistics and debug pages")
 	rootCmd.Flags().Uint16VarP(&Port, "port", "p", 8080, "port to listen on")
+	rootCmd.Flags().StringVar(&Prefix, "prefix", "", "path with which to prefix all listeners (for reverse proxying)")
 	rootCmd.Flags().BoolVar(&Profile, "profile", false, "register net/http/pprof handlers")
 	rootCmd.Flags().BoolVarP(&Recursive, "recursive", "r", false, "recurse into subdirectories")
 	rootCmd.Flags().StringVar(&RefreshInterval, "refresh-interval", "", "force refresh interval equal to this duration (minimum 500ms)")
 	rootCmd.Flags().BoolVar(&Russian, "russian", false, "remove selected images after serving")
 	rootCmd.Flags().BoolVarP(&Sorting, "sort", "s", false, "enable sorting")
-	rootCmd.Flags().BoolVar(&Statistics, "stats", false, "expose stats endpoint")
-	rootCmd.Flags().StringVar(&StatisticsFile, "stats-file", "", "path to optional persistent stats file")
 	rootCmd.Flags().BoolVar(&Text, "text", false, "enable support for text files")
 	rootCmd.Flags().BoolVarP(&Verbose, "verbose", "v", false, "log accessed files and other information to stdout")
 	rootCmd.Flags().BoolVarP(&Version, "version", "V", false, "display version and exit")
--- a/cmd/stats.go
+++ b/cmd/stats.go
@ -1,253 +0,0 @@
-/*
-Copyright © 2023 Seednode <seednode@seedno.de>
-*/
-
-package cmd
-
-import (
-	"encoding/gob"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"os"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/julienschmidt/httprouter"
-	"github.com/klauspost/compress/zstd"
-)
-
-type serveStats struct {
-	mutex sync.RWMutex
-	list  []string
-	count map[string]uint32
-	size  map[string]string
-	times map[string][]string
-}
-
-type publicServeStats struct {
-	List  []string
-	Count map[string]uint32
-	Size  map[string]string
-	Times map[string][]string
-}
-
-type timesServed struct {
-	File   string
-	Served uint32
-	Size   string
-	Times  []string
-}
-
-func (stats *serveStats) incrementCounter(file string, timestamp time.Time, filesize string) {
-	stats.mutex.Lock()
-
-	stats.count[file]++
-
-	stats.times[file] = append(stats.times[file], timestamp.Format(logDate))
-
-	_, exists := stats.size[file]
-	if !exists {
-		stats.size[file] = filesize
-	}
-
-	if !contains(stats.list, file) {
-		stats.list = append(stats.list, file)
-	}
-
-	stats.mutex.Unlock()
-}
-
-func (stats *serveStats) Import(source *publicServeStats) {
-	stats.mutex.Lock()
-
-	copy(stats.list, source.List)
-
-	for k, v := range source.Count {
-		fmt.Printf("Setting count[%s] to %d\n", k, v)
-		stats.count[k] = v
-	}
-
-	for k, v := range source.Size {
-		fmt.Printf("Setting size[%s] to %v\n", k, v)
-
-		stats.size[k] = v
-	}
-
-	for k, v := range source.Times {
-		fmt.Printf("Setting times[%s] to %v\n", k, v)
-		stats.times[k] = v
-	}
-
-	stats.mutex.Unlock()
-}
-
-func (source *serveStats) Export() *publicServeStats {
-	source.mutex.RLock()
-
-	stats := &publicServeStats{
-		List:  make([]string, len(source.list)),
-		Count: make(map[string]uint32, len(source.count)),
-		Size:  make(map[string]string, len(source.size)),
-		Times: make(map[string][]string, len(source.times)),
-	}
-
-	copy(stats.List, source.list)
-
-	for k, v := range source.count {
-		stats.Count[k] = v
-	}
-
-	for k, v := range source.size {
-		stats.Size[k] = v
-	}
-
-	for k, v := range source.times {
-		stats.Times[k] = v
-	}
-
-	source.mutex.RUnlock()
-
-	return stats
-}
-
-func (stats *serveStats) exportFile(path string) error {
-	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
-	z, err := zstd.NewWriter(file)
-	if err != nil {
-		return err
-	}
-	defer z.Close()
-
-	enc := gob.NewEncoder(z)
-
-	err = enc.Encode(stats.Export())
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (stats *serveStats) importFile(path string) error {
-	file, err := os.OpenFile(path, os.O_RDONLY, 0600)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
-	z, err := zstd.NewReader(file)
-	if err != nil {
-		return err
-	}
-	defer z.Close()
-
-	dec := gob.NewDecoder(z)
-
-	source := &publicServeStats{
-		List:  []string{},
-		Count: make(map[string]uint32),
-		Size:  make(map[string]string),
-		Times: make(map[string][]string),
-	}
-
-	err = dec.Decode(source)
-	if err != nil {
-		return err
-	}
-
-	stats.Import(source)
-
-	return nil
-}
-
-func (source *serveStats) listFiles(page int) ([]byte, error) {
-	stats := source.Export()
-
-	sort.SliceStable(stats.List, func(p, q int) bool {
-		return strings.ToLower(stats.List[p]) < strings.ToLower(stats.List[q])
-	})
-
-	var startIndex, stopIndex int
-
-	if page == -1 {
-		startIndex = 0
-		stopIndex = len(stats.List)
-	} else {
-		startIndex = ((page - 1) * int(PageLength))
-		stopIndex = (startIndex + int(PageLength))
-	}
-
-	if startIndex > len(stats.List)-1 {
-		return []byte("{}"), nil
-	}
-
-	if stopIndex > len(stats.List) {
-		stopIndex = len(stats.List)
-	}
-
-	a := make([]timesServed, (stopIndex - startIndex))
-
-	for k, v := range stats.List[startIndex:stopIndex] {
-		a[k] = timesServed{v, stats.Count[v], stats.Size[v], stats.Times[v]}
-	}
-
-	r, err := json.MarshalIndent(a, "", "    ")
-	if err != nil {
-		return []byte{}, err
-	}
-
-	return r, nil
-}
-
-func serveStatsPage(args []string, stats *serveStats) httprouter.Handle {
-	return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
-		startTime := time.Now()
-
-		page, err := strconv.Atoi(p.ByName("page"))
-		if err != nil || page == 0 {
-			page = -1
-		}
-
-		response, err := stats.listFiles(page)
-		if err != nil {
-			fmt.Println(err)
-
-			serverError(w, r, nil)
-
-			return
-		}
-
-		w.Header().Set("Content-Type", "application/json")
-
-		w.Write(response)
-
-		if Verbose {
-			fmt.Printf("%s | Served statistics page (%s) to %s in %s\n",
-				startTime.Format(logDate),
-				humanReadableSize(len(response)),
-				realIP(r),
-				time.Since(startTime).Round(time.Microsecond),
-			)
-		}
-
-		if StatisticsFile != "" {
-			stats.exportFile(StatisticsFile)
-		}
-	}
-}
-
-func registerStatsHandlers(mux *httprouter.Router, args []string, stats *serveStats) {
-	mux.GET("/stats", serveStatsPage(args, stats))
-	if PageLength != 0 {
-		mux.GET("/stats/:page", serveStatsPage(args, stats))
-	}
-}
--- a/cmd/web.go
+++ b/cmd/web.go
@ -12,14 +12,12 @@ import (
 	"net"
 	"net/http"
 	"os"
-	"os/signal"
 	"path/filepath"
 	"regexp"
 	"runtime"
 	"strconv"
 	"strings"
 	"sync"
-	"syscall"
 	"time"

 	"github.com/julienschmidt/httprouter"
@ -40,9 +38,11 @@ const (
 	timeout            time.Duration = 10 * time.Second
 )

-func serveStaticFile(paths []string, stats *serveStats, cache *fileCache) httprouter.Handle {
+func serveStaticFile(paths []string, cache *fileCache) httprouter.Handle {
 	return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
-		path := strings.TrimPrefix(r.URL.Path, sourcePrefix)
+		prefix := Prefix + sourcePrefix
+
+		path := strings.TrimPrefix(r.URL.Path, prefix)

 		prefixedFilePath, err := stripQueryParams(path)
 		if err != nil {
@ -53,7 +53,7 @@ func serveStaticFile(paths []string, stats *serveStats, cache *fileCache) httpro
 			return
 		}

-		filePath, err := filepath.EvalSymlinks(strings.TrimPrefix(prefixedFilePath, sourcePrefix))
+		filePath, err := filepath.EvalSymlinks(strings.TrimPrefix(prefixedFilePath, prefix))
 		if err != nil {
 			fmt.Println(err)

@ -122,11 +122,6 @@ func serveStaticFile(paths []string, stats *serveStats, cache *fileCache) httpro
 				time.Since(startTime).Round(time.Microsecond),
 			)
 		}
-
-		if Statistics {
-			stats.incrementCounter(filePath, startTime, fileSize)
-		}
-
 	}
 }

@ -141,7 +136,7 @@ func serveRoot(paths []string, regexes *regexes, cache *fileCache, formats *type
 			return
 		}

-		strippedRefererUri := strings.TrimPrefix(refererUri, mediaPrefix)
+		strippedRefererUri := strings.TrimPrefix(refererUri, Prefix+mediaPrefix)

 		filters := &filters{
 			included: splitQueryParams(r.URL.Query().Get("include"), regexes),
@ -194,8 +189,9 @@ func serveRoot(paths []string, regexes *regexes, cache *fileCache, formats *type

 		queryParams := generateQueryParams(filters, sortOrder, refreshInterval)

-		newUrl := fmt.Sprintf("http://%s%s%s",
+		newUrl := fmt.Sprintf("http://%s%s%s%s",
 			r.Host,
+			Prefix,
 			preparePath(filePath),
 			queryParams,
 		)
@ -212,7 +208,7 @@ func serveMedia(paths []string, regexes *regexes, formats *types.Types) httprout

 		sortOrder := sortOrder(r)

-		path := strings.TrimPrefix(r.URL.Path, mediaPrefix)
+		path := strings.TrimPrefix(strings.TrimPrefix(r.URL.Path, Prefix), mediaPrefix)

 		if runtime.GOOS == "windows" {
 			path = strings.TrimPrefix(path, "/")
@ -247,7 +243,7 @@ func serveMedia(paths []string, regexes *regexes, formats *types.Types) httprout
 			return
 		}

-		fileUri := generateFileUri(path)
+		fileUri := Prefix + "/" + generateFileUri(path)

 		fileName := filepath.Base(path)

@ -255,20 +251,20 @@ func serveMedia(paths []string, regexes *regexes, formats *types.Types) httprout

 		refreshTimer, refreshInterval := refreshInterval(r)

-		queryParams := generateQueryParams(filters, sortOrder, refreshInterval)
+		rootUrl := Prefix + "/" + generateQueryParams(filters, sortOrder, refreshInterval)

 		var htmlBody strings.Builder
 		htmlBody.WriteString(`<!DOCTYPE html><html lang="en"><head>`)
 		htmlBody.WriteString(faviconHtml)
 		htmlBody.WriteString(fmt.Sprintf(`<style>%s</style>`, fileType.Css()))
-		htmlBody.WriteString((fileType.Title(queryParams, fileUri, path, fileName, mimeType)))
+		htmlBody.WriteString((fileType.Title(rootUrl, fileUri, path, fileName, Prefix, mimeType)))
 		htmlBody.WriteString(`</head><body>`)
 		if refreshInterval != "0ms" {
-			htmlBody.WriteString(fmt.Sprintf("<script>window.onload = function(){setInterval(function(){window.location.href = '/%s';}, %d);};</script>",
-				queryParams,
+			htmlBody.WriteString(fmt.Sprintf("<script>window.onload = function(){setInterval(function(){window.location.href = '%s';}, %d);};</script>",
+				rootUrl,
 				refreshTimer))
 		}
-		htmlBody.WriteString((fileType.Body(queryParams, fileUri, path, fileName, mimeType)))
+		htmlBody.WriteString((fileType.Body(rootUrl, fileUri, path, fileName, Prefix, mimeType)))
 		htmlBody.WriteString(`</body></html>`)

 		_, err = io.WriteString(w, gohtml.Format(htmlBody.String()))
@ -292,6 +288,25 @@ func serveVersion() httprouter.Handle {
 	}
 }

+func register(mux *httprouter.Router, path string, handle httprouter.Handle) {
+	mux.GET(path, handle)
+
+	if Handlers {
+		fmt.Printf("Registered handler for path %s\n", path)
+	}
+}
+
+func redirectRoot() httprouter.Handle {
+	return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+		newUrl := fmt.Sprintf("http://%s%s",
+			r.Host,
+			Prefix,
+		)
+
+		http.Redirect(w, r, newUrl, RedirectStatusCode)
+	}
+}
+
 func ServePage(args []string) error {
 	timeZone := os.Getenv("TZ")
 	if timeZone != "" {
@ -339,7 +354,7 @@ func ServePage(args []string) error {
 		formats.Add(images.New())
 	}

-	paths, err := normalizePaths(args, formats)
+	paths, err := validatePaths(args, formats)
 	if err != nil {
 		return err
 	}
@ -368,27 +383,25 @@ func ServePage(args []string) error {
 		WriteTimeout: 5 * time.Minute,
 	}

-	stats := &serveStats{
-		mutex: sync.RWMutex{},
-		list:  []string{},
-		count: make(map[string]uint32),
-		size:  make(map[string]string),
-		times: make(map[string][]string),
-	}
-
 	mux.PanicHandler = serverErrorHandler()

-	mux.GET("/", serveRoot(paths, regexes, cache, formats))
+	Prefix = strings.TrimSuffix(Prefix, "/")

-	mux.GET("/favicons/*favicon", serveFavicons())
+	register(mux, Prefix+"/", serveRoot(paths, regexes, cache, formats))

-	mux.GET("/favicon.ico", serveFavicons())
+	if Prefix != "" {
+		register(mux, "/", redirectRoot())
+	}

-	mux.GET(mediaPrefix+"/*media", serveMedia(paths, regexes, formats))
+	register(mux, Prefix+"/favicons/*favicon", serveFavicons())

-	mux.GET(sourcePrefix+"/*static", serveStaticFile(paths, stats, cache))
+	register(mux, Prefix+"/favicon.ico", serveFavicons())

-	mux.GET("/version", serveVersion())
+	register(mux, Prefix+mediaPrefix+"/*media", serveMedia(paths, regexes, formats))
+
+	register(mux, Prefix+sourcePrefix+"/*static", serveStaticFile(paths, cache))
+
+	register(mux, Prefix+"/version", serveVersion())

 	if Cache {
 		registerCacheHandlers(mux, args, cache, formats)
@ -406,33 +419,6 @@ func ServePage(args []string) error {
 		fmt.Printf("WARNING! Files *will* be deleted after serving!\n\n")
 	}

-	if Statistics {
-		if StatisticsFile != "" {
-			StatisticsFile, err = normalizePath(StatisticsFile)
-			if err != nil {
-				return err
-			}
-
-			err := stats.importFile(StatisticsFile)
-			if err != nil {
-				return err
-			}
-
-			gracefulShutdown := make(chan os.Signal, 1)
-			signal.Notify(gracefulShutdown, syscall.SIGINT, syscall.SIGTERM)
-
-			go func() {
-				<-gracefulShutdown
-
-				stats.exportFile(StatisticsFile)
-
-				os.Exit(0)
-			}()
-		}
-
-		registerStatsHandlers(mux, args, stats)
-	}
-
 	err = srv.ListenAndServe()
 	if !errors.Is(err, http.ErrServerClosed) {
 		return err
--- a/default.pgo
+++ b/default.pgo
--- a/types/audio/audio.go
+++ b/types/audio/audio.go
@ -22,13 +22,13 @@ func (t Format) Css() string {
 	return css.String()
 }

-func (t Format) Title(queryParams, fileUri, filePath, fileName, mime string) string {
+func (t Format) Title(rootUrl, fileUri, filePath, fileName, prefix, mime string) string {
 	return fmt.Sprintf(`<title>%s</title>`, fileName)
 }

-func (t Format) Body(queryParams, fileUri, filePath, fileName, mime string) string {
-	return fmt.Sprintf(`<a href="/%s"><audio controls autoplay loop preload="auto"><source src="%s" type="%s" alt="Roulette selected: %s">Your browser does not support the audio tag.</audio></a>`,
-		queryParams,
+func (t Format) Body(rootUrl, fileUri, filePath, fileName, prefix, mime string) string {
+	return fmt.Sprintf(`<a href="%s"><audio controls autoplay loop preload="auto"><source src="%s" type="%s" alt="Roulette selected: %s">Your browser does not support the audio tag.</audio></a>`,
+		rootUrl,
 		fileUri,
 		mime,
 		fileName)
--- a/types/flash/flash.go
+++ b/types/flash/flash.go
@ -22,15 +22,15 @@ func (t Format) Css() string {
 	return css.String()
 }

-func (t Format) Title(queryParams, fileUri, filePath, fileName, mime string) string {
+func (t Format) Title(rootUrl, fileUri, filePath, fileName, prefix, mime string) string {
 	return fmt.Sprintf(`<title>%s</title>`, fileName)
 }

-func (t Format) Body(queryParams, fileUri, filePath, fileName, mime string) string {
+func (t Format) Body(rootUrl, fileUri, filePath, fileName, prefix, mime string) string {
 	var html strings.Builder

 	html.WriteString(fmt.Sprintf(`<script src="https://unpkg.com/@ruffle-rs/ruffle"></script><script>window.RufflePlayer.config = {autoplay:"on"};</script><embed src="%s"></embed>`, fileUri))
-	html.WriteString(fmt.Sprintf(`<br /><button onclick="window.location.href = '/%s';">Next</button>`, queryParams))
+	html.WriteString(fmt.Sprintf(`<br /><button onclick="window.location.href = '%s';">Next</button>`, rootUrl))

 	return html.String()
 }
--- a/types/images/images.go
+++ b/types/images/images.go
@ -37,7 +37,7 @@ func (t Format) Css() string {
 	return css.String()
 }

-func (t Format) Title(queryParams, fileUri, filePath, fileName, mime string) string {
+func (t Format) Title(rootUrl, fileUri, filePath, fileName, prefix, mime string) string {
 	dimensions, err := ImageDimensions(filePath)
 	if err != nil {
 		fmt.Println(err)
@ -49,14 +49,14 @@ func (t Format) Title(queryParams, fileUri, filePath, fileName, mime string) str
 		dimensions.height)
 }

-func (t Format) Body(queryParams, fileUri, filePath, fileName, mime string) string {
+func (t Format) Body(rootUrl, fileUri, filePath, fileName, prefix, mime string) string {
 	dimensions, err := ImageDimensions(filePath)
 	if err != nil {
 		fmt.Println(err)
 	}

-	return fmt.Sprintf(`<a href="/%s"><img src="%s" width="%d" height="%d" type="%s" alt="Roulette selected: %s"></a>`,
-		queryParams,
+	return fmt.Sprintf(`<a href="%s"><img src="%s" width="%d" height="%d" type="%s" alt="Roulette selected: %s"></a>`,
+		rootUrl,
 		fileUri,
 		dimensions.width,
 		dimensions.height,
--- a/types/text/text.go
+++ b/types/text/text.go
@ -27,18 +27,18 @@ func (t Format) Css() string {
 	return css.String()
 }

-func (t Format) Title(queryParams, fileUri, filePath, fileName, mime string) string {
+func (t Format) Title(rootUrl, fileUri, filePath, fileName, prefix, mime string) string {
 	return fmt.Sprintf(`<title>%s</title>`, fileName)
 }

-func (t Format) Body(queryParams, fileUri, filePath, fileName, mime string) string {
+func (t Format) Body(rootUrl, fileUri, filePath, fileName, prefix, mime string) string {
 	body, err := os.ReadFile(filePath)
 	if err != nil {
 		body = []byte{}
 	}

-	return fmt.Sprintf(`<a href="/%s"><textarea autofocus readonly>%s</textarea></a>`,
-		queryParams,
+	return fmt.Sprintf(`<a href="%s"><textarea autofocus readonly>%s</textarea></a>`,
+		rootUrl,
 		body)
 }

@ -46,23 +46,27 @@ func (t Format) Extensions() map[string]string {
 	return map[string]string{
 		`.css`:  `text/css`,
 		`.csv`:  `text/csv`,
-		`.htm`:  `text/html`,
-		`.html`: `text/html`,
 		`.js`:   `text/javascript`,
 		`.json`: `application/json`,
 		`.md`:   `text/markdown`,
+		`.ps1`:  `text/plain`,
+		`.sh`:   `application./x-sh`,
+		`.toml`: `application/toml`,
 		`.txt`:  `text/plain`,
 		`.xml`:  `application/xml`,
+		`.yml`:  `application/yaml`,
+		`.yaml`: `application/yaml`,
 	}
 }

 func (t Format) MimeTypes() []string {
 	return []string{
 		`application/json`,
+		`application/toml`,
 		`application/xml`,
+		`application/yaml`,
 		`text/css`,
 		`text/csv`,
-		`text/html`,
 		`text/javascript`,
 		`text/plain`,
 		`text/plain; charset=utf-8`,
--- a/types/types.go
+++ b/types/types.go
@ -20,8 +20,8 @@ var SupportedFormats = &Types{

 type Type interface {
 	Css() string
-	Title(queryParams, fileUri, filePath, fileName, mime string) string
-	Body(queryParams, fileUri, filePath, fileName, mime string) string
+	Title(rootUrl, fileUri, filePath, fileName, prefix, mime string) string
+	Body(rootUrl, fileUri, filePath, fileName, prefix, mime string) string
 	Extensions() map[string]string
 	MimeTypes() []string
 	Validate(filePath string) bool
--- a/types/video/video.go
+++ b/types/video/video.go
@ -24,13 +24,13 @@ func (t Format) Css() string {
 	return css.String()
 }

-func (t Format) Title(queryParams, fileUri, filePath, fileName, mime string) string {
+func (t Format) Title(rootUrl, fileUri, filePath, fileName, prefix, mime string) string {
 	return fmt.Sprintf(`<title>%s</title>`, fileName)
 }

-func (t Format) Body(queryParams, fileUri, filePath, fileName, mime string) string {
-	return fmt.Sprintf(`<a href="/%s"><video controls autoplay loop preload="auto"><source src="%s" type="%s" alt="Roulette selected: %s">Your browser does not support the video tag.</video></a>`,
-		queryParams,
+func (t Format) Body(rootUrl, fileUri, filePath, fileName, prefix, mime string) string {
+	return fmt.Sprintf(`<a href="%s"><video controls autoplay loop preload="auto"><source src="%s" type="%s" alt="Roulette selected: %s">Your browser does not support the video tag.</video></a>`,
+		rootUrl,
 		fileUri,
 		mime,
 		fileName)
Author	SHA1	Message	Date
Seednode	a94b7e208d	Remove html from text handler, add yaml/toml/sh/ps1	2023-09-13 23:32:02 -05:00
Seednode	fdd33376ce	Add --prefix flag for easy reverse proxying	2023-09-13 23:24:29 -05:00
Seednode	d612144be1	Fix handling directories with only one or two files	2023-09-13 22:08:01 -05:00
Seednode	bfb04cab66	Remove unneeded(?) prepareDirectory() function	2023-09-13 20:45:28 -05:00
Seednode	ce99374a9f	Removed statistics (sorry) pending full rewrite	2023-09-13 17:02:43 -05:00