Merge branch 'master' into engine_blade

Author: Ayuto

.pylintrc

@@ -46,7 +46,7 @@ class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{1,40}|(__.*__))$
 inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
 
 # Variable names that are always ok
-good-names=x,y,z,a,b,c,d,e,f,g,h,x1,y1,z1,x2,y2,z2,p1,p2,source-python,fget,create_global_pointers_from_file,create_function_typedefs_from_file,MuzzleFlashStyle,WeaponID,WeaponType,WeaponSlot,WeaponInfo,BaseClient
+good-names=x,y,z,a,b,c,d,e,f,g,h,x1,y1,z1,x2,y2,z2,p1,p2,source-python,fget,create_global_pointers_from_file,create_function_typedefs_from_file,MuzzleFlashStyle,WeaponID,WeaponType,WeaponSlot,WeaponInfo,BaseClient,BaseEntityOutput
 
 
 [REPORTS]

addons/source-python/data/source-python/entities/l4d2/CTerrorGun.ini

@@ -0,0 +1,36 @@
+[virtual_function]
+
+    [[add_upgrade]]
+        offset_linux = 425
+        offset_windows = 424
+        arguments = INT
+
+    [[has_upgrade]]
+        offset_linux = 428
+        offset_windows = 427
+        arguments = INT
+
+    [[is_dual_wielding]]
+        offset_linux = 412
+        offset_windows = 411
+        return_type = BOOL
+
+    [[is_weapon_upgraded]]
+        offset_linux = 411
+        offset_windows = 410
+        return_type = BOOL
+
+    [[remove_all_upgrades]]
+        offset_linux = 427
+        offset_windows = 426
+
+    [[remove_upgrade]]
+        offset_linux = 426
+        offset_windows = 425
+        arguments = INT
+
+
+[property]
+
+    is_dual_wielding = m_isDualWielding
+    upgrade_bits = m_upgradeBitVec

addons/source-python/data/source-python/entities/l4d2/CTerrorWeapon.ini

@@ -0,0 +1,3 @@
+[property]
+
+    upgraded_ammo = m_nUpgradedPrimaryAmmoLoaded

addons/source-python/packages/source-python/commands/auth.py

@@ -8,6 +8,8 @@
 # Source.Python Imports
 #   Auth
 from auth.manager import auth_manager
+#   Players
+from players.helpers import playerinfo_from_index
 #   Hooks
 from hooks.exceptions import except_hooks
 
@@ -38,7 +40,8 @@ def __call__(self, *args):
 
             # Is the player authorized?
             if not auth_manager.is_player_authorized(
-                    args[0], self.level, self.permission, self.flag):
+                playerinfo_from_index(args[1]), self.level, self.permission,
+                    self.flag):
 
                 # Is there fail callback?
                 if self.fail_callback is not None:

addons/source-python/packages/source-python/commands/manager.py

@@ -2,190 +2,75 @@
 
 """Provides a base class for registering commands and filters."""
 
-# =============================================================================
-# >> IMPORTS
-# =============================================================================
-# Source.Python Imports
-#   Commands
-from commands import CommandReturn
-#   Hooks
-from hooks.exceptions import except_hooks
-
 
 # =============================================================================
 # >> CLASSES
 # =============================================================================
-class _BaseCommandManager(dict):
+class _BaseCommandManager(object):
 
     """Class used to (un)register commands."""
 
-    # Store the base attributes
-    _use_args = True
-    _callback_manager = None
+    # Can be set to a class that acts like a proxy for commands. It will be
+    # registered instead of a callback. If the command was issued, the
+    # callback manager will be called and it's its responsibility to call the
+    # actual callback.
+    _callback_proxy = None
 
-    def register_commands(self, names, callback, *args, **kwargs):
-        """Register the given commands to the given callback."""
+    def __init__(self):
+        """Initialize the command manager."""
+        # This will store all created callback proxies
+        self._callback_proxies = []
+
+    def _prepare_command_names(self, names):
+        """Validate and prepare the given command names.
+
+        The given argument can be a string, list or tuple. A TypeError is
+        raised if it does not meet the requirements.
+        """
         # Was a single command name given?
         if isinstance(names, str):
