Changes in / [1:3]

Files:

• tags/0.1 (added)
• tags/0.1/I_Freebox.xml (added)
• tags/0.1/L_Freebox.lua (added)
• tags/0.1/D_Freebox.json (added)
• tags/0.1/json.lua (added)
• tags/0.1/sha1.lua (added)
• tags/0.1/S_Freebox.xml (added)
• tags/0.1/D_Freebox.xml (added)
• trunk/J_Freebox.js (added)
• trunk/L_Freebox.lua (modified) (10 diffs)
• trunk/D_Freebox.json (modified) (2 diffs)
• trunk/S_Freebox.xml (modified) (1 diff)

/trunk/L_Freebox.lua

@@ -9 +9 @@
 
 
-local PLUGIN_VERSION = "0.1"
+local PLUGIN_VERSION = "0.2"
 
 local THIS_DEVICE = 0
@@ -21 +21 @@
 local settingsPerm = false
 local refreshRate = 0
+local netDevices = nil
 
 local PLUGIN_SID = "urn:freebox-fr:serviceId:Freebox1"
@@ -67 +68 @@
 local function setVarIfChanged(serviceId, name, value, deviceId, default)
     local curValue = luup.variable_get(serviceId, name, deviceId)
-
     if ((value ~= curValue) or (curValue == nil)) then
         luup.variable_set(serviceId, name, value, deviceId)
@@ -74 +74 @@
         return (default or false)
     end
+end
+
+
+local function forceVarChange(serviceId, name, value, deviceId)
+    local curValue = luup.variable_get(serviceId, name, deviceId)
+    if (value == curValue) then
+        luup.variable_set(serviceId, name, "", deviceId)
+    end
+    luup.variable_set(serviceId, name, value, deviceId)
 end
 
@@ -363 +372 @@
 
 local function checkNetworkDevices(checkSession)
-    local devices = {}
-
     if (checkSession) then
         openSession()
@@ -398 +405 @@
             data = getData(request, code, table.concat(result))
             if (data.success) then
+                local devices = {}
                 for i=1,count do
                     local id = data.result[i].id
                     devices[id] = {}
                     devices[id].name = data.result[i].primary_name
-                    local ip = nil
+                    devices[id].mac = ""
+                    if (data.result[i].l2ident ~= nil
+                            and data.result[i].l2ident.type == "mac_address") then
+                        devices[id].mac = data.result[i].l2ident.id
+                    end
+                    devices[id].ip = ""
                     if (data.result[i].l3connectivities ~= nil) then
                         for j=1,5 do
-                            if (data.result[i].l3connectivities[j] == nil) then
+                            if (data.result[i].l3connectivities[j] ~= nil
+                                    and data.result[i].l3connectivities[j].af == "ipv4") then
+                                devices[id].ip = data.result[i].l3connectivities[j].addr
                                 break
-                            end
-                            if (data.result[i].l3connectivities[j].af == "ipv4" or ip == nil) then
-                                ip = data.result[i].l3connectivities[j].addr
                             end
                         end
                     end
-                    if (ip ~= nil) then
-                        devices[id].ip = ip
-                    else
-                        devices[id].ip = "undefined ip"
+                    devices[id].reachable = data.result[i].reachable
+                    if (netDevices ~= nil and netDevices[id] ~= nil and devices[id].mac ~= "") then
+                        if (netDevices[id].reachable and not devices[id].reachable) then
+                            forceVarChange(PLUGIN_SID, "PeripheriqueInjoignable", devices[id].mac, THIS_DEVICE)
+                        elseif (not netDevices[id].reachable and devices[id].reachable) then
+                            forceVarChange(PLUGIN_SID, "PeripheriqueJoignable", devices[id].mac, THIS_DEVICE)
+                        end
                     end
-                    devices[id].reachable = data.result[i].reachable
                 end
+                netDevices = devices
             else
                 log("Echec requête: " .. data.msg .. " ( " .. data.error_code .. " )", 2)
@@ -428 +443 @@
     end
 
