marc/scotty
1
0
Fork 0
mirror of https://git.sr.ht/~phw/scotty synced 2025-04-25 05:47:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Initialize config if it does not exist, set database relative to config dir

Browse source
This commit is contained in:
Philipp Wolfer 2023-12-05 16:31:52 +01:00
parent c101749faa
commit ce5cdceb1f
No known key found for this signature in database
GPG key ID: 8FDF744D4919943B
6 changed files with 100 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cmd/auth.go
View file

@ -26,6 +26,7 @@ import (
"go.uploadedlobster.com/scotty/internal/auth"
"go.uploadedlobster.com/scotty/internal/backends"
"go.uploadedlobster.com/scotty/internal/cli"
"go.uploadedlobster.com/scotty/internal/config"
"go.uploadedlobster.com/scotty/internal/models"
"go.uploadedlobster.com/scotty/internal/storage"
"golang.org/x/oauth2"
@ -76,7 +77,7 @@ var authCmd = &cobra.Command{
cobra.CheckErr(err)
// Store the retrieved token in the database
db, err := storage.New(viper.GetString("database"))
db, err := storage.New(config.DatabasePath())
cobra.CheckErr(err)
err = db.SetOAuth2Token(serviceName, tok)

4
cmd/listens.go
View file

@ -18,9 +18,9 @@ package cmd
import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
"go.uploadedlobster.com/scotty/internal/backends"
"go.uploadedlobster.com/scotty/internal/cli"
"go.uploadedlobster.com/scotty/internal/config"
"go.uploadedlobster.com/scotty/internal/models"
"go.uploadedlobster.com/scotty/internal/storage"
)
@ -31,7 +31,7 @@ var listensCmd = &cobra.Command{
Short: "Transfer listens between two services",
Long: `Transfers listens between two configured services.`,
Run: func(cmd *cobra.Command, args []string) {
db, err := storage.New(viper.GetString("database"))
db, err := storage.New(config.DatabasePath())
cobra.CheckErr(err)
c, err := cli.NewTransferCmd[
models.ListensExport,

4
cmd/loves.go
View file

@ -18,9 +18,9 @@ package cmd
import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
"go.uploadedlobster.com/scotty/internal/backends"
"go.uploadedlobster.com/scotty/internal/cli"
"go.uploadedlobster.com/scotty/internal/config"
"go.uploadedlobster.com/scotty/internal/models"
"go.uploadedlobster.com/scotty/internal/storage"
)
@ -31,7 +31,7 @@ var lovesCmd = &cobra.Command{
Short: "Transfer loves between two services",
Long: `Transfers loves between two configured services.`,
Run: func(cmd *cobra.Command, args []string) {
db, err := storage.New(viper.GetString("database"))
db, err := storage.New(config.DatabasePath())
cobra.CheckErr(err)
c, err := cli.NewTransferCmd[
models.LovesExport,

27
cmd/root.go
View file

@ -19,10 +19,10 @@ package cmd
import (
"fmt"
"os"
"path"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"go.uploadedlobster.com/scotty/internal/config"
"go.uploadedlobster.com/scotty/internal/version"
)
@ -56,7 +56,7 @@ func init() {
// Cobra supports persistent flags, which, if defined here,
// will be global for your application.
configDir := defaultConfigDir()
configDir := config.DefaultConfigDir()
rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "",
fmt.Sprintf("config file (default is %s/scotty.yaml)", configDir))
@ -65,27 +65,12 @@ func init() {
// rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
}
func defaultConfigDir() string {
configDir, err := os.UserConfigDir()
cobra.CheckErr(err)
return path.Join(configDir, version.AppName)
}
// initConfig reads in config file and ENV variables if set.
func initConfig() {
if cfgFile != "" {
// Use config file from the flag.
viper.SetConfigFile(cfgFile)
} else {
viper.AddConfigPath(defaultConfigDir())
viper.SetConfigType("toml")
viper.SetConfigName(version.AppName)
}
viper.AutomaticEnv() // read in environment variables that match
// If a config file is found, read it in.
if err := viper.ReadInConfig(); err == nil {
fmt.Fprintln(os.Stderr, "Using config file:", viper.ConfigFileUsed())
if err := config.InitConfig(cfgFile); err != nil {
fmt.Fprintln(os.Stderr, "Failed reading config:", err)
} else {
fmt.Println("Using config file:", viper.ConfigFileUsed())
}
}