Merge branch 'master' into bugfix/range-update-corrupt-cache

Author: simon-anz

cointop/chart.go

@@ -257,10 +257,11 @@ func (ct *Cointop) PortfolioChart() error {
 		for i := range graphData {
 			price := graphData[i]
 			sum := p.Holdings * price
-			if len(data)-1 >= i {
+			if i < len(data) {
 				data[i] += sum
+			} else {
+				data = append(data, sum)
 			}
-			data = append(data, sum)
 		}
 	}
 

cointop/cointop.go

@@ -44,6 +44,7 @@ type State struct {
 	coinsTableColumns  []string
 	convertMenuVisible bool
 	defaultView        string
+	defaultChartRange  string
 
 	// DEPRECATED: favorites by 'symbol' is deprecated because of collisions.
 	favoritesBySymbol map[string]bool
@@ -243,6 +244,7 @@ func NewCointop(config *Config) (*Cointop, error) {
 			cacheDir:           DefaultCacheDir,
 			coinsTableColumns:  DefaultCoinTableHeaders,
 			currencyConversion: DefaultCurrency,
+			defaultChartRange:  DefaultChartRange,
 			// DEPRECATED: favorites by 'symbol' is deprecated because of collisions. Kept for backward compatibility.
 			favoritesBySymbol:     make(map[string]bool),
 			favorites:             make(map[string]bool),

cointop/config.go

@@ -31,18 +31,19 @@ var possibleConfigPaths = []string{
 }
 
 type config struct {
-	Shortcuts     map[string]interface{} `toml:"shortcuts"`
-	Favorites     map[string]interface{} `toml:"favorites"`
-	Portfolio     map[string]interface{} `toml:"portfolio"`
-	PriceAlerts   map[string]interface{} `toml:"price_alerts"`
-	Currency      interface{}            `toml:"currency"`
-	DefaultView   interface{}            `toml:"default_view"`
-	CoinMarketCap map[string]interface{} `toml:"coinmarketcap"`
-	API           interface{}            `toml:"api"`
-	Colorscheme   interface{}            `toml:"colorscheme"`
-	RefreshRate   interface{}            `toml:"refresh_rate"`
-	CacheDir      interface{}            `toml:"cache_dir"`
-	Table         map[string]interface{} `toml:"table"`
+	Shortcuts         map[string]interface{} `toml:"shortcuts"`
+	Favorites         map[string]interface{} `toml:"favorites"`
+	Portfolio         map[string]interface{} `toml:"portfolio"`
+	PriceAlerts       map[string]interface{} `toml:"price_alerts"`
+	Currency          interface{}            `toml:"currency"`
+	DefaultView       interface{}            `toml:"default_view"`
+	DefaultChartRange interface{}            `toml:"default_chart_range"`
+	CoinMarketCap     map[string]interface{} `toml:"coinmarketcap"`
+	API               interface{}            `toml:"api"`
+	Colorscheme       interface{}            `toml:"colorscheme"`
+	RefreshRate       interface{}            `toml:"refresh_rate"`
+	CacheDir          interface{}            `toml:"cache_dir"`
+	Table             map[string]interface{} `toml:"table"`
 }
 
 // SetupConfig loads config file
@@ -69,6 +70,9 @@ func (ct *Cointop) SetupConfig() error {
 	if err := ct.loadDefaultViewFromConfig(); err != nil {
 		return err
 	}
+	if err := ct.loadDefaultChartRangeFromConfig(); err != nil {
+		return err
+	}
 	if err := ct.loadAPIKeysFromConfig(); err != nil {
 		return err
 	}
@@ -255,6 +259,7 @@ func (ct *Cointop) configToToml() ([]byte, error) {
 
 	var currencyIfc interface{} = ct.State.currencyConversion
 	var defaultViewIfc interface{} = ct.State.defaultView
+	var defaultChartRangeIfc interface{} = ct.State.defaultChartRange
 	var colorschemeIfc interface{} = ct.colorschemeName
 	var refreshRateIfc interface{} = uint(ct.State.refreshRate.Seconds())
 	var cacheDirIfc interface{} = ct.State.cacheDir
@@ -289,18 +294,19 @@ func (ct *Cointop) configToToml() ([]byte, error) {
 	tableMapIfc["keep_row_focus_on_sort"] = keepRowFocusOnSortIfc
 
 	var inputs = &config{
-		API:           apiChoiceIfc,
-		Colorscheme:   colorschemeIfc,
-		CoinMarketCap: cmcIfc,
-		Currency:      currencyIfc,
-		DefaultView:   defaultViewIfc,
-		Favorites:     favoritesMapIfc,
-		RefreshRate:   refreshRateIfc,
-		Shortcuts:     shortcutsIfcs,
-		Portfolio:     portfolioIfc,
-		PriceAlerts:   priceAlertsMapIfc,
-		CacheDir:      cacheDirIfc,
-		Table:         tableMapIfc,
+		API:               apiChoiceIfc,
+		Colorscheme:       colorschemeIfc,
+		CoinMarketCap:     cmcIfc,
+		Currency:          currencyIfc,
+		DefaultView:       defaultViewIfc,
+		DefaultChartRange: defaultChartRangeIfc,
+		Favorites:         favoritesMapIfc,
+		RefreshRate:       refreshRateIfc,
+		Shortcuts:         shortcutsIfcs,
+		Portfolio:         portfolioIfc,
+		PriceAlerts:       priceAlertsMapIfc,
+		CacheDir:          cacheDirIfc,
+		Table:             tableMapIfc,
 	}
 
 	var b bytes.Buffer
@@ -399,6 +405,21 @@ func (ct *Cointop) loadDefaultViewFromConfig() error {
 	return nil
 }
 
+// LoadDefaultChartRangeFromConfig loads default chart range from config file to struct
+func (ct *Cointop) loadDefaultChartRangeFromConfig() error {
+	ct.debuglog("loadDefaultChartRangeFromConfig()")
+	if defaultChartRange, ok := ct.config.DefaultChartRange.(string); ok {
+		// validate configured value
+		_, ok := ct.chartRangesMap[defaultChartRange]
+		if !ok {
+			return fmt.Errorf("invalid default chart range %q. Valid ranges are: %s", defaultChartRange, strings.Join(ChartRanges(), ","))
+		}
+		ct.State.defaultChartRange = defaultChartRange
+		ct.State.selectedChartRange = defaultChartRange
+	}
+	return nil
+}
+
 // LoadAPIKeysFromConfig loads API keys from config file to struct
 func (ct *Cointop) loadAPIKeysFromConfig() error {
 	ct.debuglog("loadAPIKeysFromConfig()")

cointop/portfolio.go

@@ -529,12 +529,25 @@ func (ct *Cointop) GetPortfolioSlice() []*Coin {
 		return sliced
 	}
 
+OUTER:
 	for i := range ct.State.allCoins {
 		coin := ct.State.allCoins[i]
 		p, isNew := ct.PortfolioEntry(coin)
 		if isNew {
 			continue
 		}
+		// check not already found
+		updateSlice := -1
+		for j := range sliced {
+			if coin.Symbol == sliced[j].Symbol {
+				if coin.Rank >= sliced[j].Rank {
+					continue OUTER // skip updates from lower-ranked coins
+				}
+				updateSlice = j // update this later
+				break
+			}
+		}
+
 		coin.Holdings = p.Holdings
 		balance := coin.Price * p.Holdings
 		balancestr := fmt.Sprintf("%.2f", balance)
@@ -543,7 +556,12 @@ func (ct *Cointop) GetPortfolioSlice() []*Coin {
 		}
 		balance, _ = strconv.ParseFloat(balancestr, 64)
 		coin.Balance = balance
-		sliced = append(sliced, coin)
+		if updateSlice == -1 {
+			sliced = append(sliced, coin)
+		} else {
+			sliced[updateSlice] = coin
+		}
+
 	}
 
 	sort.Slice(sliced, func(i, j int) bool {

docs/content/config.md

@@ -39,6 +39,7 @@ You can configure the actions you want for each key in `config.toml`:
 ```toml
 currency = "USD"
 default_view = ""
+default_chart_range = "1Y"
 api = "coingecko"
 colorscheme = "cointop"
 refresh_rate = 60

docs/content/faq.md

@@ -328,6 +328,12 @@ draft: false
 
   In the config file, set `default_view = "default"`
 
+## How do I set the default chart range?
+
+  In the config file, set `default_chart_range = "3M"`
+
+  Supported date ranges are `All Time`, `YTD`, `1Y`, `6M`, `3M`, `1M`, `7D`, `3D`, `24H`.
+
 ## How can use a different config file other than the default?
 
   Run cointop with the `--config` flag, eg `cointop --config="/path/to/config.toml"`, to use the specified file as the config.