Added /list_players and /delete_player to the player manager. Updated all plugins to correctly use the new plugin manager, and updated the plugin_settings column to use a mutable json dictionary and storage to reflect that fact. It is now a property.

AMorporkian · AMorporkian · commit ea7ff433fe5a · 2014-02-02T05:11:03.000-06:00
diff --git a/config.py b/config.py
@@ -55,7 +55,7 @@ def __init__(self):
     def save(self):
         try:
             with io.open("config/config.json", "w", encoding="utf-8") as config:
-                self.logger.warning("Writing configuration file.")
+                self.logger.debug("Writing configuration file.")
                 config.write(json.dumps(self.config, indent=4, separators=(',', ': '), sort_keys=True, ensure_ascii = False))
         except Exception as e:
             self.logger.critical("Tried to save the configuration file, failed.\n%s", str(e))
diff --git a/config/config.json.default b/config/config.json.default
@@ -121,6 +121,7 @@
     "port_check": true,
     "reap_time": 10,
     "server_connect_timeout": 5,
+    "starbound_path": "/opt/starbound/",
     "upstream_hostname": "localhost",
     "upstream_port": 21024
 }
diff --git a/plugin_manager.py b/plugin_manager.py
@@ -93,7 +93,6 @@ def load_plugins(self, plugin_dir):
                 sys.exit()
         try:
             dependencies = {x.name:set(x.depends) for x in seen_plugins}
-            print dependencies
             classes = {x.name:x for x in seen_plugins}
             while len(dependencies) > 0:
                 ready = [x for x, d in dependencies.iteritems() if len(d) == 0]
@@ -134,7 +133,11 @@ def reload_plugins(self):
     def activate_plugins(self):
         for plugin in [self.plugins[x] for x in self.load_order]:
             if plugin.auto_activate:
-                plugin.activate()
+                try:
+                    plugin.activate()
+                except FatalPluginError as e:
+                    self.logger.critical("A plugin reported a fatal error. Error: %s", str(e))
+                    raise
 
     def deactivate_plugins(self):
         for plugin in [self.plugins[x] for x in reversed(self.load_order)]:
@@ -208,4 +211,8 @@ def wrapped_function(self, data):
     def print_this_defered_failure(f):
         logger.error("Deferred function failure. %s", f)
 
-    return wrapped_function
+    return wrapped_function
+
+
+class FatalPluginError(Exception):
+    pass
diff --git a/plugins/__init__.py b/plugins/__init__.py
diff --git a/plugins/admin_commands_plugin/__init__.py b/plugins/admin_commands_plugin/__init__.py
diff --git a/plugins/admin_messenger/admin_messenger.py b/plugins/admin_messenger/admin_messenger.py
@@ -1,5 +1,5 @@
 from base_plugin import BasePlugin
-from plugins.player_manager import permissions, UserLevels
+from plugins.core.player_manager import permissions, UserLevels
 import packets
 
 
diff --git a/plugins/bouncer_plugin/bouncer_plugin.py b/plugins/bouncer_plugin/bouncer_plugin.py
@@ -1,5 +1,5 @@
 from base_plugin import BasePlugin
-from plugins.player_manager import UserLevels
+from plugins.core.player_manager import UserLevels
 
 
 class BouncerPlugin(BasePlugin):
diff --git a/plugins/colored_names/__init__.py b/plugins/colored_names/__init__.py
diff --git a/plugins/command_plugin/__init__.py b/plugins/command_plugin/__init__.py
diff --git a/plugins/core/__init__.py b/plugins/core/__init__.py
@@ -0,0 +1,5 @@
+from command_plugin import *
+from admin_commands_plugin import *
+from command_plugin import *
+from player_manager import *
+from starbound_config_manager import *
diff --git a/plugins/core/admin_commands_plugin/__init__.py b/plugins/core/admin_commands_plugin/__init__.py
@@ -0,0 +1 @@
+from plugins.core.admin_commands_plugin.admin_command_plugin import UserCommandPlugin, MuteManager
diff --git a/plugins/core/admin_commands_plugin/admin_command_plugin.py b/plugins/core/admin_commands_plugin/admin_command_plugin.py
@@ -1,6 +1,6 @@
 from twisted.internet import reactor
 from base_plugin import SimpleCommandPlugin, BasePlugin
-from plugins.player_manager import permissions, UserLevels
+from plugins.core.player_manager import permissions, UserLevels
 from packets import chat_sent
 from utility_functions import give_item_to_player, extract_name
 
