From b64928f1e6660aa46691b86feee97e5ca3400182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20G=C3=B3mez?= Date: Tue, 18 Mar 2014 20:16:38 +0000 Subject: [PATCH] Added UDSActor as downloadable, and removed from /static/... --- server/src/uds/__init__.py | 38 +++++++++---------- .../osmanagers/WindowsOsManager/__init__.py | 7 ++-- server/src/uds/xmlrpc/__init__.py | 12 ++++++ 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/server/src/uds/__init__.py b/server/src/uds/__init__.py index 44183ade..a3215e9f 100644 --- a/server/src/uds/__init__.py +++ b/server/src/uds/__init__.py @@ -4,27 +4,27 @@ # Copyright (c) 2012 Virtual Cable S.L. # All rights reserved. # -# Redistribution and use in source and binary forms, with or without modification, +# Redistribution and use in source and binary forms, with or without modification, # are permitted provided that the following conditions are met: # -# * Redistributions of source code must retain the above copyright notice, +# * Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# * Neither the name of Virtual Cable S.L. nor the names of its contributors -# may be used to endorse or promote products derived from this software +# * Neither the name of Virtual Cable S.L. nor the names of its contributors +# may be used to endorse or promote products derived from this software # without specific prior written permission. # -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ''' @@ -32,11 +32,11 @@ ''' # Make sure that all services are "available" at service startup -import services # to make sure that the packages are initialized at this point -import auths # To make sure that the packages are initialized at this point -import osmanagers # To make sure that packages are initialized at this point -import transports # To make sure that packages are initialized at this point +import services # to make sure that the packages are initialized at this point +import auths # To make sure that the packages are initialized at this point +import osmanagers # To make sure that packages are initialized at this point +import transports # To make sure that packages are initialized at this point import dispatchers import models - +import xmlrpc diff --git a/server/src/uds/osmanagers/WindowsOsManager/__init__.py b/server/src/uds/osmanagers/WindowsOsManager/__init__.py index c5d475ad..e8671928 100644 --- a/server/src/uds/osmanagers/WindowsOsManager/__init__.py +++ b/server/src/uds/osmanagers/WindowsOsManager/__init__.py @@ -15,13 +15,14 @@ from uds.core.managers.DownloadsManager import DownloadsManager from WindowsOsManager import WindowsOsManager from WinDomainOsManager import WinDomainOsManager from WinRandomPassOsManager import WinRandomPassManager -import os.path, sys +import os.path +import sys OSManagersFactory.factory().insert(WindowsOsManager) OSManagersFactory.factory().insert(WinDomainOsManager) OSManagersFactory.factory().insert(WinRandomPassManager) -DownloadsManager.manager().registerDownloadable('UDSActorSetup.exe', +DownloadsManager.manager().registerDownloadable('UDSActorSetup.exe', _('UDS Actor for windows machines (Important!! Requires .net framework 3.5 sp1)'), - os.path.dirname(sys.modules[__package__].__file__) + '/files/UDSActorSetup.exe', + os.path.dirname(sys.modules[__package__].__file__) + '/files/UDSActorSetup.exe', 'application/x-msdos-program') diff --git a/server/src/uds/xmlrpc/__init__.py b/server/src/uds/xmlrpc/__init__.py index 5c384b91..1848bfe2 100644 --- a/server/src/uds/xmlrpc/__init__.py +++ b/server/src/uds/xmlrpc/__init__.py @@ -32,3 +32,15 @@ XMLRCP processing part This package contains all xmlrpc related stuff @author: Adolfo Gómez, dkmaster at dkmon dot com ''' +from __future__ import unicode_literals + +from django.utils.translation import ugettext_noop as _ + +from uds.core.managers.DownloadsManager import DownloadsManager +import os.path +import sys + +DownloadsManager.manager().registerDownloadable('UDSAdminSetup.exe', + _('UDS Client Administration Interface (Important!! Requires .net framework 3.5 sp1)'), + os.path.dirname(sys.modules[__package__].__file__) + '/files/UDSAdminSetup.exe', + 'application/x-msdownload')