nonebot/nonebot2
1
1
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2024-09-21 05:12:34 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix #5

Browse Source
This commit is contained in:
Richard Chien 2018-08-21 22:31:22 +08:00
parent 7bae9db58b
commit e212eabaf9
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
none/command.py
View File

@ -400,17 +400,16 @@ async def handle_command(bot: NoneBot, ctx: Dict[str, Any]) -> bool:
:return: the message is handled as a command :return: the message is handled as a command
""" """
ctx_id = context_id(ctx) ctx_id = context_id(ctx)
session = None
check_perm = True
if _sessions.get(ctx_id):
session = _sessions[ctx_id]
# wait for 1.5 seconds (at most) if the current session is running # wait for 1.5 seconds (at most) if the current session is running
retry = 5 retry = 5
while session.running and retry > 0: while retry > 0 and _sessions.get(ctx_id) and _sessions[ctx_id].running:
retry -= 1 retry -= 1
await asyncio.sleep(0.3) await asyncio.sleep(0.3)
check_perm = True
session = _sessions.get(ctx_id)
if session:
if session.running: if session.running:
logger.warning(f'There is a session of command ' logger.warning(f'There is a session of command '
f'{session.cmd.name} running, notify the user') f'{session.cmd.name} running, notify the user')
@ -427,8 +426,10 @@ async def handle_command(bot: NoneBot, ctx: Dict[str, Any]) -> bool:
else: else:
# the session is expired, remove it # the session is expired, remove it
logger.debug(f'Session of command {session.cmd.name} is expired') logger.debug(f'Session of command {session.cmd.name} is expired')
if ctx_id in _sessions:
del _sessions[ctx_id] del _sessions[ctx_id]
session = None session = None
if not session: if not session:
cmd, current_arg = parse_command(bot, str(ctx['message']).lstrip()) cmd, current_arg = parse_command(bot, str(ctx['message']).lstrip())
if not cmd: if not cmd:
@ -439,6 +440,7 @@ async def handle_command(bot: NoneBot, ctx: Dict[str, Any]) -> bool:
return False return False
session = CommandSession(bot, ctx, cmd, current_arg=current_arg) session = CommandSession(bot, ctx, cmd, current_arg=current_arg)
logger.debug(f'New session of command {session.cmd.name} created') logger.debug(f'New session of command {session.cmd.name} created')
return await _real_run_command(session, ctx_id, check_perm=check_perm) return await _real_run_command(session, ctx_id, check_perm=check_perm)
@ -481,11 +483,9 @@ async def _real_run_command(session: CommandSession,
ctx_id: str, ctx_id: str,
disable_interaction: bool = False, disable_interaction: bool = False,
**kwargs) -> bool: **kwargs) -> bool:
session_overridden = False
if not disable_interaction: if not disable_interaction:
# override session only when not disabling interaction # override session only when interaction is not disabled
_sessions[ctx_id] = session _sessions[ctx_id] = session
session_overridden = True
try: try:
logger.debug(f'Running command {session.cmd.name}') logger.debug(f'Running command {session.cmd.name}')
session.running = True session.running = True
@ -503,14 +503,18 @@ async def _real_run_command(session: CommandSession,
except (_FinishException, SwitchException) as e: except (_FinishException, SwitchException) as e:
session.running = False session.running = False
logger.debug(f'Session of command {session.cmd.name} finished') logger.debug(f'Session of command {session.cmd.name} finished')
if session_overridden: if not disable_interaction and ctx_id in _sessions:
# the command is finished, remove the session # the command is finished, remove the session,
# but if interaction is disabled during this command call,
# we leave the _sessions untouched.
del _sessions[ctx_id] del _sessions[ctx_id]
if isinstance(e, _FinishException): if isinstance(e, _FinishException):
return e.result return e.result
elif isinstance(e, SwitchException): elif isinstance(e, SwitchException):
# we are guaranteed that the session is not first run here # we are guaranteed that the session is not first run here,
# which means interaction is definitely enabled,
# so we can safely touch _sessions here.
if ctx_id in _sessions: if ctx_id in _sessions:
# make sure there is no session waiting # make sure there is no session waiting
del _sessions[ctx_id] del _sessions[ctx_id]