modules/admin-full: merge rewritten package management from luci-0.9

2 files changed, 128 insertions, 105 deletions

diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index d420b2427..d3afead40 100644
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -41,90 +41,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 0f2f2e2ab..a1a8d698f 100644
--- a/modules/admin-full/luasrc/view/admin_system/packages.htm
+++ b/modules/admin-full/luasrc/view/admin_system/packages.htm
@@ -1,7 +1,7 @@
 <%#
 LuCI - Lua Configuration Interface
 Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@ $Id$
 -%>
 <%-
 local bit = require "bit"
+local opkg = require "luci.model.ipkg"
+local fs = require "nixio.fs"
+local wa = require "luci.tools.webadmin"
 local rowcnt = 1
 
 function rowstyle()
@@ -25,30 +28,18 @@ function opkg_error(code)
 	code = bit.rshift(tonumber(code), 8)
 	return translate("OPKG error code %i" % code)
 end
+
+local fstat = fs.statvfs(opkg.overlay_root())
+local space_total = fstat and fstat.blocks or 0
+local space_free  = fstat and fstat.bfree  or 0
+local space_used  = space_total - space_free
+
+local used_perc = math.floor(0.5 + ((space_total > 0) and ((100 / space_total) * space_used) or 100))
+local free_byte = space_free * fstat.frsize
+
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:System%></a></h2>
-<h3><%:Software%></h3>
-
-<br />
-
-<% if install or remove or update or upgrade then %>
-<div class="code"><strong><%:Status%>:</strong><br />
-<% if update then %>
-	<%:Package lists updated%>: <% if update == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(update)%>)</span><% end %><br />
-<% end %>
-<% if upgrade then%>
-	<%:Upgrade installed packages%>: <% 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 %>
-	<%: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 %>
-	<%: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%> - <%:Software%></a></h2>
 
 <form method="post" action="<%=REQUEST_URI%>">
 	<div class="cbi-map">
@@ -59,47 +50,106 @@ end
 			</ul>
 			<br />
 			<fieldset class="cbi-section-node">
-			<div class="cbi-value">
-				<label class="cbi-value-title"><%:Download and install package%>:</label>
-				<div class="cbi-value-field">
-					<input type="text" name="url" size="30" value="" />
-					<input class="cbi-input-save" type="submit" name="submit" value="<%:OK%>" />
+				<div class="cbi-value">
+					<label class="cbi-value-title"><%:Download and install package%>:</label>
+					<div class="cbi-value-field">
+						<input type="text" name="url" size="30" value="" />
+						<input class="cbi-input-save" type="submit" name="submit" value="<%:OK%>" />
+					</div>
 				</div>
-			</div>
 
-			<div class="cbi-value">
-				<label class="cbi-value-title"><%:Filter%>:</label>
-				<div class="cbi-value-field">
-					<input type="text" name="query" size="20" value="<%=query%>" />
-					<input type="submit" class="cbi-input-find" name="search" value="<%:Find package%>" />
+				<div class="cbi-value">
+					<label class="cbi-value-title"><%:Filter%>:</label>
+					<div class="cbi-value-field">
+						<input type="text" name="query" size="20" value="<%=query%>" />
+						<input type="submit" class="cbi-input-find" name="search" value="<%:Find package%>" />
+					</div>
 				</div>
+			</fieldset>
+		</fieldset>
+		<br />
+
+		<h3><%:Status%></h3>
+		<fieldset class="cbi-section">
+			<%:Free space%>: <strong><%=(100-used_perc)%>%</strong> (<strong><%=wa.byte_format(free_byte)%></strong>)
+			<div style="margin:3px 0; width:300px; height:10px; border:1px solid #000000; background-color:#80C080">
+				<div style="background-color:#F08080; border-right:1px solid #000000; height:100%; width:<%=used_perc%>%">&nbsp;</div>
 			</div>
 
-			<table class="cbi-section-table">
+			<% if (install and next(install)) or (remove and next(remove)) or update or upgrade then %>
+				<br /><hr /><br />
+				<% if update then %>
+					<%:Package lists updated%>: <% if update == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(update)%>)</span><% end %><br />
+				<% end %>
+				<% if upgrade then%>
+					<%:Upgrade installed packages%>: <% 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 %>
+					<%: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 %>
+					<%:Remove%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(v)%>)</span><% end %><br />
+				<% end end %>
+			<% end %>
+		</fieldset>
+		<br />
+
+		<h3><%:Installed packages%><% if query then %> (<%=luci.util.pcdata(query)%>)<% end %></h3>
+
+		<fieldset class="cbi-section">
+			<table class="cbi-section-table" style="width:100%">
 				<tr class="cbi-section-table-titles">
-					<th class="cbi-section-table-cell"><%:Package 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"><%:Description%></th>
+					<th class="cbi-section-table-cell" style="text-align:left">&nbsp;</th>
+					<th class="cbi-section-table-cell" style="text-align:left"><%:Package 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 %><%:not installed%><% end %></td>
-					<td><%=luci.util.pcdata(pkg.Description)%></td>
+					<td style="text-align:left; width:10%"><a onclick="return window.confirm('<%:Remove%> &quot;<%=luci.util.pcdata(n)%>&quot; ?')" href="<%=REQUEST_URI%>?submit=1&amp;remove=<%=luci.util.pcdata(n)%>"><%:Remove%></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 />
 
-			<br />
 
-			<div style="text-align: right">
-				<input type="submit" class="cbi-input-apply" name="submit" value="<%:Perform Actions%>" />
-			</div>
-		</fieldset></fieldset>
+		<h3><%:Available packages%><% if query then %> (<%=luci.util.pcdata(query)%>)<% end %></h3>
+
+		<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"><%:Package name%></th>
+					<th class="cbi-section-table-cell" style="text-align:left"><%:Version%></th>
+					<th class="cbi-section-table-cell" style="text-align:left"><%:Description%></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 onclick="return window.confirm('<%:Install%> &quot;<%=luci.util.pcdata(n)%>&quot; ?')" 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%>