diff --git a/plugins/core/colored_names/__init__.py b/plugins/core/colored_names/__init__.py
@@ -0,0 +1 @@
+from plugins.core.colored_names.colored_names import ColoredNames
diff --git a/plugins/core/colored_names/colored_names.py b/plugins/core/colored_names/colored_names.py
diff --git a/plugins/core/command_plugin/__init__.py b/plugins/core/command_plugin/__init__.py
@@ -0,0 +1 @@
+from plugins.core.command_plugin.command_plugin import CommandDispatchPlugin
diff --git a/plugins/core/command_plugin/command_plugin.py b/plugins/core/command_plugin/command_plugin.py
diff --git a/plugins/core/player_manager/__init__.py b/plugins/core/player_manager/__init__.py
@@ -0,0 +1,2 @@
+from plugins.core.player_manager.plugin import PlayerManagerPlugin
+from plugins.core.player_manager.manager import Banned, UserLevels, permissions, PlayerManager
diff --git a/plugins/core/player_manager/manager.py b/plugins/core/player_manager/manager.py
@@ -87,6 +87,7 @@ def __delitem__(self, key):
         dict.__delitem__(self, key)
         self.changed()
 
+MutableDict.associate_with(JSONEncodedDict)
 
 class Player(Base):
     __tablename__ = 'players'
@@ -99,7 +100,7 @@ class Player(Base):
     protocol = Column(String)
     client_id = Column(Integer)
     ip = Column(String)
-    plugin_storage = Column(MutableDict.as_mutable(JSONEncodedDict))
+    plugin_storage = Column(JSONEncodedDict, default=dict())
     planet = Column(String)
     on_ship = Column(Boolean)
     muted = Column(Boolean)
@@ -114,6 +115,8 @@ def colored_name(self, colors):
     @property
     def storage(self):
         caller = inspect.stack()[1][0].f_locals["self"].__class__.name
+        if self.plugin_storage is None:
+            self.plugin_storage = {}
         try:
             return self.plugin_storage[caller]
         except (ValueError, KeyError, TypeError):
diff --git a/plugins/core/player_manager/plugin.py b/plugins/core/player_manager/plugin.py
@@ -4,16 +4,16 @@
 from twisted.internet.task import LoopingCall
 from twisted.words.ewords import AlreadyLoggedIn
 
-from base_plugin import BasePlugin
-from plugins.player_manager.manager import PlayerManager, Banned, Player
+from base_plugin import SimpleCommandPlugin
+from manager import PlayerManager, Banned, Player, permissions, UserLevels
 from packets import client_connect, connect_response
 import packets
 from utility_functions import build_packet, Planet
 
 
-class PlayerManagerPlugin(BasePlugin):
+class PlayerManagerPlugin(SimpleCommandPlugin):
     name = "player_manager"
-
+    commands = ["list_players", "delete_player"]
     def activate(self):
         super(PlayerManagerPlugin, self).activate()
         self.player_manager = PlayerManager(self.config)
@@ -100,4 +100,33 @@ def after_world_start(self, data):
     def on_client_disconnect(self, player):
         if self.protocol.player.logged_in:
             self.logger.info("Player disconnected: %s", self.protocol.player.name)
-            self.protocol.player.logged_in = False
+            self.protocol.player.logged_in = False
+
+    @permissions(UserLevels.ADMIN)
+    def delete_player(self, data):
+        name = " ".join(data)
+        if self.player_manager.get_logged_in_by_name(name) is not None:
+            self.protocol.send_chat_message("That player is currently logged in. Refusing to delete logged in character.")
+            return False
+        else:
+            player = self.player_manager.get_by_name(name)
+            if player is None:
+                self.protocol.send_chat_message("Couldn't find a player named %s. Please check the spelling and try again." % name)
+                return False
+            self.player_manager.session.delete(player)
+            self.protocol.send_chat_message("Deleted player with name %s." % name)
+
+    @permissions(UserLevels.ADMIN)
+    def list_players(self, data):
+        if len(data) == 0:
+            self.format_player_response(self.player_manager.session.query(Player).all())
+        else:
+            rx = re.sub(r"[\*]", "%", " ".join(data))
+            self.format_player_response(self.player_manager.session.query(Player).filter(Player.name.like(rx)).all())
+
+    def format_player_response(self, players):
+        if len(players) <= 25:
+            self.protocol.send_chat_message("Results: %s" % "\n".join(["%s: %s" % (player.uuid, player.name) for player in players]))
+        else:
+            self.protocol.send_chat_message("Results: %s" % "\n".join(["%s: %s" % (player.uuid, player.name) for player in players[:25]]))
+            self.protocol.send_chat_message("And %d more. Narrow it down with SQL like syntax. Feel free to use a *, it will be replaced appropriately." % (len(players) - 25))
diff --git a/plugins/core/starbound_config_manager/__init__.py b/plugins/core/starbound_config_manager/__init__.py
@@ -0,0 +1 @@
+from starbound_config_manager import StarboundConfigManager
diff --git a/plugins/core/starbound_config_manager/starbound_config_manager.py b/plugins/core/starbound_config_manager/starbound_config_manager.py
@@ -0,0 +1,17 @@
+import os
+from base_plugin import BasePlugin
+from plugin_manager import FatalPluginError
+
+class StarboundConfigManager(BasePlugin):
+    name = "starbound_config_manager"
+
+    def activate(self):
+        super(StarboundConfigManager, self).activate()
+        try:
+            configuration_file = os.path.join(self.config.starbound_path, "starbound.config")
+            if not os.path.exists(configuration_file):
+                raise FatalPluginError("Could not open starbound configuration file. Tried path: %s" % configuration_file)
+        except AttributeError:
+            raise FatalPluginError("The starbound path (starbound_path) is not set in the configuration.")
+
+
diff --git a/plugins/motd_plugin/motd_plugin.py b/plugins/motd_plugin/motd_plugin.py
@@ -1,6 +1,6 @@
 # -*- coding: UTF-8 -*-
 from base_plugin import SimpleCommandPlugin
