Updated transitive dependencies

This commit is contained in:
Seednode 2023-05-11 23:22:31 -05:00
parent f6ac4b6e2b
commit 7184542cb6
5 changed files with 24 additions and 44 deletions

View File

@ -91,12 +91,6 @@ When accessed, these endpoints return the contents of the index, in HTML and JSO
```
Usage:
roulette <path> [path]... [flags]
roulette [command]
Available Commands:
completion Generate the autocompletion script for the specified shell
help Help about any command
version Print version
Flags:
-b, --bind string address to bind to (default "0.0.0.0")
@ -111,6 +105,5 @@ Flags:
--stats expose stats endpoint
--stats-file string path to optional persistent stats file
-v, --verbose log accessed files to stdout
Use "roulette [command] --help" for more information about a command.
-V, --version display version and exit
```

View File

@ -649,9 +649,10 @@ func normalizePath(path string) (string, error) {
}
func normalizePaths(args []string) ([]string, error) {
paths := []string{}
paths := make([]string, len(args))
fmt.Println("Paths:")
var pathList strings.Builder
pathList.WriteString("Paths:\n")
for i := 0; i < len(args); i++ {
path, err := normalizePath(args[i])
@ -670,23 +671,25 @@ func normalizePaths(args []string) ([]string, error) {
switch {
case pathMatches && hasSupportedFiles:
fmt.Printf("%s\n", args[i])
pathList.WriteString(fmt.Sprintf("%s\n", args[i]))
addPath = true
case !pathMatches && hasSupportedFiles:
fmt.Printf("%s (resolved to %s)\n", args[i], path)
pathList.WriteString(fmt.Sprintf("%s (resolved to %s)\n", args[i], path))
addPath = true
case pathMatches && !hasSupportedFiles:
fmt.Printf("%s [No supported files found]\n", args[i])
pathList.WriteString(fmt.Sprintf("%s [No supported files found]\n", args[i]))
case !pathMatches && !hasSupportedFiles:
fmt.Printf("%s (resolved to %s) [No supported files found]\n", args[i], path)
pathList.WriteString(fmt.Sprintf("%s (resolved to %s) [No supported files found]\n", args[i], path))
}
if addPath {
paths = append(paths, path)
paths[i] = path
}
}
fmt.Println()
if len(paths) > 0 {
fmt.Println(pathList.String())
}
return paths, nil
}

View File

@ -23,6 +23,7 @@ var (
statistics bool
statisticsFile string
verbose bool
version bool
rootCmd = &cobra.Command{
Use: "roulette <path> [path]...",
@ -64,5 +65,16 @@ func init() {
rootCmd.Flags().BoolVar(&statistics, "stats", false, "expose stats endpoint")
rootCmd.Flags().StringVar(&statisticsFile, "stats-file", "", "path to optional persistent stats file")
rootCmd.Flags().BoolVarP(&verbose, "verbose", "v", false, "log accessed files to stdout")
rootCmd.Flags().BoolVarP(&version, "version", "V", false, "display version and exit")
rootCmd.Flags().SetInterspersed(true)
rootCmd.CompletionOptions.HiddenDefaultCmd = true
rootCmd.SilenceErrors = true
rootCmd.SetHelpCommand(&cobra.Command{
Hidden: true,
})
rootCmd.SetVersionTemplate("roulette v{{.Version}}\n")
rootCmd.Version = "0.46.0"
}

View File

@ -1,26 +0,0 @@
/*
Copyright © 2023 Seednode <seednode@seedno.de>
*/
package cmd
import (
"fmt"
"github.com/spf13/cobra"
)
var Version = "0.45.1"
func init() {
rootCmd.AddCommand(versionCmd)
}
var versionCmd = &cobra.Command{
Use: "version",
Short: "Print version",
Long: "Print the version number of roulette",
Run: func(cmd *cobra.Command, args []string) {
fmt.Println("roulette v" + Version)
},
}

View File

@ -838,8 +838,6 @@ func serveMedia(paths []string, Regexes *Regexes, index *Index) http.HandlerFunc
func doNothing(http.ResponseWriter, *http.Request) {}
func ServePage(args []string) error {
fmt.Printf("roulette v%s\n\n", Version)
bindHost, err := net.LookupHost(bind)
if err != nil {
return err