more cosmetic changes

[svn42.git] / r3-webstatus-spaceapi / main.go

diff --git a/r3-webstatus-spaceapi/main.go b/r3-webstatus-spaceapi/main.go
index 07bb194..77dd32a 100644 (file)
--- a/r3-webstatus-spaceapi/main.go
+++ b/r3-webstatus-spaceapi/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
        "./spaceapi"
+    "./r3xmppbot"
        "bufio"
        "fmt"
        "net"
@@ -9,21 +10,26 @@ import (
        "net/url"
        "regexp"
        "time"
+    "strconv"
 )
 
 type SpaceState struct {
        present           bool
        buttonpress_until int64
+    door_locked bool
+    door_shut bool
 }
 
 var (
        re_presence_    *regexp.Regexp     = regexp.MustCompile("Presence: (yes|no)(?:, (opened|closed), (.+))?")
+       re_status_      *regexp.Regexp     = regexp.MustCompile("Status: (closed|opened), (opening|waiting|closing|idle), (ajar|shut).*")
        re_button_      *regexp.Regexp     = regexp.MustCompile("PanicButton|button\\d?")
        re_temp_        *regexp.Regexp     = regexp.MustCompile("temp0: (\\d+\\.\\d+)")
        re_photo_       *regexp.Regexp     = regexp.MustCompile("photo0: (\\d+)")
        re_querystresc_ *regexp.Regexp     = regexp.MustCompile("[^\x30-\x39\x41-\x7E]")
        spaceapidata    spaceapi.SpaceInfo = spaceapi.NewSpaceInfo("realraum", "http://realraum.at", "http://realraum.at/logo-red_250x250.png", "http://realraum.at/logo-re_open_100x100.png", "http://realraum.at/logo-re_empty_100x100.png",47.065779129, 15.442322614).AddSpaceAddress("Jakoministr. 16 ground level left, 8010 Graz, Austria")
        statusstate     *SpaceState        = new(SpaceState)
+       xmpp_presence_events_chan_     chan interface{}
 )
 
 //-------
@@ -66,30 +72,41 @@ func publishStateToWeb() {
 
 func parseSocketInputLine(line string) {
        match_presence := re_presence_.FindStringSubmatch(line)
+       match_status := re_status_.FindStringSubmatch(line)
        match_button := re_button_.FindStringSubmatch(line)
        match_temp := re_temp_.FindStringSubmatch(line)
        match_photo := re_photo_.FindStringSubmatch(line)
 
        if match_presence != nil {
                statusstate.present = (match_presence[1] == "yes")
+        statusstate.door_locked = (match_presence[2] == "closed")
+        //spaceapidata.MergeInSensor(spaceapi.MakeDoorLockSensor("Torwaechter", "Front Door", match_presence[2] == "closed"))
+        spaceapidata.MergeInSensor(spaceapi.MakeDoorLockSensor("TorwaechterLock", "Türschloß", statusstate.door_locked))
                publishStateToWeb()
+        xmpp_presence_events_chan_ <- r3xmppbot.PresenceEvent{statusstate.present, statusstate.door_locked, statusstate.door_shut}
+       } else if match_status != nil {
+        statusstate.door_locked = (match_status[1] == "closed")
+        statusstate.door_shut = (match_status[3] == "shut")
+        spaceapidata.MergeInSensor(spaceapi.MakeDoorLockSensor("TorwaechterLock", "Türschloß", statusstate.door_locked))
+        spaceapidata.MergeInSensor(spaceapi.MakeDoorLockSensor("TorwaechterAjarSensor", "Türkontakt", statusstate.door_shut))
+        //spaceapidata.MergeInSensor(spaceapi.MakeDoorAjarSensor("Torwaechter", "Front Door", match_presence[3] == "shut"))
+        publishStateToWeb()
+        xmpp_presence_events_chan_ <- r3xmppbot.PresenceEvent{statusstate.present, statusstate.door_locked, statusstate.door_shut}
        } else if match_button != nil {
                statusstate.buttonpress_until = time.Now().Unix() + 3600
                spaceapidata.AddSpaceEvent("PanicButton", "check-in", "The button has been pressed")
                publishStateToWeb()
+        xmpp_presence_events_chan_ <- "The button has been pressed ! Propably someone is bored and need company ! ;-)"
        } else if match_temp != nil {
-               spaceapidata.UpdateSensorData("temp", "Ceiling", match_temp[1]+"C")
-               //newtemp, err = strconv.ParseFloat((match_temp[1]), 32)
-               //if err == nil {
-               //      spaceapidata.UpdateSensorData("temp", "Ceiling", strconv.FormatFloat(newtemp, 'f', 2, 32)+"C")
-               //      spacestate.temperature = newtemp
-               //}
+               newtemp, err := strconv.ParseFloat((match_temp[1]), 32)
+               if err == nil {
+            spaceapidata.MergeInSensor(spaceapi.MakeTempCSensor("Temp0","Decke",newtemp))
+               }
        } else if match_photo != nil {
-               spaceapidata.UpdateSensorData("light", "Front", match_photo[1])
-               //newphoto, err = strconv.ParseInt(match_photo[1], 10, 32)
-               //if err == nil {
-               //      spacestate.lightlevel = newphoto
-               //}
+               newphoto, err := strconv.ParseInt(match_photo[1], 10, 32)
+               if err == nil {
+                       spaceapidata.MergeInSensor(spaceapi.MakeIlluminationSensor("Photodiode","Decke","1024V/5V",newphoto))
+               }
        }
 }
 
@@ -116,11 +133,29 @@ ReOpenSocket:
 }
 
 func main() {
-       spaceapidata.AddSpaceFeed("calendar", "application/rss+xml", "http://grical.realraum.at/s/?query=!realraum&view=rss")
-       spaceapidata.AddSpaceFeed("google+", "text/html", "https://plus.google.com/113737596421797426873")
+       spaceapidata.AddSpaceFeed("calendar", "http://grical.realraum.at/s/?query=!realraum&view=rss")
+       spaceapidata.AddSpaceFeed("blog", "https://plus.google.com/113737596421797426873")
+       spaceapidata.AddSpaceFeed("wiki", "http://realraum.at/wiki")
        spaceapidata.AddSpaceContactInfo("+43780700888524", "irc://irc.oftc.net/#realraum", "realraum@realraum.at", "realraum@realraum.at", "realraum@realraum.at", "vorstand@realraum.at")
-       eventqueue := make(chan string)
-       ticker := time.NewTicker(time.Duration(15) * time.Minute)
+
+    var err error
+    var bot *r3xmppbot.XmppBot
+    bot, xmpp_presence_events_chan_, err = r3xmppbot.NewStartedBot("realrauminfo@realraum.at/Tuer", "d7ynC6Dg", "r3alraumOLGAXMPPInfos", true)
+    if err != nil {
+        fmt.Println(err)
+        return
+    }
+    defer bot.StopBot()
+    
+    //~ presence_events <- PresenceEvent{true, true, true}
+    //~ presence_events <- PresenceEvent{true, true, false}
+    //~ presence_events <- PresenceEvent{true, false, false}    
+    
+
+    eventqueue := make(chan string)
+    defer close(eventqueue)
+    
+       ticker := time.NewTicker(time.Duration(7) * time.Minute)
        go readFromUSocket("/var/run/tuer/presence.socket", eventqueue)
        for {
                select {