Internal naming changes

Author: KirillMysnik

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

@@ -12,7 +12,7 @@
 from .core.events.storage import admin_resource_list
 from .core.listeners import (on_spa_loaded_listener_manager,
                              on_spa_unloaded_listener_manager)
-from .core.frontends.menus import AdminMenuSection
+from .core.frontends.menus import MenuSection
 from .core.frontends.motd import MainPage
 from .core.orm import Base, engine
 from .core.plugins.command import admin_command_manager
@@ -29,7 +29,7 @@
 # =============================================================================
 # >> GLOBAL VARIABLES
 # =============================================================================
-main_menu = AdminMenuSection(None, strings_common['title main'], 'admin')
+main_menu = MenuSection(None, strings_common['title main'], 'admin')
 
 
 # =============================================================================

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

@@ -21,7 +21,7 @@
 # =============================================================================
 # >> CLASSES
 # =============================================================================
-class AdminMenuEntry:
+class MenuEntry:
     """Represent a selectable entry in main admin menu or its submenus."""
     def __init__(self, parent, title, id_=None):
         self._parent = parent
@@ -50,7 +50,7 @@ def select(self, client):
         raise NotImplementedError
 
 
-class AdminMenuSection(AdminMenuEntry, list):
+class MenuSection(MenuEntry, list):
     """Represents a selectable section of other entries in admin menus."""
     def __init__(self, parent, title, id_=None):
         super().__init__(parent, title, id_)
@@ -77,7 +77,7 @@ def build_callback(popup, index):
                     continue
 
                 selectable = item.is_selectable(client)
-                if isinstance(item, AdminMenuSection):
+                if isinstance(item, MenuSection):
                     title = strings_menus['extensible'].tokenized(
                         item=item.title)
                 else:
