Speedup windows by only fetching the necessary blocks

src/core.rs

@@ -88,13 +88,14 @@ impl Core {
         };
 
         for path in paths {
-            let mut meta = match Meta::from_path(&path, self.flags.dereference.0) {
-                Ok(meta) => meta,
-                Err(err) => {
-                    print_error!("{}: {}.", path.display(), err);
-                    continue;
-                }
-            };
+            let mut meta =
+                match Meta::from_path(&path, self.flags.dereference.0, &self.flags.blocks) {
+                    Ok(meta) => meta,
+                    Err(err) => {
+                        print_error!("{}: {}.", path.display(), err);
+                        continue;
+                    }
+                };
 
             let recurse =
                 self.flags.layout == Layout::Tree || self.flags.display != Display::DirectoryOnly;

src/flags/blocks.rs

@@ -116,7 +116,7 @@ impl Blocks {
     ///
     /// It contains the [Block]s [Permission](Block::Permission), [User](Block::User),
     /// [Group](Block::Group), [Size](Block::Size), [Date](Block::Date) and [Name](Block::Name).
-    fn long() -> Self {
+    pub fn long() -> Self {
         Self(vec![
             Block::Permission,
             Block::User,

src/icon.rs

@@ -346,6 +346,7 @@ impl Icons {
 #[cfg(test)]
 mod test {
     use super::{Icons, Theme};
+    use crate::flags::Blocks;
     use crate::meta::Meta;
     use std::fs::File;
     use tempfile::tempdir;
@@ -355,7 +356,7 @@ mod test {
         let tmp_dir = tempdir().expect("failed to create temp dir");
         let file_path = tmp_dir.path().join("file.txt");
         File::create(&file_path).expect("failed to create file");
-        let meta = Meta::from_path(&file_path, false).unwrap();
+        let meta = Meta::from_path(&file_path, false, &Blocks::long()).unwrap();
 
         let icon = Icons::new(Theme::NoIcon, " ".to_string());
         let icon = icon.get(&meta.name);
@@ -368,7 +369,7 @@ mod test {
         let tmp_dir = tempdir().expect("failed to create temp dir");
         let file_path = tmp_dir.path().join("file");
         File::create(&file_path).expect("failed to create file");
-        let meta = Meta::from_path(&file_path, false).unwrap();
+        let meta = Meta::from_path(&file_path, false, &Blocks::long()).unwrap();
 
         let icon = Icons::new(Theme::Fancy, " ".to_string());
         let icon_str = icon.get(&meta.name);
@@ -381,7 +382,7 @@ mod test {
         let tmp_dir = tempdir().expect("failed to create temp dir");
         let file_path = tmp_dir.path().join("file");
         File::create(&file_path).expect("failed to create file");
-        let meta = Meta::from_path(&file_path, false).unwrap();
+        let meta = Meta::from_path(&file_path, false, &Blocks::long()).unwrap();
 
         let icon = Icons::new(Theme::Unicode, " ".to_string());
         let icon_str = icon.get(&meta.name);
@@ -393,7 +394,7 @@ mod test {
     fn get_directory_icon() {
         let tmp_dir = tempdir().expect("failed to create temp dir");
         let file_path = tmp_dir.path();
-        let meta = Meta::from_path(&file_path.to_path_buf(), false).unwrap();
+        let meta = Meta::from_path(&file_path.to_path_buf(), false, &Blocks::long()).unwrap();
 
         let icon = Icons::new(Theme::Fancy, " ".to_string());
         let icon_str = icon.get(&meta.name);
@@ -405,7 +406,7 @@ mod test {
     fn get_directory_icon_unicode() {
         let tmp_dir = tempdir().expect("failed to create temp dir");
         let file_path = tmp_dir.path();
-        let meta = Meta::from_path(&file_path.to_path_buf(), false).unwrap();
+        let meta = Meta::from_path(&file_path.to_path_buf(), false, &Blocks::long()).unwrap();
 
         let icon = Icons::new(Theme::Unicode, " ".to_string());
         let icon_str = icon.get(&meta.name);
@@ -417,7 +418,7 @@ mod test {
     fn get_directory_icon_with_ext() {
         let tmp_dir = tempdir().expect("failed to create temp dir");
         let file_path = tmp_dir.path();
-        let meta = Meta::from_path(&file_path.to_path_buf(), false).unwrap();
+        let meta = Meta::from_path(&file_path.to_path_buf(), false, &Blocks::long()).unwrap();
 
         let icon = Icons::new(Theme::Fancy, " ".to_string());
         let icon_str = icon.get(&meta.name);
@@ -432,7 +433,7 @@ mod test {
         for (file_name, file_icon) in &Icons::get_default_icons_by_name() {
             let file_path = tmp_dir.path().join(file_name);
             File::create(&file_path).expect("failed to create file");
-            let meta = Meta::from_path(&file_path, false).unwrap();
+            let meta = Meta::from_path(&file_path, false, &Blocks::long()).unwrap();
 
             let icon = Icons::new(Theme::Fancy, " ".to_string());
             let icon_str = icon.get(&meta.name);
@@ -448,7 +449,7 @@ mod test {
         for (ext, file_icon) in &Icons::get_default_icons_by_extension() {
             let file_path = tmp_dir.path().join(format!("file.{}", ext));
             File::create(&file_path).expect("failed to create file");
-            let meta = Meta::from_path(&file_path, false).unwrap();
+            let meta = Meta::from_path(&file_path, false, &Blocks::long()).unwrap();
 
             let icon = Icons::new(Theme::Fancy, " ".to_string());
             let icon_str = icon.get(&meta.name);

src/meta/filetype.rs

@@ -108,6 +108,7 @@ impl FileType {
 mod test {
     use super::FileType;
     use crate::color::{Colors, Theme};
+    use crate::flags::Blocks;
     use crate::meta::Meta;
     #[cfg(unix)]
     use crate::meta::Permissions;
@@ -141,7 +142,7 @@ mod test {
     #[test]
     fn test_dir_type() {
         let tmp_dir = tempdir().expect("failed to create temp dir");
-        let meta = Meta::from_path(&tmp_dir.path().to_path_buf(), false)
+        let meta = Meta::from_path(&tmp_dir.path().to_path_buf(), false, &Blocks::long())
             .expect("failed to get tempdir path");
         let metadata = tmp_dir.path().metadata().expect("failed to get metas");
 

src/meta/mod.rs

@@ -22,7 +22,7 @@ pub use self::size::Size;
 pub use self::symlink::SymLink;
 pub use crate::icon::Icons;
 
-use crate::flags::{Display, Flags, Layout};
+use crate::flags::{Block, Blocks, Display, Flags, Layout};
 use crate::print_error;
 
 use std::fs::read_link;
@@ -84,8 +84,11 @@ impl Meta {
             current_meta = self.clone();
             current_meta.name.name = ".".to_owned();
 
-            let parent_meta =
-                Self::from_path(&self.path.join(Component::ParentDir), flags.dereference.0)?;
+            let parent_meta = Self::from_path(
+                &self.path.join(Component::ParentDir),
+                flags.dereference.0,
+                &flags.blocks,
+            )?;
 
             content.push(current_meta);
             content.push(parent_meta);
@@ -109,7 +112,7 @@ impl Meta {
                 }
             }
 
-            let mut entry_meta = match Self::from_path(&path, flags.dereference.0) {
+            let mut entry_meta = match Self::from_path(&path, flags.dereference.0, &flags.blocks) {
                 Ok(res) => res,
                 Err(err) => {
                     print_error!("{}: {}.", path.display(), err);
@@ -200,21 +203,30 @@ impl Meta {
         }
     }
 
-    pub fn from_path(path: &Path, dereference: bool) -> Result<Self, std::io::Error> {
+    pub fn from_path(
+        path: &Path,
+        dereference: bool,
+        blocks: &Blocks,
+    ) -> Result<Self, std::io::Error> {
         // If the file is a link then retrieve link metadata instead with target metadata (if present).
         let (metadata, symlink_meta) = if read_link(path).is_ok() && !dereference {
             (path.symlink_metadata()?, path.metadata().ok())
         } else {
             (path.metadata()?, None)
         };
 
+        let get_owner = blocks.0.contains(&Block::User);
+        let get_group = blocks.0.contains(&Block::Group);
+        let get_permissions = blocks.0.contains(&Block::Permission);
+
         #[cfg(unix)]
         let owner = Owner::from(&metadata);
         #[cfg(unix)]
         let permissions = Permissions::from(&metadata);
 
         #[cfg(windows)]
-        let (owner, permissions) = windows_utils::get_file_data(&path)?;
+        let (owner, permissions) =
+            windows_utils::get_file_data(&path, get_owner, get_group, get_permissions)?;
 
         let file_type = FileType::new(&metadata, symlink_meta.as_ref(), &permissions);
         let name = Name::new(&path, file_type);

src/meta/name.rs

@@ -166,6 +166,7 @@ mod test {
     use super::DisplayOption;
     use super::Name;
     use crate::color::{self, Colors};
+    use crate::flags::Blocks;
     use crate::icon::{self, Icons};
     use crate::meta::FileType;
     use crate::meta::Meta;
@@ -210,7 +211,7 @@ mod test {
         // Chreate the directory
         let dir_path = tmp_dir.path().join("directory");
         fs::create_dir(&dir_path).expect("failed to create the dir");
-        let meta = Meta::from_path(&dir_path, false).unwrap();
+        let meta = Meta::from_path(&dir_path, false, &Blocks::long()).unwrap();
 
         let colors = Colors::new(color::Theme::NoLscolors);
 
@@ -310,7 +311,7 @@ mod test {
         // Create the file;
         let file_path = tmp_dir.path().join("file.txt");
         File::create(&file_path).expect("failed to create file");
-        let meta = Meta::from_path(&file_path, false).unwrap();
+        let meta = Meta::from_path(&file_path, false, &Blocks::long()).unwrap();
 
         let colors = Colors::new(color::Theme::NoColor);
 

src/meta/permissions.rs

@@ -2,7 +2,7 @@ use crate::color::{ColoredString, Colors, Elem};
 use ansi_term::ANSIStrings;
 use std::fs::Metadata;
 
-#[derive(Debug, PartialEq, Eq, Copy, Clone)]
+#[derive(Debug, PartialEq, Eq, Copy, Clone, Default)]
 pub struct Permissions {
     pub user_read: bool,
     pub user_write: bool,