modules/freifunk: Fix model/system confusion in public_status
[project/luci.git] / modules / freifunk / luasrc / view / freifunk / public_status.htm
index 8948d5e..46bff69 100644 (file)
 <%
+
 local sys = require "luci.sys"
 local twa = require "luci.tools.webadmin"
+
 -- System
-local system, model, memtotal, memcached, membuffers, memfree = sys.sysinfo()
+local model, system, memtotal, memcached, membuffers, memfree, bogomips = sys.sysinfo()
 local uptime = twa.date_format(tonumber(sys.uptime()))
-local_time = os.date("%c")
+local_time = os.date("%a, %d %b %Y, %H:%M:%S")
 local load1, load5, load15 = sys.loadavg()
 local load = string.format("%.2f, %.2f, %.2f", load1, load5, load15)
-local memory = string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
-        tonumber(memtotal) / 1024,
-        100 * memcached / memtotal,
-        tostring(translate("cached")),
-        100 * membuffers / memtotal,
-        tostring(translate("buffered")),
-        100 * memfree / memtotal,
-        tostring(translate("free"))
+
+local mem = string.format(
+       "%.2f MB (%.2f %s, %.2f %s, %.2f %s, %.2f %s)",
+       tonumber(memtotal) / 1024,
+       tonumber(memtotal - memfree) / 1024,
+       tostring(i18n.translate("used")),
+       memfree / 1024,
+       tostring(i18n.translate("free")),
+       memcached / 1024,
+       tostring(i18n.translate("cached")),
+       membuffers / 1024,
+       tostring(i18n.translate("buffered"))
 )
 
+-- update interval
+local bogomips = bogomips or 100
+local interval = 10
+if bogomips > 350 then
+       interval = 5
+end
+
 -- wireless
 local ntm = require "luci.model.network".init()
 local devices  = ntm:get_wifidevs()
 local netlist = { }
 local netdevs = { }
 local dev
