mirror of
https://github.com/nushell/nushell
synced 2024-12-26 13:03:07 +00:00
Make clickable links smarter (#6556)
* Disable clickable links when we can't get metadata of files Fixes #6498 * Refactor path name rendering related code * Make clickable links smarter * Remove unneeded clone * Return early if `use_ls_colors` is disabled
This commit is contained in:
nibon7
GitHub
parent
12a0fe39f7
commit
b159bf2c28
1 changed files with 51 additions and 61 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
use lscolors::Style;
|
use lscolors::{LsColors, Style};
|
||||||
use nu_color_config::{get_color_config, style_primitive};
|
use nu_color_config::{get_color_config, style_primitive};
|
||||||
use nu_engine::{column::get_columns, env_to_string, CallExt};
|
use nu_engine::{column::get_columns, env_to_string, CallExt};
|
||||||
use nu_protocol::{
|
use nu_protocol::{
|
||||||
|
|
@ -261,10 +261,6 @@ fn handle_row_stream(
|
||||||
};
|
};
|
||||||
let ls_colors = get_ls_colors(ls_colors_env_str);
|
let ls_colors = get_ls_colors(ls_colors_env_str);
|
||||||
|
|
||||||
// clickable links don't work in remote SSH sessions
|
|
||||||
let in_ssh_session = std::env::var("SSH_CLIENT").is_ok();
|
|
||||||
let show_clickable_links = config.show_clickable_links_in_ls && !in_ssh_session;
|
|
||||||
|
|
||||||
ListStream::from_stream(
|
ListStream::from_stream(
|
||||||
stream.map(move |mut x| match &mut x {
|
stream.map(move |mut x| match &mut x {
|
||||||
Value::Record { cols, vals, .. } => {
|
Value::Record { cols, vals, .. } => {
|
||||||
|
|
@ -273,62 +269,10 @@ fn handle_row_stream(
|
||||||
while idx < cols.len() {
|
while idx < cols.len() {
|
||||||
if cols[idx] == "name" {
|
if cols[idx] == "name" {
|
||||||
if let Some(Value::String { val: path, span }) = vals.get(idx) {
|
if let Some(Value::String { val: path, span }) = vals.get(idx) {
|
||||||
match std::fs::symlink_metadata(&path) {
|
if let Some(val) =
|
||||||
Ok(metadata) => {
|
render_path_name(path, &config, &ls_colors, *span)
|
||||||
let style = ls_colors.style_for_path_with_metadata(
|
{
|
||||||
path.clone(),
|
vals[idx] = val;
|
||||||
Some(&metadata),
|
|
||||||
);
|
|
||||||
let ansi_style = style
|
|
||||||
.map(Style::to_crossterm_style)
|
|
||||||
// .map(ToNuAnsiStyle::to_nu_ansi_style)
|
|
||||||
.unwrap_or_default();
|
|
||||||
let use_ls_colors = config.use_ls_colors;
|
|
||||||
|
|
||||||
let full_path = PathBuf::from(path.clone())
|
|
||||||
.canonicalize()
|
|
||||||
.unwrap_or_else(|_| PathBuf::from(path));
|
|
||||||
let full_path_link = make_clickable_link(
|
|
||||||
full_path.display().to_string(),
|
|
||||||
Some(&path.clone()),
|
|
||||||
show_clickable_links,
|
|
||||||
);
|
|
||||||
|
|
||||||
if use_ls_colors {
|
|
||||||
vals[idx] = Value::String {
|
|
||||||
val: ansi_style
|
|
||||||
.apply(full_path_link)
|
|
||||||
.to_string(),
|
|
||||||
span: *span,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(_) => {
|
|
||||||
let style = ls_colors.style_for_path(path.clone());
|
|
||||||
let ansi_style = style
|
|
||||||
.map(Style::to_crossterm_style)
|
|
||||||
// .map(ToNuAnsiStyle::to_nu_ansi_style)
|
|
||||||
.unwrap_or_default();
|
|
||||||
let use_ls_colors = config.use_ls_colors;
|
|
||||||
|
|
||||||
let full_path = PathBuf::from(path.clone())
|
|
||||||
.canonicalize()
|
|
||||||
.unwrap_or_else(|_| PathBuf::from(path));
|
|
||||||
let full_path_link = make_clickable_link(
|
|
||||||
full_path.display().to_string(),
|
|
||||||
Some(&path.clone()),
|
|
||||||
show_clickable_links,
|
|
||||||
);
|
|
||||||
|
|
||||||
if use_ls_colors {
|
|
||||||
vals[idx] = Value::String {
|
|
||||||
val: ansi_style
|
|
||||||
.apply(full_path_link)
|
|
||||||
.to_string(),
|
|
||||||
span: *span,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -629,3 +573,49 @@ fn load_theme_from_config(config: &Config) -> TableTheme {
|
||||||
_ => nu_table::TableTheme::rounded(),
|
_ => nu_table::TableTheme::rounded(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn render_path_name(
|
||||||
|
path: &String,
|
||||||
|
config: &Config,
|
||||||
|
ls_colors: &LsColors,
|
||||||
|
span: Span,
|
||||||
|
) -> Option<Value> {
|
||||||
|
if !config.use_ls_colors {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
let stripped_path = match strip_ansi_escapes::strip(path) {
|
||||||
|
Ok(v) => String::from_utf8(v).unwrap_or_else(|_| path.to_owned()),
|
||||||
|
Err(_) => path.to_owned(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let (style, has_metadata) = match std::fs::symlink_metadata(&stripped_path) {
|
||||||
|
Ok(metadata) => (
|
||||||
|
ls_colors.style_for_path_with_metadata(path, Some(&metadata)),
|
||||||
|
true,
|
||||||
|
),
|
||||||
|
Err(_) => (ls_colors.style_for_path(path), false),
|
||||||
|
};
|
||||||
|
|
||||||
|
// clickable links don't work in remote SSH sessions
|
||||||
|
let in_ssh_session = std::env::var("SSH_CLIENT").is_ok();
|
||||||
|
let show_clickable_links = config.show_clickable_links_in_ls && !in_ssh_session && has_metadata;
|
||||||
|
|
||||||
|
let ansi_style = style
|
||||||
|
.map(Style::to_crossterm_style)
|
||||||
|
// .map(ToNuAnsiStyle::to_nu_ansi_style)
|
||||||
|
.unwrap_or_default();
|
||||||
|
|
||||||
|
let full_path = PathBuf::from(&stripped_path)
|
||||||
|
.canonicalize()
|
||||||
|
.unwrap_or_else(|_| PathBuf::from(&stripped_path));
|
||||||
|
|
||||||
|
let full_path_link = make_clickable_link(
|
||||||
|
full_path.display().to_string(),
|
||||||
|
Some(path),
|
||||||
|
show_clickable_links,
|
||||||
|
);
|
||||||
|
|
||||||
|
let val = ansi_style.apply(full_path_link).to_string();
|
||||||
|
Some(Value::String { val, span })
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue