С питоновской частью завершено, все мигрировало на lua. Финальный вариант оставим.

[weathermon.git] / weathermon.lua

diff --git a/weathermon.lua b/weathermon.lua
index c97983058796ddaf275bcc6c9417d8d69b6da35a..e4fa3707cef3f534550911689aa73066e1283887 100755 (executable)
--- a/weathermon.lua
+++ b/weathermon.lua
@@ -59,6 +59,9 @@ function getConfig()
   mqtt_topic = cur.get(config,"mqtt","topic")
   mqtt_alarm_topic = cur.get(config,"mqtt","alarm_topic")
 
   mqtt_topic = cur.get(config,"mqtt","topic")
   mqtt_alarm_topic = cur.get(config,"mqtt","alarm_topic")
 

+  mqtt_user = cur.get(config,"mqtt","user")
+  mqtt_passwd = cur.get(config,"mqtt","password")
+

   if mqtt_host and not mqtt_id then
     mqtt_id="weather-"..web_devid
   end
   if mqtt_host and not mqtt_id then
     mqtt_id="weather-"..web_devid
   end


@@ -68,11 +71,11 @@ function getConfig()
   end
 
   if mqtt_host and not mqtt_topic then
   end
 
   if mqtt_host and not mqtt_topic then

-    mqtt_topic = 'weathermon/'..web_devid
+    mqtt_topic = 'weathermon/{dev}/{type}/{id}/{param}'

   end
 
   if mqtt_host and not mqtt_alarm_topic then
   end
 
   if mqtt_host and not mqtt_alarm_topic then

-    mqtt_alarm_topic = 'alarm/'..web_devid
+    mqtt_alarm_topic = 'alarm/{dev}/{type}/{id}'

   end
 
 end
   end
 
 end


@@ -129,14 +132,15 @@ function submitValue(type,id,param,val)
   command = command.." \""..url.."\""
 
   os.execute(command)
   command = command.." \""..url.."\""
 
   os.execute(command)

+  print()

 
 end
 
 function processLine(str)
 
   msg=splitStr(line,':')
 
 end
 
 function processLine(str)
 
   msg=splitStr(line,':')

-  msg_type=msg[1] or nil
-  msg_body=msg[2] or nil
+  msg_type=msg[1] or ''
+  msg_body=msg[2] or ''

   if msg_type=="STATUS" then
     printLog("Status: "..msg_body)
   elseif msg_type=="ERROR" then
   if msg_type=="STATUS" then
     printLog("Status: "..msg_body)
   elseif msg_type=="ERROR" then


@@ -150,8 +154,8 @@ function processLine(str)
     sensor_id = web_devid
     for i,rec in ipairs(sens) do
       recrd=splitStr(rec,'=')
     sensor_id = web_devid
     for i,rec in ipairs(sens) do
       recrd=splitStr(rec,'=')

-      key=recrd[1] or nil
-      value=recrd[2] or nil
+      key=recrd[1] or ''
+      value=recrd[2] or ''

       if value then
         if key=="TYPE" then
           sensor_type=value
       if value then
         if key=="TYPE" then
           sensor_type=value


@@ -162,16 +166,30 @@ function processLine(str)
         end
       end
     end
         end
       end
     end

-    mqtt_param = {}
-    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)
-      mqtt_param[k]=v
-    end
-    mqtt_msg = { type=sensor_type, id=sensor_id, data=mqtt_param }
-    if mqtt_client then
-      serializedString = json.encode(mqtt_msg)
-      mqtt_client:publish(mqtt_topic,serializedString)
+    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)  
     end
   elseif msg_type=="ALARM" then
     printLog("ALARM: "..msg_body)  


@@ -183,29 +201,41 @@ function processLine(str)
     mqtt_param = {}
     for i,rec in ipairs(sens) do
       recrd=splitStr(rec,'=')
     mqtt_param = {}
     for i,rec in ipairs(sens) do
       recrd=splitStr(rec,'=')

-      key=recrd[1] or nil
-      value=recrd[2] or nil
+      key=recrd[1] or ''
+      value=recrd[2] or ''

       if value then
         if key=="TYPE" then
           alarm_type=value
         elseif key=="ID" then
           alarm_id=value
       if value then
         if key=="TYPE" then
           alarm_type=value
         elseif key=="ID" then
           alarm_id=value

-        else
-          mqtt_param[key]=value

         end
       end
     end
         end
       end
     end

-    if mqtt_client then
-      mqtt_msg = { type = alarm_type, id = alarm_id, data = mqtt_param }
-      serializedString = json.encode(mqtt_msg)
-      mqtt_client:publish(mqtt_alarm_topic,serializedString)
-    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,"\"","\\\"").."\""
+        os.execute(command)
+      end
+    else
+      printLog("Cannot parse alarm input: "..msg_body)

     end
   end
 
     end
   end
 


@@ -216,8 +246,10 @@ getConfig()
 if mqtt_host then
   MQTT = require "paho.mqtt"
   mqtt_client = MQTT.client.create(mqtt_host, mqtt_port)
 if mqtt_host then
   MQTT = require "paho.mqtt"
   mqtt_client = MQTT.client.create(mqtt_host, mqtt_port)

+  if mqtt_user then
+    mqtt_client:auth(mqtt_user, mqtt_passwd)
+  end

   mqtt_client:connect(mqtt_id)
   mqtt_client:connect(mqtt_id)

-  json = require( "json" )

 end
 
 if serial_port then
 end
 
 if serial_port then


@@ -237,3 +269,4 @@ while 1 do
   print(line)
   processLine(line)
 end
   print(line)
   processLine(line)
 end

+