Author: titmuss
Date: Mon Jan 28 14:13:54 2008
New Revision: 1662
URL: http://svn.slimdevices.com?rev=1662&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1659): andy | 2008-01-28 18:36:12 +0000
Bug 6828, support a relative firmware URL from SC
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Jan 28 14:13:54 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1656
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1659
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/SetupFirmwareUpgradeMeta.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua?rev=1662&root=Jive&r1=1661&r2=1662&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
(original)
+++
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Mon Jan 28 14:13:54 2008
@@ -39,9 +39,19 @@
log:warn(err)
return
end
+
+ if not meta.player then
+ log:warn("Firmware upgrade response but not
connected to server")
+ return
+ end
-- store firmware upgrade url
- if chunk.data.firmwareUrl then
+ -- Bug 6828, use a relative URL from SC to handle
dual-homed servers
+ if chunk.data.relativeFirmwareUrl then
+ local ip, port =
meta.player.slimServer:getIpPort()
+ upgradeUrl[1] = 'http://' .. ip .. ':' .. port
.. chunk.data.relativeFirmwareUrl
+ log:info("Relative Firmware URL=",
upgradeUrl[1])
+ elseif chunk.data.firmwareUrl then
upgradeUrl[1] = chunk.data.firmwareUrl
log:info("Firmware URL=", upgradeUrl[1])
end
@@ -52,9 +62,7 @@
local applet =
appletManager:loadApplet("SetupFirmwareUpgrade")
applet:forceUpgrade(upgradeUrl[1])
- if meta.player then
-
meta.player.slimServer.comet:unsubscribe('/slim/firmwarestatus/' ..
meta.player.id)
- end
+
meta.player.slimServer.comet:unsubscribe('/slim/firmwarestatus/' ..
meta.player.id)
end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
