Author: bklaas
Date: Fri Jun 25 14:45:33 2010
New Revision: 8909
URL: http://svn.slimdevices.com/jive?rev=8909&view=rev
Log:
Strip out SN registration from setup applet completely
New applet, NetworkRegistration, for doing SN registration (and firmware
updates from MP)
NetworkRegistration will probably find a home outside of squeezeplay_baby,
either in squeezeplay_squeezos or in squeezeplay
Added:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/NetworkRegistration/
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/NetworkRegistration/NetworkRegistrationApplet.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/NetworkRegistration/NetworkRegistrationMeta.lua
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeMeta.lua
Added:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/NetworkRegistration/NetworkRegistrationApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/NetworkRegistration/NetworkRegistrationApplet.lua?rev=8909&view=auto
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/NetworkRegistration/NetworkRegistrationApplet.lua
(added)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/NetworkRegistration/NetworkRegistrationApplet.lua
Fri Jun 25 14:45:33 2010
@@ -1,0 +1,356 @@
+
+--[[
+=head1 NAME
+
+applets.NetworkRegistration
+
+=head1 DESCRIPTION
+
+Applet to register account/player to MySB.com
+
+=head1 FUNCTIONS
+
+Applet related methods are described in L<jive.Applet>.
+
+=cut
+--]]
+
+
+-- stuff we use
+local ipairs, pairs, assert, io, string, tonumber = ipairs, pairs, assert, io,
string, tonumber
+
+local oo = require("loop.simple")
+local os = require("os")
+
+local Applet = require("jive.Applet")
+local RadioGroup = require("jive.ui.RadioGroup")
+local RadioButton = require("jive.ui.RadioButton")
+local Framework = require("jive.ui.Framework")
+local Label = require("jive.ui.Label")
+local Icon = require("jive.ui.Icon")
+local Group = require("jive.ui.Group")
+local Button = require("jive.ui.Button")
+local SimpleMenu = require("jive.ui.SimpleMenu")
+local Surface = require("jive.ui.Surface")
+local Task = require("jive.ui.Task")
+local Textarea = require("jive.ui.Textarea")
+local Window = require("jive.ui.Window")
+local Popup = require("jive.ui.Popup")
+
+local localPlayer = require("jive.slim.LocalPlayer")
+local slimServer = require("jive.slim.SlimServer")
+
+local DNS = require("jive.net.DNS")
+local Networking = require("jive.net.Networking")
+
+local debug = require("jive.utils.debug")
+local locale = require("jive.utils.locale")
+local string = require("jive.utils.string")
+local table = require("jive.utils.table")
+
+local appletManager = appletManager
+
+local jiveMain = jiveMain
+local jnt = jnt
+
+module(..., Framework.constants)
+oo.class(_M, Applet)
+
+-- service method for starting mysb.com registration flow
+function startRegister(self)
+ _startRegister(self)
+end
+
+
+-- we are connected when we have a pin and upgrade url
+function _squeezenetworkConnected(self, squeezenetwork)
+ return squeezenetwork:getPin() ~= nil and
squeezenetwork:getUpgradeUrl() and squeezenetwork:isConnected()
+end
+
+
+function _anySqueezeCenterWithUpgradeFound(self)
+ local anyFound = false
+ for _,server in appletManager:callService("iterateSqueezeCenters") do
+ if server:isCompatible() and server:getUpgradeUrl() and not
server:isSqueezeNetwork() then
+ log:info("At least one compatible SC with an available
upgrade found. First found: ", server)
+ anyFound = true
+ break
+ end
+ end
+
+ return anyFound
+end
+
+
+function _startRegister(self)
+ log:info("_startRegister")
+
+ local settings = self:getSettings()
+ if settings.registerDone then
+ log:info("SqueezeNetwork registration complete")
+ return
+ end
+
+ -- Bug 12786: Selecting a Network, then backing out
+ -- and re-selecting will cause network errors
+ self.registerRequest = false
+
+ -- Find squeezenetwork server
+ local squeezenetwork = false
+ for name, server in slimServer:iterate() do
+ if server:isSqueezeNetwork() then
+ squeezenetwork = server
+ end
+ end
+
+ if not squeezenetwork then
+ log:error("no SqueezeNetwork instance")
+ return
+ end
+
+ self:_registerRequest(squeezenetwork)
+
+end
+
+
+function _squeezenetworkWait(self, squeezenetwork)
+ log:info("Looking for upgrade, waiting to connect to SqueezeNetwork and
find any compatible SCs")
+
+ -- Waiting popup
+ local popup = Popup("waiting_popup")
+
+ local icon = Icon("icon_connecting")
+ popup:addWidget(icon)
+ popup:addWidget(Label("text", self:string("CONNECTING_TO_SN")))
+ popup:addWidget(Label("subtext", self:string("MYSQUEEZEBOX_DOT_COM")))
+ popup:setAllowScreensaver(false)
+ popup:ignoreAllInputExcept()
+
+ local timeout = 0
+ --Wait until SN is connected before going to step 8. Also if SN isn't
being found, use available SCs. Allow 10 seconds to go by to give all SCs a
chacne to be discovered.
+ popup:addTimer(1000, function()
+ -- wait until we know if the player is linked
+ if _squeezenetworkConnected(self, squeezenetwork) then
+ _firmwareUpgrade(self, squeezenetwork)
+ else
+ log:info("SN not available, Waited: ", timeout + 1)
+ --allow 10 seconds to go by before doing SC check to
allow SCs to be discovered
+ if timeout >= 9 and
_anySqueezeCenterWithUpgradeFound(self) then
+ _firmwareUpgrade(self, squeezenetwork)
+ else
+ log:info("Looking for compatible SCs with an
upgrade, Waited: ", timeout + 1)
+ end
+ end
+
+
+ timeout = timeout + 1
+
+ --try for 30 seconds
+ if timeout >= 30 then
+ log:info("Can't find any SC or connect to
SqueezeNetwork after ", timeout, " seconds")
+ _squeezenetworkFailed(self, squeezenetwork)
+ end
+ end)
+
+ self:tieAndShowWindow(popup)
+end
+
+
+function _squeezenetworkFailed(self, squeezenetwork)
+ log:info("_squeezenetworkFailed")
+ Task("dns", self, function()
+ local serverip = squeezenetwork:getIpPort()
+
+ log:info("Can't connect to SqueezeNetwork: ", serverip)
+
+ local ip, err
+ if DNS:isip(serverip) then
+ ip = serverip
+ else
+ ip, err = DNS:toip(serverip)
+ end
+
+ -- some routers resolve all DNS addresses to the local
+ -- network when the internet is down, we catch these here
+ if ip then
+ local n = string.split("%.", ip)
+ n[1] = tonumber(n[1])
+ n[2] = tonumber(n[2])
+
+ -- local addresses
+ if n[1] == 192 and n[2] == 168 then
+ ip = nil
+ elseif n[1] == 172 and n[2] >= 16 and n[2] <=31 then
+ ip = nil
+ elseif n[1] == 10 then
+ ip = nil
+ end
+
+ -- test addresses, used by BT homehub on DNS failure
+ if n[1] == 192 and n[2] >= 18 and n[2] <= 19 then
+ ip = nil
+ end
+ end
+
+
+ -- have we connected while looking up the DNS?
+ if _squeezenetworkConnected(self, squeezenetwork) then
+ log:info("SN now seen")
+ return
+ end
+
+ if squeezenetwork:isConnected() then
+ -- we're connected, but don't have a PIN or Upgrade
state
+ log:error("SqueezeNetwork error. pin=",
squeezenetwork:getPin(), " upgradeUrl=", squeezenetwork:getUpgradeUrl())
+ _squeezenetworkError(self, squeezenetwork,
"SN_SYSTEM_ERROR")
+ elseif ip == nil then
+ -- dns failed
+ log:info("DNS failed for ", serverip)
+ _squeezenetworkError(self, squeezenetwork,
"SN_DNS_FAILED")
+ else
+ -- connection failed
+ _squeezenetworkError(self, squeezenetwork,
"SN_DNS_WORKED")
+ end
+ end):addTask()
+end
+
+
+function _squeezenetworkError(self, squeezenetwork, message)
+ local window = Window("help_list", self:string("CANT_CONNECT"))
+ window:setAllowScreensaver(false)
+
+ local menu = SimpleMenu("menu")
+ menu:addItem({
+ text = (self:string("SN_TRY_AGAIN")),
+ sound = "WINDOWSHOW",
+ callback = function()
+ _squeezenetworkWait(self, squeezenetwork)
+ window:hide()
+ end,
+ weight = 1
+ })
+
+ window:addWidget(menu)
+ menu:setHeaderWidget(Textarea("help_text", self:string(message)))
+
+ -- help shows diagnostics
+ window:setButtonAction("rbutton", "help")
+ window:addActionListener("help", self, function()
+ Framework:playSound("WINDOWSHOW")
+ appletManager:callService("supportMenu")
+ end)
+ jiveMain:addHelpMenuItem(menu, self, function()
+
appletManager:callService("supportMenu")
+ end)
+
+
+ window:addTimer(1000, function()
+ -- wait until we know if the player is linked
+ if _squeezenetworkConnected(self, squeezenetwork) then
+ _firmwareUpgrade(self, squeezenetwork)
+ window:hide()
+ end
+ end)
+
+ self:tieAndShowWindow(window)
+end
+
+
+function _firmwareUpgrade(self, squeezenetwork)
+ log:info("_firmwareUpgrade")
+ if not squeezenetwork:isConnected() then
+ log:info("get SC from one of discovered SCs")
+ appletManager:callService("firmwareUpgrade", nil)
+ return
+ end
+
+ local url, force = squeezenetwork:getUpgradeUrl()
+ local pin = squeezenetwork:getPin()
+
+ log:info("squeezenetwork pin=", pin, " url=", url)
+
+ if force then
+ log:info("firmware upgrade from SN")
+ appletManager:callService("firmwareUpgrade", squeezenetwork)
+ end
+end
+
+
+function _registerRequest(self, squeezenetwork)
+ if self.registerRequest then
+ return
+ end
+
+ --defer setting self.registerRequest until first register command
completes to avoid race condition where serverLinked occurs early in a
+ -- "register or continue" situation since the server in that case is
already linked
+ local successCallback = function(requireAlreadyLinked)
+ self.registerRequest = true
+ self.registerRequestRequireAlreadyLinked = requireAlreadyLinked
+ end
+
+ log:info("registration on SN")
+ appletManager:callService("squeezeNetworkRequest", { 'register', 0,
100, 'service:SN' }, true, successCallback )
+
+ self.locked = true -- don't free applet
+ -- XXX: it could be that the NetworkRegistration applet needs a
notify_playerCurrent() method to deal with the registration being successful;
the subscribe right here hints at that...
+ jnt:subscribe(self)
+end
+
+
+function _getSqueezenetwork(self)
+ local squeezenetwork = false
+ for name, server in slimServer:iterate() do
+ if server:isSqueezeNetwork() then
+ squeezenetwork = server
+ end
+ end
+ return squeezenetwork
+end
+
+
+function _setupDone(self, setupDone, registerDone)
+ log:info("network setup complete")
+
+ local settings = self:getSettings()
+
+ settings.setupDone = setupDone
+ self:storeSettings()
+
+ -- FIXME: workaround until filesystem write issue resolved
+ os.execute("sync")
+end
+
+
+function free(self)
+ appletManager:callService("setDateTimeDefaultFormats")
+ return not self.locked
+end
+
+-- XXX: this needs to be a service method registered in the meta file
+function waitForSqueezenetwork(self)
+ local squeezenetwork = self:_getSqueezenetwork()
+ _squeezenetworkWait(self, squeezenetwork)
+end
+
+
+function _getSqueezenetwork(self)
+ local squeezenetwork = false
+ for name, server in slimServer:iterate() do
+ if server:isSqueezeNetwork() then
+ squeezenetwork = server
+ end
+ end
+ return squeezenetwork
+end
+
+--[[
+
+=head1 LICENSE
+
+Copyright 2010 Logitech. All Rights Reserved.
+
+This file is licensed under BSD. Please see the LICENSE file for details.
+
+=cut
+--]]
+
Added:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/NetworkRegistration/NetworkRegistrationMeta.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/NetworkRegistration/NetworkRegistrationMeta.lua?rev=8909&view=auto
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/NetworkRegistration/NetworkRegistrationMeta.lua
(added)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/NetworkRegistration/NetworkRegistrationMeta.lua
Fri Jun 25 14:45:33 2010
@@ -1,0 +1,71 @@
+
+--[[
+=head1 NAME
+
+applets.NetworkRegistration.NetworkRegistrationMeta - NetworkRegistration
meta-info
+
+=head1 DESCRIPTION
+
+See L<applets.NetworkRegistration.NetworkRegistrationApplet>.
+
+=head1 FUNCTIONS
+
+See L<jive.AppletMeta> for a description of standard applet meta functions.
+
+=cut
+--]]
+
+
+local oo = require("loop.simple")
+local locale = require("jive.utils.locale")
+
+local AppletMeta = require("jive.AppletMeta")
+
+local slimServer = require("jive.slim.SlimServer")
+
+local appletManager = appletManager
+local jiveMain = jiveMain
+local jnt = jnt
+
+
+-- HACK: this is bad, but we need to keep the meta in scope for the network
+-- subscription to work
+local hackMeta = true
+
+
+module(...)
+oo.class(_M, AppletMeta)
+
+
+function jiveVersion(meta)
+ return 1, 1
+end
+
+
+function defaultSettings(meta)
+ return {
+ [ "registerDone" ] = false,
+ }
+end
+
+
+function registerApplet(meta)
+ meta:registerService("startRegister")
+ meta:registerService("waitForSqueezenetwork")
+end
+
+
+function configureApplet(meta)
+
+end
+
+--[[
+
+=head1 LICENSE
+
+Copyright 2010 Logitech. All Rights Reserved.
+
+This file is licensed under BSD. Please see the LICENSE file for details.
+
+=cut
+--]]
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=8909&r1=8908&r2=8909&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Fri Jun 25 14:45:33 2010
@@ -70,11 +70,6 @@
end
-function startRegister(self)
- _startRegister(self)
-end
-
-
function _consumeAction(self, event)
log:warn("HOME ACTIONS ARE DISABLED IN SETUP. USE LONG-PRESS-HOLD BACK
BUTTON INSTEAD")
-- don't allow this event to continue
@@ -209,8 +204,7 @@
log:info("step7")
if UPGRADE_FROM_SCS_ENABLED then
- local squeezenetwork = self:_getSqueezenetwork()
- _squeezenetworkWait(self, squeezenetwork)
+ appletManager:callService("waitForSqueezenetwork")
end
_setupComplete(self, false)
@@ -224,265 +218,7 @@
end
--- we are connected when we have a pin and upgrade url
-function _squeezenetworkConnected(self, squeezenetwork)
- return squeezenetwork:getPin() ~= nil and
squeezenetwork:getUpgradeUrl() and squeezenetwork:isConnected()
-end
-
-
-function _anySqueezeCenterWithUpgradeFound(self)
- local anyFound = false
- for _,server in appletManager:callService("iterateSqueezeCenters") do
- if server:isCompatible() and server:getUpgradeUrl() and not
server:isSqueezeNetwork() then
- log:info("At least one compatible SC with an available
upgrade found. First found: ", server)
- anyFound = true
- break
- end
- end
-
- return anyFound
-end
-
-
-function _startRegister(self)
- log:info("_startRegister")
-
- local settings = self:getSettings()
- if settings.registerDone then
- log:info("SqueezeNetwork registration complete")
- return
- end
-
- -- Bug 12786: Selecting a Network, then backing out
- -- and re-selecting will cause network errors
- self.registerRequest = false
-
- -- Find squeezenetwork server
- local squeezenetwork = false
- for name, server in slimServer:iterate() do
- if server:isSqueezeNetwork() then
- squeezenetwork = server
- end
- end
-
- if not squeezenetwork then
- log:error("no SqueezeNetwork instance")
- return
- end
-
- self:_registerRequest(squeezenetwork)
-
-end
-
-
-function _squeezenetworkWait(self, squeezenetwork)
- log:info("Looking for upgrade, waiting to connect to SqueezeNetwork and
find any compatible SCs")
-
- -- Waiting popup
- local popup = Popup("waiting_popup")
-
- local icon = Icon("icon_connecting")
- popup:addWidget(icon)
- popup:addWidget(Label("text", self:string("CONNECTING_TO_SN")))
- popup:addWidget(Label("subtext", self:string("MYSQUEEZEBOX_DOT_COM")))
- popup:setAllowScreensaver(false)
- popup:ignoreAllInputExcept()
-
- local timeout = 0
- --Wait until SN is connected before going to step 8. Also if SN isn't
being found, use available SCs. Allow 10 seconds to go by to give all SCs a
chacne to be discovered.
- popup:addTimer(1000, function()
- -- wait until we know if the player is linked
- if _squeezenetworkConnected(self, squeezenetwork) then
- _firmwareUpgrade(self, squeezenetwork)
- else
- log:info("SN not available, Waited: ", timeout + 1)
- --allow 10 seconds to go by before doing SC check to
allow SCs to be discovered
- if timeout >= 9 and
_anySqueezeCenterWithUpgradeFound(self) then
- _firmwareUpgrade(self, squeezenetwork)
- else
- log:info("Looking for compatible SCs with an
upgrade, Waited: ", timeout + 1)
- end
- end
-
-
- timeout = timeout + 1
-
- --try for 30 seconds
- if timeout >= 30 then
- log:info("Can't find any SC or connect to
SqueezeNetwork after ", timeout, " seconds")
- _squeezenetworkFailed(self, squeezenetwork)
- end
- end)
-
- self:tieAndShowWindow(popup)
-end
-
-
-function _squeezenetworkFailed(self, squeezenetwork)
- log:info("_squeezenetworkFailed")
- Task("dns", self, function()
- local serverip = squeezenetwork:getIpPort()
-
- log:info("Can't connect to SqueezeNetwork: ", serverip)
-
- local ip, err
- if DNS:isip(serverip) then
- ip = serverip
- else
- ip, err = DNS:toip(serverip)
- end
-
- -- some routers resolve all DNS addresses to the local
- -- network when the internet is down, we catch these here
- if ip then
- local n = string.split("%.", ip)
- n[1] = tonumber(n[1])
- n[2] = tonumber(n[2])
-
- -- local addresses
- if n[1] == 192 and n[2] == 168 then
- ip = nil
- elseif n[1] == 172 and n[2] >= 16 and n[2] <=31 then
- ip = nil
- elseif n[1] == 10 then
- ip = nil
- end
-
- -- test addresses, used by BT homehub on DNS failure
- if n[1] == 192 and n[2] >= 18 and n[2] <= 19 then
- ip = nil
- end
- end
-
-
- -- have we connected while looking up the DNS?
- if _squeezenetworkConnected(self, squeezenetwork) then
- log:info("SN now seen")
- return
- end
-
- if squeezenetwork:isConnected() then
- -- we're connected, but don't have a PIN or Upgrade
state
- log:error("SqueezeNetwork error. pin=",
squeezenetwork:getPin(), " upgradeUrl=", squeezenetwork:getUpgradeUrl())
- _squeezenetworkError(self, squeezenetwork,
"SN_SYSTEM_ERROR")
- elseif ip == nil then
- -- dns failed
- log:info("DNS failed for ", serverip)
- _squeezenetworkError(self, squeezenetwork,
"SN_DNS_FAILED")
- else
- -- connection failed
- _squeezenetworkError(self, squeezenetwork,
"SN_DNS_WORKED")
- end
- end):addTask()
-end
-
-
-function _squeezenetworkError(self, squeezenetwork, message)
- local window = Window("help_list", self:string("CANT_CONNECT"))
- window:setAllowScreensaver(false)
-
- local menu = SimpleMenu("menu")
- menu:addItem({
- text = (self:string("SN_TRY_AGAIN")),
- sound = "WINDOWSHOW",
- callback = function()
- _squeezenetworkWait(self, squeezenetwork)
- window:hide()
- end,
- weight = 1
- })
-
- window:addWidget(menu)
- menu:setHeaderWidget(Textarea("help_text", self:string(message)))
-
- -- help shows diagnostics
- window:setButtonAction("rbutton", "help")
- window:addActionListener("help", self, function()
- Framework:playSound("WINDOWSHOW")
- appletManager:callService("supportMenu")
- end)
- jiveMain:addHelpMenuItem(menu, self, function()
-
appletManager:callService("supportMenu")
- end)
-
-
- window:addTimer(1000, function()
- -- wait until we know if the player is linked
- if _squeezenetworkConnected(self, squeezenetwork) then
- _firmwareUpgrade(self, squeezenetwork)
- window:hide()
- end
- end)
-
- self:tieAndShowWindow(window)
-end
-
-
-function _firmwareUpgrade(self, squeezenetwork)
- log:info("_firmwareUpgrade")
- if not squeezenetwork:isConnected() then
- log:info("get SC from one of discovered SCs")
- appletManager:callService("firmwareUpgrade", nil)
- return
- end
-
- local url, force = squeezenetwork:getUpgradeUrl()
- local pin = squeezenetwork:getPin()
-
- log:info("squeezenetwork pin=", pin, " url=", url)
-
- if force then
- log:info("firmware upgrade from SN")
- appletManager:callService("firmwareUpgrade", squeezenetwork)
- end
-end
-
-
-function _registerRequest(self, squeezenetwork)
- if self.registerRequest then
- return
- end
-
- --defer setting self.registerRequest until first register command
completes to avoid race condition where serverLinked occurs early in a
- -- "register or continue" situation since the server in that case is
already linked
- local successCallback = function(requireAlreadyLinked)
- self.registerRequest = true
- self.registerRequestRequireAlreadyLinked = requireAlreadyLinked
- end
-
- log:info("registration on SN")
- appletManager:callService("squeezeNetworkRequest", { 'register', 0,
100, 'service:SN' }, true, successCallback )
-
- self.locked = true -- don't free applet
- jnt:subscribe(self)
-end
-
-
-
---[[ XXX: Don't think we need this any more, as mysb.com registration is not
in setup
-if that's the case, this whole playerCurrent method can go byebye
---finish setup if connected server is SC
-function notify_playerCurrent(self, player)
- if not player then
- return
- end
-
- local server = player:getSlimServer()
-
- if not server then
- return
- end
-
- if server:isSqueezeNetwork() then
- return
- end
-
- log:info("Calling step7. server: ", server)
-
- step7(self)
-end
---]]
-
+--[[ XXX: this may need to move to the NetworkRegistrationApplet
function notify_serverLinked(self, server, wasAlreadyLinked)
log:info("notify_serverLinked: ", server)
@@ -523,6 +259,7 @@
end
return squeezenetwork
end
+--]]
function _setupDone(self, setupDone, registerDone)
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeMeta.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeMeta.lua?rev=8909&r1=8908&r2=8909&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeMeta.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeMeta.lua
Fri Jun 25 14:45:33 2010
@@ -45,14 +45,12 @@
function defaultSettings(meta)
return {
[ "setupDone" ] = false,
- [ "registerDone" ] = false,
}
end
function registerApplet(meta)
meta:registerService("startSetup")
- meta:registerService("startRegister")
end
@@ -63,69 +61,7 @@
appletManager:callService("startSetup")
end
- --[[
- if not settings.registerDone then
- hackMeta = meta
- jnt:subscribe(meta)
- end
- --]]
end
-
-
-function notify_serverNew(meta, server)
- local settings = meta:getSettings()
-
- --[[ This bit of code would prompt for mysb.com during setup when
connected to mysb.com for the first time during setup
-
- if settings.setupDone and server:isSqueezeNetwork() then
- appletManager:callService("startRegister")
-
- jnt:unsubscribe(meta)
- hackMeta = nil
- end
-
- --]]
-end
-
-
---[[
-function notify_serverLinked(meta, server)
- if not server:isSqueezeNetwork() then
- return
- end
-
- log:info("server linked: ", server, " pin=", server:getPin())
-
- local settings = meta:getSettings()
- if server:getPin() == false then
- settings.registerDone = true
- meta:storeSettings()
- end
-
- if settings.registerDone then
-
- -- for testing connect the player tosqueezenetwork
- local player = appletManager:callService("getCurrentPlayer")
- log:info(player, " is conencted to ", player and
player:getSlimServer())
-
- if player and not player:getSlimServer() then
- local squeezenetwork = false
- for name, server in slimServer:iterate() do
- if server:isSqueezeNetwork() then
- squeezenetwork = server
- end
- end
-
- log:info("connecting ", player, " to ", squeezenetwork)
- player:connectToServer(squeezenetwork)
- end
-
- jnt:unsubscribe(meta)
- hackMeta = nil
- end
-end
---]]
-
--[[
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
