Changeset 5702

Timestamp:

03/01/10 00:44:44 (3 years ago)

Author:

jow

Message:

luci-0.9: merge r5698

Files:

• luci/branches/luci-0.9/libs/ipkg/luasrc/model/ipkg.lua (modified) (3 diffs)

luci/branches/luci-0.9/libs/ipkg/luasrc/model/ipkg.lua

@@ -21 +21 @@
 local pairs = pairs
 local error = error
+local table = table
 
 local ipkg = "opkg"
@@ -31 +32 @@
 local function _action(cmd, ...)
     local pkg = ""
-    arg.n = nil
-    for k, v in pairs(arg) do
+    for k, v in pairs({...}) do
         pkg = pkg .. " '" .. v:gsub("'", "") .. "'"
     end
@@ -148 +148 @@
     return _action("upgrade")
 end
+
+-- List helper
+function _list(action, pat, cb)
+    local fd = io.popen(ipkg .. " " .. action .. (pat and " '*" .. pat:gsub("'", "") .. "*'" or ""))
+    if fd then
+        local name, version, desc
+        while true do
+            local line = fd:read("*l")
+            if not line then break end
+
+            if line:sub(1,1) ~= " " then
+                name, version, desc = line:match("^(.-) %- (.-) %- (.+)")
+
+                if not name then
+                    name, version = line:match("^(.-) %- (.+)")
+                    desc = ""
+                end
+
+                cb(name, version, desc)
+
+                name    = nil
+                version = nil
+                desc    = nil
+            end
+        end
+
+        fd:close()
+    end
+end
+
+--- List all packages known to opkg.
+-- @param pat   Only find packages matching this pattern, nil lists all packages
+-- @param cb    Callback function invoked for each package, receives name, version and description as arguments
+-- @return  nothing
+function list_all(pat, cb)
+    _list("list", pat, cb)
+end
+
+--- List installed packages.
+-- @param pat   Only find packages matching this pattern, nil lists all packages
+-- @param cb    Callback function invoked for each package, receives name, version and description as arguments
+-- @return  nothing
+function list_installed(pat, cb)
+    _list("list_installed", pat, cb)
+end