@@ -93,9 +93,9 @@ def build_callback(popup, index):
     def add_entry(self, entry):
         """Add another entry to this section then sort again.
 
-        :param AdminMenuEntry entry: Given entry.
+        :param MenuEntry entry: Given entry.
         :return: Passed entry without alteration.
-        :rtype: AdminMenuEntry
+        :rtype: MenuEntry
         """
         self.append(entry)
         self.sort(key=lambda entry_: (self.order.index(entry_.id)
@@ -145,13 +145,13 @@ def select(self, client):
         client.send_popup(self.popup)
 
 
-class AdminCommand(AdminMenuEntry):
+class MenuCommand(MenuEntry):
     """Base class for entry that is bound to execute a feature."""
     def __init__(self, feature, parent, title, id_=None):
-        """Initialize AdminCommand instance.
+        """Initialize MenuCommand instance.
 
         :param feature: Feature instance this entry is bound to execute.
-        :param parent: Parent AdminMenuSection instance.
+        :param parent: Parent MenuSection instance.
         :param title: TranslationStrings instance.
         :param str|None id_: String ID that will be used to sort this item.
         """
@@ -186,10 +186,6 @@ def is_selectable(self, client):
         return client.has_permission(self.feature.flag)
 
     def select(self, client):
-        if not self.is_visible(client) or not self.is_selectable(client):
-            client.tell(strings_common['unavailable'])
-            return
-
         client.active_popup = None
 
         self.feature.execute(client)
@@ -226,18 +222,18 @@ def __init__(self):
         self.options = []
 
 
-class BasePlayerBasedAdminCommand(AdminCommand):
+class BasePlayerBasedMenuCommand(MenuCommand):
     """Base class for entry that is bound to perform a command on the players.
     """
     # Allow selecting multiple players at once?
     allow_multiple_choices = True
 
     def __init__(self, feature, parent, title, id_=None):
-        """Initialize BasePlayerBasedAdminCommand instance.
+        """Initialize BasePlayerBasedMenuCommand instance.
 
         :param feature: PlayerBasedFeature instance this entry is bound to
         execute.
-        :param parent: Parent AdminMenuSection instance.
+        :param parent: Parent MenuSection instance.
         :param title: TranslationStrings instance.
         :param str|None id_: String ID that will be used to sort this item.
         """
@@ -506,10 +502,6 @@ def _player_select(self, client, player_ids):
         :param list player_ids: Unfiltered list of IDs.
         """
 
-        if not self.is_visible(client) or not self.is_selectable(client):
-            client.tell(strings_common['unavailable'])
-            return
-
         client.active_popup = None
 
         for player in self._filter_player_ids(client, player_ids):
@@ -532,10 +524,14 @@ def render_player_name(player):
         return format_player_name(player.name)
 
     def select(self, client):
+        if not self.is_visible(client) or not self.is_selectable(client):
+            client.tell(strings_common['unavailable'])
+            return
+
         client.send_popup(self.popup)
 
 
-class PlayerBasedAdminCommand(BasePlayerBasedAdminCommand):
+class PlayerBasedMenuCommand(BasePlayerBasedMenuCommand):
     base_filter = 'all'
 
     def _get_player_id(self, player):

srcds/addons/source-python/plugins/admin/plugins/included/admin_comm_management/admin_comm_management.py

@@ -3,59 +3,59 @@
 # =============================================================================
 # Source.Python Admin
 from admin.admin import main_menu
-from admin.core.frontends.menus import AdminMenuSection
+from admin.core.frontends.menus import MenuSection
 
 # Included Plugin
-from .blocks.base import BlockCommAdminCommand
+from .blocks.base import BlockCommMenuCommand
 from .blocks.chat import (
     block_chat_feature, blocked_chat_user_manager, unblock_any_chat_feature,
-    unblock_my_chat_feature, UnblockAnyChatAdminCommand,
-    UnblockMyChatAdminCommand)
+    unblock_my_chat_feature, UnblockAnyChatMenuCommand,
+    UnblockMyChatMenuCommand)
 from .blocks.voice import (
     block_voice_feature, blocked_voice_user_manager, unblock_any_voice_feature,
-    unblock_my_voice_feature, UnblockAnyVoiceAdminCommand,
-    UnblockMyVoiceAdminCommand)
+    unblock_my_voice_feature, UnblockAnyVoiceMenuCommand,
+    UnblockMyVoiceMenuCommand)
 from .strings import plugin_strings
 
 
 # =============================================================================
 # >> MENU ENTRIES
 # =============================================================================
-menu_section = main_menu.add_entry(AdminMenuSection(
+menu_section = main_menu.add_entry(MenuSection(
     main_menu, plugin_strings['section_title main']))
 
-menu_section_chat = menu_section.add_entry(AdminMenuSection(
+menu_section_chat = menu_section.add_entry(MenuSection(
     menu_section, plugin_strings['section_title chat']))
 
-menu_section_voice = menu_section.add_entry(AdminMenuSection(
+menu_section_voice = menu_section.add_entry(MenuSection(
     menu_section, plugin_strings['section_title voice']))
 
-menu_section_chat.add_entry(BlockCommAdminCommand(
+menu_section_chat.add_entry(BlockCommMenuCommand(
     block_chat_feature,
     menu_section_chat,
     plugin_strings['popup_title block_chat']))
 
-menu_section_voice.add_entry(BlockCommAdminCommand(
+menu_section_voice.add_entry(BlockCommMenuCommand(
     block_voice_feature,
     menu_section_voice,
     plugin_strings['popup_title block_voice']))
 
-menu_section_chat.add_entry(UnblockAnyChatAdminCommand(
+menu_section_chat.add_entry(UnblockAnyChatMenuCommand(
     unblock_any_chat_feature,
     menu_section_chat,
     plugin_strings['popup_title unblock_chat_any']))
 
-menu_section_voice.add_entry(UnblockAnyVoiceAdminCommand(
+menu_section_voice.add_entry(UnblockAnyVoiceMenuCommand(
     unblock_any_voice_feature,
     menu_section_voice,
     plugin_strings['popup_title unblock_voice_any']))
 
-menu_section_chat.add_entry(UnblockMyChatAdminCommand(
+menu_section_chat.add_entry(UnblockMyChatMenuCommand(
     unblock_my_chat_feature,
     menu_section_chat,
     plugin_strings['popup_title unblock_chat']))
 
-menu_section_voice.add_entry(UnblockMyVoiceAdminCommand(
+menu_section_voice.add_entry(UnblockMyVoiceMenuCommand(
     unblock_my_voice_feature,
     menu_section_voice,
     plugin_strings['popup_title unblock_voice']))

srcds/addons/source-python/plugins/admin/plugins/included/admin_comm_management/blocks/base.py

@@ -17,7 +17,7 @@
 # Source.Python Admin
 from admin.core.clients import clients
 from admin.core.features import BaseFeature
-from admin.core.frontends.menus import AdminCommand, PlayerBasedAdminCommand
+from admin.core.frontends.menus import MenuCommand, PlayerBasedMenuCommand
 from admin.core.helpers import format_player_name
 from admin.core.orm import SessionContext
 from admin.core.paths import ADMIN_CFG_PATH, get_server_file
@@ -252,7 +252,7 @@ def filter(self, client, player):
         return not another_client.has_permission(self.flag)
 
 
-class BlockCommAdminCommand(PlayerBasedAdminCommand):
+class BlockCommMenuCommand(PlayerBasedMenuCommand):
     base_filter = 'human'
 
     def __init__(self, feature, parent, title, id_=None):
@@ -299,7 +299,7 @@ def execute(self, client, blocked_comm_user_info):
         ).start()
 
 
-class _UnblockCommAdminCommand(AdminCommand):
+class _UnblockCommMenuCommand(MenuCommand):
     popup_title = None
 
     def __init__(self, feature, parent, title, id_=None):
@@ -344,12 +344,12 @@ def select(self, client):
         client.send_popup(self.popup)
 
 
-class UnblockAnyCommAdminCommand(_UnblockCommAdminCommand):
+class UnblockAnyCommMenuCommand(_UnblockCommMenuCommand):
     def _get_blocks(self, client):
         return self.feature.blocked_comm_user_manager.get_active_blocks()
 
 
-class UnblockMyCommAdminCommand(_UnblockCommAdminCommand):
+class UnblockMyCommMenuCommand(_UnblockCommMenuCommand):
     def _get_blocks(self, client):
         return self.feature.blocked_comm_user_manager.get_active_blocks(
             blocked_by=client.steamid)

srcds/addons/source-python/plugins/admin/plugins/included/admin_comm_management/blocks/chat.py

@@ -13,8 +13,8 @@
 from ..models import BlockedChatUser
 from ..strings import plugin_strings
 from .base import (
-    BlockCommFeature, BlockedCommUserManager, UnblockAnyCommAdminCommand,
-    UnblockCommFeature, UnblockMyCommAdminCommand)
+    BlockCommFeature, BlockedCommUserManager, UnblockAnyCommMenuCommand,
+    UnblockCommFeature, UnblockMyCommMenuCommand)
 
 
 # =============================================================================
@@ -70,11 +70,11 @@ class _UnblockMyChatFeature(_UnblockChatFeature):
 unblock_my_chat_feature = _UnblockMyChatFeature()
 
 
-class UnblockAnyChatAdminCommand(UnblockAnyCommAdminCommand):
+class UnblockAnyChatMenuCommand(UnblockAnyCommMenuCommand):
     popup_title = plugin_strings['popup_title unblock_chat_any']
 
 
-class UnblockMyChatAdminCommand(UnblockMyCommAdminCommand):
+class UnblockMyChatMenuCommand(UnblockMyCommMenuCommand):
     popup_title = plugin_strings['popup_title unblock_chat']
 
 

srcds/addons/source-python/plugins/admin/plugins/included/admin_comm_management/blocks/voice.py

@@ -15,8 +15,8 @@
 from ..models import BlockedVoiceUser
 from ..strings import plugin_strings
 from .base import (
-    BlockCommFeature, BlockedCommUserManager, UnblockAnyCommAdminCommand,
-    UnblockCommFeature, UnblockMyCommAdminCommand)
+    BlockCommFeature, BlockedCommUserManager, UnblockAnyCommMenuCommand,
+    UnblockCommFeature, UnblockMyCommMenuCommand)
 
 
 # =============================================================================
@@ -95,11 +95,11 @@ class _UnblockMyVoiceFeature(_UnblockVoiceFeature):
 unblock_my_voice_feature = _UnblockMyVoiceFeature()
 
 
-class UnblockAnyVoiceAdminCommand(UnblockAnyCommAdminCommand):
+class UnblockAnyVoiceMenuCommand(UnblockAnyCommMenuCommand):
     popup_title = plugin_strings['popup_title unblock_voice_any']
 
 
-class UnblockMyVoiceAdminCommand(UnblockMyCommAdminCommand):
+class UnblockMyVoiceMenuCommand(UnblockMyCommMenuCommand):
     popup_title = plugin_strings['popup_title unblock_voice']
 
 

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

@@ -8,7 +8,7 @@
 from admin.admin import main_menu
 from admin.core.features import PlayerBasedFeature
 from admin.core.frontends.menus import (
-    AdminCommand, AdminMenuSection, PlayerBasedAdminCommand)
+    MenuCommand, MenuSection, PlayerBasedMenuCommand)
 from admin.core.frontends.motd import (
     main_motd, MOTDSection, MOTDPageEntry, PlayerBasedFeaturePage)
 from admin.core.helpers import log_admin_action
@@ -51,7 +51,7 @@ def execute(self, client, player):
 kick_feature = _KickFeature()
 
 
-class _KickMenuCommand(PlayerBasedAdminCommand):
+class _KickMenuCommand(PlayerBasedMenuCommand):
     allow_multiple_choices = False
 
 
@@ -68,13 +68,13 @@ class _KickPage(PlayerBasedFeaturePage):
 # =============================================================================
 # >> MENU ENTRIES
 # =============================================================================
-menu_section = main_menu.add_entry(AdminMenuSection(
+menu_section = main_menu.add_entry(MenuSection(
     main_menu, plugin_strings['section_title main']))
 
-menu_section_steamid = menu_section.add_entry(AdminMenuSection(
+menu_section_steamid = menu_section.add_entry(MenuSection(
     menu_section, plugin_strings['section_title steamid_bans']))
 
-menu_section_ip_address = menu_section.add_entry(AdminMenuSection(
+menu_section_ip_address = menu_section.add_entry(MenuSection(
     menu_section, plugin_strings['section_title ip_address_bans']))
 
 lift_steamid_ban_popup_feature.ban_popup.parent_menu = (
@@ -105,42 +105,42 @@ class _KickPage(PlayerBasedFeaturePage):
     menu_section_ip_address,
     plugin_strings['popup_title ban_ip_address']))
 
-menu_section_steamid.add_entry(AdminCommand(
+menu_section_steamid.add_entry(MenuCommand(
     review_steamid_ban_popup_feature,
     menu_section_steamid,
     plugin_strings['popup_title review_steamid']))
 
-menu_section_ip_address.add_entry(AdminCommand(
+menu_section_ip_address.add_entry(MenuCommand(
     review_ip_address_ban_popup_feature,
     menu_section_ip_address,
     plugin_strings['popup_title review_ip_address']))
 
-menu_section_steamid.add_entry(AdminCommand(
+menu_section_steamid.add_entry(MenuCommand(
     lift_steamid_ban_popup_feature,
     menu_section_steamid,
     plugin_strings['popup_title lift_steamid']))
 
-menu_section_ip_address.add_entry(AdminCommand(
+menu_section_ip_address.add_entry(MenuCommand(
     lift_ip_address_ban_popup_feature,
     menu_section_ip_address,
     plugin_strings['popup_title lift_ip_address']))
 
-menu_section_steamid.add_entry(AdminCommand(
+menu_section_steamid.add_entry(MenuCommand(
     lift_any_steamid_ban_popup_feature,
     menu_section_steamid,
     plugin_strings['popup_title lift_reviewed_steamid']))
 
-menu_section_ip_address.add_entry(AdminCommand(
+menu_section_ip_address.add_entry(MenuCommand(
     lift_any_ip_address_ban_popup_feature,
     menu_section_ip_address,
     plugin_strings['popup_title lift_reviewed_ip_address']))
 
-menu_section_steamid.add_entry(AdminCommand(
+menu_section_steamid.add_entry(MenuCommand(
     search_bad_steamid_bans_popup_feature,
     menu_section_steamid,
     plugin_strings['popup_title search_bad_bans']))
 
-menu_section_ip_address.add_entry(AdminCommand(
+menu_section_ip_address.add_entry(MenuCommand(
     search_bad_ip_address_bans_popup_feature,
     menu_section_ip_address,
     plugin_strings['popup_title search_bad_bans']))