mirror of
https://github.com/evennia/evennia.git
synced 2026-03-23 16:26:30 +01:00
Some minor pep8 fixes and refactoring.
This commit is contained in:
Griatch
parent
63f4f04d77
commit
a9bee74b37
1 changed files with 59 additions and 93 deletions
|
|
@ -46,12 +46,13 @@ from evennia import syscmdkeys
|
|||
from evennia.utils.evmenu import EvMenu
|
||||
from evennia.utils.utils import random_string_from_module
|
||||
|
||||
## Constants
|
||||
# Constants
|
||||
RE_VALID_USERNAME = re.compile(r"^[a-z]{3,}$", re.I)
|
||||
LEN_PASSWD = 6
|
||||
CONNECTION_SCREEN_MODULE = settings.CONNECTION_SCREEN_MODULE
|
||||
|
||||
## Menu notes (top-level functions)
|
||||
# Menu notes (top-level functions)
|
||||
|
||||
|
||||
def start(caller):
|
||||
"""The user should enter his/her username or NEW to create one.
|
||||
|
|
@ -66,23 +67,17 @@ def start(caller):
|
|||
text = random_string_from_module(CONNECTION_SCREEN_MODULE)
|
||||
text += "\n\nEnter your username or |yNEW|n to create a new account."
|
||||
options = (
|
||||
{ "key": "",
|
||||
"goto": "start",
|
||||
},
|
||||
{
|
||||
"key": "new",
|
||||
"goto": "create_account",
|
||||
},
|
||||
{ "key": "quit",
|
||||
"goto": "quit"
|
||||
},
|
||||
{
|
||||
"key": "_default",
|
||||
"goto": "username",
|
||||
},
|
||||
)
|
||||
{"key": "",
|
||||
"goto": "start"},
|
||||
{"key": "new",
|
||||
"goto": "create_account"},
|
||||
{"key": "quit",
|
||||
"goto": "quit"},
|
||||
{"key": "_default",
|
||||
"goto": "username"})
|
||||
return text, options
|
||||
|
||||
|
||||
def username(caller, string_input):
|
||||
"""Check that the username leads to an existing player.
|
||||
|
||||
|
|
@ -100,34 +95,25 @@ def username(caller, string_input):
|
|||
Try another name or leave empty to go back.
|
||||
""".strip("\n")).format(string_input)
|
||||
options = (
|
||||
{
|
||||
"key": "",
|
||||
"goto": "start",
|
||||
},
|
||||
{
|
||||
"key": "_default",
|
||||
"goto": "username",
|
||||
},
|
||||
)
|
||||
{"key": "",
|
||||
"goto": "start"},
|
||||
{"key": "_default",
|
||||
"goto": "username"})
|
||||
else:
|
||||
caller.ndb._menutree.player = player
|
||||
text = "Enter the password for the {} account.".format(player.name)
|
||||
# Disables echo for the password
|
||||
caller.msg("", options={"echo": False})
|
||||
options = (
|
||||
{
|
||||
"key": "",
|
||||
"exec": lambda caller: caller.msg("", options={"echo": True}),
|
||||
"goto": "start",
|
||||
},
|
||||
{
|
||||
"key": "_default",
|
||||
"goto": "ask_password",
|
||||
},
|
||||
)
|
||||
{"key": "",
|
||||
"exec": lambda caller: caller.msg("", options={"echo": True}),
|
||||
"goto": "start"},
|
||||
{"key": "_default",
|
||||
"goto": "ask_password"})
|
||||
|
||||
return text, options
|
||||
|
||||
|
||||
def ask_password(caller, string_input):
|
||||
"""Ask the user to enter the password to this player.
|
||||
|
||||
|
|
@ -145,10 +131,10 @@ def ask_password(caller, string_input):
|
|||
|
||||
player = menutree.player
|
||||
password_attempts = menutree.password_attempts \
|
||||
if hasattr(menutree, "password_attempts") else 0
|
||||
if hasattr(menutree, "password_attempts") else 0
|
||||
bans = ServerConfig.objects.conf("server_bans")
|
||||
banned = bans and (any(tup[0] == player.name.lower() for tup in bans) \
|
||||
or any(tup[2].match(caller.address) for tup in bans if tup[2]))
|
||||
banned = bans and (any(tup[0] == player.name.lower() for tup in bans) or
|
||||
any(tup[2].match(caller.address) for tup in bans if tup[2]))
|
||||
|
||||
if not player.check_password(string_input):
|
||||
# Didn't enter a correct password
|
||||
|
|
@ -156,7 +142,7 @@ def ask_password(caller, string_input):
|
|||
if password_attempts > 2:
|
||||
# Too many tries
|
||||
caller.sessionhandler.disconnect(
|
||||
caller, "|rToo many failed attempts. Disconnecting.|n")
|
||||
caller, "|rToo many failed attempts. Disconnecting.|n")
|
||||
text = ""
|
||||
options = {}
|
||||
else:
|
||||
|
|
@ -167,16 +153,11 @@ def ask_password(caller, string_input):
|
|||
""".strip("\n"))
|
||||
# Loops on the same node
|
||||
options = (
|
||||
{
|
||||
"key": "",
|
||||
"exec": lambda caller: caller.msg("", options={"echo": True}),
|
||||
"goto": "start",
|
||||
},
|
||||
{
|
||||
"key": "_default",
|
||||
"goto": "ask_password",
|
||||
},
|
||||
)
|
||||
{"key": "",
|
||||
"exec": lambda caller: caller.msg("", options={"echo": True}),
|
||||
"goto": "start"},
|
||||
{"key": "_default",
|
||||
"goto": "ask_password"})
|
||||
elif banned:
|
||||
# This is a banned IP or name!
|
||||
string = dedent("""
|
||||
|
|
@ -196,6 +177,7 @@ def ask_password(caller, string_input):
|
|||
|
||||
return text, options
|
||||
|
||||
|
||||
def create_account(caller):
|
||||
"""Create a new account.
|
||||
|
||||
|
|
@ -205,13 +187,11 @@ def create_account(caller):
|
|||
"""
|
||||
text = "Enter your new account name."
|
||||
options = (
|
||||
{
|
||||
"key": "_default",
|
||||
"goto": "create_username",
|
||||
},
|
||||
)
|
||||
{"key": "_default",
|
||||
"goto": "create_username"},)
|
||||
return text, options
|
||||
|
||||
|
||||
def create_username(caller, string_input):
|
||||
"""Prompt to enter a valid username (one that doesnt exist).
|
||||
|
||||
|
|
@ -231,15 +211,10 @@ def create_username(caller, string_input):
|
|||
""".strip("\n")).format(string_input)
|
||||
# Loops on the same node
|
||||
options = (
|
||||
{
|
||||
"key": "",
|
||||
"goto": "start",
|
||||
},
|
||||
{
|
||||
"key": "_default",
|
||||
"goto": "create_username",
|
||||
},
|
||||
)
|
||||
{"key": "",
|
||||
"goto": "start"},
|
||||
{"key": "_default",
|
||||
"goto": "create_username"})
|
||||
elif not RE_VALID_USERNAME.search(string_input):
|
||||
text = dedent("""
|
||||
|rThis username isn't valid.|n
|
||||
|
|
@ -248,15 +223,10 @@ def create_username(caller, string_input):
|
|||
Enter another username or leave blank to go back.
|
||||
""".strip("\n"))
|
||||
options = (
|
||||
{
|
||||
"key": "",
|
||||
"goto": "start",
|
||||
},
|
||||
{
|
||||
"key": "_default",
|
||||
"goto": "create_username",
|
||||
},
|
||||
)
|
||||
{"key": "",
|
||||
"goto": "start"},
|
||||
{"key": "_default",
|
||||
"goto": "create_username"})
|
||||
else:
|
||||
# a valid username - continue getting the password
|
||||
menutree.playername = string_input
|
||||
|
|
@ -265,14 +235,12 @@ def create_username(caller, string_input):
|
|||
# Redirects to the creation of a password
|
||||
text = "Enter this account's new password."
|
||||
options = (
|
||||
{
|
||||
"key": "_default",
|
||||
"goto": "create_password",
|
||||
},
|
||||
)
|
||||
{"key": "_default",
|
||||
"goto": "create_password"},)
|
||||
|
||||
return text, options
|
||||
|
||||
|
||||
def create_password(caller, string_input):
|
||||
"""Ask the user to create a password.
|
||||
|
||||
|
|
@ -284,16 +252,11 @@ def create_password(caller, string_input):
|
|||
menutree = caller.ndb._menutree
|
||||
text = ""
|
||||
options = (
|
||||
{
|
||||
"key": "",
|
||||
"exec": lambda caller: caller.msg("", options={"echo": True}),
|
||||
"goto": "start",
|
||||
},
|
||||
{
|
||||
"key": "_default",
|
||||
"goto": "create_password",
|
||||
},
|
||||
)
|
||||
{"key": "",
|
||||
"exec": lambda caller: caller.msg("", options={"echo": True}),
|
||||
"goto": "start"},
|
||||
{"key": "_default",
|
||||
"goto": "create_password"})
|
||||
|
||||
password = string_input.strip()
|
||||
playername = menutree.playername
|
||||
|
|
@ -313,13 +276,13 @@ def create_password(caller, string_input):
|
|||
permissions = settings.PERMISSION_PLAYER_DEFAULT
|
||||
typeclass = settings.BASE_CHARACTER_TYPECLASS
|
||||
new_player = unloggedin._create_player(caller, playername,
|
||||
password, permissions)
|
||||
password, permissions)
|
||||
if new_player:
|
||||
if settings.MULTISESSION_MODE < 2:
|
||||
default_home = ObjectDB.objects.get_id(
|
||||
settings.DEFAULT_HOME)
|
||||
settings.DEFAULT_HOME)
|
||||
unloggedin._create_character(caller, new_player,
|
||||
typeclass, default_home, permissions)
|
||||
typeclass, default_home, permissions)
|
||||
except Exception:
|
||||
# We are in the middle between logged in and -not, so we have
|
||||
# to handle tracebacks ourselves at this point. If we don't, we
|
||||
|
|
@ -338,11 +301,13 @@ def create_password(caller, string_input):
|
|||
|
||||
return text, options
|
||||
|
||||
|
||||
def quit(caller):
|
||||
caller.sessionhandler.disconnect(caller, "Goodbye! Logging off.")
|
||||
return "", {}
|
||||
|
||||
## Other functions
|
||||
# Other functions
|
||||
|
||||
|
||||
def _formatter(nodetext, optionstext, caller=None):
|
||||
"""Do not display the options, only the text.
|
||||
|
|
@ -354,7 +319,8 @@ def _formatter(nodetext, optionstext, caller=None):
|
|||
"""
|
||||
return nodetext
|
||||
|
||||
## Commands and CmdSets
|
||||
|
||||
# Commands and CmdSets
|
||||
|
||||
class UnloggedinCmdSet(CmdSet):
|
||||
"Cmdset for the unloggedin state"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue