Merge pull request #64 from adelina-t/add_premarket

Add pre and post market change percentage.

layout.go

@@ -5,13 +5,13 @@
 package mop
 
 import (
-	`bytes`
+	"bytes"
-	`fmt`
+	"fmt"
-	`reflect`
+	"reflect"
-	`regexp`
+	"regexp"
-	`strings`
+	"strings"
-	`text/template`
+	"text/template"
-	`time`
+	"time"
 )
 
 // Column describes formatting rules for individual column within the list
@@ -20,7 +20,7 @@ type Column struct {
 	width     int                    // Column width.
 	name      string                 // The name of the field in the Stock struct.
 	title     string                 // Column title to display in the header.
-	formatter func(... string) string // Optional function to format the contents of the column.
+	formatter func(...string) string // Optional function to format the contents of the column.
 }
 
 // Layout is used to format and display all the collected data, i.e. market
@@ -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))
@@ -256,7 +258,7 @@ func arrowFor(column int, profile *Profile) string {
 }
 
 //-----------------------------------------------------------------------------
-func blank(str... string) string {
+func blank(str ...string) string {
 	if len(str) < 1 {
 		return "ERR"
 	}
@@ -268,8 +270,8 @@ func blank(str... string) string {
 }
 
 //-----------------------------------------------------------------------------
-func zero(str... string) string {
+func zero(str ...string) string {
-	if len(str) < 2{
+	if len(str) < 2 {
 		return "ERR"
 	}
 	if str[0] == `0.00` {
@@ -280,7 +282,7 @@ func zero(str... string) string {
 }
 
 //-----------------------------------------------------------------------------
-func last(str... string) string {
+func last(str ...string) string {
 	if len(str) < 1 {
 		return "ERR"
 	}
@@ -292,13 +294,13 @@ func last(str... string) string {
 }
 
 //-----------------------------------------------------------------------------
-func currency(str... string) string {
+func currency(str ...string) string {
 	if len(str) < 2 {
 		return "ERR"
 	}
 	//default to $
 	symbol := "$"
-	switch (str[1]){
+	switch str[1] {
 	case "JPY":
 		symbol = "¥"
 		break
@@ -321,7 +323,7 @@ func currency(str... string) string {
 
 // Returns percent value truncated at 2 decimal points.
 //-----------------------------------------------------------------------------
-func percent(str... string) string {
+func percent(str ...string) string {
 	if len(str) < 1 {
 		return "ERR"
 	}

yahoo_quotes.go

@@ -5,14 +5,14 @@
 package mop
 
 import (
-	`bytes`
+	"bytes"
-	`encoding/json`
+	"encoding/json"
-	`fmt`
+	"fmt"
-	`io/ioutil`
+	"io/ioutil"
-	`net/http`
+	"net/http"
-	`reflect`
+	"reflect"
-	`strconv`
+	"strconv"
-	`strings`
+	"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("-------------------")
@@ -235,7 +238,7 @@ func sanitize(body []byte) []byte {
 	return bytes.Replace(bytes.TrimSpace(body), []byte{'"'}, []byte{}, -1)
 }
 
- func float2Str(v float64) string {
+func float2Str(v float64) string {
 	unit := ""
 	switch {
 	case v > 1.0e12:
@@ -256,4 +259,3 @@ func sanitize(body []byte) []byte {
 	// parse
 	return fmt.Sprintf("%0.3f%s", v, unit)
 }
-