From a376d3f5a061f3769c9aec859a087494809d821e Mon Sep 17 00:00:00 2001 From: niubility000 <76441520+niubility000@users.noreply.github.com> Date: Tue, 27 Feb 2024 08:47:06 +0800 Subject: [PATCH] fix: change two default values --- cmd/root.go | 14 +++++++++----- cmd/utils.go | 12 +++++++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 7ec4d441..d7231257 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -54,7 +54,7 @@ func init() { } func addServerFlags(flags *pflag.FlagSet) { - flags.StringP("address", "a", "127.0.0.1", "address to listen on") + flags.StringP("address", "a", "0.0.0.0", "address to listen on") flags.StringP("log", "l", "stdout", "log output") flags.StringP("port", "p", "8080", "port to listen on") flags.StringP("cert", "t", "", "tls certificate") @@ -69,7 +69,7 @@ func addServerFlags(flags *pflag.FlagSet) { flags.Bool("disable-thumbnails", false, "disable image thumbnails") flags.Bool("disable-preview-resize", false, "disable resize of image previews") flags.Bool("disable-exec", false, "disables Command Runner feature") - flags.Bool("disable-type-detection-by-header", false, "disables type detection by reading file headers") + flags.Bool("enable-type-detection-by-header", false, "enables type detection by reading file headers") } var rootCmd = &cobra.Command{ @@ -181,7 +181,11 @@ user created with the credentials from options "username" and "password".`, defer listener.Close() - log.Println("Listening on", listener.Addr().String()) + if strings.Contains(adr, "0.0.0.0") { + log.Println("Listening on localhost:" + server.Port) + } else { + log.Println("Listening on", listener.Addr().String()) + } //nolint: gosec if err := http.Serve(listener, handler); err != nil { log.Fatal(err) @@ -256,8 +260,8 @@ func getRunParams(flags *pflag.FlagSet, st *storage.Storage) *settings.Server { _, disablePreviewResize := getParamB(flags, "disable-preview-resize") server.ResizePreview = !disablePreviewResize - _, disableTypeDetectionByHeader := getParamB(flags, "disable-type-detection-by-header") - server.TypeDetectionByHeader = !disableTypeDetectionByHeader + _, enableTypeDetectionByHeader := getParamB(flags, "enable-type-detection-by-header") + server.TypeDetectionByHeader = enableTypeDetectionByHeader _, disableExec := getParamB(flags, "disable-exec") server.EnableExec = !disableExec diff --git a/cmd/utils.go b/cmd/utils.go index 2bd9e760..8c917e13 100644 --- a/cmd/utils.go +++ b/cmd/utils.go @@ -87,16 +87,22 @@ func python(fn pythonFunc, cfg pythonConfig) cobraFunc { data := pythonData{hadDB: true} path := getParam(cmd.Flags(), "database") + absPath, err := filepath.Abs(path) + if err != nil { + panic(err) + } exists, err := dbExists(path) if err != nil { panic(err) } else if exists && cfg.noDB { - log.Fatal(path + " already exists") + log.Fatal(absPath + " already exists") } else if !exists && !cfg.noDB && !cfg.allowNoDB { - log.Fatal(path + " does not exist. Please run 'filebrowser config init' first.") + log.Fatal(absPath + " does not exist. Please run 'filebrowser config init' first.") + } else if !exists && !cfg.noDB { + log.Println(absPath + " does not exist. initialing...") } - + log.Println("Using database: " + absPath ) data.hadDB = exists db, err := storm.Open(path) checkErr(err)