+for _, dev in ipairs(devices) do
+       local net
+       for _, net in ipairs(dev:get_wifinets()) do
+               netlist[#netlist+1] = net:ifname()
+               netdevs[net:ifname()] = dev:name()
+       end
+end
 local has_iwinfo = pcall(require, "iwinfo")
 
 -- Routes
 local defroutev4 = sys.net.defaultroute()
-local defroutev6 = sys.net.defaultroute6 ()
+local defroutev6 = sys.net.defaultroute6()
+
+if defroutev4 then
+       defroutev4.dest = defroutev4.dest:string()
+       defroutev4.gateway = defroutev4.gateway:string()
+else
+       local dr4 = sys.exec("ip r s t olsr-default")
+       if dr4 then
+               defroutev4 = { }
+               defroutev4.dest, defroutev4.gateway, defroutev4.device, defroutev4.metric = dr4:match("^(%w+) via (%d+.%d+.%d+.%d+) dev (%w+) +metric (%d+)")
+       end
+end
+
+
+-%>
 
-%>
 <%+header%>
 
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+
+<script type="text/javascript">//<![CDATA[
+       XHR.poll(<%=interval%>, '<%=luci.dispatcher.build_url("freifunk", "status", "public_status_json", table.concat(netlist, ","))%>', null,
+               function(x, st)
+               {
+                       if (st)
+                       {
+                               for( var i = 0; i < st.length; i++ )
+                               {
+                                       var iw = st[i];
+                                       var is_assoc = (iw.bssid && iw.channel);
+                                       var p = (100 / iw.quality_max * iw.quality);
+                                       var q = is_assoc ? p : -1;
+
+                                       var icon;
+                                       if (q < 0)
+                                               icon = "<%=resource%>/icons/signal-none.png";
+                                       else if (q == 0)
+                                               icon = "<%=resource%>/icons/signal-0.png";
+                                       else if (q < 25)
+                                               icon = "<%=resource%>/icons/signal-0-25.png";
+                                       else if (q < 50)
+                                               icon = "<%=resource%>/icons/signal-25-50.png";
+                                       else if (q < 75)
+                                               icon = "<%=resource%>/icons/signal-50-75.png";
+                                       else
+                                               icon = "<%=resource%>/icons/signal-75-100.png";
+
+                                       var power = document.getElementById(iw.id + '-txpower');
+                                       if (power)
+                                               power.innerHTML = String.format('%s dbm', iw.txpower);
+
+                                       var signal = document.getElementById(iw.id + '-signal');
+                                       if (signal)
+                                               signal.innerHTML = String.format(
+                                                       '<img src="%s" title="Signal: %s db / Noise: %s db" alt="Signal Quality" />',
+                                                       icon, iw.signal, iw.noise
+                                               );
+
+                                       var bitrate = document.getElementById(iw.id + '-bitrate');
+                                       if (bitrate)
+                                               bitrate.innerHTML = String.format('%s Mb/s', iw.bitrate ? iw.bitrate / 1000 : '?');
+
+                                       var ssid = document.getElementById(iw.id + '-ssid');
+                                       if (ssid)
+                                               ssid.innerHTML = iw.ssid;
+
+                                       var bssid = document.getElementById(iw.id + '-bssid');
+                                       if (bssid)
+                                               bssid.innerHTML = iw.bssid;
+
+                                       var channel = document.getElementById(iw.id + '-channel');
+                                       if (channel)
+                                               channel.innerHTML = iw.channel;
+
+                                       var mode = document.getElementById(iw.id + '-mode');
+                                       if (mode)
+                                       mode.innerHTML = iw.mode;
+                               }
+
+                               i = st.length - 1
+                               var u
+
+                               if (u = document.getElementById('dynuptime'))
+                                       u.innerHTML = st[i].uptime;
+
+                               if (u = document.getElementById('dynload'))
+                                       u.innerHTML = st[i].load;
+
+                               if (u = document.getElementById('dynmem'))
+                                       u.innerHTML = st[i].mem;
+
+                               if (u = document.getElementById('dyntime'))
+                                       u.innerHTML = st[i].time;
+
+                               if (st[i].defroutev4)
+                               {
+                                       if (u = document.getElementById('v4dst'))
+                                               u.innerHTML = st[i].defroutev4.dest;
+
+                                       if (u = document.getElementById('v4gw'))
+                                               u.innerHTML = st[i].defroutev4.gateway;
+
+                                       if (u = document.getElementById('v4dev'))
+                                               u.innerHTML = st[i].defroutev4.dev;
+
+                                       if (u = document.getElementById('v4metr'))
+                                               u.innerHTML = st[i].defroutev4.metr;
+                               }
+
+                               if (st[i].defroutev6)
+                               {
+                                       if (u = document.getElementById('v6dst'))
+                                               u.innerHTML = st[i].defroutev6.dest;
+
+                                       if (u = document.getElementById('v6gw'))
+                                               u.innerHTML = st[i].defroutev6.gateway;
+
+                                       if (u = document.getElementById('v6dev'))
+                                               u.innerHTML = st[i].defroutev6.dev;
+
+                                       if (u = document.getElementById('v6metr'))
+                                               u.innerHTML = st[i].defroutev6.metr;
+                               }
+                       }
+               }
+       );
+//]]></script>
+
 <div class="cbi-map">
        <h2><%:System%></h2>
        <div class="cbi-section-node">
                <div class="cbi-value"><label class="cbi-value-title"><%:System%></label><div class="cbi-value-field"><%=system%></div></div>
                <div class="cbi-value"><label class="cbi-value-title"><%:Processor%></label><div class="cbi-value-field"><%=model%></div></div>
-               <div class="cbi-value"><label class="cbi-value-title"><%:Load%></label><div class="cbi-value-field"><%=load%></div></div>
-               <div class="cbi-value"><label class="cbi-value-title"><%:Memory%></label><div class="cbi-value-field"><%=memory%></div></div>
-               <div class="cbi-value"><label class="cbi-value-title"><%:Local Time%></label><div class="cbi-value-field"><%=local_time%></div></div>
-               <div class="cbi-value"><label class="cbi-value-title"><%:Uptime%></label><div class="cbi-value-field"><%=uptime%></div></div>
+               <div class="cbi-value"><label class="cbi-value-title"><%:Load%></label><div class="cbi-value-field" id="dynload"><%=load%></div></div>
+               <div class="cbi-value"><label class="cbi-value-title"><%:Memory%></label><div class="cbi-value-field" id="dynmem"><%=mem%></div></div>
+               <div class="cbi-value"><label class="cbi-value-title"><%:Local Time%></label><div class="cbi-value-field" id="dyntime"><%=local_time%></div></div>
+               <div class="cbi-value"><label class="cbi-value-title"><%:Uptime%></label><div class="cbi-value-field" id="dynuptime"><%=uptime%></div></div>
        </div>
 </div>
 
@@ -48,7 +192,7 @@ local defroutev6 = sys.net.defaultroute6 ()
 
 <div class="cbi-map">
        <h2><%:Wireless Overview%></h2>
-       
+
                <% if not has_iwinfo then %>
                        <div class="errorbox">
                                <strong><%:Package libiwinfo required!%></strong><br />
@@ -69,7 +213,7 @@ local defroutev6 = sys.net.defaultroute6 ()
                                                <th class="cbi-section-table-cell"><%:TX%>-<%:Power%></th>
                                                <th class="cbi-section-table-cell"><%:Interface%></th>
                                        </tr>
-       <% 
+       <%
        for _, dev in ipairs(devices) do
        local net
                for _, net in ipairs(dev:get_wifinets()) do
@@ -114,13 +258,13 @@ local defroutev6 = sys.net.defaultroute6 ()
                                local interface = net.iwdata.ifname or "N/A"
        %>
                                                <tr class="cbi-section-table-row cbi-rowstyle-1">
-                                               <td class="cbi-value-field"><%=signal_string%></td>
-                                               <td class="cbi-value-field"><%=bitrate%></td>
-                                               <td class="cbi-value-field"><%=ssid%></td>
-                                               <td class="cbi-value-field"><%=bssid%></td>
-                                               <td class="cbi-value-field"><%=chan%></td>
-                                               <td class="cbi-value-field"><%=mode%></td>
-                                               <td class="cbi-value-field"><%=txpwr%></td>
+                                               <td class="cbi-value-field" id="<%=net:ifname()%>-signal"><%=signal_string%></td>
+                                               <td class="cbi-value-field" id="<%=net:ifname()%>-bitrate"><%=bitrate%></td>
+                                               <td class="cbi-value-field" id="<%=net:ifname()%>-ssid"><%=ssid%></td>
+                                               <td class="cbi-value-field" id="<%=net:ifname()%>-bssid"><%=bssid%></td>
+                                               <td class="cbi-value-field" id="<%=net:ifname()%>-channel"><%=chan%></td>
+                                               <td class="cbi-value-field" id="<%=net:ifname()%>-mode"><%=mode%></td>
+                                               <td class="cbi-value-field" id="<%=net:ifname()%>-txpower"><%=txpwr%></td>
                                                <td class="cbi-value-field"><%=interface%></td>
                                        </tr>
                        <% end
@@ -136,11 +280,11 @@ local defroutev6 = sys.net.defaultroute6 ()
        <h2><%:Default routes%></h2>
                <div class="cbi-section">
                        <div class="cbi-section-node">
-                               <table class="cbi-section-table">
 
 <% if not defroutev4 and not defroutev6 then %>
        <%:No default routes known.%>
 <%else%>
+                               <table class="cbi-section-table">
                                                <tr class="cbi-section-table-titles">
                                                        <th class="cbi-section-table-cell"><%:Network%></th>
                                                        <th class="cbi-section-table-cell"><%:Interface%></th>
@@ -151,28 +295,27 @@ local defroutev6 = sys.net.defaultroute6 ()
        <% if defroutev4 then %>
 
                                                <tr class="cbi-section-table-row cbi-rowstyle-1">
-                                                       <td class="cbi-value-field"><%=defroutev4.dest:string()%></td>
-                                                       <td class="cbi-value-field"><%=defroutev4.device%></td>
-                                                       <td class="cbi-value-field"><%=defroutev4.gateway:string()%></td>
-                                                       <td class="cbi-value-field"><%=defroutev4.metric%></td>
+                                                       <td class="cbi-value-field" id="v4dst"><%=defroutev4.dest%></td>
+                                                       <td class="cbi-value-field" id="v4dev"><%=defroutev4.device%></td>
+                                                       <td class="cbi-value-field" id="v4gw"><%=defroutev4.gateway%></td>
+                                                       <td class="cbi-value-field" id="v4metr"><%=defroutev4.metric%></td>
                                                </tr>
 
        <% end
        if defroutev6 then %>
 
                                                <tr class="cbi-section-table-row cbi-rowstyle-2">
-                                                       <td class="cbi-value-field"><%=defroutev6.dest:string()%></td>
-                                                       <td class="cbi-value-field"><%=defroutev6.device%></td>
-                                                       <td class="cbi-value-field"><%=defroutev6.nexthop:string()%></td>
-                                                       <td class="cbi-value-field"><%=defroutev6.metric%></td>
+                                                       <td class="cbi-value-field" id="v6dst"><%=defroutev6.dest:string()%></td>
+                                                       <td class="cbi-value-field" id="v6dev"><%=defroutev6.device%></td>
+                                                       <td class="cbi-value-field" id="v6gw"><%=defroutev6.nexthop:string()%></td>
+                                                       <td class="cbi-value-field" id="v6metr"><%=defroutev6.metric%></td>
                                                </tr>
 
        <% end %>
 
                                </table>
+<% end %>
                </div>
        </div>
 </div>
-<% end %>
-
 <%+footer%>