beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 09:00:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Shell: Add support for showing shortened prompt path with ellipsis

Browse source
This commit is contained in:
Adam Harald Jørgensen 2023-11-03 15:24:18 +01:00 committed by Ali Mohammad Pur
parent 4febd31dba
commit a1cdfe1b54
Notes: sideshowbarker 2024-07-18 03:23:00 +09:00 
Author: https://github.com/adamjoer
Commit: https://github.com/SerenityOS/serenity/commit/a1cdfe1b54
Pull-request: https://github.com/SerenityOS/serenity/pull/21820
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Base/usr/share/man/man7/Shell-vars.md
View file

@ -61,7 +61,7 @@ The value of this variable is used to generate a prompt, the following escape se
- `\\h`: the current hostname - `\\h`: the current hostname
- `\\p`: the string '$' (or '#' if the user is 'root') - `\\p`: the string '$' (or '#' if the user is 'root')
- `\\u`: the current username - `\\u`: the current username
- `\\w`: a collapsed path (relative to home) to the current directory. If an integer follows the `\\`, it specifies the number of trailing components of the path to show - `\\w`, `\\W`: a collapsed path (relative to home) to the current directory. If an integer follows the `\\`, it specifies the number of trailing components of the path to show; if 'w' is used instead of 'W', removed components are shown with ellipsis ("...")
- `\\X`: reset style (foreground and background color, etc) - `\\X`: reset style (foreground and background color, etc)
- `\\t`: current time in the 24-hour format HH:MM:SS - `\\t`: current time in the 24-hour format HH:MM:SS
- `\\T`: current time in the 12-hour format HH:MM - `\\T`: current time in the 12-hour format HH:MM

18
Userland/Shell/Shell.cpp
View file

@ -118,7 +118,7 @@ DeprecatedString Shell::prompt() const
} else if (lexer.consume_specific('h')) { } else if (lexer.consume_specific('h')) {
builder.append({ hostname, strlen(hostname) }); builder.append({ hostname, strlen(hostname) });
} else if (lexer.consume_specific('w')) { } else if (lexer.consume_specific('w') || lexer.consume_specific('W')) {
DeprecatedString const home_path = getenv("HOME"); DeprecatedString const home_path = getenv("HOME");
if (cwd.starts_with(home_path)) { if (cwd.starts_with(home_path)) {
builder.append('~'); builder.append('~');
@ -128,7 +128,11 @@ DeprecatedString Shell::prompt() const
} }
} else if (auto const number_string = lexer.consume_while(is_ascii_digit); !number_string.is_empty()) { } else if (auto const number_string = lexer.consume_while(is_ascii_digit); !number_string.is_empty()) {
if (lexer.is_eof() || lexer.consume() != 'w') if (lexer.is_eof())
break;
auto const next_char = lexer.consume();
if (next_char != 'w' && next_char != 'W')
continue; continue;
auto const max_component_count = number_string.to_uint().value(); auto const max_component_count = number_string.to_uint().value();
@ -136,18 +140,26 @@ DeprecatedString Shell::prompt() const
DeprecatedString const home_path = getenv("HOME"); DeprecatedString const home_path = getenv("HOME");
auto const should_collapse_path = cwd.starts_with(home_path); auto const should_collapse_path = cwd.starts_with(home_path);
auto const should_use_ellipsis = (next_char == 'w');
auto const path = should_collapse_path ? cwd.substring_view(home_path.length(), cwd.length() - home_path.length()) auto const path = should_collapse_path ? cwd.substring_view(home_path.length(), cwd.length() - home_path.length())
: cwd.view(); : cwd.view();
auto const parts = path.split_view('/'); auto const parts = path.split_view('/');
auto const start_index = (max_component_count < parts.size()) ? parts.size() - max_component_count : 0; auto const start_index = (max_component_count < parts.size()) ? parts.size() - max_component_count : 0;
if (start_index == 0) { if (start_index == 0 || (start_index == 1 && should_use_ellipsis)) {
if (should_collapse_path) if (should_collapse_path)
builder.append('~'); builder.append('~');
builder.append(path); builder.append(path);
continue; continue;
} }
if (should_use_ellipsis) {
if (should_collapse_path)
builder.append("~/"sv);
builder.append(".../"sv);
}
for (auto i = start_index; i < parts.size(); ++i) { for (auto i = start_index; i < parts.size(); ++i) {
if (i != start_index) if (i != start_index)
builder.append('/'); builder.append('/');