From 89e1f0ef76a8ab80f1ef97f86e5fe587f37fc26f Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 17 Jul 2015 15:52:01 +0200 Subject: add go format target to makefile diff --git a/Makefile b/Makefile index b1a116a..c20b334 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ curdir:= $(shell pwd) GOCMD := go +GOFMT := gofmt getlibs: export GOPATH=$(curdir) getlibs: @@ -31,8 +32,12 @@ getlibs: $(GOCMD) get "github.com/gorilla/websocket" $(GOCMD) get "github.com/tuxychandru/pubsub" +format: export GOPATH=$(curdir) +format: + $(GOFMT) -w src/helsinki.at/rhrdtime + build: export GOPATH=$(curdir) -build: getlibs +build: getlibs format $(GOCMD) install helsinki.at/rhrdtime clean: diff --git a/src/helsinki.at/rhrdtime/rhrdtime.go b/src/helsinki.at/rhrdtime/rhrdtime.go index 6677e97..e00eb5b 100644 --- a/src/helsinki.at/rhrdtime/rhrdtime.go +++ b/src/helsinki.at/rhrdtime/rhrdtime.go @@ -25,123 +25,123 @@ package main import ( - "fmt" - "time" - "math" - "flag" - "net/http" - "encoding/json" - - "github.com/go-martini/martini" - "github.com/gorilla/websocket" - "github.com/tuxychandru/pubsub" + "encoding/json" + "flag" + "fmt" + "math" + "net/http" + "time" + + "github.com/go-martini/martini" + "github.com/gorilla/websocket" + "github.com/tuxychandru/pubsub" ) type timeUpdate struct { - Timestamp int64 `json:"timestamp"` - TZOffset int `json:"tz-offset"` - Week uint8 `json:"week"` + Timestamp int64 `json:"timestamp"` + TZOffset int `json:"tz-offset"` + Week uint8 `json:"week"` } func getTimeUpdate() []byte { - // - // This computes the current Rivendell Week based on the number - // of weeks since epoch. - // - // Explanation: - // epoch was at 01.01.1970 UTC which was a Thursday. - // Monday in that week is (s-from-epoch + 3*24*60*60) seconds ago. - // This needs to be adjusted by the timezone offset for Europe/Vienna - // which is of course not constant (damn you daylight savings time) - // Divide this by (7*24*60*60) and you get the number of - // weeks since the Monday in the week of epoch adjusted for timezone offsets. - // This week had week number 3 so add an offset of 2 and - // get the modulo of 4. This rounded down gives you the current week - // with 0 meaning Week 1. So add 1 to that number and you will get - // the current RD week. - // - - loc, err := time.LoadLocation("Europe/Vienna"); - if err != nil { - fmt.Println(err) - return []byte{'{', '}'} - } - - now := time.Now().In(loc); - _, offset := now.Zone() - - sEpoch := now.Unix() + int64(offset) - week := uint8(math.Floor(math.Mod((((float64(sEpoch) + 259200)/604800) + 2), 4)) + 1) - - update := timeUpdate{now.Unix(), offset, week} - update_json, err := json.Marshal(update) - if err != nil { - fmt.Println(err) - return []byte{'{', '}'} - } - return update_json + // + // This computes the current Rivendell Week based on the number + // of weeks since epoch. + // + // Explanation: + // epoch was at 01.01.1970 UTC which was a Thursday. + // Monday in that week is (s-from-epoch + 3*24*60*60) seconds ago. + // This needs to be adjusted by the timezone offset for Europe/Vienna + // which is of course not constant (damn you daylight savings time) + // Divide this by (7*24*60*60) and you get the number of + // weeks since the Monday in the week of epoch adjusted for timezone offsets. + // This week had week number 3 so add an offset of 2 and + // get the modulo of 4. This rounded down gives you the current week + // with 0 meaning Week 1. So add 1 to that number and you will get + // the current RD week. + // + + loc, err := time.LoadLocation("Europe/Vienna") + if err != nil { + fmt.Println(err) + return []byte{'{', '}'} + } + + now := time.Now().In(loc) + _, offset := now.Zone() + + sEpoch := now.Unix() + int64(offset) + week := uint8(math.Floor(math.Mod((((float64(sEpoch)+259200)/604800)+2), 4)) + 1) + + update := timeUpdate{now.Unix(), offset, week} + update_json, err := json.Marshal(update) + if err != nil { + fmt.Println(err) + return []byte{'{', '}'} + } + return update_json } func goTalkWithClient(w http.ResponseWriter, r *http.Request, ps *pubsub.PubSub) { - ws, err := websocket.Upgrade(w, r, nil, 1024, 1024) - if _, ok := err.(websocket.HandshakeError); ok { - http.Error(w, "Not a websocket handshake", 400) - return - } else if err != nil { - fmt.Println(err) - return - } - fmt.Println("Client connected", ws.RemoteAddr()) - - timeupdate_chan := ps.Sub("timeupdate") - defer ps.Unsub(timeupdate_chan, "timeupdate") - - update_json := getTimeUpdate() - if err := ws.WriteMessage(websocket.TextMessage, update_json); err != nil { - return - } - - for jsonupdate := range timeupdate_chan { - if err := ws.WriteMessage(websocket.TextMessage, jsonupdate.([]byte)); err != nil { - return - } - } + ws, err := websocket.Upgrade(w, r, nil, 1024, 1024) + if _, ok := err.(websocket.HandshakeError); ok { + http.Error(w, "Not a websocket handshake", 400) + return + } else if err != nil { + fmt.Println(err) + return + } + fmt.Println("Client connected", ws.RemoteAddr()) + + timeupdate_chan := ps.Sub("timeupdate") + defer ps.Unsub(timeupdate_chan, "timeupdate") + + update_json := getTimeUpdate() + if err := ws.WriteMessage(websocket.TextMessage, update_json); err != nil { + return + } + + for jsonupdate := range timeupdate_chan { + if err := ws.WriteMessage(websocket.TextMessage, jsonupdate.([]byte)); err != nil { + return + } + } } func RunMartini(ps *pubsub.PubSub, addr string) { - m := martini.Classic() - m.Get("/time", func(w http.ResponseWriter, r *http.Request) { - goTalkWithClient(w, r, ps) - }) + m := martini.Classic() + m.Get("/time", func(w http.ResponseWriter, r *http.Request) { + goTalkWithClient(w, r, ps) + }) - m.RunOnAddr(addr) + m.RunOnAddr(addr) } func main() { - interval_s := flag.String("interval", "15s", "the interval between updates, default: '15s'") + interval_s := flag.String("interval", "15s", "the interval between updates, default: '15s'") addr_s := flag.String("addr", ":3000", "addr:port to listen on, default: ':3000'") help := flag.Bool("help", false, "show usage") - flag.Parse() - if *help { - flag.Usage() - return - } + flag.Parse() + if *help { + flag.Usage() + return + } - interval, err := time.ParseDuration(*interval_s) - if err != nil { - fmt.Println(err) - return - } + interval, err := time.ParseDuration(*interval_s) + if err != nil { + fmt.Println(err) + return + } - ps := pubsub.New(1) + ps := pubsub.New(1) - ticker := time.NewTicker(interval) - go func() { - for _ = range ticker.C { - ps.Pub(getTimeUpdate(), "timeupdate") - } - }() + ticker := time.NewTicker(interval) + go func() { + for _ = range ticker.C { + ps.Pub(getTimeUpdate(), "timeupdate") + } + }() - RunMartini(ps, *addr_s) + RunMartini(ps, *addr_s) } -- cgit v0.10.2