Merge branch 'cointop-sh:master' into feature/top-coin

cointop/cointop.go

@@ -48,9 +48,6 @@ type State struct {
 	defaultChartRange  string
 	maxChartWidth      int
 
-	// DEPRECATED: favorites by 'symbol' is deprecated because of collisions.
-	favoritesBySymbol map[string]bool
-
 	favorites                  map[string]bool
 	favoritesTableColumns      []string
 	favoriteChar               string
@@ -72,6 +69,7 @@ type State struct {
 	refreshRate                time.Duration
 	running                    bool
 	searchFieldVisible         bool
+	lastSearchQuery            string
 	selectedCoin               *Coin
 	selectedChartRange         string
 	selectedView               string
@@ -259,14 +257,12 @@ func NewCointop(config *Config) (*Cointop, error) {
 		limiter:        time.NewTicker(2 * time.Second).C,
 		filecache:      nil,
 		State: &State{
-			allCoins:           []*Coin{},
-			cacheDir:           DefaultCacheDir,
-			coinsTableColumns:  DefaultCoinTableHeaders,
-			currencyConversion: DefaultCurrency,
-			defaultChartRange:  DefaultChartRange,
-			maxChartWidth:      DefaultMaxChartWidth,
-			// DEPRECATED: favorites by 'symbol' is deprecated because of collisions. Kept for backward compatibility.
-			favoritesBySymbol:     make(map[string]bool),
+			allCoins:              []*Coin{},
+			cacheDir:              DefaultCacheDir,
+			coinsTableColumns:     DefaultCoinTableHeaders,
+			currencyConversion:    DefaultCurrency,
+			defaultChartRange:     DefaultChartRange,
+			maxChartWidth:         DefaultMaxChartWidth,
 			favorites:             make(map[string]bool),
 			favoritesTableColumns: DefaultCoinTableHeaders,
 			favoriteChar:          DefaultFavoriteChar,
@@ -454,21 +450,6 @@ func NewCointop(config *Config) (*Cointop, error) {
 		ct.State.coins = ct.State.allCoins[0:max]
 	}
 
-	// DEPRECATED: favorites by 'symbol' is deprecated because of collisions. Kept for backward compatibility.
-	// Here we're doing a lookup based on symbol and setting the favorite to the coin name instead of coin symbol.
-	ct.State.allCoinsSlugMap.Range(func(key, value interface{}) bool {
-		if coin, ok := value.(*Coin); ok {
-			for k := range ct.State.favoritesBySymbol {
-				if coin.Symbol == k {
-					ct.State.favorites[coin.Name] = true
-					delete(ct.State.favoritesBySymbol, k)
-				}
-			}
-		}
-
-		return true
-	})
-
 	var globaldata []float64
 	chartcachekey := ct.CompositeCacheKey("globaldata", "", "", ct.State.selectedChartRange)
 	if ct.filecache != nil {

cointop/config.go

@@ -214,10 +214,7 @@ func (ct *Cointop) ConfigToToml() ([]byte, error) {
 		return favoritesIfc[i].(string) < favoritesIfc[j].(string)
 	})
 
-	var favoritesBySymbolIfc []interface{}
 	favoritesMapIfc := map[string]interface{}{
-		// DEPRECATED: favorites by 'symbol' is deprecated because of collisions. Kept for backward compatibility.
-		"symbols":          favoritesBySymbolIfc,
 		"names":            favoritesIfc,
 		"columns":          ct.State.favoritesTableColumns,
 		"character":        ct.State.favoriteChar,
@@ -509,13 +506,6 @@ func (ct *Cointop) loadFavoritesFromConfig() error {
 			continue
 		}
 		switch k {
-		// DEPRECATED: favorites by 'symbol' is deprecated because of collisions. Kept for backward compatibility.
-		case "symbols":
-			for _, ifc := range ifcs {
-				if v, ok := ifc.(string); ok {
-					ct.State.favoritesBySymbol[strings.ToUpper(v)] = true
-				}
-			}
 		case "names":
 			for _, ifc := range ifcs {
 				if v, ok := ifc.(string); ok {

cointop/navigation.go

@@ -416,13 +416,18 @@ func (ct *Cointop) GoToPageRowIndex(idx int) error {
 
 // GoToGlobalIndex navigates to the selected row index of all page rows
 func (ct *Cointop) GoToGlobalIndex(idx int) error {
-	log.Debug("GoToGlobalIndex()")
+	log.Debugf("GoToGlobalIndex(%d)", idx)
+	target := ct.State.allCoins[idx]
 	l := ct.TableRowsLen()
 	atpage := idx / l
 	ct.SetPage(atpage)
-	rowIndex := idx % l
-	ct.HighlightRow(rowIndex)
 	ct.UpdateTable()
+	// Look for the coin in the current page
+	for i, coin := range ct.State.coins {
+		if coin == target {
+			ct.HighlightRow(i)
+		}
+	}
 	return nil
 }
 

cointop/portfolio.go

@@ -492,15 +492,11 @@ func (ct *Cointop) PortfolioEntry(c *Coin) (*PortfolioEntry, bool) {
 	var ok bool
 	key := strings.ToLower(c.Name)
 	if p, ok = ct.State.portfolio.Entries[key]; !ok {
-		// NOTE: if not found then try the symbol
-		key := strings.ToLower(c.Symbol)
-		if p, ok = ct.State.portfolio.Entries[key]; !ok {
-			p = &PortfolioEntry{
-				Coin:     c.Name,
-				Holdings: 0,
-			}
-			isNew = true
+		p = &PortfolioEntry{
+			Coin:     c.Name,
+			Holdings: 0,
 		}
+		isNew = true
 	}
 
 	return p, isNew
@@ -560,25 +556,13 @@ 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 {
+	for _, p := range ct.State.portfolio.Entries {
+		coinIfc, _ := ct.State.allCoinsSlugMap.Load(p.Coin)
+		coin, ok := coinIfc.(*Coin)
+		if !ok {
+			log.Errorf("Could not find coin %s", p.Coin)
 			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)
@@ -587,12 +571,7 @@ OUTER:
 		}
 		balance, _ = strconv.ParseFloat(balancestr, 64)
 		coin.Balance = balance
-		if updateSlice == -1 {
-			sliced = append(sliced, coin)
-		} else {
-			sliced[updateSlice] = coin
-		}
-
+		sliced = append(sliced, coin)
 	}
 
 	sort.Slice(sliced, func(i, j int) bool {

cointop/search.go

@@ -66,7 +66,7 @@ func (ct *Cointop) DoSearch() error {
 	if n == 0 {
 		return nil
 	}
-	q := string(b)
+	q := strings.TrimSpace(string(b[:n]))
 	// remove slash
 	regex := regexp.MustCompile(`/(.*)`)
 	matches := regex.FindStringSubmatch(q)
@@ -78,13 +78,32 @@ func (ct *Cointop) DoSearch() error {
 
 // Search performs the search and filtering
 func (ct *Cointop) Search(q string) error {
-	log.Debug("Search()")
+	log.Debugf("Search(%s)", q)
+
+	// If there are no coins, return no result
+	if len(ct.State.coins) == 0 {
+		return nil
+	}
+
+	// If search term is empty, use the previous search term.
 	q = strings.TrimSpace(strings.ToLower(q))
+	if q == "" {
+		q = ct.State.lastSearchQuery
+	} else {
+		ct.State.lastSearchQuery = q
+	}
+
 	idx := -1
 	min := -1
 	var hasprefixidx []int
 	var hasprefixdist []int
-	for i := range ct.State.allCoins {
+
+	// Start the search from the current position (+1), looking names that start with the search term, or symbols that match completely
+	currentIndex := ct.GetGlobalCoinIndex(ct.HighlightedRowCoin()) + 1
+	if ct.IsLastPage() && ct.IsLastRow() {
+		currentIndex = 0
+	}
+	for i := currentIndex; i < len(ct.State.allCoins); i++ {
 		coin := ct.State.allCoins[i]
 		name := strings.ToLower(coin.Name)
 		symbol := strings.ToLower(coin.Symbol)

docs/content/faq.md

@@ -132,6 +132,7 @@ draft: false
 ## How do I search?
 
   The default key to open search is <kbd>/</kbd>. Type the search query after the `/` in the field and hit <kbd>Enter</kbd>.
+  Each search starts from the current cursor position. To search for the same term again, hit <kbd>/</kbd> then <kbd>Enter</kbd>.
 
 ## How do I exit search?