Moved extract_name to utility_functions.py

Author: AMorporkian

plugins/admin_commands_plugin/admin_command_plugin.py

@@ -1,7 +1,7 @@
 from base_plugin import SimpleCommandPlugin, BasePlugin
 from core_plugins.player_manager import permissions, UserLevels
 from packets import chat_sent
-from utility_functions import give_item_to_player
+from utility_functions import give_item_to_player, extract_name
 
 
 class UserCommandPlugin(SimpleCommandPlugin):
@@ -18,25 +18,6 @@ def activate(self):
         self.player_manager = self.plugins['player_manager'].player_manager
         self.godmode = {}
 
-    @staticmethod
-    def extract_name(l):
-        name = []
-        if l[0][0] not in ["'", '"']:
-            return l[0], l[1:]
-        name.append(l[0][1:])
-        terminator = l[0][0]
-        for idx, s in enumerate(l[1:]):
-            if s[-1] == terminator:
-                name.append(s[:-1])
-                if idx + 2 != len(l):
-                    return " ".join(name), l[idx + 2:]
-                else:
-                    return " ".join(name), None
-            else:
-                name.append(s)
-        raise ValueError("Final terminator character of <%s> not found" %
-                         terminator)
-
     def who(self, data):
         """Returns all current users on the server. Syntax: /who"""
         who = [w.colored_name(self.config.colors) for w in self.player_manager.who()]
@@ -122,7 +103,7 @@ def make_admin(self, player):
     @permissions(UserLevels.MODERATOR)
     def kick(self, data):
         """Kicks a user from the server. Usage: /kick [username] [reason]"""
-        name, reason = self.extract_name(data)
+        name, reason = extract_name(data)
         if reason is None:
             reason = "no reason given"
         info = self.player_manager.whois(name)
@@ -169,7 +150,7 @@ def unban(self, data):
     def give_item(self, data):
         """Gives an item to a player. Syntax: /give [target player] [item name] [optional: item count]"""
         if len(data) >= 2:
-            name, item = self.extract_name(data)
+            name, item = extract_name(data)
             target_player = self.player_manager.get_logged_in_by_name(name)
             target_protocol = self.protocol.factory.protocols[target_player.protocol]
             if target_player is not None:
@@ -225,6 +206,7 @@ def passthrough(self, data):
         """Sets the server to passthrough mode. *This is irreversible without restart.* Syntax: /passthrough"""
         self.config.passthrough = True
 
+
 class MuteManager(BasePlugin):
     name = "mute_manager"
     def on_chat_sent(self, data):

utility_functions.py

@@ -56,4 +56,23 @@ def move_ship_to_coords(protocol, sector, x, y, z, planet, satellite):
                                packets.warp_command_write(t="MOVE_SHIP", sector=sector, x=x, y=y, z=z,
                                                           planet=planet,
                                                           satellite=satellite, player="".encode('utf-8')))
-    protocol.client_protocol.transport.write(warp_packet)
+    protocol.client_protocol.transport.write(warp_packet)
+
+
+def extract_name(l):
+    name = []
+    if l[0][0] not in ["'", '"']:
+        return l[0], l[1:]
+    name.append(l[0][1:])
+    terminator = l[0][0]
+    for idx, s in enumerate(l[1:]):
+        if s[-1] == terminator:
+            name.append(s[:-1])
+            if idx + 2 != len(l):
+                return " ".join(name), l[idx + 2:]
+            else:
+                return " ".join(name), None
+        else:
+            name.append(s)
+    raise ValueError("Final terminator character of <%s> not found" %
+                     terminator)