X-Git-Url: https://git.rvb.name/weathermon.git/blobdiff_plain/43054b4dc0965871a36730c619ee2cde76540a38..817101e336c2e0812345e8583aed2dae3007c5be:/weathermon.lua

diff --git a/weathermon.lua b/weathermon.lua
index d1917c1..af38729 100755
--- a/weathermon.lua
+++ b/weathermon.lua
@@ -1,10 +1,55 @@
 #!/usr/bin/lua
 
-function getConfig()
+require("json")
+require("socket")
+
+function startswith(String,Start)
+   if String then
+     return string.sub(String,1,string.len(Start))==Start
+   else
+     return False
+   end    
+end
+
+function url_encode(str)
+  if (str) then
+    str = string.gsub (str, "\n", "\r\n")
+    str = string.gsub (str, "([^%w %-%_%.%~])",
+        function (c) return string.format ("%%%02X", string.byte(c)) end)
+    str = string.gsub (str, " ", "+")
+  end
+  return str	
+end
+
+function capture(cmd, raw)
+  local f = assert(io.popen(cmd, 'r'))
+  local s = assert(f:read('*a'))
+  f:close()
+  if raw then return s end
+  s = string.gsub(s, '^%s+', '')
+  s = string.gsub(s, '%s+$', '')
+  s = string.gsub(s, '[\n\r]+', ' ')
+  return s
+end
+
+function mqtt_encode(str)
+  if (str) then
+    str = string.gsub (str, "\n", "")
+    str = string.gsub (str, "/", "-")
+  end
+  return str	
+end
+
+function getConfig(configname)
 
   local uci=require("uci")
   local cur=uci.cursor()
-  local config="weathermon"
+  local config
+  if configname then
+    config=configname
+  else
+    config="weathermon"
+  end
 
   web_url  = cur.get(config,"web","url")
   web_user = cur.get(config,"web","user")
@@ -49,7 +94,7 @@ function getConfig()
   if serial_port then
 
     command = "stty -F  "..serial_port.." "..serial_baud
-    os.execute(command)
+    capture(command)
 
   end
 
@@ -80,8 +125,6 @@ function getConfig()
 
 end
 
-require "socket"
-
 function sleep(sec)
   socket.select(nil, nil, sec)
 end
@@ -91,7 +134,6 @@ function splitStr(str,char)
   local res = {}
   local idx = 1
 
-
   while str:len()>0 do
     pos = str:find(char); 
     if pos == nil then
@@ -109,15 +151,16 @@ function splitStr(str,char)
 end
 
 function printLog(str)
-  print(str)
   if logging=="on" then
-    os.execute("logger -t weathermon "..str)
+    capture("logger -t weathermon "..str)
+  else 
+    print(str)  
   end 
 end
 
 function submitValue(type,id,param,val)
 
-  url = web_url.."?stype="..type.."&sid="..id.."&param="..param.."&value="..val
+  url = web_url.."?stype="..url_encode(type).."&sid="..url_encode(id).."&param="..url_encode(param).."&value="..url_encode(val)
 
   command = "curl"
 
@@ -131,8 +174,55 @@ function submitValue(type,id,param,val)
 
   command = command.." \""..url.."\""
 
-  os.execute(command)
-  print()
+  result = capture(command)
+
+end
+
+function processJson(str)
+
+  msg=json.decode(str)
+
+  sensor={}
+
+  for key,value in pairs(msg) do
+    if value then
+      if key=="model" then
+        sensor_type=value
+      elseif key=="id" then
+        sensor_id=value
+      elseif key=='time' then
+        sensor_time=value
+      else
+        sensor[key]=value
+      end
+    end
+  end
+
+  if not (sensor_type==nil or sensor_id==nil or sensor_type=='' or sensor_id=='') then
+    for k,v in pairs(sensor) do
+      printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..k..", Value = "..v)
+      submitValue(sensor_type,sensor_id,k,v)
+      if mqtt_client then
+        mqtt_path=string.gsub(mqtt_topic,"{(.-)}", 
+          function (name) 
+            if name=="dev" then
+              return mqtt_encode(web_devid)
+            elseif name=="type" then
+              return mqtt_encode(sensor_type)
+            elseif name=="id" then
+              return mqtt_encode(sensor_id)
+            elseif name=="param" then
+              return k
+            else
+              return '{'..name..'}'
+            end      
+          end)
+        mqtt_client:publish(mqtt_path,v)
+      end  
+    end
+  else
+    printLog("Cannot parse sensor input: "..msg_body)
+  end
 
 end
 
