load from file cache

cointop/cointop.go

@@ -7,7 +7,9 @@ import (
 	"time"
 
 	"github.com/miguelmota/cointop/pkg/api"
+	types "github.com/miguelmota/cointop/pkg/api/types"
 	"github.com/miguelmota/cointop/pkg/cache"
+	"github.com/miguelmota/cointop/pkg/fcache"
 	"github.com/miguelmota/cointop/pkg/gocui"
 	"github.com/miguelmota/cointop/pkg/table"
 	"github.com/miguelmota/cointop/pkg/termui"
@@ -15,38 +17,45 @@ import (
 
 // Cointop cointop
 type Cointop struct {
-	g                 *gocui.Gui
+	g                   *gocui.Gui
-	marketview        *gocui.View
+	marketbarviewname   string
-	chartview         *gocui.View
+	marketbarview       *gocui.View
-	chartpoints       [][]termui.Cell
+	chartview           *gocui.View
-	headersview       *gocui.View
+	chartviewname       string
-	tableview         *gocui.View
+	chartpoints         [][]termui.Cell
-	table             *table.Table
+	headersview         *gocui.View
-	statusbarview     *gocui.View
+	headerviewname      string
-	sortdesc          bool
+	tableview           *gocui.View
-	sortby            string
+	tableviewname       string
-	api               api.Interface
+	table               *table.Table
-	allcoins          []*coin
+	maxtablewidth       int
-	coins             []*coin
+	statusbarview       *gocui.View
-	allcoinsmap       map[string]*coin
+	statusbarviewname   string
-	page              int
+	sortdesc            bool
-	perpage           int
+	sortby              string
-	refreshmux        sync.Mutex
+	api                 api.Interface
-	refreshticker     *time.Ticker
+	allcoins            []*coin
-	forcerefresh      chan bool
+	coins               []*coin
-	selectedcoin      *coin
+	allcoinsmap         map[string]*coin
-	maxtablewidth     int
+	page                int
-	actionsmap        map[string]bool
+	perpage             int
-	shortcutkeys      map[string]string
+	refreshmux          sync.Mutex
-	config            config // toml config
+	refreshticker       *time.Ticker
-	searchfield       *gocui.View
+	forcerefresh        chan bool
-	favorites         map[string]bool
+	selectedcoin        *coin
-	filterByFavorites bool
+	actionsmap          map[string]bool
-	savemux           sync.Mutex
+	shortcutkeys        map[string]string
-	cache             *cache.Cache
+	config              config // toml config
-	debug             bool
+	searchfield         *gocui.View
-	helpview          *gocui.View
+	searchfieldviewname string
-	helpvisible       bool
+	favorites           map[string]bool
+	filterByFavorites   bool
+	savemux             sync.Mutex
+	cache               *cache.Cache
+	debug               bool
+	helpview            *gocui.View
+	helpviewname        string
+	helpvisible         bool
 }
 
 // Run runs cointop
@@ -56,24 +65,44 @@ func Run() {
 		debug = true
 	}
 	ct := Cointop{
-		api:           api.NewCMC(),
+		api:                 api.NewCMC(),
-		refreshticker: time.NewTicker(1 * time.Minute),
+		refreshticker:       time.NewTicker(1 * time.Minute),
-		sortby:        "rank",
+		sortby:              "rank",
-		sortdesc:      false,
+		sortdesc:            false,
-		page:          0,
+		page:                0,
-		perpage:       100,
+		perpage:             100,
-		forcerefresh:  make(chan bool),
+		forcerefresh:        make(chan bool),
-		maxtablewidth: 175,
+		maxtablewidth:       175,
-		actionsmap:    actionsMap(),
+		actionsmap:          actionsMap(),
-		shortcutkeys:  defaultShortcuts(),
+		shortcutkeys:        defaultShortcuts(),
-		favorites:     map[string]bool{},
+		favorites:           map[string]bool{},
-		cache:         cache.New(1*time.Minute, 2*time.Minute),
+		cache:               cache.New(1*time.Minute, 2*time.Minute),
-		debug:         debug,
+		debug:               debug,
+		marketbarviewname:   "market",
+		chartviewname:       "chart",
+		headerviewname:      "header",
+		tableviewname:       "table",
+		statusbarviewname:   "statusbar",
+		searchfieldviewname: "searchfield",
+		helpviewname:        "help",
 	}
 	err := ct.setupConfig()
 	if err != nil {
 		log.Fatal(err)
 	}
+
+	allcoinsmap := map[string]types.Coin{}
+	fcache.Get("allcoinsmap", &allcoinsmap)
+	ct.cache.Set("allcoinsmap", allcoinsmap, 10*time.Second)
+
+	var globaldata []float64
+	fcache.Get("globaldata", &globaldata)
+	ct.cache.Set("globaldata", globaldata, 10*time.Second)
+
+	var market types.GlobalMarketData
+	fcache.Get("market", &market)
+	ct.cache.Set("market", market, 10*time.Second)
+
 	g, err := gocui.NewGui(gocui.Output256)
 	if err != nil {
 		log.Fatalf("new gocui: %v", err)
@@ -89,24 +118,6 @@ func Run() {
 	if err := g.MainLoop(); err != nil && err != gocui.ErrQuit {
 		log.Fatalf("main loop: %v", err)
 	}
-	/*
-		ifc, ok, _ := ct.readHardCache(&data, filename)
-		if ok {
-			// hard cache hit
-			if ifc != nil {
-				ct.debuglog("hard cache hit")
-			}
-		}
-	*/
-	/*
-		ifc, ok, _ := ct.readHardCache(&allcoinsmap, "allcoinsmap")
-		if ok {
-			// hard cache hit
-			if ifc != nil {
-				ct.debuglog("hard cache hit")
-			}
-		}
-	*/
 }
 
 func (ct *Cointop) quit() error {

cointop/help.go

@@ -69,8 +69,8 @@ func (ct *Cointop) showHelp() error {
 
 func (ct *Cointop) hideHelp() error {
 	ct.helpvisible = false
-	ct.setViewOnBottom("help")
+	ct.setViewOnBottom(ct.helpviewname)
-	ct.setActiveView("table")
+	ct.setActiveView(ct.tableviewname)
 	ct.update(func() {
 		ct.helpview.Clear()
 		ct.helpview.Frame = false

cointop/layout.go

@@ -6,34 +6,49 @@ import (
 	"github.com/miguelmota/cointop/pkg/gocui"
 )
 
+// layout sets initial layout
 func (ct *Cointop) layout(g *gocui.Gui) error {
 	maxX, maxY := ct.size()
 	chartHeight := 10
 	topOffset := 0
 
-	if v, err := g.SetView("market", 0, topOffset, maxX, 2); err != nil {
+	if v, err := g.SetView(ct.marketbarviewname, 0, topOffset, maxX, 2); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
-		ct.marketview = v
+		ct.marketbarview = v
-		ct.marketview.Frame = false
+		ct.marketbarview.Frame = false
-		ct.marketview.BgColor = gocui.ColorBlack
+		ct.marketbarview.BgColor = gocui.ColorBlack
-		ct.marketview.FgColor = gocui.ColorWhite
+		ct.marketbarview.FgColor = gocui.ColorWhite
-		go ct.updateMarketbar()
+		go func() {
+			ct.updateMarketbar()
+			_, found := ct.cache.Get(ct.marketbarviewname)
+			if found {
+				ct.cache.Delete(ct.marketbarviewname)
+				ct.updateMarketbar()
+			}
+		}()
 	}
 
 	topOffset = topOffset + 1
-	if v, err := g.SetView("chart", 0, topOffset, maxX, topOffset+chartHeight); err != nil {
+	if v, err := g.SetView(ct.chartviewname, 0, topOffset, maxX, topOffset+chartHeight); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
 		ct.chartview = v
 		ct.chartview.Frame = false
-		go ct.updateChart()
+		go func() {
+			ct.updateChart()
+			_, found := ct.cache.Get("globaldata")
+			if found {
+				ct.cache.Delete("globaldata")
+				ct.updateChart()
+			}
+		}()
 	}
 
 	topOffset = topOffset + chartHeight
-	if v, err := g.SetView("header", 0, topOffset, ct.maxtablewidth, topOffset+2); err != nil {
+	if v, err := g.SetView(ct.headerviewname, 0, topOffset, ct.maxtablewidth, topOffset+2); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
@@ -45,7 +60,7 @@ func (ct *Cointop) layout(g *gocui.Gui) error {
 	}
 
 	topOffset = topOffset + 1
-	if v, err := g.SetView("table", 0, topOffset, ct.maxtablewidth, maxY-1); err != nil {
+	if v, err := g.SetView(ct.tableviewname, 0, topOffset, ct.maxtablewidth, maxY-1); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
@@ -57,10 +72,16 @@ func (ct *Cointop) layout(g *gocui.Gui) error {
 		go func() {
 			ct.updateCoins()
 			ct.updateTable()
+			_, found := ct.cache.Get("allcoinsmap")
+			if found {
+				ct.cache.Delete("allcoinsmap")
+				ct.updateCoins()
+				ct.updateTable()
+			}
 		}()
 	}
 
-	if v, err := g.SetView("statusbar", 0, maxY-2, ct.maxtablewidth, maxY); err != nil {
+	if v, err := g.SetView(ct.statusbarviewname, 0, maxY-2, ct.maxtablewidth, maxY); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
@@ -71,7 +92,7 @@ func (ct *Cointop) layout(g *gocui.Gui) error {
 		go ct.updateStatusbar("")
 	}
 
-	if v, err := g.SetView("searchfield", 0, maxY-2, ct.maxtablewidth, maxY); err != nil {
+	if v, err := g.SetView(ct.searchfieldviewname, 0, maxY-2, ct.maxtablewidth, maxY); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
@@ -82,7 +103,7 @@ func (ct *Cointop) layout(g *gocui.Gui) error {
 		ct.searchfield.FgColor = gocui.ColorWhite
 	}
 
-	if v, err := g.SetView("help", 1, 1, ct.maxtablewidth-2, maxY-1); err != nil {
+	if v, err := g.SetView(ct.helpviewname, 1, 1, ct.maxtablewidth-2, maxY-1); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
@@ -94,9 +115,9 @@ func (ct *Cointop) layout(g *gocui.Gui) error {
 		// run only once on init.
 		// this bit of code should be at the bottom
 		ct.g = g
-		g.SetViewOnBottom("searchfield") // hide
+		g.SetViewOnBottom(ct.searchfieldviewname) // hide
-		g.SetViewOnBottom("help")        // hide
+		g.SetViewOnBottom(ct.helpviewname)        // hide
-		ct.setActiveView("table")
+		ct.setActiveView(ct.tableviewname)
 		ct.intervalFetchData()
 	}
 
@@ -106,12 +127,12 @@ func (ct *Cointop) layout(g *gocui.Gui) error {
 func (ct *Cointop) setActiveView(v string) error {
 	ct.g.SetViewOnTop(v)
 	ct.g.SetCurrentView(v)
-	if v == "searchfield" {
+	if v == ct.searchfieldviewname {
 		ct.searchfield.Clear()
 		ct.searchfield.SetCursor(1, 0)
 		fmt.Fprintf(ct.searchfield, "%s", "/")
-	} else if v == "table" {
+	} else if v == ct.tableviewname {
-		ct.g.SetViewOnTop("statusbar")
+		ct.g.SetViewOnTop(ct.statusbarviewname)
 	}
 	return nil
 }

cointop/marketbar.go

@@ -43,9 +43,9 @@ func (ct *Cointop) updateMarketbar() error {
 		chartname = "Global"
 	}
 	ct.update(func() {
-		ct.marketview.Clear()
+		ct.marketbarview.Clear()
 		fmt.Fprintln(
-			ct.marketview,
+			ct.marketbarview,
 			pad.Right(
 				fmt.Sprintf(
 					"%s [ Chart: %s %s ] Global ▶ Market Cap: %s • 24H Volume: %s • BTC Dominance: %.2f%% • Active Currencies: %s • Active Markets: %s",

cointop/search.go

@@ -8,12 +8,12 @@ import (
 )
 
 func (ct *Cointop) openSearch() error {
-	ct.setActiveView("searchfield")
+	ct.setActiveView(ct.searchfieldviewname)
 	return nil
 }
 
 func (ct *Cointop) cancelSearch() error {
-	ct.setActiveView("table")
+	ct.setActiveView(ct.tableviewname)
 	return nil
 }
 
@@ -21,7 +21,7 @@ func (ct *Cointop) doSearch() error {
 	ct.searchfield.Rewind()
 	b := make([]byte, 100)
 	n, err := ct.searchfield.Read(b)
-	defer ct.setActiveView("table")
+	defer ct.setActiveView(ct.tableviewname)
 	if err != nil {
 		return nil
 	}