From 6aa6b3b7ebae9f295c06d1fa859c1cf9bf2e979b Mon Sep 17 00:00:00 2001 From: Manuel Munz Date: Thu, 10 Feb 2011 14:58:44 +0000 Subject: applications/luci-olsr-services: Move services away from mod-freifunk and make it seperate app instead. --- .../luasrc/controller/services.lua | 17 ++++ .../luasrc/view/freifunk-services/services.htm | 90 ++++++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 applications/luci-olsr-services/luasrc/controller/services.lua create mode 100644 applications/luci-olsr-services/luasrc/view/freifunk-services/services.htm (limited to 'applications/luci-olsr-services/luasrc') diff --git a/applications/luci-olsr-services/luasrc/controller/services.lua b/applications/luci-olsr-services/luasrc/controller/services.lua new file mode 100644 index 000000000..cc1a2f62e --- /dev/null +++ b/applications/luci-olsr-services/luasrc/controller/services.lua @@ -0,0 +1,17 @@ +module "luci.controller.services" + +function index() + local uci = require "luci.model.uci".cursor() + local i18n = luci.i18n.translate + + uci:foreach("olsrd", "LoadPlugin", function(s) + if s.library == "olsrd_nameservice.so.0.3" then + has_serv = true + end + end) + + if has_serv then + entry({"freifunk", "services"}, template("freifunk-services/services"), i18n("Services"), 60) + end +end + diff --git a/applications/luci-olsr-services/luasrc/view/freifunk-services/services.htm b/applications/luci-olsr-services/luasrc/view/freifunk-services/services.htm new file mode 100644 index 000000000..c9385cd57 --- /dev/null +++ b/applications/luci-olsr-services/luasrc/view/freifunk-services/services.htm @@ -0,0 +1,90 @@ +<%+header%> + +<% +local fs = require "luci.fs" +local utl = require "luci.util" + +-- check if nameservice plugin is enabled and where to find the services file +local has_services = false + +local uci = require "luci.model.uci".cursor() +uci:foreach("olsrd", "LoadPlugin", function(s) + if s.library == "olsrd_nameservice.so.0.3" then + if s.services_file and fs.access(s.services_file) then + has_services = true + services_file = s.services_file + else + if fs.access("/var/run/services_olsr") then + has_services = true + services_file = "/var/run/services_olsr" + end + end + end +end) + + +function fetch_services() + local rawdata = fs.readfile(services_file) + + if #rawdata == 0 then + return nil + end + + local data = {} + + local tables = utl.split(utl.trim(rawdata), "\n", nil, true) + -- remove the first 3 lines + table.remove(tables,1) + table.remove(tables,1) + table.remove(tables,1) + + -- store last line in last_update and remove it, then remove another empty line at the end + last_update=table.remove(tables) + table.remove(tables) + + for i, tbl in ipairs(tables) do + local lines = utl.split(tbl, "\n", nil, true) + end + + return tables +end +%> + +<% if has_services then %> +
+

<%:Services%>

+
+
+
+ + + + + + + <% table=fetch_services() + local i = 1 + for k, line in ipairs(table) do + local field = {} + -- split line at # and |, 1=url, 2=proto, 3=description, 4=source + local field = utl.split(line, "[#|]", split, true) + local url,descr,origin = pcdata(field[1]),pcdata(field[3]),pcdata(field[4]) + %> + + + + + <% if i == 1 then i = 0 elseif i == 0 then i = 1 end %> + <%end%> +
<%:Url%><%:Source%>
<%=descr%><%=origin%>
+
+
+
+
+ <%=last_update%> + +<%else%> + <%:No services can be shown, because olsrd is not running or the olsrd-nameservice Plugin is not loaded.%> +<%end%> + +<%+footer%> -- cgit v1.2.3