luci-0.9: rewrite package management to be less OOM prone

diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index a273ff3..f86fa04 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -38,90 +38,63 @@ end
 
 function action_packages()
        local ipkg = require("luci.model.ipkg")
-       local void = nil
        local submit = luci.http.formvalue("submit")
        local changes = false
-       
-       
+       local install = { }
+       local remove  = { }
+
        -- Search query
        local query = luci.http.formvalue("query")
        query = (query ~= '') and query or nil
        
        
        -- Packets to be installed
-       local install = submit and luci.http.formvaluetable("install")
-       
+       local ninst = submit and luci.http.formvalue("install")
+       local uinst = nil       
+
        -- Install from URL
        local url = luci.http.formvalue("url")
        if url and url ~= '' and submit then
-               if not install then
-                       install = {}
-               end
-               install[url] = 1
-               changes = true
+               uinst = url
        end
-       
+
        -- Do install
-       if install then
-               for k, v in pairs(install) do
-                       void, install[k] = ipkg.install(k)
-               end
+       if ninst then
+               _, install[ninst] = ipkg.install(ninst)
                changes = true
        end
-       
-       
+
+       if uinst then
+               _, install[uinst] = ipkg.install(uinst)
+               changes = true
+       end
+
        -- Remove packets
-       local remove = submit and luci.http.formvaluetable("remove")
-       if remove then  
-               for k, v in pairs(remove) do
-                       void, remove[k] = ipkg.remove(k)
-               end
+       local rem = submit and luci.http.formvalue("remove")
+       if rem then     
+               _, remove[rem] = ipkg.remove(rem)
                changes = true
        end
-       
+
        
        -- Update all packets
        local update = luci.http.formvalue("update")
        if update then
-               void, update = ipkg.update()
+               _, update = ipkg.update()
        end
        
        
        -- Upgrade all packets
        local upgrade = luci.http.formvalue("upgrade")
        if upgrade then
-               void, upgrade = ipkg.upgrade()
+               _, upgrade = ipkg.upgrade()
        end
+
        
-       
-       -- Package info
-       local info = luci.model.ipkg.info(query and "*"..query.."*")
-       info = info or {}
-       local pkgs = {}
-       
-       -- Sort after status and name
-       for k, v in pairs(info) do
-               local x = 0
-               for i, j in pairs(pkgs) do
-                       local vins = (v.Status and v.Status.installed)
-                       local jins = (j.Status and j.Status.installed)
-                       if vins ~= jins then
-                               if vins then
-                                       break
-                               end
-                       else
-                               if j.Package > v.Package then
-                                       break
-                               end
-                       end
-                       x = i
-               end
-               table.insert(pkgs, x+1, v)
-       end 
-       
-       luci.template.render("admin_system/packages", {pkgs=pkgs, query=query,
-        install=install, remove=remove, update=update, upgrade=upgrade})
-        
+       luci.template.render("admin_system/packages", {
+               query=query, install=install, remove=remove, update=update, upgrade=upgrade
+       })
+ 
        -- Remove index cache
        if changes then
                nixio.fs.unlink("/tmp/luci-indexcache")

diff --git a/modules/admin-full/luasrc/view/admin_system/packages.htm b/modules/admin-full/luasrc/view/admin_system/packages.htm
index 5cd9f63..8cba08a 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_system/packages.htm
+++ b/modules/admin-full/luasrc/view/admin_system/packages.htm
@@ -30,28 +30,7 @@ function opkg_error(code)
 end
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:system%></a></h2>
-<h3><%:a_s_packages%></h3>
-
-<br />
-
-<% if install or remove or update or upgrade then %>
-<div class="code"><strong><%:status%>:</strong><br />
-<% if update then %>
-       <%:a_s_packages_update%>: <% if update == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%=opkg_error(update)%>)</span><% end %><br />
-<% end %>
-<% if upgrade then%>
-       <%:a_s_packages_upgrade%>: <% if upgrade == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%=opkg_error(upgrade)%>)</span><% end %><br />
-<% end %>
-<% if install then for k,v in pairs(install) do %>
-       <%:a_s_packages_install%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%=opkg_error(v)%>)</span><% end %><br />
-<% end end %>
-<% if remove then for k,v in pairs(remove) do %>
-       <%:a_s_packages_remove%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%=opkg_error(v)%>)</span><% end %><br />
-<% end end %>
-</div>
-<br />
-<% end %>
+<h2><a id="content" name="content"><%:system%> - <%:a_s_packages%></a></h2>
 
 <form method="post" action="<%=REQUEST_URI%>">
        <div class="cbi-map">
@@ -77,32 +56,83 @@ end
                                        <input type="submit" class="cbi-input-find" name="search" value="<%:a_s_packages_search%>" />
                                </div>
                        </div>
