Author: bklaas
Date: Mon Nov 3 20:59:46 2008
New Revision: 3266
URL: http://svn.slimdevices.com?rev=3266&root=Jive&view=rev
Log:
Bug: 7271
Description: remove DEFAULT_FIRMWARE_URL that pointed to a 7.0 firmware
do not add Network Update item when there is no firmware url available
register clearUpdateUrl service for wiping the updateUrl table
add call to clearUpdateUrl when playerConnected is nil
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua?rev=3266&root=Jive&r1=3265&r2=3266&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
Mon Nov 3 20:59:46 2008
@@ -55,8 +55,6 @@
local firmwareupgradeTitleStyle = 'settingstitle'
-local DEFAULT_FIRMWARE_URL =
"http://www.slimdevices.com/update/firmware/7.0/jive.bin";
-
local SDCARD_PATH = "/mnt/mmc/"
module(..., Framework.constants)
@@ -94,22 +92,25 @@
function _makeUpgradeItems(self, window, menu, optional, url, urlHelp)
local help = Textarea("help", "")
- local version = self:_firmwareVersion(url)
- menu:addItem({
- text = self:string("BEGIN_UPDATE"),
- sound = "WINDOWSHOW",
- callback = function()
- self.url = url
- self:_upgrade()
- end,
- focusGained = function()
- if _versionCompare(JIVE_VERSION, version) <= 0 then
- help:setValue(self:string(urlHelp or
"UPDATE_BEGIN_REINSTALL", version or "?"))
- else
- help:setValue(self:string(urlHelp or
"UPDATE_BEGIN_UPGRADE", version or "?"))
+ if url then
+ local version = self:_firmwareVersion(url)
+ local networkUpdateItem = {
+ text = self:string("BEGIN_UPDATE"),
+ sound = "WINDOWSHOW",
+ callback = function()
+ self.url = url
+ self:_upgrade()
+ end,
+ focusGained = function()
+ if _versionCompare(JIVE_VERSION, version) <= 0
then
+ help:setValue(self:string(urlHelp or
"UPDATE_BEGIN_REINSTALL", version or "?"))
+ else
+ help:setValue(self:string(urlHelp or
"UPDATE_BEGIN_UPGRADE", version or "?"))
+ end
end
- end
- })
+ }
+ menu:addItem(networkUpdateItem)
+ end
for entry in lfs.dir(SDCARD_PATH) do
local fileurl = "file:" .. SDCARD_PATH .. entry
@@ -148,6 +149,10 @@
window:addWidget(menu)
end
+-- when the server disconnects we clear the upgrade Url
+function clearUpgradeUrl(self)
+ upgradeUrl = { false }
+end
function forceUpgrade(self, optional, upgUrl, urlHelp)
local url = upgUrl
@@ -155,7 +160,7 @@
url = upgradeUrl[1]
end
if not url then
- url = DEFAULT_FIRMWARE_URL
+ return
end
local window = Window("window", self:string("UPDATE"),
firmwareupgradeTitleStyle)
@@ -182,7 +187,6 @@
return window
end
-
function settingsShow(self)
local window = Window("window", self:string("UPDATE"),
firmwareupgradeTitleStyle)
@@ -190,7 +194,7 @@
local url = upgradeUrl[1]
if not url then
- url = DEFAULT_FIRMWARE_URL
+ url = false
end
self:_makeUpgradeItems(window, menu, true, url)
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua?rev=3266&root=Jive&r1=3265&r2=3266&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Mon Nov 3 20:59:46 2008
@@ -31,6 +31,7 @@
jiveMain:addItem(meta:menuItem('appletSetupFirmwareUpgrade',
'advancedSettings', "UPDATE", function(applet) applet:settingsShow() end))
meta:registerService("forceUpgrade")
+ meta:registerService("clearUpgradeUrl")
-- check for firmware upgrades when we connect to a new player
-- we don't want the firmware upgrade applets always loaded so
-- do this in the meta class
@@ -60,6 +61,7 @@
meta.player = player
if not player then
+ appletManager:callService("clearUpgradeUrl")
return
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
