From c363e309c11b5bdca8a0d1a0e8dccc1ba5821c5e Mon Sep 17 00:00:00 2001 From: Chteufleur Date: Mon, 2 Nov 2015 19:07:13 +0100 Subject: [PATCH] Make it go getable --- controllers/addTemp.go | 10 +++++----- controllers/default.go | 6 +++--- controllers/login.go | 4 ++-- controllers/relay.go | 25 ++++++------------------- controllers/sensors.go | 12 ++++-------- controllers/user.go | 4 ++-- controllers/viewTemp.go | 8 ++++---- main.go | 8 ++++---- models/relay/relay.go | 20 ++++++++------------ models/sensor/sensor.go | 4 ++-- models/temperature/temp/temp.go | 4 ++-- models/temperature/temperature.go | 4 ++-- models/user/user.go | 4 ++-- models/variables/variables.go | 18 +++++++++--------- routers/router.go | 4 ++-- views/relay.tpl | 1 + 16 files changed, 58 insertions(+), 78 deletions(-) diff --git a/controllers/addTemp.go b/controllers/addTemp.go index 6f96ccc..c1a3f01 100644 --- a/controllers/addTemp.go +++ b/controllers/addTemp.go @@ -6,10 +6,10 @@ import ( "github.com/astaxie/beego" - "datahouse/models/sensor" - "datahouse/models/temperature" - temperatureTmp "datahouse/models/temperature/temp" - "datahouse/models/variables" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/sensor" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/temperature" + temperatureTmp "git.kingpenguin.tk/chteufleur/datahouse.git/models/temperature/temp" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/variables" ) type AddTempController struct { @@ -21,7 +21,7 @@ func (c *AddTempController) Prepare() { if sess != nil { c.Data["IsAuthentificated"] = true } - + c.Data["version"] = variables.Version } diff --git a/controllers/default.go b/controllers/default.go index fb263e2..b15231d 100644 --- a/controllers/default.go +++ b/controllers/default.go @@ -3,9 +3,9 @@ package controllers import ( "github.com/astaxie/beego" - "datahouse/models/sensor" - temperatureTmp "datahouse/models/temperature/temp" - "datahouse/models/variables" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/sensor" + temperatureTmp "git.kingpenguin.tk/chteufleur/datahouse.git/models/temperature/temp" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/variables" "strconv" "time" diff --git a/controllers/login.go b/controllers/login.go index 249bc42..cf20caa 100644 --- a/controllers/login.go +++ b/controllers/login.go @@ -3,8 +3,8 @@ package controllers import ( "github.com/astaxie/beego" - "datahouse/models/user" - "datahouse/models/variables" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/user" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/variables" ) type LoginController struct { diff --git a/controllers/relay.go b/controllers/relay.go index acd3ac1..d3866cf 100644 --- a/controllers/relay.go +++ b/controllers/relay.go @@ -4,21 +4,16 @@ import ( "github.com/astaxie/beego" "github.com/astaxie/beego/httplib" - "datahouse/models/variables" - "datahouse/models/relay" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/relay" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/variables" "strings" "time" ) - - - - /* -------------------------------------------------------------------------------- */ - type ViewRelayController struct { beego.Controller } @@ -31,7 +26,7 @@ func (c *ViewRelayController) Prepare() { c.Data["IsAuthentificated"] = true } - c.Data["IsViewRelay"] = true; + c.Data["IsViewRelay"] = true c.Data["version"] = variables.Version } @@ -53,15 +48,14 @@ func (c *ViewRelayController) Get() { c.TplNames = "relay.tpl" } - func (c *ViewRelayController) Post() { mac := c.Ctx.Input.Param(":sensor") r := relay.GetRelayByMac(mac) ret := "" if r.Id != 0 { - ret += r.Mac+"/" + ret += r.Mac + "/" if r.IpAddress != "" { - getRep, err := httplib.Get("http://"+r.IpAddress+"/status").SetTimeout(3 * time.Second, 3 * time.Second).String() + getRep, err := httplib.Get("http://"+r.IpAddress+"/status").SetTimeout(3*time.Second, 3*time.Second).String() if err == nil { ret += getRep } else { @@ -72,9 +66,6 @@ func (c *ViewRelayController) Post() { c.Ctx.Output.Body([]byte(ret)) } - - - /* -------------------------------------------------------------------------------- */ @@ -83,7 +74,6 @@ type AddRelayController struct { beego.Controller } - func (c *AddRelayController) Get() { ip := strings.Split(c.Ctx.Request.RemoteAddr, ":")[0] mac := c.Ctx.Input.Param(":sensor") @@ -92,9 +82,6 @@ func (c *AddRelayController) Get() { c.Ctx.Output.Body([]byte("OK")) } - - - /* -------------------------------------------------------------------------------- */ @@ -114,7 +101,7 @@ func (c *CommandRelayController) Post() { mac := c.Ctx.Input.Param(":sensor") r := relay.GetRelayByMac(mac) if r.Id != 0 { - httplib.Get("http://"+r.IpAddress+"/toggle").SetTimeout(3 * time.Second, 3 * time.Second).String() + httplib.Get("http://"+r.IpAddress+"/toggle").SetTimeout(3*time.Second, 3*time.Second).String() } c.Ctx.Output.Body([]byte("")) diff --git a/controllers/sensors.go b/controllers/sensors.go index d94dffd..832c836 100644 --- a/controllers/sensors.go +++ b/controllers/sensors.go @@ -3,10 +3,10 @@ package controllers import ( "github.com/astaxie/beego" - "datahouse/models/relay" - "datahouse/models/sensor" - "datahouse/models/temperature" - "datahouse/models/variables" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/relay" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/sensor" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/temperature" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/variables" "fmt" "strconv" @@ -48,8 +48,6 @@ func (c *SensorsController) Post() { } } - - func (c *SensorsController) PostTempSensors() { description := c.Input().Get("description") mac := c.Input().Get("mac") @@ -73,8 +71,6 @@ func (c *SensorsController) PostTempSensors() { } } - - func (c *SensorsController) PostRelay() { description := c.Input().Get("description") mac := c.Input().Get("mac") diff --git a/controllers/user.go b/controllers/user.go index b77dea8..d395d84 100644 --- a/controllers/user.go +++ b/controllers/user.go @@ -3,8 +3,8 @@ package controllers import ( "github.com/astaxie/beego" - "datahouse/models/user" - "datahouse/models/variables" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/user" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/variables" ) type UserController struct { diff --git a/controllers/viewTemp.go b/controllers/viewTemp.go index 144db41..02a7fd0 100644 --- a/controllers/viewTemp.go +++ b/controllers/viewTemp.go @@ -3,9 +3,9 @@ package controllers import ( "github.com/astaxie/beego" - "datahouse/models/sensor" - "datahouse/models/temperature" - "datahouse/models/variables" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/sensor" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/temperature" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/variables" "html/template" "strconv" @@ -20,7 +20,7 @@ func (c *ViewTempController) Prepare() { if sess != nil { c.Data["IsAuthentificated"] = true } - + c.Data["IsViewTemp"] = true c.Data["version"] = variables.Version } diff --git a/main.go b/main.go index e8d67cf..46951e1 100644 --- a/main.go +++ b/main.go @@ -1,10 +1,10 @@ package main import ( - "datahouse/models/database" - _ "datahouse/models/temperature" - "datahouse/models/user" - _ "datahouse/routers" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/database" + _ "git.kingpenguin.tk/chteufleur/datahouse.git/models/temperature" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/user" + _ "git.kingpenguin.tk/chteufleur/datahouse.git/routers" "github.com/astaxie/beego" "github.com/astaxie/beego/logs" diff --git a/models/relay/relay.go b/models/relay/relay.go index 2b5aff9..7012458 100644 --- a/models/relay/relay.go +++ b/models/relay/relay.go @@ -3,25 +3,21 @@ package relay import ( "github.com/astaxie/beego/orm" - "datahouse/models/database" - "datahouse/models/utils" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/database" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/utils" ) - - type RelayTable struct { - Id int64 - Mac string - Description string - IpAddress string + Id int64 + Mac string + Description string + IpAddress string } func init() { orm.RegisterModel(new(RelayTable)) } - - func GetRelayByMac(relayMac string) *RelayTable { o := orm.NewOrm() o.Using(database.Alias) @@ -52,7 +48,7 @@ func GetAllRelay() []RelayTable { if err == nil { for _, m := range maps { r := new(RelayTable) - r.Id = utils.GetInt(m, "Id") + r.Id = utils.GetInt(m, "Id") r.Mac = utils.GetString(m, "Mac") r.Description = utils.GetString(m, "Description") r.IpAddress = utils.GetString(m, "IpAddress") @@ -72,7 +68,7 @@ func GetRelay(id int64) *RelayTable { _, err := o.QueryTable(new(RelayTable)).Filter("Id", id).Values(&maps) if err == nil { for _, m := range maps { - ret.Id = utils.GetInt(m, "Id") + ret.Id = utils.GetInt(m, "Id") ret.Mac = utils.GetString(m, "Mac") ret.Description = utils.GetString(m, "Description") ret.IpAddress = utils.GetString(m, "IpAddress") diff --git a/models/sensor/sensor.go b/models/sensor/sensor.go index 1f03ff5..0225d58 100644 --- a/models/sensor/sensor.go +++ b/models/sensor/sensor.go @@ -3,8 +3,8 @@ package sensor import ( "github.com/astaxie/beego/orm" - "datahouse/models/database" - "datahouse/models/utils" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/database" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/utils" ) type SensorTable struct { diff --git a/models/temperature/temp/temp.go b/models/temperature/temp/temp.go index d804245..9976854 100644 --- a/models/temperature/temp/temp.go +++ b/models/temperature/temp/temp.go @@ -3,8 +3,8 @@ package temp import ( "github.com/astaxie/beego/orm" - "datahouse/models/database" - "datahouse/models/utils" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/database" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/utils" "time" ) diff --git a/models/temperature/temperature.go b/models/temperature/temperature.go index 95d36b7..d654839 100644 --- a/models/temperature/temperature.go +++ b/models/temperature/temperature.go @@ -3,8 +3,8 @@ package temperature import ( "github.com/astaxie/beego/orm" - "datahouse/models/database" - "datahouse/models/utils" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/database" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/utils" "time" ) diff --git a/models/user/user.go b/models/user/user.go index 91f9a97..113dcb5 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -4,8 +4,8 @@ import ( "github.com/astaxie/beego/orm" _ "github.com/go-sql-driver/mysql" - "datahouse/models/database" - "datahouse/models/utils" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/database" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/utils" ) type User struct { diff --git a/models/variables/variables.go b/models/variables/variables.go index 36d5dff..21366db 100644 --- a/models/variables/variables.go +++ b/models/variables/variables.go @@ -9,18 +9,18 @@ const ( ) var ( - RootRoute = "/" + RootRoute = "/" - AddTempRoute = "/add/temp/"+sensorMacRegex+"/:val([0-9]+)" - AddRelayRoute = "/add/relay/"+sensorMacRegex + AddTempRoute = "/add/temp/" + sensorMacRegex + "/:val([0-9]+)" + AddRelayRoute = "/add/relay/" + sensorMacRegex - ViewTempRoute = "/view/temp" + ViewTempRoute = "/view/temp" ViewRelaysRoute = "/view/relay" - ViewRelayRoute = "/view/relay/"+sensorMacRegex + ViewRelayRoute = "/view/relay/" + sensorMacRegex - CommandRelayRoute = "/command/relay/"+sensorMacRegex + CommandRelayRoute = "/command/relay/" + sensorMacRegex - SensorsRoute = "/sensors" - LoginRoute = "/login" - UserRoute = "/user" + SensorsRoute = "/sensors" + LoginRoute = "/login" + UserRoute = "/user" ) diff --git a/routers/router.go b/routers/router.go index 40054a2..da59e28 100644 --- a/routers/router.go +++ b/routers/router.go @@ -1,8 +1,8 @@ package routers import ( - "datahouse/controllers" - "datahouse/models/variables" + "git.kingpenguin.tk/chteufleur/datahouse.git/controllers" + "git.kingpenguin.tk/chteufleur/datahouse.git/models/variables" "github.com/astaxie/beego" ) diff --git a/views/relay.tpl b/views/relay.tpl index 1964ec4..151fba6 100644 --- a/views/relay.tpl +++ b/views/relay.tpl @@ -105,6 +105,7 @@ $("#toggleButton").click(function() { $.ajax({ url: "/command/relay/"+$(".jumbotron img").attr("id"), method: "POST", + timeout: 1000, }); });