[Slim-Checkins] r33869 - /7.7/trunk/server/Slim/Utils/Update.pm
[email protected] Wed, 29 Feb 2012 16:24:43 -0000
| Newsgroups | gmane.music.equipment.slimdevices.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: agrundman
Date: Wed Feb 29 08:24:43 2012
New Revision: 33869
URL: http://svn.slimdevices.com/slim?rev=33869&view=rev
Log:
Add player count stats to MySB update check
Modified:
7.7/trunk/server/Slim/Utils/Update.pm
Modified: 7.7/trunk/server/Slim/Utils/Update.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Utils/Update.pm?rev=33869&r1=33868&r2=33869&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Utils/Update.pm (original)
+++ 7.7/trunk/server/Slim/Utils/Update.pm Wed Feb 29 08:24:43 2012
@@ -28,8 +28,6 @@
Slim::Utils::Misc::deleteFiles($prefs->get('cachedir'), qr/^(?:Squeezebox|SqueezeCenter|LogitechMediaServer).*\.(dmg|exe)(\.tmp)?$/i);
return unless $prefs->get('checkVersion');
-
- return if $::REVISION eq 'TRUNK';
$versionFile = catdir( scalar($os->dirsFor('updates')), 'server.version' );
@@ -70,13 +68,14 @@
my $url = Slim::Networking::SqueezeNetwork->url(
sprintf(
- "/update/?version=%s&revision=%s&lang=%s&geturl=%s&os=%s&uuid=%s",
+ "/update/?version=%s&revision=%s&lang=%s&geturl=%s&os=%s&uuid=%s&pcount=%d",
$::VERSION,
$::REVISION,
Slim::Utils::Strings::getLanguage(),
$os->canAutoUpdate() && $prefs->get('autoDownloadUpdate') ? '1' : '0',
$os->installerOS(),
$prefs->get('server_uuid'),
+ Slim::Player::Client::clientCount(),
)
);
@@ -94,6 +93,9 @@
# called when check version request is complete
sub checkVersionCB {
my $http = shift;
+
+ # Ignore update check results for users running from svn
+ return if $::REVISION eq 'TRUNK';
# store result in global variable, to be displayed by browser
if ($http->code =~ /^2\d\d/) {
@@ -127,6 +129,9 @@
# called only if check version request fails
sub checkVersionError {
my $http = shift;
+
+ # Ignore update check results for users running from svn
+ return if $::REVISION eq 'TRUNK';
my $proxy = $prefs->get('webproxy');