fix: changed TYPE names; some code refactored

Author: at-elcapitan

src/ds.1

@@ -1,7 +1,7 @@
 .\" Manpage for Directory diSplay.
 .\" by ElCapitan, https://github.com/at-elcapitan
 
-.TH "ds" 1 "30 July 2024" "GNU" "Directory diSplay"
+.TH "ds" 1 "27 Feb 2026" "GNU" "Directory diSplay"
 .SH NAME
 Directory diSplay (DS) - display current directory
 

src/file.rs

@@ -38,7 +38,7 @@ fn get_file_type(file: &DirEntry) -> ObjectType {
 
     if filetype.is_dir() {
         ObjectType {
-            type_name: String::from(" DIR"),
+            type_name: String::from("DIR"),
             display_color: String::from("\x1b[34;1m")
         }
     } else if filetype.is_file() 
@@ -56,7 +56,7 @@ fn get_file_type(file: &DirEntry) -> ObjectType {
         }
     } else if filetype.is_symlink() {
         ObjectType {
-            type_name: String::from("SYMLINK"),
+            type_name: String::from("SYML"),
             display_color: String::from("\x1b[31;1m"),
         }
     } else if filetype.is_block_device() {
@@ -71,7 +71,7 @@ fn get_file_type(file: &DirEntry) -> ObjectType {
         }
     } else {
         ObjectType {
-            type_name: String::from("UNKNOWN"),
+            type_name: String::from("UNDEF"),
             display_color: String::from(""),
         }
     }

src/main.rs

@@ -50,30 +50,30 @@ fn main() -> std::io::Result<()> {
         &parsed_args.full_name
     );
 
-    // Displaying the top line and setting the final size
-    if let Some(dir_name) = current_dir.file_name() {
-        let current_dir_name: Cow<str> = dir_name.to_string_lossy();
-
-        let current_dir_name_len: usize = current_dir_name.chars()
-                                                          .count();
+    let current_dir_name: Cow<str>;
+    let current_dir_name_len: usize;
 
-        files.max_name_length = files.max_name_length.max(current_dir_name_len);
-        utils::display_top_line(
-            &files.max_name_length, 
-            current_dir_name, 
-            current_dir_name_len, 
-            &parsed_args.access, 
-            &parsed_args.size
-        );
+    // Setting final max_length value
+    if let Some(dir_name) = current_dir.file_name() {
+        current_dir_name = dir_name.to_string_lossy();
+        current_dir_name_len = 
+            current_dir_name.chars()
+                            .count();
+        files.max_name_length = 
+            files.max_name_length.max(current_dir_name_len);
     } else {
-        utils::display_top_line(
-            &files.max_name_length, 
-            Cow::Borrowed(""),
-            0, 
-            &parsed_args.access, 
-            &parsed_args.size
-        );
+        current_dir_name = Cow::Borrowed("");
+        current_dir_name_len = 0;
     }
+
+    // Displaying the top line
+    utils::display_top_line(
+        &files.max_name_length, 
+        current_dir_name, 
+        current_dir_name_len, 
+        &parsed_args.access, 
+        &parsed_args.size
+    );
 
     // Printing empty line
     println!("  │");

src/utils.rs

@@ -52,7 +52,7 @@ pub fn display_help() {
 }
 
 pub fn display_version() {
-    println!("ds (Directory diSplay) 2.1.0");
+    println!("ds (Directory diSplay) 2.1.1");
     println!();
     println!(
         "This is free software; see the source for copying conditions. There is NO"
@@ -79,28 +79,22 @@ pub fn display_top_line(max_length: &usize,
         additional.push_str("PUSER\tGROUP\tOTHER")
     }
 
-    if current_dir_name_len > 0 {
-        let spaces = max_length + 7 - current_dir_name_len;
+    let spaces = max_length + 7 - current_dir_name_len;
 
-        println!(
-            "{}/{}\tTYPE\t\t{}",
-            current_dir_name,
-            " ".repeat(spaces),
-            additional
-        );
-
-        return;
-    }
-
-    println!("./{}  \tTYPE\t\t{}", " ".repeat(max_length + 6), additional);
+    println!(
+        "{}/{}\tTYPE\t\t{}",
+        current_dir_name,
+        " ".repeat(spaces),
+        additional
+    );
 }
 
 pub fn display_objects(
         objects: Vec<DisplayableObject>, 
         max_length: &usize,
         flag_access: &bool,
         flag_size: &bool,
-        ending: bool
+        final_objects: bool
     ) {
     for (i, obj) in objects.iter().enumerate() {
         let mut flags_data = String::new();
@@ -130,12 +124,12 @@ pub fn display_objects(
 
         let symbol;
 
-        if ending && i == objects.len() - 1 {
+        if final_objects && i == objects.len() - 1 {
             symbol = String::from("└");
         } else {
             symbol = String::from("├");
         }
-
+        
         println!(
             "  {} {}{:<width$}\x1b[0m\t{}\t\t{flags_data}",
             symbol,