-    -- for k, v in pairs(devices) do
-        -- if (v.reachable) then
-            -- log(v.name .. " " .. v.ip .. " joignable")
-        -- else
-            -- log(v.name .. " " .. v.ip .. " injoignable")
-        -- end
-    -- end
+    local xml = "<net_devices>"
+    if (netDevices ~= nil) then
+        for k, v in pairs(netDevices) do
+            if (v.reachable) then
+                xml = xml .. "<device>"
+                xml = xml .. "<name>" .. v.name .. "</name>"
+                xml = xml .. "<ip>" .. v.ip .. "</ip>"
+                xml = xml .. "<mac>" .. v.mac .. "</mac>"
+                xml = xml .. "<reachable>true</reachable>"
+                xml = xml .. "</device>"
+            end
+        end
+        for k, v in pairs(netDevices) do
+            if (not v.reachable) then
+                xml = xml .. "<device>"
+                xml = xml .. "<name>" .. v.name .. "</name>"
+                xml = xml .. "<ip>" .. v.ip .. "</ip>"
+                xml = xml .. "<mac>" .. v.mac .. "</mac>"
+                xml = xml .. "<reachable>false</reachable>"
+                xml = xml .. "</device>"
+            end
+        end
+    end
+    xml = xml .. "</net_devices>"
+    setVarIfChanged(PLUGIN_SID, "PeripheriquesReseau", xml, THIS_DEVICE, false)
 end
 
@@ -643 +676 @@
 local function getRefreshRate()
     local rate = tonumber(luup.variable_get(PLUGIN_SID, "FrequenceMiseAJour", THIS_DEVICE) or "")
-    if (rate == nil or rate < 5) then
+    if (rate == nil or (rate > 0 and rate < 5)) then
         rate = 0
-        setVarIfChanged(PLUGIN_SID, "FrequenceMiseAJour", rate, THIS_DEVICE, false)
+        setVarIfChanged(PLUGIN_SID, "FrequenceMiseAJour", string.format("%d", rate), THIS_DEVICE, false)
     end
     refreshRate = rate
@@ -657 +690 @@
             rate = 0
         end
-        setVarIfChanged(PLUGIN_SID, "FrequenceMiseAJour", rate, THIS_DEVICE, false)
+        setVarIfChanged(PLUGIN_SID, "FrequenceMiseAJour", string.format("%d", rate), THIS_DEVICE, false)
         local oldRate = refreshRate
         refreshRate = rate
@@ -713 +746 @@
     checkLanServer(false)
 
-    --checkNetworkDevices(false)
+    checkNetworkDevices(false)
+
+    -- local devices = luup.variable_get("urn:freebox-fr:serviceId:Freebox1", "PeripheriquesReseau", THIS_DEVICE) or ""
+    -- local mac = ""
+    -- local reachable = devices:match("<mac>"..mac.."</mac><reachable>(.-)</reachable>")
+    -- if (reachable == "true") then
+        -- log(mac .. " joignable")
+    -- elseif (reachable == "false") then
+        -- log(mac .. " injoignable")
+    -- else
+        -- log(mac .. " inconnu")
+    -- end
+    -- local ip = ""
+    -- reachable = devices:match("<ip>"..ip.."</ip>.-<reachable>(.-)</reachable>")
+    -- if (reachable == "true") then
+        -- log(ip .. " joignable")
+    -- elseif (reachable == "false") then
+        -- log(ip .. " injoignable")
+    -- else
+        -- log(ip .. " inconnu")
+    -- end
 
     checkWifi(false)

/trunk/D_Freebox.json

@@ -432 +432 @@
             ]
         },
+        {
+            "Label": {
+                "lang_tag": "tabname_net_devices",
+                "text": "Peripheriques reseau"
+            },
+            "Position": "1",
+            "TabType": "javascript",
+            "ScriptName": "J_Freebox.js",
+            "Function": "showNetDevices"
+        },
         {
             "Label": {
@@ -437 +447 @@
                 "text": "Advanced"
             },
-            "Position": "1",
+            "Position": "2",
             "TabType": "javascript",
             "ScriptName": "shared.js",
             "Function": "advanced_device"
+        },
+        {
+            "Label": {
+                "lang_tag": "logs",
+                "text": "Logs"
+            },
+            "Position": "3",
+            "TabType": "javascript",
+            "ScriptName": "shared.js",
+            "Function": "device_logs"
+        },
+        {
+            "Label": {
+                "lang_tag": "notifications",
+                "text": "Notifications"
+            },
+            "Position": "4",
+            "TabType": "javascript",
+            "ScriptName": "shared.js",
+            "Function": "device_notifications"
         }
     ],
