fix(portability): cross-platform size-on-disk

Adds the filesize crate as a dependency.
imsnif · Jun 18, 2020 · b83a07a · b83a07a
1 parent f19a4f5
commit b83a07a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,6 +15,7 @@ failure = "0.1"
 walkdir = "2"
 signal-hook = "0.1.10"
 structopt = "0.3"
+filesize = "0.2.0"
 
 [dev-dependencies]
 insta = "0.12.0"

diff --git a/src/state/files/file_or_folder.rs b/src/state/files/file_or_folder.rs
@@ -1,9 +1,10 @@
 use ::std::collections::{HashMap, VecDeque};
 use ::std::ffi::OsString;
 use ::std::fs::Metadata;
-use ::std::os::unix::fs::MetadataExt; // TODO: support other OSs
 use ::std::path::PathBuf;
 
+use ::filesize::PathExt;
+
 #[derive(Debug, Clone)]
 pub enum FileOrFolder {
     Folder(Folder),
@@ -58,7 +59,7 @@ impl Folder {
         if entry_metadata.is_dir() {
             self.add_folder(relative_path);
         } else {
-            let size = entry_metadata.blocks() * 512; // TODO: support other OSs that do not have blocks
+            let size = relative_path.size_on_disk_fast(&entry_metadata).unwrap_or(entry_metadata.len());
             self.add_file(relative_path, size);
         }
     }