Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 12:56:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix editor's range specification

Browse source
This commit is contained in:
Chiizujin 2024-03-31 17:12:59 +11:00
parent a3066c9b59
commit b7cbdd9433
3 changed files with 83 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
evennia/utils/eveditor.py
View file

@ -305,12 +305,9 @@ class CmdEditorBase(_COMMAND_DEFAULT_CLASS):
linerange = False
if arglist and arglist[0].count(":") == 1:
part1, part2 = arglist[0].split(":")
if part1 and part1.isdigit():
lstart = min(max(0, int(part1)) - 1, nlines)
linerange = True
if part2 and part2.isdigit():
lend = min(lstart + 1, int(part2)) + 1
linerange = True
lstart = min(max(1, int(part1)), nlines) - 1 if utils.value_is_integer(part1) else 0
lend = min(max(lstart + 1, int(part2)), nlines) if utils.value_is_integer(part2) else nlines
linerange = True
elif arglist and arglist[0].isdigit():
lstart = min(max(0, int(arglist[0]) - 1), nlines)
lend = lstart + 1

63
evennia/utils/tests/test_eveditor.py
View file

@ -8,6 +8,67 @@ from evennia.utils import eveditor
class TestEvEditor(BaseEvenniaCommandTest):
def test_eveditor_ranges(self):
eveditor.EvEditor(self.char1)
self.call(
eveditor.CmdEditorGroup(),
"",
cmdstring=":",
msg="Line Editor []\n01\n[l:01 w:000 c:0000](:h for help)",
)
self.call(eveditor.CmdLineInput(), "line 1", raw_string="line 1", msg="01line 1")
self.call(eveditor.CmdLineInput(), "line 2", raw_string="line 2", msg="02line 2")
self.call(eveditor.CmdLineInput(), "line 3", raw_string="line 3", msg="03line 3")
self.call(eveditor.CmdLineInput(), "line 4", raw_string="line 4", msg="04line 4")
self.call(eveditor.CmdLineInput(), "line 5", raw_string="line 5", msg="05line 5")
self.call(
eveditor.CmdEditorGroup(),
"", # list whole buffer
cmdstring=":",
msg="Line Editor []\n01line 1\n02line 2\n"
"03line 3\n04line 4\n05line 5\n"
"[l:05 w:010 c:0034](:h for help)",
)
self.call(
eveditor.CmdEditorGroup(),
":", # list empty range
cmdstring=":",
msg="Line Editor []\n01line 1\n02line 2\n"
"03line 3\n04line 4\n05line 5\n"
"[l:05 w:010 c:0034](:h for help)",
)
self.call(
eveditor.CmdEditorGroup(),
":4", # list from start to line 4
cmdstring=":",
msg="Line Editor []\n01line 1\n02line 2\n"
"03line 3\n04line 4\n"
"[l:04 w:008 c:0027](:h for help)",
)
self.call(
eveditor.CmdEditorGroup(),
"2:", # list from line 2 to end
cmdstring=":",
msg="Line Editor []\n02line 2\n03line 3\n"
"04line 4\n05line 5\n"
"[l:04 w:008 c:0027](:h for help)",
)
self.call(
eveditor.CmdEditorGroup(),
"-10:10", # try to list invalid range (too large)
cmdstring=":",
msg="Line Editor []\n01line 1\n02line 2\n"
"03line 3\n04line 4\n05line 5\n"
"[l:05 w:010 c:0034](:h for help)",
)
self.call(
eveditor.CmdEditorGroup(),
"3:1", # try to list invalid range (reversed)
cmdstring=":",
msg="Line Editor []\n03line 3\n"
"[l:01 w:002 c:0006](:h for help)",
)
def test_eveditor_view_cmd(self):
eveditor.EvEditor(self.char1)
self.call(
@ -244,7 +305,7 @@ class TestEvEditor(BaseEvenniaCommandTest):
msg="Line Editor []\n01\n[l:01 w:000 c:0000](:h for help)",
)
self.call(eveditor.CmdLineInput(), "line 1", raw_string="line 1", msg="01line 1")
self.call(eveditor.CmdEditorGroup(), "1:2", cmdstring=":f", msg="Flood filled lines 1-2.")
self.call(eveditor.CmdEditorGroup(), "1:2", cmdstring=":f", msg="Flood filled line 1.")
self.assertEqual(self.char1.ndb._eveditor.get_buffer(), "line 1")
def test_eveditor_COLON_J(self):

18
evennia/utils/utils.py
View file

@ -3077,3 +3077,21 @@ def ip_from_request(request, exclude=None) -> str:
logger.log_warn("ip_from_request: No valid IP address found in request. Using remote_addr.")
return remote_addr
def value_is_integer(value):
"""
Determines if a value can be type-cast to an integer.
Args:
value (any): The value to check.
Returns:
result (bool): Whether it can be type-cast to an integer or not.
"""
try:
int(value)
except ValueError:
return False
return True