diff options
| -rw-r--r-- | modules/luci-base/luasrc/model/ipkg.lua | 15 | ||||
| -rw-r--r-- | modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm | 7 |
2 files changed, 13 insertions, 9 deletions
diff --git a/modules/luci-base/luasrc/model/ipkg.lua b/modules/luci-base/luasrc/model/ipkg.lua index 41633c43d7..2ed92ca706 100644 --- a/modules/luci-base/luasrc/model/ipkg.lua +++ b/modules/luci-base/luasrc/model/ipkg.lua @@ -127,15 +127,15 @@ local function _list(action, pat, cb) (pat and (" '%s'" % pat:gsub("'", "")) or "")) if fd then - local name, version, desc + local name, version, sz, desc while true do local line = fd:read("*l") if not line then break end - name, version, desc = line:match("^(.-) %- (.-) %- (.+)") + name, version, sz, desc = line:match("^(.-) %- (.-) %- (.-) %- (.+)") if not name then - name, version = line:match("^(.-) %- (.+)") + name, version, sz = line:match("^(.-) %- (.-) %- (.+)") desc = "" end @@ -143,10 +143,11 @@ local function _list(action, pat, cb) version = version:sub(1,21) .. ".." .. version:sub(-3,-1) end - cb(name, version, desc) + cb(name, version, sz, desc) name = nil version = nil + sz = nil desc = nil end @@ -155,15 +156,15 @@ local function _list(action, pat, cb) end function list_all(pat, cb) - _list("list", pat, cb) + _list("list --size", pat, cb) end function list_installed(pat, cb) - _list("list_installed", pat, cb) + _list("list_installed --size", pat, cb) end function find(pat, cb) - _list("find", pat, cb) + _list("find --size", pat, cb) end diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm index 1ceda47852..fe2fe04366 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm @@ -132,7 +132,7 @@ end <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> - <% local empty = true; luci.model.ipkg.list_installed(querypat, function(n, v, d) empty = false; filter[n] = true %> + <% local empty = true; luci.model.ipkg.list_installed(querypat, function(n, v, s, d) empty = false; filter[n] = true %> <tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>"> <td style="text-align:left; width:10%"><a onclick="return window.confirm('<%:Remove%> "<%=luci.util.pcdata(n)%>" ?')" href="<%=REQUEST_URI%>?submit=1&remove=<%=luci.util.pcdata(n)%>"><%:Remove%></a></td> <td style="text-align:left"><%=luci.util.pcdata(n)%></td> @@ -164,13 +164,15 @@ end <th class="cbi-section-table-cell" style="text-align:left"> </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:right"><%:Size (.ipk)%></th> <th class="cbi-section-table-cell" style="text-align:left"><%:Description%></th> </tr> - <% local empty = true; opkg_list(querypat or letterpat, function(n, v, d) if filter[n] then return end; empty = false %> + <% local empty = true; opkg_list(querypat or letterpat, function(n, v, s, d) if filter[n] then return end; empty = false %> <tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>"> <td style="text-align:left; width:10%"><a onclick="return window.confirm('<%:Install%> "<%=luci.util.pcdata(n)%>" ?')" href="<%=REQUEST_URI%>?submit=1&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:right"><%=luci.util.pcdata(s)%></td> <td style="text-align:left"><%=luci.util.pcdata(d)%></td> </tr> <% end) %> @@ -179,6 +181,7 @@ end <td style="text-align:left"> </td> <td style="text-align:left"><em><%:none%></em></td> <td style="text-align:left"><em><%:none%></em></td> + <td style="text-align:right"><em><%:none%></em></td> <td style="text-align:left"><em><%:none%></em></td> </tr> <% end %> |