summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2013-10-18 19:50:04 +0000
committerTed Trask <ttrask01@yahoo.com>2013-10-18 19:50:04 +0000
commite7d749fe01f73a441e6591dba32feb73cfc74ce0 (patch)
treec6ffc75050b25768cd80a6e13d343153913f0373
parentbc27c1637bf7840d978fcd92390d91d9898351dc (diff)
downloadacf-apk-tools-e7d749fe01f73a441e6591dba32feb73cfc74ce0.tar.bz2
acf-apk-tools-e7d749fe01f73a441e6591dba32feb73cfc74ce0.tar.xz
Remove all calls to 'module' in preparation for move to Lua 5.2
Use mymodule parameter for module definition. This was also helpful in revealing places where the code relied on the global environment.
-rw-r--r--apk-controller.lua27
-rw-r--r--apk-model.lua38
2 files changed, 34 insertions, 31 deletions
diff --git a/apk-controller.lua b/apk-controller.lua
index 5ccd137..70e82bf 100644
--- a/apk-controller.lua
+++ b/apk-controller.lua
@@ -1,45 +1,46 @@
-- the apk controller
+local mymodule = {}
-module (..., package.seeall)
+mymodule.default_action = "loaded"
-default_action = "loaded"
-
-loaded = function(self)
+mymodule.loaded = function(self)
return self.model.get_loaded_packages()
end
-available = function(self)
+mymodule.available = function(self)
return self.model.get_available_packages()
end
-details = function(self)
+mymodule.details = function(self)
return self.model.get_package_details(self.clientdata.package)
end
-delete = function(self)
+mymodule.delete = function(self)
return self.handle_form(self, self.model.get_delete_package, self.model.delete_package, self.clientdata, "Delete", "Delete Package")
end
-install = function(self)
+mymodule.install = function(self)
return self.handle_form(self, self.model.get_install_package, self.model.install_package, self.clientdata, "Install", "Install Package")
end
-upgrade = function(self)
+mymodule.upgrade = function(self)
return self.handle_form(self, self.model.get_upgrade_package, self.model.upgrade_package, self.clientdata, "Upgrade", "Upgrade Package")
end
-cache = function(self)
+mymodule.cache = function(self)
return self.handle_form(self, self.model.get_cache, self.model.update_cache, self.clientdata, "Save", "Edit Cache Settings", "Settings Saved")
end
-expert = function(self)
+mymodule.expert = function(self)
return self.handle_form(self, self.model.get_configfile, self.model.update_configfile, self.clientdata, "Save", "Edit Configuration", "Configuration Saved")
end
-updateall = function(self)
+mymodule.updateall = function(self)
return self.handle_form(self, self.model.get_update_all, self.model.update_all, self.clientdata, "Update All", "Update All Packages")
end
-upgradeall = function(self)
+mymodule.upgradeall = function(self)
return self.handle_form(self, self.model.get_upgrade_all, self.model.upgrade_all, self.clientdata, "Upgrade All", "Upgrade All Packages")
end
+
+return mymodule
diff --git a/apk-model.lua b/apk-model.lua
index db7c8ea..32fa7f4 100644
--- a/apk-model.lua
+++ b/apk-model.lua
@@ -1,5 +1,5 @@
-- acf model for packages (apk)
-module (..., package.seeall)
+local mymodule = {}
modelfunctions = require("modelfunctions")
posix = require("posix")
fs = require("acf.fs")
@@ -144,7 +144,7 @@ end
-- ################################################################################
-- PUBLIC FUNCTIONS
-get_loaded_packages = function()
+mymodule.get_loaded_packages = function()
repo = repository()
toplevel = gettoplevel()
@@ -170,7 +170,7 @@ get_loaded_packages = function()
return cfe({ type="group", value={toplevel=top, dependent=depend}, label="Installed Packages" })
end
-get_available_packages = function()
+mymodule.get_available_packages = function()
repo = repository()
-- available are all except same version installed
local available = cfe({ type="list", value={}, label="Available Packages" })
@@ -187,14 +187,14 @@ get_available_packages = function()
return available
end
-get_delete_package = function(self, clientdata)
+mymodule.get_delete_package = function(self, clientdata)
local result = {}
result.package = cfe({ value=clientdata.package, label="Package" })
return cfe({ type="group", value=result, label="Result of Delete" })
end
-delete_package = function(self, deleterequest)
+mymodule.delete_package = function(self, deleterequest)
deleterequest.descr, deleterequest.errtxt = modelfunctions.run_executable({"apk", "del", deleterequest.value.package.value}, true)
if deleterequest.errtxt == "" then
deleterequest.errtxt = "Failed to delete package."
@@ -205,14 +205,14 @@ delete_package = function(self, deleterequest)
return deleterequest
end
-get_install_package = function(self, clientdata)
+mymodule.get_install_package = function(self, clientdata)
local result = {}
result.package = cfe({ value=clientdata.package, label="Package" })
return cfe({ type="group", value=result, label="Result of Install" })
end
-install_package = function(self, installrequest)
+mymodule.install_package = function(self, installrequest)
installrequest.descr, installrequest.errtxt = modelfunctions.run_executable({"apk", "add", installrequest.value.package.value}, true)
if not installrequest.errtxt then
-- Destroy menu and permissions info in session so recalculated
@@ -222,14 +222,14 @@ install_package = function(self, installrequest)
return installrequest
end
-get_upgrade_package = function(self, clientdata)
+mymodule.get_upgrade_package = function(self, clientdata)
local result = {}
result.package = cfe({ value=clientdata.package, label="Package" })
return cfe({ type="group", value=result, label="Result of Upgrade" })
end
-upgrade_package = function(self, upgraderequest)
+mymodule.upgrade_package = function(self, upgraderequest)
upgraderequest.descr, upgraderequest.errtxt = modelfunctions.run_executable({"apk", "fix", "-u", upgraderequest.value.package.value}, true)
if upgraderequest.errtxt == "" then
upgraderequest.errtxt = "Failed to upgrade package."
@@ -240,13 +240,13 @@ upgrade_package = function(self, upgraderequest)
return upgraderequest
end
-get_update_all = function(self, clientdata)
+mymodule.get_update_all = function(self, clientdata)
local result = {}
return cfe({ type="group", value=result, label="Result of Update" })
end
-update_all = function(self, updaterequest)
+mymodule.update_all = function(self, updaterequest)
updaterequest.descr, updaterequest.errtxt = modelfunctions.run_executable({"apk", "update"}, true)
if updaterequest.errtxt == "" then
updaterequest.errtxt = "Failed to update index."
@@ -255,13 +255,13 @@ update_all = function(self, updaterequest)
return updaterequest
end
-get_upgrade_all = function(self, clientdata)
+mymodule.get_upgrade_all = function(self, clientdata)
local result = {}
return cfe({ type="group", value=result, label="Result of Upgrade" })
end
-upgrade_all = function(self, upgraderequest)
+mymodule.upgrade_all = function(self, upgraderequest)
upgraderequest.descr, upgraderequest.errtxt = modelfunctions.run_executable({"apk", "upgrade", "-U"}, true)
if upgraderequest.errtxt == "" then
upgraderequest.errtxt = "Failed to upgrade packages."
@@ -272,7 +272,7 @@ upgrade_all = function(self, upgraderequest)
return upgraderequest
end
-get_cache = function()
+mymodule.get_cache = function()
local cache = {}
cache.enable = cfe({ type="boolean", value=false, label="Enable Cache" })
cache.directory = cfe({ label="Cache Directory" })
@@ -292,7 +292,7 @@ get_cache = function()
return cfe({ type="group", value=cache, label="Cache Settings" })
end
-update_cache = function(self, cache)
+mymodule.update_cache = function(self, cache)
cache.value.enable.errtxt = nil
if not cache.value.enable.value then
os.remove(cachelink)
@@ -323,15 +323,15 @@ update_cache = function(self, cache)
return cache
end
-get_configfile = function()
+mymodule.get_configfile = function()
return modelfunctions.getfiledetails(configfile)
end
-update_configfile = function(self, newconfig)
+mymodule.update_configfile = function(self, newconfig)
return modelfunctions.setfiledetails(self, newconfig, {configfile})
end
-get_package_details = function(package)
+mymodule.get_package_details = function(package)
repo = repo or repository()
local details = {}
details.package = cfe({ value=package, label="Package" })
@@ -368,3 +368,5 @@ get_package_details = function(package)
end
return cfe({ type="group", value=details, label="Package Details" })
end
+
+return mymodule