-    "DeviceType": "urn:freebox-fr:device:Freebox:1"
+    "DeviceType": "urn:freebox-fr:device:Freebox:1",
+    "eventList": {
+        "event_1": {
+            "label": "Peripherique devient joignable",
+            "serviceId": "urn:freebox-fr:serviceId:Freebox1",
+            "argumentList" : {
+                "argument_1" : {
+                    "dataType": "string",
+                    "defaultValue": "",
+                    "name": "PeripheriqueJoignable",
+                    "comparisson": "=",
+                    "prefix": "Adresse MAC",
+                    "suffix": ""
+                }
+            }
+        },
+        "event_2": {
+            "label": "Peripherique devient injoignable",
+            "serviceId": "urn:freebox-fr:serviceId:Freebox1",
+            "argumentList" : {
+                "argument_1" : {
+                    "dataType": "string",
+                    "defaultValue": "",
+                    "name": "PeripheriqueInjoignable",
+                    "comparisson": "=",
+                    "prefix": "Adresse MAC",
+                    "suffix": ""
+                }
+            }
+        }
+    },
+    "eventList2": [
+        {
+            "id": 1,
+            "label": {
+                "lang_tag": "device_reachable",
+                "text": "Peripherique devient joignable"
+            },
+            "serviceId": "urn:freebox-fr:serviceId:Freebox1",
+            "argumentList": [
+                {
+                    "id": 1,
+                    "dataType": "string",
+                    "defaultValue": "",
+                    "name": "PeripheriqueJoignable",
+                    "comparisson": "=",
+                    "prefix": {
+                        "lang_tag": "mac_address",
+                        "text": "Adresse MAC"
+                    },
+                    "suffix": {}
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "label": {
+                "lang_tag": "device_unreachable",
+                "text": "Peripherique devient injoignable"
+            },
+            "serviceId": "urn:freebox-fr:serviceId:Freebox1",
+            "argumentList": [
+                {
+                    "id": 1,
+                    "dataType": "string",
+                    "defaultValue": "",
+                    "name": "PeripheriqueInjoignable",
+                    "comparisson": "=",
+                    "prefix": {
+                        "lang_tag": "mac_address",
+                        "text": "Adresse MAC"
+                    },
+                    "suffix": {}
+                }
+            ]
+        }
+    ]
 }

/trunk/S_Freebox.xml

@@ -41 +41 @@
         <dataType>boolean</dataType>
     </stateVariable>
+    <stateVariable>
+        <name>PeripheriquesReseau</name>
+        <sendEventsAttribute>no</sendEventsAttribute>
+        <dataType>string</dataType>
+    </stateVariable>
+    <stateVariable>
+        <name>PeripheriqueJoignable</name>
+        <sendEventsAttribute>yes</sendEventsAttribute>
+        <dataType>string</dataType>
+    </stateVariable>
+    <stateVariable>
+        <name>PeripheriqueInjoignable</name>
+        <sendEventsAttribute>yes</sendEventsAttribute>
+        <dataType>string</dataType>
+    </stateVariable>
+    <stateVariable>
+        <name>PeripheriqueJoignable</name>
+        <sendEventsAttribute>no</sendEventsAttribute>
+        <dataType>string</dataType>
+    </stateVariable>
     <stateVariable sendEvents="no">
       <name>A_ARG_TYPE_frequence</name>
       <dataType>ui4</dataType>
+    </stateVariable>
+    <stateVariable sendEvents="no">
+      <name>A_ARG_TYPE_mac</name>
+      <dataType>string</dataType>
     </stateVariable>
   </serviceStateTable>