@@ -166,26 +256,30 @@ function processLine(str)
         end
       end
     end
-    for k,v in pairs(sensor) do
-      printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..k..", Value = "..v)
-      submitValue(sensor_type,sensor_id,k,v)
-      if mqtt_client then
-        mqtt_path=string.gsub(mqtt_topic,"{(.-)}", 
-          function (name) 
-            if name=="dev" then
-              return web_devid
-            elseif name=="type" then
-              return sensor_type
-            elseif name=="id" then
-              return sensor_id
-            elseif name=="param" then
-              return k
-            else
-              return '{'..name..'}'
-            end      
-          end)
-        mqtt_client:publish(mqtt_path,v)
-      end  
+    if not (sensor_type==nil or sensor_id==nil or sensor_type=='' or sensor_id=='') then
+      for k,v in pairs(sensor) do
+        printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..k..", Value = "..v)
+        submitValue(sensor_type,sensor_id,k,v)
+        if mqtt_client then
+          mqtt_path=string.gsub(mqtt_topic,"{(.-)}", 
+            function (name) 
+              if name=="dev" then
+                return web_devid
+              elseif name=="type" then
+                return sensor_type
+              elseif name=="id" then
+                return sensor_id
+              elseif name=="param" then
+                return k
+              else
+                return '{'..name..'}'
+              end      
+            end)
+          mqtt_client:publish(mqtt_path,v)
+        end  
+      end
+    else
+      printLog("Cannot parse sensor input: "..msg_body)
     end
   elseif msg_type=="ALARM" then
     printLog("ALARM: "..msg_body)  
@@ -207,33 +301,37 @@ function processLine(str)
         end
       end
     end
-    if mqtt_client then
-      mqtt_path=string.gsub(mqtt_alarm_topic,"{(.-)}", 
-        function (name) 
-          if name=="dev" then
-            return web_devid
-          elseif name=="type" then
-            return sensor_type
-          elseif name=="id" then
-            return sensor_id
-          else
-            return '{'..name..'}'
-          end      
-        end)
-      mqtt_client:publish(mqtt_path,msg_body)
-    end
-    if alarm_exec then
-      command=alarm_exec..
-        " \""..string.gsub(alarm_type,"\"","\\\"")..
-        "\" \""..string.gsub(alarm_id,"\"","\\\"")..
-        "\" \""..string.gsub(msg_body,"\"","\\\"").."\""
-      os.execute(command)
+    if not (alarm_type==nil or alarm_id==nil or alarm_type=='' or alarm_id=='') then
+      if mqtt_client then
+        mqtt_path=string.gsub(mqtt_alarm_topic,"{(.-)}", 
+          function (name) 
+            if name=="dev" then
+              return web_devid
+            elseif name=="type" then
+              return sensor_type
+            elseif name=="id" then
+              return sensor_id
+            else
+              return '{'..name..'}'
+            end      
+          end)
+        mqtt_client:publish(mqtt_path,msg_body)
+      end
+      if alarm_exec then
+        command=alarm_exec..
+          " \""..string.gsub(alarm_type,"\"","\\\"")..
+          "\" \""..string.gsub(alarm_id,"\"","\\\"")..
+          "\" \""..string.gsub(msg_body,"\"","\\\"").."\""
+        capture(command)
+      end
+    else
+      printLog("Cannot parse alarm input: "..msg_body)
     end
   end
 
 end
 
-getConfig()
+getConfig(arg[1])
 
 if mqtt_host then
   MQTT = require "paho.mqtt"
@@ -242,7 +340,6 @@ if mqtt_host then
     mqtt_client:auth(mqtt_user, mqtt_passwd)
   end
   mqtt_client:connect(mqtt_id)
-  json = require( "json" )
 end
 
 if serial_port then
@@ -259,6 +356,13 @@ else
 end  
 while 1 do
   line=serialin:read()
-  print(line)
-  processLine(line)
+  if line == nil then
+    break
+  end
+  printLog("Received: "..line);
+  if startswith(line,'{') then
+    processJson(line)
+  else
+    processLine(line)
+  end
 end