Skip to content

non-tty LsCommand #11

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.

Sign up for GitHub

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

Merged
BakerNet merged 1 commit into from
Jun 29, 2025
Merged

non-tty LsCommand #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 30 additions & 6 deletions src/app/terminal/fs_tools.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,17 +252,41 @@ This version of ls only supports options 'a' and 'l'"#
view! { {all_views} }.into_any()
}))
} else {
// For non-TTY output, just return simple text
// TODO - fix - not currently doing long format
// For non-TTY output, return text format
let mut text_output = Vec::new();
let is_multi =
dir_listings.len() > 1 || (!dir_listings.is_empty() && !file_items.is_empty());

// Handle file targets
if !file_items.is_empty() {
for item in &file_items {
if long_format {
text_output.push(format!("{} {}", item.node.long_meta_string(item.link_count), item.display_name));
} else {
text_output.push(item.display_name.clone());
}
}

for item in &file_items {
text_output.push(item.display_name.clone());
if is_multi {
text_output.push("".to_string()); // Empty line separator
}
}

for (_, items) in &dir_listings {
// Handle directory targets
for (i, (display_name, items)) in dir_listings.iter().enumerate() {
if is_multi {
if i > 0 {
text_output.push("".to_string()); // Empty line separator
}
text_output.push(format!("{}:", display_name));
}

for item in items {
text_output.push(item.display_name.clone());
if long_format {
text_output.push(format!("{} {}", item.node.long_meta_string(item.link_count), item.display_name));
} else {
text_output.push(item.display_name.clone());
}
}
}

Expand Down