-from plugins.player_manager import permissions, UserLevels
+from plugins.core.player_manager import permissions, UserLevels
 
 
 class MOTDPlugin(SimpleCommandPlugin):
diff --git a/plugins/new_player_greeter_plugin/new_player_greeter_plugin.py b/plugins/new_player_greeter_plugin/new_player_greeter_plugin.py
@@ -20,7 +20,6 @@ def after_connect_response(self, data):
             return
         if not 'given_starter_items' in my_storage or my_storage['given_starter_items'] == "False":
             my_storage['given_starter_items'] = "True"
-            self.protocol.player.storage(my_storage)
             self.give_items()
             self.send_greetings()
             self.logger.info("Gave starter items to %s.", self.protocol.player.name)
diff --git a/plugins/planet_protect/planet_protect_plugin.py b/plugins/planet_protect/planet_protect_plugin.py
@@ -1,5 +1,5 @@
 from base_plugin import SimpleCommandPlugin
-from plugins.player_manager import UserLevels, permissions
+from plugins.core.player_manager import UserLevels, permissions
 from packets import entity_create, EntityType, star_string
 
 
diff --git a/plugins/player_manager/__init__.py b/plugins/player_manager/__init__.py
diff --git a/plugins/plugin_manager_plugin/plugin_manager_plugin.py b/plugins/plugin_manager_plugin/plugin_manager_plugin.py
@@ -1,5 +1,5 @@
 from base_plugin import SimpleCommandPlugin
-from plugins.player_manager import permissions, UserLevels
+from plugins.core.player_manager import permissions, UserLevels
 from plugin_manager import PluginNotFound
 
 
diff --git a/plugins/spawn_warper/__init__.py b/plugins/spawn_warper/__init__.py
@@ -0,0 +1 @@
+from spawn_warper import SpawnWarper
diff --git a/plugins/spawn_warper/spawn_warper.py b/plugins/spawn_warper/spawn_warper.py
@@ -0,0 +1,17 @@
+from base_plugin import SimpleCommandPlugin
+from plugins.core import permissions, UserLevels
+
+
+class SpawnWarper(SimpleCommandPlugin):
+    name = "spawn_warper"
+    description = "Moves player's ship to spawn for free."
+    depends = ["command_dispatcher", "warpy_plugin", "starbound_config_manager"]
+    commands = ["spawn"]
+
+    def activate(self):
+        super(SpawnWarper, self).activate()
+        self.warper = self.plugins['warpy_plugin']
+
+    @permissions(UserLevels.GUEST)
+    def spawn(self, data):
+        """Transports player to spawn. Syntax: /warp"""
diff --git a/plugins/warpy_plugin/warpy_plugin.py b/plugins/warpy_plugin/warpy_plugin.py
@@ -1,5 +1,5 @@
 from base_plugin import SimpleCommandPlugin
-from plugins.player_manager import permissions, UserLevels
+from plugins.core.player_manager import permissions, UserLevels
 from packets import warp_command_write, Packets
 from utility_functions import build_packet, move_ship_to_coords, extract_name
 
@@ -43,8 +43,6 @@ def move_ship(self, location):
         """Move your ship to another player or specific coordinates. Syntax: /move_ship [player_name] OR /move_ship [from player] [to player]"""
         try:
             first_name, rest = extract_name(location)
-            print first_name
-            print rest
             if not rest:
                 self.move_own_ship_to_player(first_name)
             else:
@@ -65,16 +63,13 @@ def warp_player_to_player(self, from_string, to_string):
                           from_string, to_string)
         from_player = self.player_manager.get_logged_in_by_name(from_string)
         to_player = self.player_manager.get_logged_in_by_name(to_string)
-        print from_player
-        print to_player
         if from_player is not None:
             if to_player is not None:
                 from_protocol = self.factory.protocols[from_player.protocol]
                 if from_player is not to_player:
                     warp_packet = build_packet(Packets.WARP_COMMAND,
                                                warp_command_write(t="WARP_OTHER_SHIP",
                                                                   player=to_player.name.encode('utf-8')))
-                    print warp_packet
                 else:
                     warp_packet = build_packet(Packets.WARP_COMMAND,
                                                warp_command_write(t='WARP_UP'))

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@`
`121`	`121`	`"port_check": true,`
`122`	`122`	`"reap_time": 10,`
`123`	`123`	`"server_connect_timeout": 5,`
	`124`	`+ "starbound_path": "/opt/starbound/",`
`124`	`125`	`"upstream_hostname": "localhost",`
`125`	`126`	`"upstream_port": 21024`
`126`	`127`	`}`