improve config, token and fn

Author: gi8lino

.vimbin.yaml

@@ -8,6 +8,16 @@
 
 ## Commands
 
+### Global Flags
+
+| Flag                    | Description                                                                    |
+| :---------------------- | :----------------------------------------------------------------------------- |
+| `-c`, `--config` `PATH` | Path to the configuration file (Default: `$HOME/.vimbin.yaml`).                |
+| `--debug`               | Activates debug output for detailed logging.                                   |
+| `-t`, `--token` `TOKEN` | Token to use for authentication. If not set, a random token will be generated. Can also be set with the environment variable `VIMBIN_TOKEN` |
+| `--trace`               | Enables trace mode. This will show the content in the logs!                    |
+| `-v`, `--version`       | Print version and exit.                                                        |
+
 ### Serve
 
 Start the server:
@@ -16,12 +26,15 @@ Start the server:
 ./vimbin serve
 ```
 
-#### Options
+**Flags:**
 
-`--listen-address`, `-a`: The address to listen on for HTTP requests. (Default: `:8080`)
-`--theme`, `-t`: The theme to use. Can be auto, light, or dark. (Default: `auto`)
-`--directory`, `-d`: The path to the storage directory. Defaults to the current working directory.
-`--name`, `-n`: The name of the file to save. (Default: `.vimbin`)
+| Flag                                    | Description                                                                                      |
+| :-------------------------------------- | :----------------------------------------------------------------------------------------------- |
+| `-d`, `--directory` `DIRECTORY`         | The path to the storage directory. Defaults to the current working directory. (default `$(pwd)`) |
+| `-a`, `--listen-address` `ADDRESS:PORT` | The address to listen on for HTTP requests. (default `:8080`)                                    |
+| `-n`, `--name` string                   | The name of the file to save. (default ".vimbin")                                                |
+| `--theme` THEME                         | The theme to use. Can be `auto`, `light` or `dark`. (default `auto`)                             |
+| `-h`, `--help`                          | help for serve                                                                                   |
 
 ### Push
 
@@ -31,10 +44,14 @@ Push data to the `vimbin` server:
 ./vimbin push [text]
 ```
 
-#### Options
+**Flags:**
 
-`--url`, `-u`: The URL of the `vimbin` server.
-`--append`, `-a`: Append to the existing file on the `vimbin` server.
+| Flag                           | Description                            |
+| :----------------------------- | :------------------------------------- |
+| `-a`, `--append`               | Append content to the existing content |
+| `-i`, `--insecure-skip-verify` | Skip TLS certificate verification      |
+| `-u`, `--url` `URL`            | The URL of the vimbin server           |
+| `-h`, `--help`                 | help for push                          |
 
 ### Fetch
 
@@ -44,9 +61,13 @@ Fetch the latest data from the `vimbin` server:
 ./vimbin fetch
 ```
 
-#### Options
+**Flags:**
 
-`--url`, `-u`: The URL of the `vimbin` server.
+| Flag                           | Description                       |
+| :----------------------------- | :-------------------------------- |
+| `-i`, `--insecure-skip-verify` | Skip TLS certificate verification |
+| `-u`, `--url` `URL`            | The URL of the vimbin server      |
+| `-h`, `--help`                 | help for fetch                    |
 
 ## Configuration
 
@@ -61,6 +82,7 @@ server:
     theme: auto
   api:
     address: "http://vimbin.example.com"
+    token: secure token
 
 storage:
   name: .vimbin

README.md

@@ -75,6 +75,9 @@ var rootCmd = &cobra.Command{
 			zerolog.SetGlobalLevel(zerolog.TraceLevel)
 			log.Debug().Msgf("Trace output enabled")
 		}
+		if token := cmd.Flag("token").Value.String(); token != "" {
+			config.App.Server.Api.Token.Set(token)
+		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		// Run is executed if no subcommand is specified.
@@ -104,6 +107,7 @@ func init() {
 	// Define command-line flags for the root command
 	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "", "Path to the configuration file (Default: $HOME/.vimbin.yaml).")
 	rootCmd.PersistentFlags().BoolVarP(&debug, "debug", "", false, "Activates debug output for detailed logging.")
+	rootCmd.PersistentFlags().StringP("token", "t", "", "Token to use for authentication. If not set, a random token will be generated.")
 	rootCmd.PersistentFlags().BoolVarP(&trace, "trace", "", false, "Enables trace mode. This will show the content in the logs!")
 	rootCmd.MarkFlagsMutuallyExclusive("debug", "trace") // Ensure that debug and trace flags are mutually exclusive
 
@@ -113,6 +117,11 @@ func init() {
 // initConfig reads the configuration from the specified file or environment variables.
 func initConfig() {
 	if cfgFile != "" {
+		// Check if the specified config file exists
+		if _, err := os.Stat(cfgFile); err != nil {
+			log.Fatal().Msg("Config file '%s' not found")
+		}
+
 		// Use the config file specified by the flag.
 		viper.SetConfigFile(cfgFile)
 	} else {

cmd/root.go

@@ -74,7 +74,7 @@ func init() {
 	// Define command-line flags for the serve command
 	serveCmd.PersistentFlags().StringVarP(&config.App.Server.Web.Address, "listen-address", "a", ":8080", "The address to listen on for HTTP requests.")
 
-	serveCmd.PersistentFlags().StringVarP(&config.App.Server.Web.Theme, "theme", "t", "auto", fmt.Sprintf("The theme to use. Can be %s.", strings.Join(supportedThemes, "|")))
+	serveCmd.PersistentFlags().StringVarP(&config.App.Server.Web.Theme, "theme", "", "auto", fmt.Sprintf("The theme to use. Can be %s.", strings.Join(supportedThemes, "|")))
 	serveCmd.RegisterFlagCompletionFunc("theme", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		return supportedThemes, cobra.ShellCompDirectiveDefault
 	})

cmd/serve.go

@@ -50,6 +50,11 @@ func (c *Config) Parse() (err error) {
 		return fmt.Errorf("Unable to extract hostname and port: %s", err)
 	}
 
+	// Check if the API token was set as ENV variable
+	if token := os.Getenv("VIMBIN_TOKEN"); token != "" {
+		c.Server.Api.Token.Set(token)
+	}
+
 	// Check if the API token is valid
 	if c.Server.Api.Token.Get() == "" {
 		if err := c.Server.Api.Token.Generate(32); err != nil {

internal/config/parse.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/mitchellh/mapstructure"
+
 	"github.com/spf13/viper"
 )
 
@@ -23,8 +24,8 @@ func (c *Config) Read(configPath string) error {
 	viper.SetConfigFile(configPath)
 
 	// Read the config file
-	if err := viper.ReadInConfig(); err != nil {
-		return fmt.Errorf("Failed to read config file: %v", err)
+	if err := viper.ReadInConfig(); err == nil {
+		return nil
 	}
 
 	if err := viper.Unmarshal(c, func(d *mapstructure.DecoderConfig) {

internal/config/read.go

@@ -40,8 +40,7 @@ return (--n >= 0) ? (unsigned char) *bufp++ : EOF;
 //     An error if unable to check or create the storage file.
 func checkStorageFile(filePath string) error {
 	// Open the file to check if it exists
-	_, err := os.Stat(filePath)
-	if err != nil {
+	if _, err := os.Stat(filePath); err != nil {
 		// If the file doesn't exist, create it with default content
 		log.Debug().Msg("Storage file not found; creating it with default content")
 		example := []byte(defaultExample)