From 63ad635f62e265c92b49a2d5766031757cf9567c Mon Sep 17 00:00:00 2001 From: c9s Date: Wed, 1 Jun 2022 15:52:11 +0800 Subject: [PATCH] cmd: rewrite sync command --- pkg/cmd/sync.go | 36 +++++++++--------------------------- pkg/util/paper_trade.go | 6 ++++++ 2 files changed, 15 insertions(+), 27 deletions(-) create mode 100644 pkg/util/paper_trade.go diff --git a/pkg/cmd/sync.go b/pkg/cmd/sync.go index aa56cbb4f..2aa7ed331 100644 --- a/pkg/cmd/sync.go +++ b/pkg/cmd/sync.go @@ -6,7 +6,6 @@ import ( "time" "github.com/pkg/errors" - log "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/c9s/bbgo/pkg/bbgo" @@ -88,35 +87,18 @@ var SyncCmd = &cobra.Command{ environ.SetSyncStartTime(syncStartTime) - // syncSymbols is the symbol list to sync - var syncSymbols []string - - if userConfig.Sync != nil && len(userConfig.Sync.Symbols) > 0 { - syncSymbols = userConfig.Sync.Symbols - } - if len(symbol) > 0 { - syncSymbols = []string{symbol} - } - - var selectedSessions []string - - if userConfig.Sync != nil && len(userConfig.Sync.Sessions) > 0 { - selectedSessions = userConfig.Sync.Sessions - } - if len(sessionName) > 0 { - selectedSessions = []string{sessionName} - } - - sessions := environ.SelectSessions(selectedSessions...) - for _, session := range sessions { - if err := environ.SyncSession(ctx, session, syncSymbols...); err != nil { - return err + if userConfig.Sync != nil && len(userConfig.Sync.Symbols) > 0 { + userConfig.Sync.Symbols = []string{symbol} } - - log.Infof("exchange session %s synchronization done", session.Name) } - return nil + if len(sessionName) > 0 { + if userConfig.Sync != nil && len(userConfig.Sync.Sessions) > 0 { + userConfig.Sync.Sessions = []string{sessionName} + } + } + + return environ.Sync(ctx, userConfig) }, } diff --git a/pkg/util/paper_trade.go b/pkg/util/paper_trade.go new file mode 100644 index 000000000..b3a09d68b --- /dev/null +++ b/pkg/util/paper_trade.go @@ -0,0 +1,6 @@ +package util + +func IsPaperTrade() bool { + v, ok := GetEnvVarBool("PAPER_TRADE") + return ok && v +}