Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle lines ending with a backslash on replay and recording #294

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions src/doitlive/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,12 +169,20 @@ def run(
commentecho=commentecho,
)

backslash_broken_command_buffer = []
i = 0
while i < len(commands):
command = commands[i].strip()
i += 1
if not command:
continue
if command.endswith("\\"):
backslash_broken_command_buffer.append(command[:-1])
continue
if backslash_broken_command_buffer:
backslash_broken_command_buffer += command
command = "".join(backslash_broken_command_buffer)
backslash_broken_command_buffer = []
is_comment = command.startswith("#")
if not is_comment:
command_as_list = shlex.split(command)
Expand Down Expand Up @@ -468,11 +476,23 @@ def echo_rec_buffer(commands):

def run_recorder(shell, prompt, aliases=None, envvars=None):
commands = []
prefix = "(" + style("REC", fg="red") + ") "
default_prefix = "(" + style("REC", fg="red") + ") "
broken_line_prefix = "> "
backslash_broken_command_buffer = []
while True:
formatted_prompt = prefix + format_prompt(THEMES[prompt]) + " "
formatted_prompt = (
default_prefix + format_prompt(THEMES[prompt]) + " "
if not backslash_broken_command_buffer
else broken_line_prefix
)
command = click.prompt(formatted_prompt, prompt_suffix="").strip()

if command.endswith("\\"):
backslash_broken_command_buffer.append(command[:-1])
continue
if backslash_broken_command_buffer:
backslash_broken_command_buffer += command
command = "".join(backslash_broken_command_buffer)
backslash_broken_command_buffer = []
if command == STOP_COMMAND:
break
elif command == PREVIEW_COMMAND:
Expand Down