Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(installer): improve directory selection experience

Browse Source
This commit is contained in:
Eugene Brodsky 2024-02-05 20:28:12 -05:00 committed by Kent Keirsey
parent 97c1545cca
commit 31b9538976
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
installer/lib/messages.py
View File

@ -97,22 +97,6 @@ def choose_version(available_releases: tuple | None = None) -> str:
return "stable" if response == "" else response return "stable" if response == "" else response
return response
def confirm_install(dest: Path) -> bool:
if dest.exists():
print(f":exclamation: Directory {dest} already exists :exclamation:")
dest_confirmed = Confirm.ask(
":stop_sign: (re)install in this location?",
default=False,
)
else:
print(f"InvokeAI will be installed in {dest}")
dest_confirmed = Confirm.ask("Use this location?", default=True)
console.line()
return dest_confirmed
def user_wants_auto_configuration() -> bool: def user_wants_auto_configuration() -> bool:
"""Prompt the user to choose between manual and auto configuration.""" """Prompt the user to choose between manual and auto configuration."""
@ -147,6 +131,22 @@ def user_wants_auto_configuration() -> bool:
return choice.lower().startswith("a") return choice.lower().startswith("a")
def confirm_install(dest: Path) -> bool:
if dest.exists():
print(f":stop_sign: Directory {dest} already exists!")
print(" Is this location correct?")
default = False
else:
print(f":file_folder: InvokeAI will be installed in {dest}")
default = True
dest_confirmed = Confirm.ask(" Please confirm:", default=default)
console.line()
return dest_confirmed
def dest_path(dest=None) -> Path | None: def dest_path(dest=None) -> Path | None:
""" """
Prompt the user for the destination path and create the path Prompt the user for the destination path and create the path
@ -162,15 +162,10 @@ def dest_path(dest=None) -> Path | None:
else: else:
dest = Path.cwd().expanduser().resolve() dest = Path.cwd().expanduser().resolve()
prev_dest = init_path = dest prev_dest = init_path = dest
dest_confirmed = False
dest_confirmed = confirm_install(dest)
while not dest_confirmed: while not dest_confirmed:
# if the given destination already exists, the starting point for browsing is its parent directory. browse_start = (dest or Path.cwd()).expanduser().resolve()
# the user may have made a typo, or otherwise wants to place the root dir next to an existing one.
# if the destination dir does NOT exist, then the user must have changed their mind about the selection.
# since we can't read their mind, start browsing at Path.cwd().
browse_start = (prev_dest.parent if prev_dest.exists() else Path.cwd()).expanduser().resolve()
path_completer = PathCompleter( path_completer = PathCompleter(
only_directories=True, only_directories=True,
@ -180,7 +175,8 @@ def dest_path(dest=None) -> Path | None:
) )
console.line() console.line()
console.print(f"[orange3]Please select the destination directory for the installation:[/] \\[{browse_start}]: ")
console.print(f":grey_question: [orange3]Please select the install destination:[/] \\[{browse_start}]: ")
selected = prompt( selected = prompt(
">>> ", ">>> ",
complete_in_thread=True, complete_in_thread=True,
@ -193,6 +189,7 @@ def dest_path(dest=None) -> Path | None:
) )
prev_dest = dest prev_dest = dest
dest = Path(selected) dest = Path(selected)
console.line() console.line()
dest_confirmed = confirm_install(dest.expanduser().resolve()) dest_confirmed = confirm_install(dest.expanduser().resolve())