From ea0ec551e22ddf1252d1b457b831cbadd1970c1e Mon Sep 17 00:00:00 2001 From: Manuel Munz Date: Tue, 6 Mar 2012 18:13:02 +0000 Subject: [PATCH] luci-0.10: olsr-services: Merge r7908 and r7926 --- .../luasrc/view/freifunk-services/services.htm | 175 ++++++++++++++------- 1 file changed, 119 insertions(+), 56 deletions(-) diff --git a/applications/luci-olsr-services/luasrc/view/freifunk-services/services.htm b/applications/luci-olsr-services/luasrc/view/freifunk-services/services.htm index c9385cd57..2928b854d 100644 --- a/applications/luci-olsr-services/luasrc/view/freifunk-services/services.htm +++ b/applications/luci-olsr-services/luasrc/view/freifunk-services/services.htm @@ -1,90 +1,153 @@ -<%+header%> +<%# +LuCI - Lua Configuration Interface + +Copyright 2011 Manuel Munz + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +-%> <% local fs = require "luci.fs" local utl = require "luci.util" - --- check if nameservice plugin is enabled and where to find the services file +local last_update +local i = 1 +local rawdata +local services_file_empty 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 + rawdata = fs.readfile(s.services_file) + else if fs.access("/var/run/services_olsr") then has_services = true - services_file = "/var/run/services_olsr" + rawdata = fs.readfile("/var/run/services_olsr") end end + if rawdata and #rawdata == 0 then + services_file_empty = true + end end end) -function fetch_services() - local rawdata = fs.readfile(services_file) - - if #rawdata == 0 then - return nil - end - - local data = {} +if not has_services or services_file_empty then +%> + <%+header%> +
+ <%:No services can be shown, because olsrd is not running or the olsrd-nameservice Plugin is not loaded.%> + <%+footer%> +<% + return +end +function fetch_services() 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) + -- remove first 3 lines + for i = 1,3 do + table.remove(tables,1) + end -- 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) + return tables +end +local services = fetch_services() - for i, tbl in ipairs(tables) do - local lines = utl.split(tbl, "\n", nil, true) +if luci.http.formvalue("status") == "1" then + local rv = {} + for k, line in ipairs(services) do + local field = utl.split(line, "[#|]", split, true) + local url, proto, descr, origin = pcdata(field[1]), pcdata(field[2]), utl.trim(pcdata(field[3])), pcdata(field[4]) + rv[#rv+1] = { + url = url, + proto = proto, + origin = origin, + descr = descr, + } end - - return tables + luci.http.prepare_content("application/json") + luci.http.write_json(rv) + return end + %> -<% if has_services then %> -
+<%+header%> + + + + + + +

<%: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%> +
+ <%:Internal services%> + + + + + + + + + + + <% + for k, line in ipairs(services) do + local field = {} + -- split line at # and |, 1=url, 2=proto, 3=description, 4=source + local field = utl.split(line, "[#|]", split, true) + local url, proto, descr, origin = pcdata(field[1]), pcdata(field[2]), utl.trim(pcdata(field[3])), pcdata(field[4]) + %> + + + + + + <% i = ((i % 2) + 1) + end %> + +
<%:Url%><%:Protocol%><%:Source%>
<%=descr%><%=proto%><%=origin%>
+
+ <%=last_update%> +
<%+footer%> -- 2.11.0