d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-05-31 07:26:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Introduces a new config.DefaultFilePath func (#415)

Browse Source 
* Introduces a new config.DefaultFilePath func

* FiX GrAmMeRiNo
This commit is contained in:
Adrian Gallagher
2020-01-16 08:10:25 +11:00
committed by GitHub
parent 838b378c21
commit 7a90aecf6f
8 changed files with 60 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/config/config.go
View File

@@ -20,15 +20,9 @@ func EncryptOrDecrypt(encrypt bool) string {
func main() {
var inFile, outFile, key string
var encrypt bool
var err error
configFile, err := config.GetFilePath("")
if err != nil {
log.Fatal(err)
}
flag.StringVar(&inFile, "infile", configFile, "The config input file to process.")
flag.StringVar(&outFile, "outfile", configFile+".out", "The config output file.")
defaultCfgFile := config.DefaultFilePath()
flag.StringVar(&inFile, "infile", defaultCfgFile, "The config input file to process.")
flag.StringVar(&outFile, "outfile", defaultCfgFile+".out", "The config output file.")
flag.BoolVar(&encrypt, "encrypt", true, "Whether to encrypt or decrypt.")
flag.StringVar(&key, "key", "", "The key to use for AES encryption.")
flag.Parse()
@@ -36,9 +30,9 @@ func main() {
log.Println("GoCryptoTrader: config-helper tool.")
if key == "" {
result, errf := config.PromptForConfigKey(false)
if errf != nil {
log.Fatal("Unable to obtain encryption/decryption key.")
result, err := config.PromptForConfigKey(false)
if err != nil {
log.Fatalf("Unable to obtain encryption/decryption key: %s", err)
}
key = string(result)
}

15
cmd/dbmigrate/main.go
View File

@@ -48,24 +48,16 @@ func main() {
fmt.Println(core.Copyright)
fmt.Println()
defaultPath, err := config.GetFilePath("")
if err != nil {
fmt.Println(err)
os.Exit(1)
}
flag.StringVar(&command, "command", "", "command to run status|up|up-by-one|up-to|down|create")
flag.StringVar(&args, "args", "", "arguments to pass to goose")
flag.StringVar(&configFile, "config", defaultPath, "config file to load")
flag.StringVar(&configFile, "config", config.DefaultFilePath(), "config file to load")
flag.StringVar(&defaultDataDir, "datadir", common.GetDefaultDataDir(runtime.GOOS), "default data directory for GoCryptoTrader files")
flag.StringVar(&migrationDir, "migrationdir", database.MigrationDir, "override migration folder")
flag.Parse()
conf := config.GetConfig()
err = conf.LoadConfig(configFile, true)
var conf config.Config
err := conf.LoadConfig(configFile, true)
if err != nil {
fmt.Println(err)
os.Exit(1)
@@ -75,6 +67,7 @@ func main() {
fmt.Println("Database support is disabled")
os.Exit(1)
}
err = openDbConnection(conf.Database.Driver)
if err != nil {
fmt.Println(err)

7
cmd/gen_otp/otp_gen.go
View File

@@ -27,12 +27,7 @@ func main() {
var single bool
var err error
defaultCfg, err := config.GetFilePath("")
if err != nil {
log.Fatal(err)
}
flag.StringVar(&cfgFile, "config", defaultCfg, "The config input file to process.")
flag.StringVar(&cfgFile, "config", config.DefaultFilePath(), "The config input file to process.")
flag.BoolVar(&single, "single", false, "prompt for single use OTP code gen")
flag.Parse()

15
cmd/gen_sqlboiler_config/main.go
View File

@@ -40,26 +40,19 @@ func main() {
fmt.Println(core.Copyright)
fmt.Println()
defaultPath, err := config.GetFilePath("")
if err != nil {
fmt.Println(err)
os.Exit(1)
}
flag.StringVar(&configFile, "config", defaultPath, "config file to load")
flag.StringVar(&configFile, "config", config.DefaultFilePath(), "config file to load")
flag.StringVar(&defaultDataDir, "datadir", common.GetDefaultDataDir(runtime.GOOS), "default data directory for GoCryptoTrader files")
flag.StringVar(&outputFolder, "outdir", "", "overwrite default output folder")
flag.Parse()
conf := config.GetConfig()
err = conf.LoadConfig(configFile, true)
var cfg config.Config
err := cfg.LoadConfig(configFile, true)
if err != nil {
fmt.Println(err)
os.Exit(1)
}
convertGCTtoSQLBoilerConfig(&conf.Database)
convertGCTtoSQLBoilerConfig(&cfg.Database)
jsonOutput, err := json.MarshalIndent(sqlboilerConfig, "", " ")
if err != nil {

11
cmd/portfolio/portfolio.go
View File

@@ -63,21 +63,14 @@ func getOnlineOfflinePortfolio(coins []portfolio.Coin, online bool) {
func main() {
var inFile, key string
defaultCfg, err := config.GetFilePath("")
if err != nil {
log.Println(err)
os.Exit(1)
}
flag.StringVar(&inFile, "infile", defaultCfg, "The config input file to process.")
flag.StringVar(&inFile, "infile", config.DefaultFilePath(), "The config input file to process.")
flag.StringVar(&key, "key", "", "The key to use for AES encryption.")
flag.Parse()
log.Println("GoCryptoTrader: portfolio tool.")
var cfg config.Config
err = cfg.LoadConfig(inFile, true)
err := cfg.LoadConfig(inFile, true)
if err != nil {
log.Println(err)
os.Exit(1)