Merge branch 'master' of https://github.com/Source-Python-Dev-Team/Source.Python

Author: Ayuto

addons/source-python/docs/source-python/source/general/installation.rst

@@ -10,7 +10,7 @@ Requirements
 Installation steps
 ------------------
 
-1. Download the latest Source.Python version from our `buildbot <http://build.affecta.net/job/Source.Python/lastSuccessfulBuild/>`_.
+1. Download the latest Source.Python version from our `buildbot <http://builds.sourcepython.com/job/Source.Python/lastSuccessfulBuild/>`_.
 2. Extract the archive in your server's game folder. E.g. ``../my_servers/css/cstrike/``
 3. Start/restart your server and validate the installation:
 
@@ -19,4 +19,4 @@ Installation steps
 
 4. If you validated the installation, you successfully installed Source.Python!
 5. Edit your server's ``../cfg/source-python/core_settings.ini`` file to your liking.
-6. If you are having problems installing Source.Python, please let us know on our `forums <http://forums.sourcepython.com/>`_!
+6. If you are having problems installing Source.Python, please let us know on our `forums <http://forums.sourcepython.com/>`_!

addons/source-python/packages/source-python/core/command/__init__.py

@@ -140,23 +140,23 @@ def print_credits(self):
 # =============================================================================
 # >> sp
 # =============================================================================
-@_core_command.server_sub_command('delay')
+@_core_command.server_sub_command(['delay'])
 def _sp_delay(command_info, delay:float, command, *args):
     """Execute a command after a given delay."""
     Delay(delay, engine_server.server_command, command + ' ' + ' '.join(args))
 
-@_core_command.server_sub_command('version')
+@_core_command.server_sub_command(['version'])
 def _sp_version(command_info):
     """Display Source.Python version information."""
     core_command_logger.log_message(
         'Current Source.Python version: {0}'.format(VERSION))
 
-@_core_command.server_sub_command('credits')
+@_core_command.server_sub_command(['credits'])
 def _sp_credits(command_info):
     """List all credits for Source.Python."""
     _core_command.print_credits()
 
-@_core_command.server_sub_command('help')
+@_core_command.server_sub_command(['help'])
 def _sp_help(command_info, command=None, *server_sub_commands):
     """Print all sp sub-commands or help for a specific command."""
     if command is None:
@@ -180,4 +180,4 @@ def _sp_help(command_info, command=None, *server_sub_commands):
 # >> DESCRIPTION
 # =============================================================================
 _sp = TypedServerCommand.parser.get_node('sp')
-_sp.description = 'Source.Python main command.'
+_sp.description = 'Source.Python main command.'

addons/source-python/packages/source-python/core/command/auth.py

@@ -27,7 +27,7 @@
 # =============================================================================
 # >> sp auth backend
 # =============================================================================
-@_core_command.server_sub_command('auth', 'backend', 'set')
+@_core_command.server_sub_command(['auth', 'backend', 'set'])
 def _sp_auth_load(command_info, backend):
     """Set the active backend."""
     try:
@@ -38,7 +38,7 @@ def _sp_auth_load(command_info, backend):
         logger.log_message(
             'Backend "{}" has been loaded sucessfully!'.format(backend))
 
-@_core_command.server_sub_command('auth', 'backend', 'list')
+@_core_command.server_sub_command(['auth', 'backend', 'list'])
 def _sp_auth_list(command_info):
     """List all available backends and marks the active backend."""
     if not auth_manager:
@@ -57,7 +57,7 @@ def _sp_auth_list(command_info):
 # =============================================================================
 # >> sp auth permission player
 # =============================================================================
-@_core_command.server_sub_command('auth', 'permission', 'player', 'add')
+@_core_command.server_sub_command(['auth', 'permission', 'player', 'add'])
 def _sp_auth_permission_player_add(
         command_info, players:filter_str, permission, server_id:int=None):
     """Grant a permission to players."""
