Finilize version version 0.1.

hummhumm.go

@@ -9,7 +9,10 @@ import (
 	"log"
 	//	"math"
 	"net/http"
+	//"sort"
+	"os/exec"
 	"strconv"
+	"sync"
 	"time"
 )
 
@@ -30,54 +33,44 @@ type HnItem struct {
 }
 
 const apiUrl string = "https://hacker-news.firebaseio.com/v0"
+const numstories int = 30
 
-func (h *HnStories) populateStories(numstories int, done chan bool, widget *widgets.Gauge) {
+func (h *HnStories) fetchHNStories(item string, wg *sync.WaitGroup) {
-	var item string
+	defer wg.Done()
 	var itemUrl string
-	var counter int = 1
+	itemUrl = apiUrl + "/item/" + item + ".json"
-	for _, id := range h.Items[:numstories] {
+	timeout := time.Duration(5 * time.Second)
-		item = strconv.Itoa(id)
+	client := &http.Client{
-		itemUrl = apiUrl + "/item/" + item + ".json"
+		Timeout: timeout,
-		timeout := time.Duration(5 * time.Second)
-		client := &http.Client{
-			Timeout: timeout,
-		}
-		request, err := http.NewRequest("GET", itemUrl, nil)
-		if err != nil {
-			log.Println(err)
-		}
-		response, err := client.Do(request)
-		if err != nil {
-			log.Println(err)
-		}
-		storydata, err := ioutil.ReadAll(response.Body)
-		if err != nil {
-			log.Println(err)
-		}
-
-		var item HnItem
-
-		json.Unmarshal(storydata, &item)
-
-		h.Stories = append(h.Stories, HnItem{
-			By:    item.By,
-			Id:    item.Id,
-			Added: item.Added,
-			Title: item.Title,
-			Type:  item.Type,
-			Url:   item.Url,
-			Kids:  item.Kids,
-		})
-		counter++
-		fcounter := float64(counter)
-		fnumstories := float64(numstories)
-		percentage := (fcounter / fnumstories) * 100
-		widget.Percent = int(percentage)
-		termui.Render(widget)
 	}
-	widget.Percent = 100
+	request, err := http.NewRequest("GET", itemUrl, nil)
-	done <- true
+	if err != nil {
+		log.Println(err)
+	}
+	response, err := client.Do(request)
+	if err != nil {
+		log.Println(err)
+	}
+	storydata, err := ioutil.ReadAll(response.Body)
+	if err != nil {
+		log.Println(err)
+	}
+
+	var story HnItem
+
+	json.Unmarshal(storydata, &story)
+
+	h.Stories = append(h.Stories, HnItem{
+		By:    story.By,
+		Id:    story.Id,
+		Added: story.Added,
+		Title: story.Title,
+		Type:  story.Type,
+		Url:   story.Url,
+		Kids:  story.Kids,
+	})
 }
+
 func (h *HnStories) httpHNFetchIds(url string, done chan bool) {
 	timeout := time.Duration(5 * time.Second)
 	client := &http.Client{
@@ -99,7 +92,7 @@ func (h *HnStories) httpHNFetchIds(url string, done chan bool) {
 	done <- true
 }
 
-func (h *HnStories) httpHNDisplayStories(numstories int, done chan []string) {
+func (h *HnStories) httpHNDisplayStories(numstories int) []string {
 	counter := 1
 	var termuiitems []string
 	for _, item := range h.Stories[:numstories] {
@@ -107,7 +100,7 @@ func (h *HnStories) httpHNDisplayStories(numstories int, done chan []string) {
 		termuiitems = append(termuiitems, itemstring)
 		counter++
 	}
-	done <- termuiitems
+	return termuiitems
 }
 
 func main() {
@@ -127,84 +120,110 @@ func main() {
 	g0.BorderStyle.Fg = termui.ColorWhite
 	hnurl := apiUrl + "/topstories.json"
 	var a HnStories
-	var numstories = 10
+	var counter = 1
+	var wg sync.WaitGroup
 	done1 := make(chan bool, 10)
-	done2 := make(chan bool, 10)
 	g0.Percent = 1
 	termui.Render(g0)
 	go a.httpHNFetchIds(hnurl, done1)
 	<-done1
-	go a.populateStories(numstories, done2, g0)
+	for _, item := range a.Items[:numstories] {
-	<-done2
+		wg.Add(1)
+		go a.fetchHNStories(strconv.Itoa(item), &wg)
+		fcounter := float64(counter)
+		fnumstories := float64(numstories)
+		percentage := (fcounter / fnumstories) * 100
+		g0.Percent = int(percentage)
+		termui.Render(g0)
+		counter++
+	}
+	wg.Wait()
 	termui.Clear()
 	l := widgets.NewList()
+	chanitems := make(chan []string, numstories)
+	var items []string
 	//l.Title = "[Y] hacker news"
-	termuiitems := make(chan []string, numstories)
-	go a.httpHNDisplayStories(numstories, termuiitems)
 	l.Border = false
+	x, y = termui.TerminalDimensions()
 	l.SetRect(0, 1, x, y)
-	l.Rows = <-termuiitems
 	l.TextStyle = termui.NewStyle(termui.ColorYellow)
 	l.WrapText = true
-	x, y = termui.TerminalDimensions()
+	//sort.SliceStable(a.Stories, func(i, j int) bool {
-	renderTab := func() {
+	//	return a.Stories[i].Score > a.Stories[j].Score
-		switch tabpane.ActiveTabIndex {
+	//})
-		case 0:
+	go func(items []string) {
-			termui.Render(tabpane, l)
+		chanitems <- a.httpHNDisplayStories(numstories)
-		}
+	}(items)
-	}
+	select {
-	termui.Render(tabpane, l)
+	case items := <-chanitems:
-
+		l.Rows = items
-	previousKey := ""
+		renderTab := func() {
-	uiEvents := termui.PollEvents()
+			switch tabpane.ActiveTabIndex {
-	for {
+			case 0:
-		e := <-uiEvents
+				termui.Render(tabpane, l)
-		switch e.ID {
-		case "h":
-			tabpane.FocusLeft()
-			termui.Clear()
-			termui.Render(tabpane, l)
-			renderTab()
-		case "l":
-			tabpane.FocusRight()
-			termui.Clear()
-			termui.Render(tabpane, l)
-			renderTab()
-		case "q", "<C-c>":
-			return
-		case "j", "<Down>":
-			l.ScrollDown()
-		case "k", "<Up>":
-			l.ScrollUp()
-		case "<C-d>":
-			l.ScrollHalfPageDown()
-		case "<C-u>":
-			l.ScrollHalfPageUp()
-		case "<C-f>":
-			l.ScrollPageDown()
-		case "<C-b>":
-			l.ScrollPageUp()
-		case "g":
-			if previousKey == "g" {
-				l.ScrollTop()
 			}
-		case "<Home>":
-			l.ScrollTop()
-		case "G", "<End>":
-			l.ScrollBottom()
-		case "<Resize>":
-			payload := e.Payload.(termui.Resize)
-			l.SetRect(0, 1, payload.Width, payload.Height)
-			termui.Clear()
-			termui.Render(l)
 		}
+		termui.Render(tabpane, l)
 
-		if previousKey == "g" {
+		previousKey := ""
-			previousKey = ""
+		uiEvents := termui.PollEvents()
-		} else {
+		for {
-			previousKey = e.ID
+			e := <-uiEvents
+			switch e.ID {
+			case "h":
+				tabpane.FocusLeft()
+				termui.Clear()
+				termui.Render(tabpane, l)
+				renderTab()
+			case "l":
+				tabpane.FocusRight()
+				termui.Clear()
+				termui.Render(tabpane, l)
+				renderTab()
+			case "q", "<C-c>":
+				return
+			case "r":
+
+			case "j", "<Down>":
+				l.ScrollDown()
+			case "k", "<Up>":
+				l.ScrollUp()
+			case "<C-d>":
+				l.ScrollHalfPageDown()
+			case "<C-u>":
+				l.ScrollHalfPageUp()
+			case "<C-f>":
+				l.ScrollPageDown()
+			case "<C-b>":
+				l.ScrollPageUp()
+			case "g":
+				if previousKey == "g" {
+					l.ScrollTop()
+				}
+			case "<Home>":
+				l.ScrollTop()
+			case "G", "<End>":
+				l.ScrollBottom()
+			case "<Enter>":
+				url := a.Stories[l.SelectedRow].Url
+				err := exec.Command("open", "-a", "Safari", url).Start()
+				if err != nil {
+					log.Fatal(err)
+				}
+			case "<Resize>":
+				payload := e.Payload.(termui.Resize)
+				l.SetRect(0, 1, payload.Width, payload.Height)
+				termui.Clear()
+				termui.Render(l)
+			}
+
+			if previousKey == "g" {
+				previousKey = ""
+			} else {
+				previousKey = e.ID
+			}
+
+			termui.Render(l, tabpane)
 		}
-
-		termui.Render(l, tabpane)
 	}
 }