Author: mherger
Date: Wed Apr 7 22:46:42 2010
New Revision: 8680
URL: http://svn.slimdevices.com/jive?rev=8680&view=rev
Log:
Fixed Bug: 11866
Description: display/test actual SBS http port instead of hard-coded value 9000
Modified:
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
Modified:
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua?rev=8680&r1=8679&r2=8680&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua
Wed Apr 7 22:46:42 2010
@@ -1,5 +1,5 @@
-local ipairs, tostring = ipairs, tostring, tonumber
+local ipairs, tostring, tonumber = ipairs, tostring, tonumber
-- stuff we use
local oo = require("loop.simple")
@@ -91,11 +91,17 @@
["24"] = "BATT_CHARGING_PAUSED",
}
-function setValue(self, key, value)
+function setValue(self, key, value, customLabel)
if not value then
value = '-'
end
- self.diagMenu:setText(self.labels[key], self:string(key, value))
+
+ -- if we have customLabelArgs, we want to insert those first to the
string args
+ if customLabel then
+ self.diagMenu:setText(self.labels[key], self:string(key,
tostring(customLabel), value))
+ else
+ self.diagMenu:setText(self.labels[key], self:string(key, value))
+ end
end
@@ -107,7 +113,8 @@
end
-function serverPort(self, server, port, key)
+function serverPort(self, server, port, key, customLabel)
+
if not server then
self:setValue(key, self.notConnected)
return
@@ -126,7 +133,7 @@
end
if ip == nil then
- self:setValue(key, portFail)
+ self:setValue(key, portFail, customLabel)
return
end
@@ -137,9 +144,9 @@
local res, err = tcp.t_sock:send(" ")
if err then
- self:setValue(key, portFail)
+ self:setValue(key, portFail, customLabel)
else
- self:setValue(key, portOk)
+ self:setValue(key, portOk, customLabel)
end
tcp:close()
@@ -388,12 +395,13 @@
self:setValue("SC_ADDRESS", self.notConnected)
self:setValue("SC_PING", self.notConnected)
self:setValue("SC_PORT_3483", self.notConnected)
- self:setValue("SC_PORT_9000", self.notConnected)
+ self:setValue("SC_PORT_9000", self.notConnected, "9000") --
guess at 9000 here
else
self:setValue("SC_NAME", sc:getName())
self:serverPing(sc, "SC_ADDRESS", "SC_PING")
self:serverPort(sc, 3483, "SC_PORT_3483")
- self:serverPort(sc, 9000, "SC_PORT_9000")
+ local ip, port = sc:getIpPort()
+ self:serverPort(sc, port, "SC_PORT_9000", port)
end
@@ -471,8 +479,15 @@
for i,name in ipairs(tests) do
if name ~= 'ETH_CONNECTION' or System:getMachine() ~= 'jive'
then
+ local label
+ if name == 'SC_PORT_9000' then
+ label = self:string(name, '9000', '-')
+ else
+ label = self:string(name, '-')
+ end
+
self.labels[name] = {
- text = self:string(name, ''),
+ text = label,
style = 'item_info',
}
menu:addItem(self.labels[name])
Modified:
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt?rev=8680&r1=8679&r2=8680&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
Wed Apr 7 22:46:42 2010
@@ -529,19 +529,19 @@
SV TCP-port 3483\n%s
SC_PORT_9000
- CS TCP port 9000\n%s
- DA TCP-port 9000\n%s
- DE TCP-Anschluss 9000\n%s
- EN TCP port 9000\n%s
- ES Puerto TCP 9000\n%s
- FI TCP-portti 9000\n%s
- FR Port TCP 9000\n%s
- IT Porta TCP 9000\n%s
- NL TCP-poort 9000\n%s
- NO TCP-port 9000\n%s
- PL Port TCP 9000\n%s
- RU TCP-поÑÑ 9000\n%s
- SV TCP-port 9000\n%s
+ CS TCP port %s\n%s
+ DA TCP-port %s\n%s
+ DE TCP-Anschluss %s\n%s
+ EN TCP port %s\n%s
+ ES Puerto TCP %s\n%s
+ FI TCP-portti %s\n%s
+ FR Port TCP %s\n%s
+ IT Porta TCP %s\n%s
+ NL TCP-poort %s\n%s
+ NO TCP-port %s\n%s
+ PL Port TCP %s\n%s
+ RU TCP-поÑÑ %s\n%s
+ SV TCP-port %s\n%s
SUPPORT
CS DalÅ¡Ã nápovÄda
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