@@ -72,7 +72,7 @@ def _sp_auth_permission_player_add(
         logger.log_message('Granted permission "{}" to {}.'.format(
             permission, player.name))
 
-@_core_command.server_sub_command('auth', 'permission', 'player', 'remove')
+@_core_command.server_sub_command(['auth', 'permission', 'player', 'remove'])
 def _sp_auth_permission_player_remove(
         command_info, players:filter_str, permission, server_id:int=None):
     """Remove a permission from players."""
@@ -88,7 +88,9 @@ def _sp_auth_permission_player_remove(
             'Removed permission "{}" from {}.'.format(
                 permission, player.name))
 
-@_core_command.server_sub_command('auth', 'permission', 'player', 'add_parent')
+@_core_command.server_sub_command([
+    'auth', 'permission', 'player', 'add_parent'
+])
 def _sp_auth_permission_player_add_parent(
         command_info, players:filter_str, parent):
     """Add a parent to players."""
@@ -103,7 +105,9 @@ def _sp_auth_permission_player_add_parent(
         logger.log_message(
             'Added parent "{}" to {}.'.format(parent, player.name))
 
-@_core_command.server_sub_command('auth', 'permission', 'player', 'remove_parent')
+@_core_command.server_sub_command([
+    'auth', 'permission', 'player', 'remove_parent'
+])
 def _sp_auth_permission_player_remove_parent(
         command_info, players:filter_str, parent):
     """Remove a parent from players."""
@@ -118,7 +122,7 @@ def _sp_auth_permission_player_remove_parent(
         logger.log_message(
             'Removed parent "{}" from {}.'.format(parent, player.name))
 
-@_core_command.server_sub_command('auth', 'permission', 'player', 'test')
+@_core_command.server_sub_command(['auth', 'permission', 'player', 'test'])
 def _sp_auth_permission_player_test(command_info, permission):
     """Test which players are granted a permission."""
     logger.log_message(
@@ -144,31 +148,35 @@ def _sp_auth_permission_player_test(command_info, permission):
 # =============================================================================
 # >> sp auth permission parent
 # =============================================================================
-@_core_command.server_sub_command('auth', 'permission', 'parent', 'add')
+@_core_command.server_sub_command(['auth', 'permission', 'parent', 'add'])
 def _sp_auth_permission_parent_add(
         command_info, parent, permission, server_id:int=None):
     """Add a permission to a parent."""
     auth_manager.get_parent_permissions(parent).add(permission, server_id)
     logger.log_message(
         'Added permission "{}" to parent "{}".'.format(permission, parent))
 
-@_core_command.server_sub_command('auth', 'permission', 'parent', 'remove')
+@_core_command.server_sub_command(['auth', 'permission', 'parent', 'remove'])
 def _sp_auth_permission_parent_remove(
         command_info, parent, permission, server_id:int=None):
     """Remove a permission from a parent."""
     auth_manager.get_parent_permissions(parent).remove(permission, server_id)
     logger.log_message('Removed permission "{}" from parent "{}".'.format(
             permission, parent))
 
-@_core_command.server_sub_command('auth', 'permission', 'parent', 'add_parent')
+@_core_command.server_sub_command([
+    'auth', 'permission', 'parent', 'add_parent'
+])
 def _sp_auth_permission_parent_add_parent(
         command_info, parent, parent_to_add):
     """Add a parent to a parent."""
     auth_manager.get_parent_permissions(parent).add_parent(parent_to_add)
     logger.log_message(
         'Added parent "{}" to parent "{}".'.format(parent_to_add, parent))
 
-@_core_command.server_sub_command('auth', 'permission', 'parent', 'remove_parent')
+@_core_command.server_sub_command([
+    'auth', 'permission', 'parent', 'remove_parent'
+])
 def _sp_auth_permission_parent_remove_parent(
         command_info, parent, parent_to_remove):
     """Remove a parent from a parent."""

addons/source-python/packages/source-python/core/command/docs.py

@@ -37,17 +37,17 @@
 # =============================================================================
 # >> sp docs create/generate/build
 # =============================================================================
-@_core_command.server_sub_command('docs', 'create')
+@_core_command.server_sub_command(['docs', 'create'])
 def _sp_docs_create(command_info, package):
     """Create a Sphinx project."""
     _create_sphinx_project(package)
 
-@_core_command.server_sub_command('docs', 'generate')
+@_core_command.server_sub_command(['docs', 'generate'])
 def _sp_docs_generate(command_info, package):
     """Generate a Sphinx project."""
     _generate_sphinx_project(package)
 
-@_core_command.server_sub_command('docs', 'build')
+@_core_command.server_sub_command(['docs', 'build'])
 def _sp_docs_build(command_info, package):
     """Build a Sphinx project."""
     _build_sphinx_project(package)

addons/source-python/packages/source-python/core/command/dump.py

@@ -17,32 +17,32 @@
 # >> sp dump
 # =============================================================================
 #: .. todo:: Make file_name optional
-@_core_command.server_sub_command('dump', 'class_info')
+@_core_command.server_sub_command(['dump', 'class_info'])
 def _sp_dump_class_info(command_info, file_name):
     """Dump class info."""
     dumps.dump_class_info(file_name)
 
-@_core_command.server_sub_command('dump', 'convars')
+@_core_command.server_sub_command(['dump', 'convars'])
 def _sp_dump_convars(command_info, file_name):
     """Dump convars."""
     dumps.dump_convars(file_name)
 
-@_core_command.server_sub_command('dump', 'datamaps')
+@_core_command.server_sub_command(['dump', 'datamaps'])
 def _sp_dump_datamaps(command_info, file_name):
     """Dump datamaps."""
     dumps.dump_datamaps(file_name)
 
-@_core_command.server_sub_command('dump', 'server_classes')
+@_core_command.server_sub_command(['dump', 'server_classes'])
 def _sp_dump_server_classes(command_info, file_name):
     """Dump server classes."""
     dumps.dump_server_classes(file_name)
 
-@_core_command.server_sub_command('dump', 'string_tables')
+@_core_command.server_sub_command(['dump', 'string_tables'])
 def _sp_dump_string_tables(command_info, file_name):
     """Dump string tables."""
     dumps.dump_string_tables(file_name)
 
-@_core_command.server_sub_command('dump', 'weapon_scripts')
+@_core_command.server_sub_command(['dump', 'weapon_scripts'])
 def _sp_dump_weapon_scripts(command_info, file_name):
     """Dump weapon scripts."""
     dumps.dump_weapon_scripts(file_name)

addons/source-python/packages/source-python/core/command/plugin.py

@@ -25,48 +25,48 @@
 # =============================================================================
 # >> sp plugin
 # =============================================================================
-@_core_command.server_sub_command('plugin', 'load')
+@_core_command.server_sub_command(['plugin', 'load'])
 def _sp_plugin_load(command_info, plugin):
     """Load a plugin."""
     _core_command.load_plugin(plugin)
 
-@_core_command.server_sub_command('load')
+@_core_command.server_sub_command(['load'])
 def _sp_load(command_info, plugin):
     """Load a plugin."""
     warn('"sp load" will be removed soon. Use "sp plugin load" instead.',
         DeprecationWarning)
     _core_command.load_plugin(plugin)
 
-@_core_command.server_sub_command('plugin', 'unload')
+@_core_command.server_sub_command(['plugin', 'unload'])
 def _sp_plugin_unload(command_info, plugin):
     """Unload a plugin."""
     _core_command.unload_plugin(plugin)
 
-@_core_command.server_sub_command('unload')
+@_core_command.server_sub_command(['unload'])
 def _sp_unload(command_info, plugin):
     """Unload a plugin."""
     warn('"sp unload" will be removed soon. Use "sp plugin unload" instead.',
         DeprecationWarning)
     _core_command.unload_plugin(plugin)
 
-@_core_command.server_sub_command('plugin', 'reload')
+@_core_command.server_sub_command(['plugin', 'reload'])
 def _sp_plugin_reload(command_info, plugin):
     """Reload a plugin."""
     _core_command.reload_plugin(plugin)
 
-@_core_command.server_sub_command('reload')
+@_core_command.server_sub_command(['reload'])
 def _sp_reload(command_info, plugin):
     """Reload a plugin."""
     warn('"sp reload" will be removed soon. Use "sp plugin reload" instead.',
         DeprecationWarning)
     _core_command.reload_plugin(plugin)
 
-@_core_command.server_sub_command('plugin', 'list')
+@_core_command.server_sub_command(['plugin', 'list'])
 def _sp_plugin_list(command_info):
     """List all currently loaded plugins."""
     _core_command.print_plugins()
 
-@_core_command.server_sub_command('list')
+@_core_command.server_sub_command(['list'])
 def _sp_list(command_info):
     """List all currently loaded plugins."""
     warn('"sp list" will be removed soon. Use "sp plugin list" instead.',

addons/source-python/packages/source-python/plugins/command.py

@@ -85,30 +85,30 @@ def _unload_instance(self):
         for item in self:
             item._unload_instance()
 
-    def server_sub_command(self, *commands):
+    def server_sub_command(self, commands):
         """Add a sub-command.
 
         .. seealso:: :class:`commands.typed.TypedServerCommand`
         """
-        if not len(commands):
-            raise ValueError('No sub-commands were given.')
+        if isinstance(commands, str):
+            commands = [commands]
         command = TypedServerCommand([self._command] + list(commands))
         self.append(command)
         return command
 
-    def client_sub_command(self, *commands, permission=None):
-        if not len(commands):
-            raise ValueError('No sub-commands were given.')
+    def client_sub_command(self, commands, permission=None):
+        if isinstance(commands, str):
+            commands = [commands]
         command = TypedClientCommand(
             [self._command] + list(commands),
             permission=permission,
         )
         self.append(command)
         return command
 
-    def say_sub_command(self, *commands, permission=None):
-        if not len(commands):
-            raise ValueError('No sub-commands were given.')
+    def say_sub_command(self, commands, permission=None):
+        if isinstance(commands, str):
+            commands = [commands]
         command = TypedSayCommand(
             [self._command] + list(commands),
             permission=permission,