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

Made launcher docstring more verbose and now better relays args/kwargs to the django-admin.

Browse source
This commit is contained in:
Griatch 2015-02-09 00:34:55 +01:00
parent 2aafafc09c
commit 68fb42acc6
1 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
evennia/server/evennia_launcher.py
View file

@ -95,8 +95,8 @@ CREATED_NEW_GAMEDIR = \
ERROR_INPUT = \ ERROR_INPUT = \
""" """
The argument(s) The argument(s)
{args} {args} {kwargs}
is not recognized by Evennia nor Django. Use -h for help. is/are not recognized by Evennia nor Django. Use -h for help.
""" """
ERROR_NO_GAMEDIR = \ ERROR_NO_GAMEDIR = \
@ -188,10 +188,9 @@ INFO_WINDOWS_BATFILE = \
CMDLINE_HELP = \ CMDLINE_HELP = \
""" """
Starts or operates the Evennia MU* server. Also allows for Starts or operates the Evennia MU* server. Also allows for
initializing a new game directory and managing the game's initializing a new game directory and manages the game's database.
database. You can also pass django manage.py arguments through You can also pass most standard django-admin arguments and
this launcher. If you need manage.py --options, use djangoadmin options.
directly instead.
""" """
@ -902,9 +901,11 @@ def main():
parser.add_argument('--dummyrunner', nargs=1, action='store', dest='dummyrunner', metavar="N", parser.add_argument('--dummyrunner', nargs=1, action='store', dest='dummyrunner', metavar="N",
help="Tests a running server by connecting N dummy players to it.") help="Tests a running server by connecting N dummy players to it.")
parser.add_argument("option", nargs='?', default="noop", parser.add_argument("option", nargs='?', default="noop",
help="Operational mode or management option.") help="Operational mode: 'start', 'stop', 'restart' or 'menu'.")
parser.add_argument("service", metavar="component", nargs='?', default="all", parser.add_argument("service", metavar="component", nargs='?', default="all",
help="Which server component to operate on. One of server, portal or all (default).") help="Server component to operate on: 'server', 'portal' or 'all' (default).")
parser.epilog = "Example django-admin commands: 'migrate', 'flush', 'shell' and 'dbshell'. " \
"See the django documentation for more django-admin commands."
args, unknown_args = parser.parse_known_args() args, unknown_args = parser.parse_known_args()
@ -914,7 +915,10 @@ def main():
check_main_evennia_dependencies() check_main_evennia_dependencies()
if args.init: if not args:
print CMDLINE_HELP
sys.exit()
elif args.init:
create_game_directory(args.init) create_game_directory(args.init)
print CREATED_NEW_GAMEDIR.format(gamedir=args.init, print CREATED_NEW_GAMEDIR.format(gamedir=args.init,
settings_path=os.path.join(args.init, SETTINGS_PATH)) settings_path=os.path.join(args.init, SETTINGS_PATH))
@ -923,9 +927,6 @@ def main():
if args.show_version: if args.show_version:
print show_version_info(option=="help") print show_version_info(option=="help")
sys.exit() sys.exit()
if option == "help" and not args.dummyrunner:
print ABOUT_INFO
sys.exit()
if args.dummyrunner: if args.dummyrunner:
# launch the dummy runner # launch the dummy runner
@ -957,7 +958,12 @@ def main():
try: try:
django.core.management.call_command(*args, **kwargs) django.core.management.call_command(*args, **kwargs)
except django.core.management.base.CommandError: except django.core.management.base.CommandError:
print ERROR_INPUT.format(args=" ".join(args)) args = ", ".join(args)
kwargs = ", ".join(["--%s" % kw for kw in kwargs])
print ERROR_INPUT.format(args=args, kwargs=kwargs)
else:
# no input; print evennia info
print ABOUT_INFO
if __name__ == '__main__': if __name__ == '__main__':