guillermo/lsplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0B instead of 0.00B

Browse Source
This commit is contained in:
=
2024-02-24 12:59:56 +01:00
parent 873f368004
commit 28cb8c587b
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/out/list.rs
View File

@@ -57,6 +57,7 @@ fn print_elements(
for (i, e) in elements.iter().enumerate() { for (i, e) in elements.iter().enumerate() {
print!("│ "); print!("│ ");
// text.push_str("│ ");
let mut e_string = String::new(); let mut e_string = String::new();
if current_depth > 0 { if current_depth > 0 {
add_recursive_lines( add_recursive_lines(
@@ -69,15 +70,30 @@ fn print_elements(
} }
e_string.push_str(e.to_string().as_str()); e_string.push_str(e.to_string().as_str());
print!( let file_text = pad_string(
"{}",
pad_string(
get_slice_of_string(e_string.as_str(), name_length - 1, 0, current_depth), get_slice_of_string(e_string.as_str(), name_length - 1, 0, current_depth),
name_length, name_length,
true true,
)
); );
print!(
"{}",
file_text // if e.get_file_type() == TypeOfFile::Dir {
// file_text.cyan().to_string()
// } else {
// file_text
// }
);
// text.push_str(
// pad_string(
// get_slice_of_string(e_string.as_str(), name_length - 1, 0, current_depth),
// name_length,
// true,
// )
// .as_str(),
// );
print_size_and_creation_date(e); print_size_and_creation_date(e);
let num_splits = let num_splits =
@@ -105,7 +121,9 @@ fn print_elements(
.as_str(), .as_str(),
); );
print!("{}", pad_string(e_name, name_length + 2, true)); print!("{}", pad_string(e_name, name_length + 2, true));
// text.push_str(pad_string(e_name, name_length + 2, true).as_str());
println!("│ │ │"); println!("│ │ │");
// text.push_str("│ │ │\n");
} }
if e.get_file_type() == TypeOfFile::Dir && current_depth < recursive_limit { if e.get_file_type() == TypeOfFile::Dir && current_depth < recursive_limit {

8
src/utils.rs
View File

@@ -59,7 +59,7 @@ pub fn get_string_length(s: &str) -> usize {
pub fn get_size_string(bytes: u64) -> String { pub fn get_size_string(bytes: u64) -> String {
if bytes == 0 { if bytes == 0 {
return String::from("0.00 B "); return String::from(" 0 B ");
} }
let bytes_f32 = bytes as f32; let bytes_f32 = bytes as f32;
let exp = bytes_f32.log(1024.0).floor(); let exp = bytes_f32.log(1024.0).floor();
@@ -89,12 +89,12 @@ pub fn sort_elements(elements: &mut [Element], sort_by: &SortBy) {
// ALL ICONS MUST BE FOLLOWED BY A SPACE // ALL ICONS MUST BE FOLLOWED BY A SPACE
pub fn get_icon_file_type<'a>(filename: String) -> &'a str { pub fn get_icon_file_type<'a>(filename: String) -> &'a str {
let extension = filename.split('.').last().unwrap(); //.collect::<Vec<&str>>()[1..].join("."); let extension = filename.split('.').last().unwrap();
match extension.to_lowercase().as_str() { match extension.to_lowercase().as_str() {
"jpg" | "jpeg" | "png" | "bmp" | "gif" | "webp" | "svg" => "󰋩 ", "jpg" | "jpeg" | "png" | "bmp" | "gif" | "webp" | "svg" => "󰋩 ",
"zip" | "rar" | "7zip" | "tar" | "gz" | "tgz" => "󰗄 ", "zip" | "rar" | "7zip" | "tar" | "gz" | "tgz" => "󰗄 ",
"config" | "toml" | "yaml" | "conf" | "cfg" => "󰒓 ",
"flv" | "avi" | "mp4" | "webm" | "mov" => "", "flv" | "avi" | "mp4" | "webm" | "mov" => "",
"config" | "toml" | "yaml" | "conf" => "󰒓 ",
"exe" | "bat" | "dll" | "msi" => "", "exe" | "bat" | "dll" | "msi" => "",
"mp3" | "wav" | "ogg" => "", "mp3" | "wav" | "ogg" => "",
"java" | "jar" => "", "java" | "jar" => "",
@@ -117,11 +117,13 @@ pub fn get_icon_file_type<'a>(filename: String) -> &'a str {
"lua" => "", "lua" => "",
"php" => "", "php" => "",
"vim" => "", "vim" => "",
"key" => "󰌋 ",
"rs" => "", "rs" => "",
"js" => "", "js" => "",
"sh" => "", "sh" => "",
"db" => "󰆼 ", "db" => "󰆼 ",
"cs" => "", "cs" => "",
"md" => "",
"c" => "", "c" => "",
"r" => "", "r" => "",
_ => "󰈔 ", _ => "󰈔 ",