+                       </fieldset>
+               </fieldset>
+
+               <% if (install and next(install)) or (remove and next(remove)) or update or upgrade then %>
+               <h2><%:status%></h2>
+               <fieldset class="cbi-section">
+                       <% if update then %>
+                               <%:a_s_packages_update%>: <% if update == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%=opkg_error(update)%>)</span><% end %><br />
+                       <% end %>
+                       <% if upgrade then%>
+                               <%:a_s_packages_upgrade%>: <% if upgrade == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%=opkg_error(upgrade)%>)</span><% end %><br />
+                       <% end %>
+                       <% if install then for k,v in pairs(install) do %>
+                               <%:a_s_packages_install%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%=opkg_error(v)%>)</span><% end %><br />
+                       <% end end %>
+                       <% if remove then for k,v in pairs(remove) do %>
+                               <%:a_s_packages_remove%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%=opkg_error(v)%>)</span><% end %><br />
+                       <% end end %>
+               </fieldset>
+               <br />
+               <% end %>
+
+               <h2><%:a_s_packages_installed Installed packages%><% if query then %> (<%=luci.util.pcdata(query)%>)<% end %></h2>
 
-                       <table class="cbi-section-table">
+               <fieldset class="cbi-section">
+                       <table class="cbi-section-table" style="width:100%">
                                <tr class="cbi-section-table-titles">
-                                       <th class="cbi-section-table-cell"><%:a_s_packages_name%></th>
-                                       <th class="cbi-section-table-cell"><%:version%></th>
-                                       <th class="cbi-section-table-cell"><%:install%></th>
-                                       <th class="cbi-section-table-cell"><%:delete%></th>
-                                       <th class="cbi-section-table-cell"><%:descr%></th>
+                                       <th class="cbi-section-table-cell" style="text-align:left">&nbsp;</th>
+                                       <th class="cbi-section-table-cell" style="text-align:left"><%:a_s_packages_name%></th>
+                                       <th class="cbi-section-table-cell" style="text-align:left"><%:version%></th>
                                </tr>
-                               <% for k, pkg in pairs(pkgs) do %>
+                               <% local empty = true; luci.model.ipkg.list_installed(query, function(n, v, d) empty = false %>
                                <tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>">
-                                       <td><%=luci.util.pcdata(pkg.Package)%></td>
-                                       <td><%=luci.util.pcdata(pkg.Version)%></td>
-                                       <td><% if not pkg.Status or not pkg.Status.installed then %><input type="checkbox" name="install.<%=pkg.Package%>" value="1" /><% else %><%:installed%><% end %></td>
-                                       <td><% if pkg.Status and pkg.Status.installed then %><input type="checkbox" name="remove.<%=pkg.Package%>" value="1" /><% else %><%:notinstalled%><% end %></td>
-                                       <td><%=luci.util.pcdata(pkg.Description)%></td>
+                                       <td style="text-align:left; width:10%"><a href="<%=REQUEST_URI%>?submit=1&amp;remove=<%=luci.util.pcdata(n)%>"><%:delete%></a></td>
+                                       <td style="text-align:left"><%=luci.util.pcdata(n)%></td>
+                                       <td style="text-align:left"><%=luci.util.pcdata(v)%></td>
+                               </tr>
+                               <% end) %>
+                               <% if empty then %>
+                               <tr class="cbi-section-table-row">
+                                       <td style="text-align:left">&nbsp;</td>
+                                       <td style="text-align:left"><em><%:none%></em></td>
+                                       <td style="text-align:left"><em><%:none%></em></td>
                                </tr>
                                <% end %>
                        </table>
+               </fieldset>
 
-                       <br />
 
-                       <div style="text-align: right">
-                               <input type="submit" class="cbi-input-apply" name="submit" value="<%:a_s_packages_do%>" />
-                       </div>
-               </fieldset></fieldset>
+               <h2><%:a_s_packages_available Available packages%><% if query then %> (<%=luci.util.pcdata(query)%>)<% end %></h2>
+
+               <fieldset class="cbi-section">
+                       <table class="cbi-section-table" style="width:100%">
+                               <tr class="cbi-section-table-titles">
+                                       <th class="cbi-section-table-cell" style="text-align:left">&nbsp;</th>
+                                       <th class="cbi-section-table-cell" style="text-align:left"><%:a_s_packages_name%></th>
+                                       <th class="cbi-section-table-cell" style="text-align:left"><%:version%></th>
+                                       <th class="cbi-section-table-cell" style="text-align:left"><%:descr%></th>
+                               </tr>
+                               <% local empty = true; luci.model.ipkg.list_all(query, function(n, v, d) empty = false %>
+                               <tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>">
+                                       <td style="text-align:left; width:10%"><a href="<%=REQUEST_URI%>?submit=1&amp;install=<%=luci.util.pcdata(n)%>"><%:install%></a></td>
+                                       <td style="text-align:left"><%=luci.util.pcdata(n)%></td>
+                                       <td style="text-align:left"><%=luci.util.pcdata(v)%></td>
+                                       <td style="text-align:left"><%=luci.util.pcdata(d)%></td>
+                               </tr>
+                               <% end) %>
+                               <% if empty then %>
+                               <tr class="cbi-section-table-row">
+                                       <td style="text-align:left">&nbsp;</td>
+                                       <td style="text-align:left"><em><%:none%></em></td>
+                                       <td style="text-align:left"><em><%:none%></em></td>
+                                       <td style="text-align:left"><em><%:none%></em></td>
+                               </tr>
+                               <% end %>
+                       </table>
+               </fieldset>
        </div>
 </form>
 <%+footer%>