From: Christian Heller Date: Sat, 20 Feb 2016 10:32:33 +0000 (+0100) Subject: Change plugin naming convention. X-Git-Tag: tce~194 X-Git-Url: https://plomlompom.com/repos/todo?a=commitdiff_plain;h=18954ad72dc5ec75c76fdc92882d4381bf6ac7ba;p=plomrogue Change plugin naming convention. --- diff --git a/roguelike-client b/roguelike-client index e0f8558..ed0ab74 100755 --- a/roguelike-client +++ b/roguelike-client @@ -92,8 +92,9 @@ def read_message_queue(): elif message == "PLUGIN": str_plugin = message[7:] if (str_plugin.replace("_", "").isalnum() - and os.access("plugins/client/" + str_plugin, os.F_OK)): - exec(open("plugins/client/" + str_plugin).read()) + and os.access("plugins/client/" + str_plugin + ".py", + os.F_OK)): + exec(open("plugins/client/" + str_plugin + ".py").read()) return raise SystemExit("Invalid plugin load path in message: " + message) read_message_queue.parse_thingshere = False diff --git a/server/commands.py b/server/commands.py index a1f97c9..975e1bd 100644 --- a/server/commands.py +++ b/server/commands.py @@ -15,8 +15,8 @@ def command_plugin(str_plugin): """Run code in plugins/[str_plugin].""" import os if (str_plugin.replace("_", "").isalnum() - and os.access("plugins/server/" + str_plugin, os.F_OK)): - exec(open("plugins/server/" + str_plugin).read()) + and os.access("plugins/server/" + str_plugin + ".py", os.F_OK)): + exec(open("plugins/server/" + str_plugin + ".py").read()) world_db["PLUGIN"] += [str_plugin] return print("Bad plugin name:", str_plugin)