Some more information on status-page.

Added include/exclude list to the config-page.

git-svn-id: svn://svn.alpinelinux.org/acf/lbu/trunk@596 ab2d0c66-481e-0410-8bed-d214d4d58bed

3 files changed, 64 insertions, 2 deletions

diff --git a/lbu-config-html.lsp b/lbu-config-html.lsp
index 095f6bc..2dba128 100644
--- a/lbu-config-html.lsp
+++ b/lbu-config-html.lsp
@@ -26,6 +26,35 @@
 </select></dd>
 </dl>
 
+<H3>Include/exclude list</H3>
+<dl>
+<dt>Included item(s)</dt>
+<dd><select name="lbu_included" size="3">
+<? for i=1, table.maxn(view.config.lbu_included or {}) do ?>
+<option value="<?= view.config.lbu_included[i] ?>"><?= view.config.lbu_included[i] ?></option>
+<? end ?>
+</select></dd>
+</dl>
+
+<dl>
+<dt>Delete selected include-item</dt>
+<dd><input name="cmd_delete_included" class="submit" type="submit" value="Delete" disabled> (see above)</dd>
+</dl>
+
+<dl>
+<dt>Excluded item(s)</dt>
+<dd><select name="lbu_excluded" size="3">
+<? for i=1, table.maxn(view.config.lbu_excluded or {}) do ?>
+<option value="<?= view.config.lbu_excluded[i] ?>"><?= view.config.lbu_excluded[i] ?></option>
+<? end ?>
+</select></dd>
+</dl>
+
+<dl>
+<dt>Delete selected exclude-item</dt>
+<dd><input name="cmd_delete_excluded" class="submit" type="submit" value="Delete" disabled> (see above)</dd>
+</dl>
+
 <H3>Security/Encryption</H3>
 
 <dl>
@@ -71,7 +100,7 @@
 
 
 <?
----[[ DEBUG INFORMATION
+--[[ DEBUG INFORMATION
 require("debugs")
 io.write(debugs.variables(view))
 --]]
diff --git a/lbu-model.lua b/lbu-model.lua
index 3170736..7757332 100644
--- a/lbu-model.lua
+++ b/lbu-model.lua
@@ -48,18 +48,36 @@ local function getciphers()
 	return opensslciphers
 end
 
+local function getincexl(state)
+	local incexl = {}
+	if (string.lower(state) == "include") or (string.lower(state) == "exclude") then
+		local f = io.popen("/sbin/lbu " .. state .. " -l 2>&1", "r")
+		if not (f) then return ciphers end
+		for line in f:lines() do
+			table.insert(incexl,tostring(line))
+		end
+		f:close()
+	end
+	return incexl
+end
+
 -- ################################################################################
 -- PUBLIC FUNCTIONS
 
 function getstatus ()
+	local path = configfile
 	local status = {}
 	local statustxt = nil
 	local lbustatus = list()
 	if (#lbustatus == 0) then
 		statustxt = "OK! (There is no uncommited files)"
 	else
-		statustxt = "WARNING! (Until you commit, you will loose your changes at next reboot/shutdown!)"
+		statustxt = "WARNING! (Until you commit, you will lose your changes at next reboot/shutdown!)"
 	end
+	local config = getopts.getoptsfromfile(path)
+	status["LBU_MEDIA"] = config["LBU_MEDIA"]
+	status["ENCRYPTION"] = config["ENCRYPTION"]
+	status["DEFAULT_CIPHER"] = config["DEFAULT_CIPHER"]
 	status["version"] = get_version()
 	status["status"] = statustxt
 	return status
@@ -83,6 +101,8 @@ function getconfig ()
 	table.insert(lbumedias, {name="floppy", value="floppy"})
 	table.insert(lbumedias, {name="usb", value="usb"})
 	config = getopts.getoptsfromfile(path)
+	config["lbu_included"]= getincexl("include")
+	config["lbu_excluded"]= getincexl("exclude")
 	config["LBU_MEDIA_LIST"]= lbumedias
 	config["DEFAULT_CIPHER_LIST"]= getciphers()
 --	config["debug"] = getciphers()
diff --git a/lbu-status-html.lsp b/lbu-status-html.lsp
index fad2b2a..b7cd769 100644
--- a/lbu-status-html.lsp
+++ b/lbu-status-html.lsp
@@ -14,6 +14,19 @@
 
 <H2>PROGRAM SPECIFIC OPTIONS/INFORMATION</H2>
 
+<? if (view.status.LBU_MEDIA) then ?>
+<dl>
+<dt>Archives will be saved to</dt>
+<dd><?= view.status.LBU_MEDIA ?></DD>
+</dl>
+<? end ?>
+
+<? if (view.status.ENCRYPTION) then ?>
+<dl>
+<dt>Archives will be encrypted</dt>
+<dd>yes <I>(Using cipher: <?= view.status.DEFAULT_CIPHER or "unknown" ?>)</I></DD>
+</dl>
+<? end ?>
 
 <dl>
 <dt>Files changed since last commit</dt>