Enable Windows builds

.travis.yml

@@ -12,9 +12,12 @@ matrix:
     - os: osx
       rust: stable
       env: TARGET=x86_64-apple-darwin
+    - os: windows
+      rust: stable
+      env: TARGET=x86_64-pc-windows-msvc
     # Minimum Rust supported channel.
     - os: linux
-      rust: 1.29.0
+      rust: 1.34.0
       env: TARGET=x86_64-unknown-linux-gnu
 
 

README.md

@@ -112,11 +112,18 @@ Check out the [release page](https://github.com/sharkdp/diskus/releases) for bin
 
 ### Via cargo
 
-If you have Rust 1.29 or higher, you can install `diskus` from source via `cargo`:
+If you have Rust 1.34 or higher, you can install `diskus` from source via `cargo`:
 ```
 cargo install diskus
 ```
 
+## Windows caveats
+
+Windows-internal tools such as Powershell, Explorer or `dir` are not respecting hardlinks or
+junction points when determining the size of a directory. `diskus` does the same and counts
+such entries multiple times (on Unix systems, multiple hardlinks to a single file are counted
+just once).
+
 ## License
 
 Licensed under either of

src/walk.rs → src/walk/mod.rs

@@ -1,6 +1,5 @@
 use std::collections::HashSet;
 use std::fs;
-use std::os::unix::fs::MetadataExt;
 use std::path::PathBuf;
 use std::thread;
 
@@ -10,7 +9,17 @@ use rayon;
 use rayon::prelude::*;
 
 #[derive(Eq, PartialEq, Hash)]
-struct UniqueID(u64, u64);
+pub struct UniqueID(u64, u64);
+
+#[cfg(target_os = "windows")]
+mod windows;
+#[cfg(target_os = "windows")]
+pub use self::windows::*;
+
+#[cfg(not(target_os = "windows"))]
+mod unix;
+#[cfg(not(target_os = "windows"))]
+pub use self::unix::*;
 
 enum Message {
     SizeEntry(Option<UniqueID>, u64),
@@ -21,14 +30,7 @@ enum Message {
 fn walk(tx: channel::Sender<Message>, entries: &[PathBuf]) {
     entries.into_par_iter().for_each_with(tx, |tx_ref, entry| {
         if let Ok(metadata) = entry.symlink_metadata() {
-            // If the entry has more than one hard link, generate
-            // a unique ID consisting of device and inode in order
-            // not to count this entry twice.
-            let unique_id = if metadata.is_file() && metadata.nlink() > 1 {
-                Some(UniqueID(metadata.dev(), metadata.ino()))
-            } else {
-                None
-            };
+            let unique_id = generate_unique_id(&metadata);
 
             let size = metadata.len();
 

src/walk/unix.rs

@@ -0,0 +1,14 @@
+use std::os::unix::fs::MetadataExt;
+
+use super::UniqueID;
+
+pub fn generate_unique_id(metadata: &std::fs::Metadata) -> Option<UniqueID> {
+    // If the entry has more than one hard link, generate
+    // a unique ID consisting of device and inode in order
+    // not to count this entry twice.
+    if metadata.is_file() && metadata.nlink() > 1 {
+        Some(UniqueID(metadata.dev(), metadata.ino()))
+    } else {
+        None
+    }
+}

src/walk/windows.rs

@@ -0,0 +1,9 @@
+pub fn generate_unique_id(_metadata: &std::fs::Metadata) -> Option<super::UniqueID> {
+    // Windows-internal tools such as Powershell, Explorer or `dir` are not respecting hardlinks
+    // or junction points when determining the size of a directory. `diskus` does the same and
+    // counts such entries multiple times (on Unix systems, multiple hardlinks to a single file are
+    // counted just once).
+    //
+    // See: https://github.com/sharkdp/diskus/issues/32
+    None
+}