-
-            # Store the command as a list
             names = [names]
 
         # Are the names of a proper iterable type?
         if not isinstance(names, (list, tuple)):
-
-            # Raise an error
             raise TypeError(
                 '{0} commands must be passed as a list, tuple, or string,'
                 ' not "{1}"'.format(type(self).__name__, type(names).__name__))
 
-        # Is there a specified callback manager for this class?
-        if self._callback_manager is not None:
-
-            # Get the callback manager's instance for the given callback
-            callback = self._callback_manager(callback, *args, **kwargs)
-
-        # Loop through the given names
-        for name in names:
+        return names
 
-            # Is the command already registered?
-            if name not in self:
+    def _get_command_proxy(self, callback):
+        """Return the command proxy for the given callback.
 
-                # Are the arguments supposed to be used
-                # when getting the command instance?
-                if self._use_args:
+        Raise a ValueError when the proxy wasn't found.
+        """
+        for proxy in self._callback_proxies:
+            if proxy.callback is callback:
+                return proxy
 
-                    # Get the command using the arguments
-                    command = self._get_command(name, *args)
+        raise ValueError('Unable to find a proxy for the given callback.')
 
-                # Are the arguments not supposed to be used?
-                else:
-
-                    # Get the command without the arguments
-                    command = self._get_command(name)
+    def register_commands(self, names, callback, *args, **kwargs):
+        """Register the given commands to the given callback."""
+        names = self._prepare_command_names(names)
 
-                # Add the command to the dictionary
-                self[name] = _CallbackList(command)
+        if self._callback_proxy is not None:
+            # Create a new callback proxy for this callback
+            callback = self._callback_proxy(callback, *args, **kwargs)
+            self._callback_proxies.append(callback)
 
-            # Add the callback to the command's list of callbacks
-            self[name].append(callback)
+        # Register all command names
+        for name in names:
+            self._get_command(name, *args).add_callback(callback)
 
     def unregister_commands(self, names, callback):
         """Unregister the given commands from the given callback."""
-        # Was a single command name given?
-        if isinstance(names, str):
-
-            # Store the command as a list
-            names = [names]
-
-        # Are the names of a proper iterable type?
-        if not isinstance(names, (list, tuple)):
+        names = self._prepare_command_names(names)
 
-            # Raise an error
-            raise TypeError(
-                '{0} commands must be passed as a list, tuple, or string,'
-                ' not "{1}"'.format(type(self).__name__, type(names).__name__))
+        if self._callback_proxy is not None:
+            callback = self._get_command_proxy(callback)
+            self._callback_proxies.remove(callback)
 
-        # Loop through all given names
+        # Unregister all command names
         for name in names:
-
-            # Is the command registered?
-            if name not in self:
-
-                # Raise an error
-                raise KeyError('Command "{0}" not registered'.format(name))
-
-            # Is there a specified callback manager for this class?
-            if self._callback_manager is not None:
-
-                # Loop through each callback in the command's list
-                for registered_callback in self[name]:
-
-                    # Is the current callback an
-                    # instance for the given callback?
-                    if registered_callback.callback == callback:
-
-                        # Set the callback's instance to the current callback
-                        callback = registered_callback
-
-                        # Break the loop
-                        break
-
-            # Remove the callback from the command's list
-            self[name].remove(callback)
-
-            # Are there any more callbacks registered to the command?
-            if not self[name]:
-
-                # Remove the callback from the command's callback
-                self[name].command.remove_callback(self[name])
-
-                # Remove the command from the dictionary
-                del self[name]
-
-
-class _CallbackList(list):
-
-    """List class used to store."""
-
-    def __init__(self, command):
-        """Register the instance to the command."""
-        # Initialize the list
-        super(_CallbackList, self).__init__()
-
-        # Store the command
-        self.command = command
-
-        # Add the instance to the command's callback list
-        self.command.add_callback(self)
-
-    def __call__(self, *args):
-        """Call all callbacks for the command."""
-        # Loop through each callback in the list
-        for callback in self:
-
-            # Use try/except to continue the loop in case of an error
-            try:
-
-                # Call the callback and get its return value
-                return_value = callback(*args)
-
-            # Was an error encountered?
-            except:
-
-                # Print the exception to the console
-                except_hooks.print_exception()
-
-            # Was no error encountered?
-            else:
-
-                # Does the command need blocked?
-                if not (return_value is None or return_value):
-
-                    # Block the command
-                    return CommandReturn.BLOCK
-
-        # Allow the command to continue
-        return CommandReturn.CONTINUE
-
-    def append(self, callback):
-        """Add a callback to the list."""
-        # Is the callback already in the list?
-        if callback in self:
-
-            # Raise an error
-            raise ValueError('Callback already registered to command')
-
-        # Add the callback to the list
-        super(_CallbackList, self).append(callback)
-
-    def remove(self, callback):
-        """Remove a callback from the list."""
-        # Is the callback in the list?
-        if callback not in self:
-
-            # Raise an error
-            raise ValueError('Callback not registered to command')
-
-        # Remove the callback from the list
-        super(_CallbackList, self).remove(callback)
+            self._get_command(name).remove_callback(callback)

addons/source-python/packages/source-python/commands/player.py

@@ -18,6 +18,4 @@ class _PlayerCommandManager(_BaseCommandManager):
 
     """Base class used to (un)register client/say commands."""
 
-    # Store the base attributes
-    _use_args = False
-    _callback_manager = _AuthCallback
+    _callback_proxy = _AuthCallback

addons/source-python/packages/source-python/engines/precache.py

@@ -51,11 +51,14 @@ class _PrecacheBase(AutoUnload):
     #   or not the path was added to the downloadables
     _downloads = None
 
-    def __init__(self, path, download=False):
+    def __init__(self, path, preload=False, download=False):
         """Add the file to downloadables if download is True."""
         # Save the path that should be precached
         self._path = path
 
+        # Save whether the the file should be preloaded
+        self._preload = preload
+
         # Get the calling module
         caller = getmodule(stack()[1][0])
 
@@ -101,7 +104,7 @@ def path(self):
 
     def _precache(self):
         """Precache the path."""
-        self._precache_method(self._path)
+        self._precache_method(self._path, self._preload)
 
     def _server_spawn(self, game_event):
         """Precache the object on map change."""

addons/source-python/packages/source-python/listeners/_entity_output.py

@@ -24,13 +24,6 @@
 from _listeners import _ListenerManager
 
 
-# =============================================================================
-# >> ALL DECLARATION
-# =============================================================================
-__all__ = ('entity_output_listener_manager',
-           )
-
-
 # =============================================================================
 # >> GLOBAL VARIABLES
 # =============================================================================

addons/source-python/packages/source-python/net_channel.py

@@ -29,6 +29,7 @@
 __all__ = ('NetChannel',
            'NetChannelHandler',
            'NetChannelInfo',
+           'NetFlow',
            'NetMessage',
            )
 

addons/source-python/packages/source-python/players/voice.py

@@ -31,8 +31,8 @@
 # =============================================================================
 # >> ALL DECLARATION
 # =============================================================================
-__all__ = ('voice_server',
-           'mute_manager',
+__all__ = ('mute_manager',
+           'voice_server',
            )
 
 

src/core/modules/commands/commands.h

@@ -69,6 +69,11 @@ class CCommandExt
 		const char* szValue = command.GetCommandString();
 		return PyUnicode_DecodeUTF8(szValue, strlen(szValue), "ignore");
 	}
+
+	static bool Tokenize(CCommand& command, const char* szCommand)
+	{
+		return command.Tokenize(szCommand);
+	}
 };