Merge pull request #64 from adelina-t/add_premarket

Add pre and post market change percentage.
master
Brandon Lee Camilleri 5 years ago committed by GitHub
commit d1305eb791
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      layout.go
  2. 22
      yahoo_quotes.go

@ -5,13 +5,13 @@
package mop
import (
`bytes`
`fmt`
`reflect`
`regexp`
`strings`
`text/template`
`time`
"bytes"
"fmt"
"reflect"
"regexp"
"strings"
"text/template"
"time"
)
// Column describes formatting rules for individual column within the list
@ -53,6 +53,8 @@ func NewLayout() *Layout {
{9, `Dividend`, `Dividend`, zero},
{9, `Yield`, `Yield`, percent},
{11, `MarketCap`, `MktCap`, currency},
{13, `PreOpen`, `PreMktChg%`, last},
{13, `AfterHours`, `AfterMktChg%`, last},
}
layout.regex = regexp.MustCompile(`(\.\d+)[BMK]?$`)
layout.marketTemplate = buildMarketTemplate()
@ -208,7 +210,7 @@ func buildQuotesTemplate() *template.Template {
{{.Header}}
{{range.Stocks}}{{if .Advancing}}<green>{{end}}{{.Ticker}}{{.LastTrade}}{{.Change}}{{.ChangePct}}{{.Open}}{{.Low}}{{.High}}{{.Low52}}{{.High52}}{{.Volume}}{{.AvgVolume}}{{.PeRatio}}{{.Dividend}}{{.Yield}}{{.MarketCap}}</>
{{range.Stocks}}{{if .Advancing}}<green>{{end}}{{.Ticker}}{{.LastTrade}}{{.Change}}{{.ChangePct}}{{.Open}}{{.Low}}{{.High}}{{.Low52}}{{.High52}}{{.Volume}}{{.AvgVolume}}{{.PeRatio}}{{.Dividend}}{{.Yield}}{{.MarketCap}}{{.PreOpen}}{{.AfterHours}}</>
{{end}}`
return template.Must(template.New(`quotes`).Parse(markup))
@ -298,7 +300,7 @@ func currency(str... string) string {
}
//default to $
symbol := "$"
switch (str[1]){
switch str[1] {
case "JPY":
symbol = "¥"
break

@ -5,14 +5,14 @@
package mop
import (
`bytes`
`encoding/json`
`fmt`
`io/ioutil`
`net/http`
`reflect`
`strconv`
`strings`
"bytes"
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"reflect"
"strconv"
"strings"
)
// const quotesURL = `http://download.finance.yahoo.com/d/quotes.csv?s=%s&f=sl1c1p2oghjkva2r2rdyj3j1`
@ -43,6 +43,8 @@ type Stock struct {
MarketCapX string `json:"marketCap"` // j1: market cap (fallback when real time is N/A).
Currency string `json:"currency"` // String code for currency of stock.
Advancing bool // True when change is >= $0.
PreOpen string `json:"preMarketChangePercent,omitempty"`
AfterHours string `json:"postMarketChangePercent,omitempty"`
}
// Quotes stores relevant pointers as well as the array of stock quotes for
@ -173,7 +175,8 @@ func (quotes *Quotes) parse2(body []byte) (*Quotes, error) {
// TODO calculate rt?
quotes.stocks[i].MarketCapX = result["marketCap"]
quotes.stocks[i].Currency = result["currency"]
quotes.stocks[i].PreOpen = result["preMarketChangePercent"]
quotes.stocks[i].AfterHours = result["postMarketChangePercent"]
/*
fmt.Println(i)
fmt.Println("-------------------")
@ -256,4 +259,3 @@ func sanitize(body []byte) []byte {
// parse
return fmt.Sprintf("%0.3f%s", v, unit)
}

Loading…
Cancel
Save