Merge branch 'lyricnz-feature/portfolio-buy2'

cointop/actions.go

@@ -69,6 +69,9 @@ func ActionsMap() map[string]bool {
 		"move_down_or_next_page":            true,
 		"show_price_alert_add_menu":         true,
 		"sort_column_balance":               true,
+		"sort_column_cost":                  true,
+		"sort_column_pnl":                   true,
+		"sort_column_pnl_percent":           true,
 	}
 }
 

cointop/coin.go

@@ -23,8 +23,10 @@ type Coin struct {
 	// for favorites
 	Favorite bool
 	// for portfolio
-	Holdings float64
-	Balance  float64
+	Holdings    float64
+	Balance     float64
+	BuyPrice    float64
+	BuyCurrency string
 }
 
 // AllCoins returns a slice of all the coins

cointop/cointop.go

@@ -92,6 +92,7 @@ type State struct {
 	tableCompactNotation     bool
 	favoritesCompactNotation bool
 	portfolioCompactNotation bool
+	enableMouse              bool
 }
 
 // Cointop cointop
@@ -125,8 +126,10 @@ type Cointop struct {
 
 // PortfolioEntry is portfolio entry
 type PortfolioEntry struct {
-	Coin     string
-	Holdings float64
+	Coin        string
+	Holdings    float64
+	BuyPrice    float64
+	BuyCurrency string
 }
 
 // Portfolio is portfolio structure
@@ -187,6 +190,9 @@ var DefaultChartRange = "1Y"
 // DefaultCompactNotation ...
 var DefaultCompactNotation = false
 
+// DefaultEnableMouse ...
+var DefaultEnableMouse = true
+
 // DefaultMaxChartWidth ...
 var DefaultMaxChartWidth = 175
 
@@ -296,6 +302,7 @@ func NewCointop(config *Config) (*Cointop, error) {
 				SoundEnabled: true,
 			},
 			compactNotation:          DefaultCompactNotation,
+			enableMouse:              DefaultEnableMouse,
 			tableCompactNotation:     DefaultCompactNotation,
 			favoritesCompactNotation: DefaultCompactNotation,
 			portfolioCompactNotation: DefaultCompactNotation,
@@ -488,7 +495,7 @@ func (ct *Cointop) Run() error {
 	defer ui.Close()
 
 	ui.SetInputEsc(true)
-	ui.SetMouse(true)
+	ui.SetMouse(ct.State.enableMouse)
 	ui.SetHighlight(true)
 	ui.SetManagerFunc(ct.layout)
 	if err := ct.SetKeybindings(); err != nil {

cointop/config.go

@@ -49,6 +49,7 @@ type ConfigFileConfig struct {
 	RefreshRate       interface{}            `toml:"refresh_rate"`
 	CacheDir          interface{}            `toml:"cache_dir"`
 	CompactNotation   interface{}            `toml:"compact_notation"`
+	EnableMouse       interface{}            `toml:"enable_mouse"`
 	Table             map[string]interface{} `toml:"table"`
 	Chart             map[string]interface{} `toml:"chart"`
 }
@@ -72,6 +73,7 @@ func (ct *Cointop) SetupConfig() error {
 		ct.loadRefreshRateFromConfig,
 		ct.loadCacheDirFromConfig,
 		ct.loadCompactNotationFromConfig,
+		ct.loadEnableMouseFromConfig,
 		ct.loadPriceAlertsFromConfig,
 		ct.loadPortfolioFromConfig,
 	}
@@ -227,9 +229,12 @@ func (ct *Cointop) ConfigToToml() ([]byte, error) {
 		if !ok || entry.Coin == "" {
 			continue
 		}
-		amount := strconv.FormatFloat(entry.Holdings, 'f', -1, 64)
-		coinName := entry.Coin
-		tuple := []string{coinName, amount}
+		tuple := []string{
+			entry.Coin,
+			strconv.FormatFloat(entry.Holdings, 'f', -1, 64),
+			strconv.FormatFloat(entry.BuyPrice, 'f', -1, 64),
+			entry.BuyCurrency,
+		}
 		holdingsIfc = append(holdingsIfc, tuple)
 	}
 	sort.Slice(holdingsIfc, func(i, j int) bool {
@@ -289,6 +294,7 @@ func (ct *Cointop) ConfigToToml() ([]byte, error) {
 		Table:             tableMapIfc,
 		Chart:             chartMapIfc,
 		CompactNotation:   ct.State.compactNotation,
+		EnableMouse:       ct.State.enableMouse,
 	}
 
 	var b bytes.Buffer
@@ -506,6 +512,16 @@ func (ct *Cointop) loadCompactNotationFromConfig() error {
 	return nil
 }
 
+// loadCompactNotationFromConfig loads compact-notation setting from config file to struct
+func (ct *Cointop) loadEnableMouseFromConfig() error {
+	log.Debug("loadEnableMouseFromConfig()")
+	if enableMouse, ok := ct.config.EnableMouse.(bool); ok {
+		ct.State.enableMouse = enableMouse
+	}
+
+	return nil
+}
+
 // LoadAPIChoiceFromConfig loads API choices from config file to struct
 func (ct *Cointop) loadAPIChoiceFromConfig() error {
 	log.Debug("loadAPIKeysFromConfig()")
@@ -584,33 +600,7 @@ func (ct *Cointop) loadPortfolioFromConfig() error {
 				}
 			}
 		} else if key == "holdings" {
-			holdingsIfc, ok := valueIfc.([]interface{})
-			if !ok {
-				continue
-			}
-
-			for _, itemIfc := range holdingsIfc {
-				tupleIfc, ok := itemIfc.([]interface{})
-				if !ok {
-					continue
-				}
-				if len(tupleIfc) > 2 {
-					continue
-				}
-				name, ok := tupleIfc[0].(string)
-				if !ok {
-					continue
-				}
-
-				holdings, err := ct.InterfaceToFloat64(tupleIfc[1])
-				if err != nil {
-					return nil
-				}
-
-				if err := ct.SetPortfolioEntry(name, holdings); err != nil {
-					return err
-				}
-			}
+			// Defer until the end to work around premature-save issue
 		} else if key == "compact_notation" {
 			ct.State.portfolioCompactNotation = valueIfc.(bool)
 		} else {
@@ -620,12 +610,62 @@ func (ct *Cointop) loadPortfolioFromConfig() error {
 				return err
 			}
 
-			if err := ct.SetPortfolioEntry(key, holdings); err != nil {
+			if err := ct.SetPortfolioEntry(key, holdings, 0.0, ""); err != nil {
 				return err
 			}
 		}
 	}
 
+	// Process holdings last because it causes a ct.Save()
+	if valueIfc, ok := ct.config.Portfolio["holdings"]; ok {
+		if holdingsIfc, ok := valueIfc.([]interface{}); ok {
+			ct.loadPortfolioHoldingsFromConfig(holdingsIfc)
+		}
+	}
+
+	return nil
+}
+
+func (ct *Cointop) loadPortfolioHoldingsFromConfig(holdingsIfc []interface{}) error {
+	for _, itemIfc := range holdingsIfc {
+		tupleIfc, ok := itemIfc.([]interface{})
+		if !ok {
+			continue
+		}
+		if len(tupleIfc) > 4 {
+			continue
+		}
+		name, ok := tupleIfc[0].(string)
+		if !ok {
+			continue // was not a string
+		}
+
+		holdings, err := ct.InterfaceToFloat64(tupleIfc[1])
+		if err != nil {
+			return err // was not a float64
+		}
+
+		buyPrice := 0.0
+		if len(tupleIfc) >= 3 {
+			if buyPrice, err = ct.InterfaceToFloat64(tupleIfc[2]); err != nil {
+				return err
+			}
+		}
+
+		buyCurrency := ""
+		if len(tupleIfc) >= 4 {
+			if parseCurrency, ok := tupleIfc[3].(string); !ok {
+				return err // was not a string
+			} else {
+				buyCurrency = parseCurrency
+			}
+		}
+
+		// Watch out - this calls ct.Save() which may save a half-loaded configuration
+		if err := ct.SetPortfolioEntry(name, holdings, buyPrice, buyCurrency); err != nil {
+			return err
+		}
+	}
 	return nil
 }
 

cointop/conversion.go

@@ -12,7 +12,7 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-// FiatCurrencyNames is a mpa of currency symbols to names.
+// FiatCurrencyNames is a map of currency symbols to names.
 // Keep these in alphabetical order.
 var FiatCurrencyNames = map[string]string{
 	"AUD": "Australian Dollar",
@@ -301,3 +301,20 @@ func CurrencySymbol(currency string) string {
 
 	return "?"
 }
+
+// Convert converts an amount to another currency type
+func (ct *Cointop) Convert(convertFrom, convertTo string, amount float64) (float64, error) {
+	convertFrom = strings.ToLower(convertFrom)
+	convertTo = strings.ToLower(convertTo)
+
+	if convertFrom == convertTo {
+		return amount, nil
+	}
+
+	rate, err := ct.api.GetExchangeRate(convertFrom, convertTo, true)
+	if err != nil {
+		return 0, err
+	}
+
+	return rate * amount, nil
+}

cointop/default_shortcuts.go

@@ -85,5 +85,8 @@ func DefaultShortcuts() map[string]string {
 		"<":          "scroll_left",
 		"+":          "show_price_alert_add_menu",
 		"\\\\":       "toggle_table_fullscreen",
+		"!":          "sort_column_cost",
+		"@":          "sort_column_pnl",
+		"#":          "sort_column_pnl_percent",
 	}
 }

cointop/keybindings.go

@@ -325,6 +325,12 @@ func (ct *Cointop) SetKeybindingAction(shortcutKey string, action string) error
 		fn = ct.Keyfn(ct.CursorDownOrNextPage)
 	case "move_up_or_previous_page":
 		fn = ct.Keyfn(ct.CursorUpOrPreviousPage)
+	case "sort_column_cost":
+		fn = ct.Sortfn("cost", true)
+	case "sort_column_pnl":
+		fn = ct.Sortfn("pnl", true)
+	case "sort_column_pnl_percent":
+		fn = ct.Sortfn("pnl_percent", true)
 	default:
 		fn = ct.Keyfn(ct.Noop)
 	}