Author: titmuss
Date: Sun Jan 27 13:23:05 2008
New Revision: 1650
URL: http://svn.slimdevices.com?rev=1650&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1645): titmuss | 2008-01-27 19:16:45 +0000
Bug: 6761
Description:
Make firmware upgrade applet (at least partly) work on the desktop to make
debugging
easier.
Fix "Try again" option, so it does not leave extra windows on the stack.
Fix zipfilter, so that it aborts if the stream is empty (for example an http
404).
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
trunk/jive/src/pkg/luazipfilter/src/luazipfilter.c
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sun Jan 27 13:23:05 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1641
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1645
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua?rev=1650&root=Jive&r1=1649&r2=1650&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
(original)
+++
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
Sun Jan 27 13:23:05 2008
@@ -16,7 +16,6 @@
local socket = require("socket")
local lfs = require("lfs")
local os = require("os")
-local bsp = require("jiveBSP")
local coroutine = require("coroutine")
local Applet = require("jive.Applet")
@@ -30,7 +29,9 @@
local Textarea = require("jive.ui.Textarea")
local Window = require("jive.ui.Window")
local Popup = require("jive.ui.Popup")
+
local Upgrade = require("applets.SetupFirmwareUpgrade.Upgrade")
+local hasBSP, BSP = pcall(require, "jiveBSP")
local debug = require("jive.utils.debug")
local log =
require("jive.utils.log").logger("applets.setup")
@@ -173,7 +174,11 @@
function _checkBattery()
- return bsp.ioctl(23) == 0 or bsp.ioctl(17) > 830
+ if hasBSP then
+ return BSP.ioctl(23) == 0 or bsp.ioctl(17) > 830
+ else
+ return true
+ end
end
@@ -285,7 +290,9 @@
sound = "WINDOWSHOW",
callback = function()
if
_checkBattery() then
-
self:_upgrade():showInstead()
+
window:hide()
+
self:_upgrade()
+
else
window:bumpRight()
end
Modified: trunk/jive/src/pkg/luazipfilter/src/luazipfilter.c
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/luazipfilter/src/luazipfilter.c?rev=1650&root=Jive&r1=1649&r2=1650&view=diff
==============================================================================
--- trunk/jive/src/pkg/luazipfilter/src/luazipfilter.c (original)
+++ trunk/jive/src/pkg/luazipfilter/src/luazipfilter.c Sun Jan 27 13:23:05 2008
@@ -104,6 +104,12 @@
case PARSE_FILE_HEADER:
DEBUG("PARSE FILE HEADER\n");
+ if (lua_isnil(L, 1)) {
+ /* empty file */
+ lua_pushnil(L);
+ return 1;
+ }
+
if (end - ptr < 30 /* local file header length */) {
lua_pushlstring(L, (const char *)ptr, end -
ptr);
lua_replace(L, lua_upvalueindex(2));
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
