diff options
author | Ted Trask <ttrask01@yahoo.com> | 2008-04-25 20:58:56 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2008-04-25 20:58:56 +0000 |
commit | 20b0e779f4524e348f123786688a4dc56a2bfe4f (patch) | |
tree | 5589b7f70ffeed66635fbd70f88578ce44663da5 | |
parent | 4d7ae8ac014de3bb30da89729218e92451660eea (diff) | |
download | acf-apk-tools-20b0e779f4524e348f123786688a4dc56a2bfe4f.tar.bz2 acf-apk-tools-20b0e779f4524e348f123786688a4dc56a2bfe4f.tar.xz |
Added cfe support to apk
git-svn-id: svn://svn.alpinelinux.org/acf/apk/trunk@1047 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r-- | apk-controller.lua | 11 | ||||
-rw-r--r-- | apk-html.lsp | 12 | ||||
-rw-r--r-- | apk-model.lua | 21 |
3 files changed, 20 insertions, 24 deletions
diff --git a/apk-controller.lua b/apk-controller.lua index 669184e..797c444 100644 --- a/apk-controller.lua +++ b/apk-controller.lua @@ -5,24 +5,19 @@ module (..., package.seeall) default_action = "loaded" read = function(self) - local loaded, available = self.model.get_packages() - --local loaded = self.model.get_loaded_packages() - --local available = self.model.get_available_packages() - return ( { loaded = loaded, available=available, self=self } ) + return self.model.get_packages() end - loaded = function(self) -- Get command result out of session data local cmdresult = self.sessiondata.cmdresult self.sessiondata.cmdresult = nil local loaded = self.model.get_loaded_packages() - return ( { loaded = loaded, cmdresult = cmdresult } ) + return cfe({ type="group", value={loaded=loaded, cmdresult=cmdresult} }) end available = function(self) - local available = self.model.get_available_packages() - return ( { available=available } ) + return cfe({ type="group", value={available=self.model.get_available_packages()} }) end delete = function(self) diff --git a/apk-html.lsp b/apk-html.lsp index 81288f4..76334ff 100644 --- a/apk-html.lsp +++ b/apk-html.lsp @@ -7,14 +7,14 @@ io.write("</span>") --]] ?> -<? if form.cmdresult then ?> +<? if form.value.cmdresult then ?> <H1>Command Result</H1> <DL> -<?= form.cmdresult ?> +<?= form.value.cmdresult.value ?> </DL> <? end ?> -<? if form.loaded then ?> +<? if form.value.loaded then ?> <H1>Loaded Packages</H1> <DL> <TABLE> @@ -25,7 +25,7 @@ io.write("</span>") <TD style="white-space:nowrap;" class="header">Description</TD> </TR> -<? for i,packagetable in pairs(form.loaded) do ?> +<? for i,packagetable in pairs(form.value.loaded.option) do ?> <TR> <TD style="padding-right:20px;white-space:nowrap;"> <?= html.link{value = "delete?package=" .. packagetable.name, label="Delete"} ?> @@ -39,7 +39,7 @@ io.write("</span>") </DL> <? end ?> -<? if form.available then ?> +<? if form.value.available then ?> <H1>Available Packages</H1> <DL> <TABLE> @@ -48,7 +48,7 @@ io.write("</span>") <TD style="white-space:nowrap;" WIDTH="90%" class="header">Package Name</TD> </TR> -<? for i,package in pairs(form.available) do ?> +<? for i,package in pairs(form.value.available.option) do ?> <TR> <TD style="padding-right:20px;white-space:nowrap;"> <?= html.link{value = "install?package=" .. package, label="Install"} ?> diff --git a/apk-model.lua b/apk-model.lua index 188f9e8..fd329df 100644 --- a/apk-model.lua +++ b/apk-model.lua @@ -8,7 +8,7 @@ get_all_packages = function() local all = {} for line in f:lines() do all[#all + 1] = line end f:close() - return all + return cfe({ type="select", option=all, name="All Packages"}) end get_loaded_packages = function() @@ -22,27 +22,28 @@ get_loaded_packages = function() temp.version, temp.description = string.match(line, "([^ ]+) %- (.+)") loaded[#loaded+1] = temp end - return loaded + return cfe({ type="select", option=loaded, name="Loaded Packages"}) end -get_available_packages = function(_loaded, _all) +get_available_packages = function(_loaded_cfe, _all_cfe) -- available are all except loaded - local loaded = _loaded or get_loaded_packages() - local all = _all or get_all_packages() + local loaded_cfe = _loaded_cfe or get_loaded_packages() + local all_cfe = _all_cfe or get_all_packages() + local loaded = loaded_cfe.option + local all = all_cfe.option local available = {} local reverseloaded = {} for i,packagetable in ipairs(loaded) do reverseloaded[packagetable.name] = i end for i,package in ipairs(all) do if (reverseloaded[package]==nil) then available[#available + 1] = package end end - return available + return cfe({ type="select", option=available, name="Available Packages" }) end get_packages = function() local loaded = get_loaded_packages() local available = get_available_packages(loaded) - - return loaded, available + return cfe({ type="group", value={loaded=loaded, available=available} }) end delete_package = function(package, sessiondata) @@ -53,7 +54,7 @@ delete_package = function(package, sessiondata) -- Destroy menu and permissions info in session so recalculated if sessiondata then sessiondata.menu = nil end if sessiondata then sessiondata.permissions = nil end - return cmdresult + return cfe({ type="message", value=cmdresult, name="Result of Delete" }) end install_package = function(package,sessiondata) @@ -65,5 +66,5 @@ install_package = function(package,sessiondata) -- Destroy menu and permissions info in session so recalculated if sessiondata then sessiondata.menu = nil end if sessiondata then sessiondata.permissions = nil end - return cmdresult + return cfe({ type="message", value=cmdresult, name="Result of Install" }) end |