Added cached_result decorator.

Author: jordanbriere

addons/source-python/packages/source-python/core/cache.py

@@ -10,6 +10,12 @@
 # =============================================================================
 # >> FORWARD IMPORTS
 # =============================================================================
+# Python Imports
+#   FuncTools
+from functools import wraps
+#   Types
+from types import MethodType
+
 # Source.Python Imports
 #   Core
 from _core._cache import CachedProperty
@@ -22,4 +28,46 @@
 __all__ = [
     'CachedProperty',
     'cached_property'
+    'cached_result'
 ]
+
+
+# =============================================================================
+# >> FUNCTIONS
+# =============================================================================
+def cached_result(fget):
+    """Decorator used to register a cached method.
+
+    :param function fget:
+        Method that is only called once and its result cached for subsequent
+        calls.
+    :rtype: CachedProperty
+    """
+    # Get a dummy object as default cache, so that we can cache None
+    NONE = object()
+
+    def getter(self):
+        """Getter function that generates the cached method."""
+        # Set our cache to the default value
+        cache = NONE
+
+        # Wrap the decorated method as the inner function
+        @wraps(fget)
+        def wrapper(self, *args, **kwargs):
+            """Calls the decorated method and cache the result."""
+            nonlocal cache
+
+            # Did we cache a result already?
+            if cache is NONE:
+
+                # No cache, let's call the wrapped method and cache the result
+                cache = fget(self, *args, **kwargs)
+
+            # Return the cached result
+            return cache
+
+        # Bind the wrapper function to the passed instance and return it
+        return MethodType(wrapper, self)
+
+    # Return a cached property bound to the getter function
+    return CachedProperty(getter, doc=fget.__doc__)

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

@@ -15,6 +15,7 @@
 #   Core
 from core import GAME_NAME
 from core.cache import cached_property
+from core.cache import cached_result
 #   Engines
 from engines.server import server
 from engines.server import engine_server
@@ -217,35 +218,21 @@ def is_fake_client(self):
         """
         return self.playerinfo.is_fake_client()
 
-    @cached_property
-    def _is_hltv(self):
-        """Return whether the player is HLTV.
-
-        :rtype: bool
-        """
-        return self.playerinfo.is_hltv()
-
+    @cached_result
     def is_hltv(self):
         """Return whether the player is HLTV.
 
         :rtype: bool
         """
-        return self._is_hltv
-
-    @cached_property
-    def _is_bot(self):
-        """Return whether the player is a bot.
-
-        :rtype: bool
-        """
-        return self.is_fake_client() or self.steamid == 'BOT'
+        return self.playerinfo.is_hltv()
 
+    @cached_result
     def is_bot(self):
         """Return whether the player is a bot.
 
         :rtype: bool
         """
-        return self._is_bot
+        return self.is_fake_client() or self.steamid == 'BOT'
 
     def is_in_a_vehicle(self):
         """Return whether the player is in a vehicle.