Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add --gamedir option for remote-running Evennia

Browse source
This commit is contained in:
Griatch 2018-01-18 00:44:36 +01:00
parent 4126ec8318
commit 54c6ae4aec
1 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

49
evennia/server/evennia_launcher.py
View file

@ -136,8 +136,7 @@ ERROR_INPUT = \
ERROR_NO_ALT_GAMEDIR = \ ERROR_NO_ALT_GAMEDIR = \
""" """
The path {gamedir} doesn't seem to exist. The path '{gamedir}' could not be found.
""" """
ERROR_NO_GAMEDIR = \ ERROR_NO_GAMEDIR = \
@ -990,8 +989,9 @@ def set_gamedir(path):
Ndepth = 10 Ndepth = 10
settings_path = os.path.join("server", "conf", "settings.py") settings_path = os.path.join("server", "conf", "settings.py")
os.chdir(GAMEDIR)
for i in range(Ndepth): for i in range(Ndepth):
gpath = GAMEDIR gpath = os.getcwd()
if "server" in os.listdir(gpath): if "server" in os.listdir(gpath):
if os.path.isfile(settings_path): if os.path.isfile(settings_path):
GAMEDIR = gpath GAMEDIR = gpath
@ -1554,36 +1554,36 @@ def main():
parser = ArgumentParser(description=CMDLINE_HELP) parser = ArgumentParser(description=CMDLINE_HELP)
parser.add_argument( parser.add_argument(
'-v', '--version', action='store_true', '--gamedir', nargs=1, action='store', dest='altgamedir',
dest='show_version', default=False, metavar="<path>",
help="Show version info.") help="Location of gamedir (default: current location)")
parser.add_argument( parser.add_argument(
'--init', action='store', dest="init", metavar="name", '--init', action='store', dest="init", metavar="<gamename>",
help="Creates a new game directory 'name' at the current location.") help="Creates a new gamedir 'name' at current location.")
parser.add_argument( parser.add_argument(
'--list', nargs='+', action='store', dest='listsetting', metavar="key", '--list', nargs='+', action='store', dest='listsetting', metavar="all|<key>",
help=("List values for server settings. Use 'all' to list all " help=("List values for server settings. Use 'all' to list all "
"available keys.")) "available keys."))
parser.add_argument(
'--profiler', action='store_true', dest='profiler', default=False,
help="Start given server component under the Python profiler.")
parser.add_argument(
'--dummyrunner', nargs=1, action='store', dest='dummyrunner',
metavar="N",
help="Test a running server by connecting N dummy accounts to it.")
parser.add_argument(
'--gamedir', nargs=1, action='store', dest='altgamedir',
default=None, metavar="path/to/gamedir",
help="Supply path to gamedir, if not current location")
parser.add_argument( parser.add_argument(
'--settings', nargs=1, action='store', dest='altsettings', '--settings', nargs=1, action='store', dest='altsettings',
default=None, metavar="filename.py", default=None, metavar="<path>",
help=("Start evennia with alternative settings file from " help=("Start evennia with alternative settings file from "
"gamedir/server/conf/. (default is settings.py)")) "gamedir/server/conf/. (default is settings.py)"))
parser.add_argument( parser.add_argument(
'--initsettings', action='store_true', dest="initsettings", '--initsettings', action='store_true', dest="initsettings",
default=False, default=False,
help="Create a new, empty settings file as gamedir/server/conf/settings.py.") help="Create a new, empty settings file as gamedir/server/conf/settings.py.")
parser.add_argument(
'--profiler', action='store_true', dest='profiler', default=False,
help="Start given server component under the Python profiler.")
parser.add_argument(
'--dummyrunner', nargs=1, action='store', dest='dummyrunner',
metavar="<N>",
help="Test a server by connecting <N> dummy accounts to it.")
parser.add_argument(
'-v', '--version', action='store_true',
dest='show_version', default=False,
help="Show version info.")
parser.add_argument( parser.add_argument(
"operation", nargs='?', default="noop", "operation", nargs='?', default="noop",
metavar="start|stop|reload|reset|sstart|info|status|menu", metavar="start|stop|reload|reset|sstart|info|status|menu",
@ -1609,10 +1609,11 @@ def main():
if args.altgamedir: if args.altgamedir:
# use alternative gamedir path # use alternative gamedir path
global GAMEDIR global GAMEDIR
if not os.path.isdir(args.altgamedir) and not args.init: altgamedir = args.altgamedir[0]
print(ERROR_NO_ALT_GAMEDIR.format(args.altgamedir)) if not os.path.isdir(altgamedir) and not args.init:
print(ERROR_NO_ALT_GAMEDIR.format(gamedir=altgamedir))
sys.exit() sys.exit()
GAMEDIR = args.altgamedir GAMEDIR = altgamedir
if args.init: if args.init:
# initialization of game directory # initialization of game directory