Started enforcing non-None 'flag' attribute on all feature classes

Author: KirillMysnik

srcds/addons/source-python/plugins/admin/core/features.py

@@ -7,12 +7,33 @@
 # =============================================================================
 # >> CLASSES
 # =============================================================================
-class BaseFeature:
+class FeatureMeta(type):
+    def __init__(cls, name, bases, namespace):
+        super().__init__(name, bases, namespace)
+
+        if namespace.get('feature_abstract', False):
+            del cls.feature_abstract
+            return
+
+        if not hasattr(cls, 'flag'):
+            raise ValueError("Class '{}' doesn't have 'flag' "
+                             "attribute".format(cls))
+
+        if cls.flag is None:
+            raise ValueError("Class '{}' has its 'flag' "
+                             "attribute set to None".format(cls))
+
+
+class BaseFeature(metaclass=FeatureMeta):
+    feature_abstract = True
+
     # Required permission in Source.Python auth system to execute this feature
     flag = None
 
 
 class Feature(BaseFeature):
+    feature_abstract = True
+
     def execute(self, client):
         """Execute the feature.
 
@@ -22,6 +43,8 @@ def execute(self, client):
 
 
 class PlayerBasedFeature(BaseFeature):
+    feature_abstract = True
+
     # Allow clients to execute this feature on themselves?
     allow_execution_on_self = True
 

srcds/addons/source-python/plugins/admin/core/frontends/menus.py

@@ -170,10 +170,6 @@ def is_visible(self, client):
         if not default:
             return False
 
-        # Do we even need to check the permission?
-        if self.feature.flag is None:
-            return True
-
         return client.has_permission(self.feature.flag)
 
     def is_selectable(self, client):
@@ -187,10 +183,6 @@ def is_selectable(self, client):
         if not default:
             return False
 
-        # Do we even need to check the permission?
-        if self.feature.flag is None:
-            return True
-
         return client.has_permission(self.feature.flag)
 
     def select(self, client):

srcds/addons/source-python/plugins/admin/plugins/included/admin_kick_ban/left_player.py

@@ -89,6 +89,8 @@ def iterator():
 
 
 class LeftPlayerBasedFeature(BaseFeature):
+    feature_abstract = True
+
     # Allow clients to execute this feature on themselves?
     allow_execution_on_self = True