New Version

Rename variable
Fix: Allow -n to be used with -d
2025-12-07 13:20:39 -08:00 · 2022-07-14 08:07:48 +01:00 · 2022-07-13 09:38:21 +01:00 · 2022-07-13 09:38:21 +01:00 · 2022-07-01 12:04:31 +01:00 · 2022-06-07 09:00:43 +01:00
17 changed files with 1417 additions and 1092 deletions
--- a/.github/workflows/CICD.yml
+++ b/.github/workflows/CICD.yml
@@ -81,12 +81,14 @@ jobs:
      matrix:
        job:
          # { os, target, cargo-options, features, use-cross, toolchain }
+          - { os: ubuntu-latest  , target: aarch64-unknown-linux-gnu   , use-cross: use-cross }
+          - { os: ubuntu-latest  , target: aarch64-unknown-linux-musl  , use-cross: use-cross }
          - { os: ubuntu-latest  , target: arm-unknown-linux-gnueabihf , use-cross: use-cross }
-          - { os: ubuntu-18.04   , target: i686-unknown-linux-gnu      , use-cross: use-cross }
-          - { os: ubuntu-18.04   , target: i686-unknown-linux-musl     , use-cross: use-cross }
+          - { os: ubuntu-20.04   , target: i686-unknown-linux-gnu      , use-cross: use-cross }
+          - { os: ubuntu-20.04   , target: i686-unknown-linux-musl     , use-cross: use-cross }
+          - { os: ubuntu-20.04   , target: x86_64-unknown-linux-gnu    , use-cross: use-cross }
+          - { os: ubuntu-20.04   , target: x86_64-unknown-linux-musl   , use-cross: use-cross }
          - { os: ubuntu-18.04   , target: x86_64-unknown-linux-gnu    , use-cross: use-cross }
-          - { os: ubuntu-18.04   , target: x86_64-unknown-linux-musl   , use-cross: use-cross }
-          - { os: ubuntu-16.04   , target: x86_64-unknown-linux-gnu    , use-cross: use-cross }
          - { os: macos-latest   , target: x86_64-apple-darwin         }
          - { os: windows-latest , target: i686-pc-windows-gnu         }
          - { os: windows-latest , target: i686-pc-windows-msvc        }
@@ -99,6 +101,7 @@ jobs:
      run: |
        case ${{ matrix.job.target }} in
          arm-unknown-linux-gnueabihf) sudo apt-get -y update ; sudo apt-get -y install gcc-arm-linux-gnueabihf ;;
+          aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install binutils-aarch64-linux-gnu ;;
        esac
    - name: Initialize workflow variables
      id: vars
@@ -134,7 +137,7 @@ jobs:
        echo ::set-output name=REF_TAG::${REF_TAG}
        echo ::set-output name=REF_SHAS::${REF_SHAS}
        # parse target
-        unset TARGET_ARCH ; case ${{ matrix.job.target }} in arm-unknown-linux-gnueabihf) TARGET_ARCH=arm ;; i686-*) TARGET_ARCH=i686 ;; x86_64-*) TARGET_ARCH=x86_64 ;; esac;
+        unset TARGET_ARCH ; case ${{ matrix.job.target }} in arm-unknown-linux-gnueabihf) TARGET_ARCH=arm ;; aarch-*) TARGET_ARCH=aarch64 ;; i686-*) TARGET_ARCH=i686 ;; x86_64-*) TARGET_ARCH=x86_64 ;; esac;
        echo set-output name=TARGET_ARCH::${TARGET_ARCH}
        echo ::set-output name=TARGET_ARCH::${TARGET_ARCH}
        unset TARGET_OS ; case ${{ matrix.job.target }} in *-linux-*) TARGET_OS=linux ;; *-apple-*) TARGET_OS=macos ;; *-windows-*) TARGET_OS=windows ;; esac;
@@ -166,16 +169,16 @@ jobs:
        echo ::set-output name=CARGO_USE_CROSS::${CARGO_USE_CROSS}
        # # * `arm` cannot be tested on ubuntu-* hosts (b/c testing is currently primarily done via comparison of target outputs with built-in outputs and the `arm` target is not executable on the host)
        JOB_DO_TESTING="true"
-        case ${{ matrix.job.target }} in arm-*) unset JOB_DO_TESTING ;; esac;
+        case ${{ matrix.job.target }} in arm-*|aarch64-*) unset JOB_DO_TESTING ;; esac;
        echo set-output name=JOB_DO_TESTING::${JOB_DO_TESTING:-<empty>/false}
        echo ::set-output name=JOB_DO_TESTING::${JOB_DO_TESTING}
        # # * test only binary for arm-type targets
        unset CARGO_TEST_OPTIONS
-        unset CARGO_TEST_OPTIONS ; case ${{ matrix.job.target }} in arm-*) CARGO_TEST_OPTIONS="--bin ${PROJECT_NAME}" ;; esac;
+        unset CARGO_TEST_OPTIONS ; case ${{ matrix.job.target }} in arm-*|aarch64-*) CARGO_TEST_OPTIONS="--bin ${PROJECT_NAME}" ;; esac;
        echo set-output name=CARGO_TEST_OPTIONS::${CARGO_TEST_OPTIONS}
        echo ::set-output name=CARGO_TEST_OPTIONS::${CARGO_TEST_OPTIONS}
        # * strip executable?
-        STRIP="strip" ; case ${{ matrix.job.target }} in arm-unknown-linux-gnueabihf) STRIP="arm-linux-gnueabihf-strip" ;; *-pc-windows-msvc) STRIP="" ;; esac;
+        STRIP="strip" ; case ${{ matrix.job.target }} in arm-unknown-linux-gnueabihf) STRIP="arm-linux-gnueabihf-strip" ;; *-pc-windows-msvc) STRIP="" ;; aarch64-unknown-linux-gnu) STRIP="aarch64-linux-gnu-strip" ;; aarch64-unknown-linux-musl) STRIP="" ;;esac;
        echo set-output name=STRIP::${STRIP}
        echo ::set-output name=STRIP::${STRIP}
    - name: Create all needed build/work directories
@@ -205,6 +208,18 @@ jobs:
        use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }}
        command: build
        args: --release --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }}
+    - name: Install cargo-deb
+      uses: actions-rs/cargo@v1
+      with:
+          command: install
+          args: cargo-deb
+      if: matrix.job.target == 'i686-unknown-linux-musl' || matrix.job.target == 'x86_64-unknown-linux-musl'
+    - name: Build deb
+      uses: actions-rs/cargo@v1
+      with:
+          command: deb
+          args: --no-build --target=${{ matrix.job.target }}
+      if: matrix.job.target == 'i686-unknown-linux-musl' || matrix.job.target == 'x86_64-unknown-linux-musl'
    - name: Test
      uses: actions-rs/cargo@v1
      with:
@@ -216,6 +231,12 @@ jobs:
      with:
        name: ${{ env.PROJECT_NAME }}-${{ matrix.job.target }}
        path: target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}
+    - name: Archive deb artifacts
+      uses: actions/upload-artifact@master
+      with:
+        name: ${{ env.PROJECT_NAME }}-${{ matrix.job.target }}.deb
+        path: target/${{ matrix.job.target }}/debian
+      if: matrix.job.target == 'i686-unknown-linux-musl' || matrix.job.target == 'x86_64-unknown-linux-musl'
    - name: Package
      shell: bash
      run: |
@@ -239,6 +260,8 @@ jobs:
      with:
        files: |
          ${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_NAME }}
+          target/${{ matrix.job.target }}/debian/*.deb
+
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,21 +1,14 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-[[package]]
-name = "aho-corasick"
-version = "0.7.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
-dependencies = [
- "memchr",
-]
+version = 3

 [[package]]
-name = "ansi_term"
-version = "0.11.0"
+name = "aho-corasick"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
 dependencies = [
- "winapi",
+ "memchr",
 ]

 [[package]]
@@ -29,10 +22,11 @@ dependencies = [

 [[package]]
 name = "assert_cmd"
-version = "1.0.2"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dc1679af9a1ab4bea16f228b05d18f8363f8327b1fa8db00d2760cfafc6b61e"
+checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe"
 dependencies = [
+ "bstr",
 "doc-comment",
 "predicates",
 "predicates-core",
@@ -53,31 +47,27 @@ dependencies = [

 [[package]]
 name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

 [[package]]
 name = "bstr"
-version = "0.2.14"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf"
+checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
 dependencies = [
+ "lazy_static",
 "memchr",
+ "regex-automata",
 ]

-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -86,56 +76,69 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "clap"
-version = "2.33.3"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+checksum = "5177fac1ab67102d8989464efd043c6ff44191b1557ec1ddd489b4f7e1447e77"
 dependencies = [
- "ansi_term 0.11.0",
 "atty",
 "bitflags",
+ "indexmap",
+ "lazy_static",
+ "os_str_bytes",
 "strsim",
+ "termcolor",
 "textwrap",
- "unicode-width",
- "vec_map",
 ]

 [[package]]
 name = "crossbeam-channel"
-version = "0.4.4"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
+checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"
 dependencies = [
- "crossbeam-utils 0.7.2",
- "maybe-uninit",
+ "cfg-if",
+ "crossbeam-utils",
 ]

 [[package]]
-name = "crossbeam-utils"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-dependencies = [
- "autocfg",
- "cfg-if 0.1.10",
- "lazy_static",
-]
-
-[[package]]
-name = "crossbeam-utils"
+name = "crossbeam-deque"
 version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
+checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
 dependencies = [
- "autocfg",
- "cfg-if 1.0.0",
+ "cfg-if",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "lazy_static",
+ "memoffset",
+ "scopeguard",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6"
+dependencies = [
+ "cfg-if",
 "lazy_static",
 ]

 [[package]]
-name = "difference"
-version = "2.0.0"
+name = "difflib"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
+checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"

 [[package]]
 name = "doc-comment"
@@ -145,79 +148,78 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"

 [[package]]
 name = "du-dust"
-version = "0.5.4"
+version = "0.8.1"
 dependencies = [
- "ansi_term 0.12.1",
+ "ansi_term",
 "assert_cmd",
 "clap",
- "crossbeam-channel",
- "ignore",
 "lscolors",
- "num_cpus",
+ "rayon",
+ "regex",
 "stfu8",
 "tempfile",
 "terminal_size",
 "thousands",
 "unicode-width",
- "walkdir",
 "winapi-util",
 ]

 [[package]]
-name = "fnv"
-version = "1.0.7"
+name = "either"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"

 [[package]]
-name = "getrandom"
-version = "0.2.1"
+name = "fastrand"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4060f4657be78b8e766215b02b18a2e862d83745545de804638e2b545e81aee6"
+checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
 dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi",
+ "instant",
 ]

 [[package]]
-name = "globset"
-version = "0.4.6"
+name = "hashbrown"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c152169ef1e421390738366d2f796655fec62621dabbd0fd476f905934061e4a"
-dependencies = [
- "aho-corasick",
- "bstr",
- "fnv",
- "log",
- "regex",
-]
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"

 [[package]]
 name = "hermit-abi"
-version = "0.1.17"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
 dependencies = [
 "libc",
 ]

 [[package]]
-name = "ignore"
-version = "0.4.17"
+name = "indexmap"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b287fb45c60bb826a0dc68ff08742b9d88a2fea13d6e0c286b3172065aaf878c"
+checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223"
 dependencies = [
- "crossbeam-utils 0.8.1",
- "globset",
- "lazy_static",
- "log",
- "memchr",
- "regex",
- "same-file",
- "thread_local",
- "walkdir",
- "winapi-util",
+ "autocfg",
+ "hashbrown",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
+dependencies = [
+ "either",
 ]

 [[package]]
@@ -228,18 +230,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.82"
+version = "0.2.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
-
-[[package]]
-name = "log"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2"
-dependencies = [
- "cfg-if 0.1.10",
-]
+checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4"

 [[package]]
 name = "lscolors"
@@ -247,129 +240,126 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d24b894c45c9da468621cdd615a5a79ee5e5523dd4f75c76ebc03d458940c16e"
 dependencies = [
- "ansi_term 0.12.1",
+ "ansi_term",
 ]

 [[package]]
-name = "maybe-uninit"
-version = "2.0.0"
+name = "memchr"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"

 [[package]]
-name = "memchr"
-version = "2.3.4"
+name = "memoffset"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+dependencies = [
+ "autocfg",
+]

 [[package]]
 name = "num_cpus"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
 dependencies = [
 "hermit-abi",
 "libc",
 ]

 [[package]]
-name = "ppv-lite86"
-version = "0.2.10"
+name = "os_str_bytes"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
+dependencies = [
+ "memchr",
+]

 [[package]]
 name = "predicates"
-version = "1.0.6"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73dd9b7b200044694dfede9edf907c1ca19630908443e9447e624993700c6932"
+checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c"
 dependencies = [
- "difference",
+ "difflib",
+ "itertools",
 "predicates-core",
 ]

 [[package]]
 name = "predicates-core"
-version = "1.0.1"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb3dbeaaf793584e29c58c7e3a82bbb3c7c06b63cea68d13b0e3cddc124104dc"
+checksum = "da1c2388b1513e1b605fcec39a95e0a9e8ef088f71443ef37099fa9ae6673fcb"

 [[package]]
 name = "predicates-tree"
-version = "1.0.1"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aee95d988ee893cb35c06b148c80ed2cd52c8eea927f50ba7a0be1a786aeab73"
+checksum = "4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032"
 dependencies = [
 "predicates-core",
- "treeline",
+ "termtree",
 ]

 [[package]]
-name = "rand"
-version = "0.8.2"
+name = "rayon"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18519b42a40024d661e1714153e9ad0c3de27cd495760ceb09710920f1098b1e"
+checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
 dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
- "rand_hc",
+ "autocfg",
+ "crossbeam-deque",
+ "either",
+ "rayon-core",
 ]

 [[package]]
-name = "rand_chacha"
-version = "0.3.0"
+name = "rayon-core"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
+checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
 dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
-dependencies = [
- "rand_core",
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-utils",
+ "lazy_static",
+ "num_cpus",
 ]

 [[package]]
 name = "redox_syscall"
-version = "0.2.4"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570"
+checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
 dependencies = [
 "bitflags",
 ]

 [[package]]
 name = "regex"
-version = "1.4.3"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
+checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
 dependencies = [
 "aho-corasick",
 "memchr",
 "regex-syntax",
- "thread_local",
 ]

 [[package]]
-name = "regex-syntax"
-version = "0.6.22"
+name = "regex-automata"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"

 [[package]]
 name = "remove_dir_all"
@@ -381,19 +371,16 @@ dependencies = [
 ]

 [[package]]
-name = "same-file"
-version = "1.0.6"
+name = "scopeguard"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"

 [[package]]
 name = "stfu8"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bf70433e3300a3c395d06606a700cdf4205f4f14dbae2c6833127c6bb22db77"
+checksum = "019f0c664fd85d5a87dcfb62b40b691055392a35a6e59f4df83d4b770db7e876"
 dependencies = [
 "lazy_static",
 "regex",
@@ -401,42 +388,54 @@ dependencies = [

 [[package]]
 name = "strsim"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"

 [[package]]
 name = "tempfile"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
+ "fastrand",
 "libc",
- "rand",
 "redox_syscall",
 "remove_dir_all",
 "winapi",
 ]

 [[package]]
-name = "terminal_size"
-version = "0.1.15"
+name = "termcolor"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bd2d183bd3fac5f5fe38ddbeb4dc9aec4a39a9d7d59e7491d900302da01cbe1"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "terminal_size"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
 dependencies = [
 "libc",
 "winapi",
 ]

 [[package]]
-name = "textwrap"
-version = "0.11.0"
+name = "termtree"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
+checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b"
+
+[[package]]
+name = "textwrap"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"

 [[package]]
 name = "thousands"
@@ -444,32 +443,11 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820"

-[[package]]
-name = "thread_local"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "treeline"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
-
 [[package]]
 name = "unicode-width"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"

 [[package]]
 name = "wait-timeout"
@@ -480,23 +458,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "walkdir"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
-dependencies = [
- "same-file",
- "winapi",
- "winapi-util",
-]
-
-[[package]]
-name = "wasi"
-version = "0.10.1+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93c6c3420963c5c64bca373b25e77acb562081b9bb4dd5bb864187742186cea9"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
 name = "du-dust"
 description = "A more intuitive version of du"
-version = "0.5.4"
+version = "0.8.1"
 authors = ["bootandy <bootandy@gmail.com>", "nebkor <code@ardent.nebcorp.com>"]
 edition = "2018"
+readme = "README.md"

 documentation = "https://github.com/bootandy/dust"
 homepage = "https://github.com/bootandy/dust"
@@ -14,7 +15,7 @@ categories = ["command-line-utilities"]
 license = "Apache-2.0"

 [badges]
-travis-ci = {repository = "https://travis-ci.org/bootandy/dust"}
+travis-ci = { repository = "https://travis-ci.org/bootandy/dust" }

 [[bin]]
 name = "dust"
@@ -22,25 +23,35 @@ path = "src/main.rs"

 [dependencies]
 ansi_term = "0.12"
-clap = "=2.33"
+clap = { version = "=3", features=["cargo"] }
 lscolors = "0.7"
-num_cpus = "1"
 terminal_size = "0.1"
 unicode-width = "0.1"
-ignore="0.4"
-crossbeam-channel = "0.4"
-walkdir="2.3"
+rayon="1"
 thousands = "0.2"
 stfu8 = "0.2"
+regex = "1"

 [target.'cfg(windows)'.dependencies]
 winapi-util = "0.1"

 [dev-dependencies]
-assert_cmd ="1"
+assert_cmd = "1"
 tempfile = "=3"

-
 [[test]]
 name = "integration"
 path = "tests/tests.rs"
+
+[package.metadata.deb]
+section = "utils"
+assets = [
+  ["target/release/dust", "usr/bin/", "755"],
+  ["LICENSE", "usr/share/doc/du-dust/", "644"],
+  ["README.md", "usr/share/doc/du-dust/README", "644"],
+]
+extended-description = """\
+Dust is meant to give you an instant overview of which directories are using
+disk space without requiring sort or head. Dust will print a maximum of one
+'Did not have permissions message'.
+"""
--- a/README.md
+++ b/README.md
@@ -26,6 +26,14 @@ Because I want an easy way to see where my disk is being used.

 * `brew tap tgotwig/linux-dust && brew install dust`

+#### [Pacstall](https://github.com/pacstall/pacstall) (Debian/Ubuntu)
+
+* `pacstall -I dust-bin`
+
+#### Windows:
+* Windows GNU version - works
+* Windows MSVC - requires: [VCRUNTIME140.dll](https://docs.microsoft.com/en-gb/cpp/windows/latest-supported-vc-redist?view=msvc-170)
+
 #### Download

 * Download Linux/Mac binary from [Releases](https://github.com/bootandy/dust/releases)
@@ -38,20 +46,27 @@ Dust is meant to give you an instant overview of which directories are using dis

 Dust will list a slightly-less-than-the-terminal-height number of the biggest subdirectories or files and will smartly recurse down the tree to find the larger ones. There is no need for a '-d' flag or a '-h' flag. The largest subdirectories will be colored.

+The different colors on the bars: These represent the combined tree hierarchy & disk usage. The shades of grey are used to indicate which parent folder a subfolder belongs to. For instance, look at the above screenshot. `.steam` is a folder taking 44% of the space. From the `.steam` bar is a light grey line that goes up. All these folders are inside `.steam` so if you delete `.steam` all that stuff will be gone too.
+
 ## Usage

 ```
 Usage: dust
 Usage: dust <dir>
 Usage: dust <dir>  <another_dir> <and_more>
-Usage: dust -p <dir>  (full-path - does not shorten the path of the subdirectories)
-Usage: dust -s <dir>  (apparent-size - shows the length of the file as opposed to the amount of disk space it uses)
-Usage: dust -n 30  <dir>  (shows 30 directories instead of the default)
-Usage: dust -d 3  <dir>  (shows 3 levels of subdirectories)
-Usage: dust -r  <dir>  (reverse order of output, with root at the lowest)
-Usage: dust -x  <dir>  (only show directories on the same filesystem)
-Usage: dust -X ignore  <dir>  (ignore all files and directories with the name 'ignore')
-Usage: dust -b <dir>  (do not show percentages or draw ASCII bars)
+Usage: dust -p (full-path - Show fullpath of the subdirectories)
+Usage: dust -s (apparent-size - shows the length of the file as opposed to the amount of disk space it uses)
+Usage: dust -n 30 (shows 30 directories instead of the default [default is terminal height])
+Usage: dust -d 3  (shows 3 levels of subdirectories)
+Usage: dust -r  (reverse order of output)
+Usage: dust -X ignore  (ignore all files and directories with the name 'ignore')
+Usage: dust -x (only show directories on the same filesystem)
+Usage: dust -b (do not show percentages or draw ASCII bars)
+Usage: dust -i (do not show hidden files)
+Usage: dust -c (No colors [monochrome])
+Usage: dust -f (Count files instead of diskspace)
+Usage: dust -t Group by filetype
+Usage: dust -e regex Only include files matching this regex (eg dust -e "\.png$" would match png files)
 ```


@@ -59,6 +74,9 @@ Usage: dust -b <dir>  (do not show percentages or draw ASCII bars)

 * [NCDU](https://dev.yorhel.nl/ncdu)
 * [dutree](https://github.com/nachoparker/dutree)
+* [dua](https://github.com/Byron/dua-cli/)
+* [pdu](https://github.com/KSXGitHub/parallel-disk-usage)
+* [dirstat-rs](https://github.com/scullionw/dirstat-rs)
 * du -d 1 -h | sort -h

 Note: Apparent-size is calculated slightly differently in dust to gdu. In dust each hard link is counted as using file_length space. In gdu only the first entry is counted.
--- a/ci/how2publish.txt
+++ b/ci/how2publish.txt
@@ -1,6 +1,6 @@
 # ----------- To do a release ---------
 # edit version in cargo.toml
-# tag a commit and push (increment version first):
+# tag a commit and push (increment version in Cargo.toml first):
 #   git tag v0.4.5
 #   git push origin v0.4.5

--- a/src/dir_walker.rs
+++ b/src/dir_walker.rs
@@ -0,0 +1,208 @@
+use std::fs;
+
+use crate::node::Node;
+use crate::utils::is_filtered_out_due_to_invert_regex;
+use crate::utils::is_filtered_out_due_to_regex;
+use rayon::iter::ParallelBridge;
+use rayon::prelude::ParallelIterator;
+use regex::Regex;
+use std::path::PathBuf;
+
+use std::sync::atomic;
+use std::sync::atomic::AtomicBool;
+
+use std::collections::HashSet;
+
+use crate::node::build_node;
+use std::fs::DirEntry;
+
+use crate::platform::get_metadata;
+
+pub struct WalkData<'a> {
+    pub ignore_directories: HashSet<PathBuf>,
+    pub filter_regex: &'a [Regex],
+    pub invert_filter_regex: &'a [Regex],
+    pub allowed_filesystems: HashSet<u64>,
+    pub use_apparent_size: bool,
+    pub by_filecount: bool,
+    pub ignore_hidden: bool,
+}
+
+pub fn walk_it(dirs: HashSet<PathBuf>, walk_data: WalkData) -> (Vec<Node>, bool) {
+    let permissions_flag = AtomicBool::new(false);
+
+    let top_level_nodes: Vec<_> = dirs
+        .into_iter()
+        .filter_map(|d| {
+            let n = walk(d, &permissions_flag, &walk_data, 0);
+            match n {
+                Some(n) => {
+                    let mut inodes: HashSet<(u64, u64)> = HashSet::new();
+                    clean_inodes(n, &mut inodes, walk_data.use_apparent_size)
+                }
+                None => None,
+            }
+        })
+        .collect();
+    (top_level_nodes, permissions_flag.into_inner())
+}
+
+// Remove files which have the same inode, we don't want to double count them.
+fn clean_inodes(
+    x: Node,
+    inodes: &mut HashSet<(u64, u64)>,
+    use_apparent_size: bool,
+) -> Option<Node> {
+    if !use_apparent_size {
+        if let Some(id) = x.inode_device {
+            if inodes.contains(&id) {
+                return None;
+            }
+            inodes.insert(id);
+        }
+    }
+
+    let new_children: Vec<_> = x
+        .children
+        .into_iter()
+        .filter_map(|c| clean_inodes(c, inodes, use_apparent_size))
+        .collect();
+
+    return Some(Node {
+        name: x.name,
+        size: x.size + new_children.iter().map(|c| c.size).sum::<u64>(),
+        children: new_children,
+        inode_device: x.inode_device,
+        depth: x.depth,
+    });
+}
+
+fn ignore_file(entry: &DirEntry, walk_data: &WalkData) -> bool {
+    let is_dot_file = entry.file_name().to_str().unwrap_or("").starts_with('.');
+    let is_ignored_path = walk_data.ignore_directories.contains(&entry.path());
+
+    if !walk_data.allowed_filesystems.is_empty() {
+        let size_inode_device = get_metadata(&entry.path(), false);
+
+        if let Some((_size, Some((_id, dev)))) = size_inode_device {
+            if !walk_data.allowed_filesystems.contains(&dev) {
+                return true;
+            }
+        }
+    }
+
+    // Keeping `walk_data.filter_regex.is_empty()` is important for performance reasons, it stops unnecessary work
+    if !walk_data.filter_regex.is_empty()
+        && entry.path().is_file()
+        && is_filtered_out_due_to_regex(walk_data.filter_regex, &entry.path())
+    {
+        return true;
+    }
+
+    if !walk_data.invert_filter_regex.is_empty()
+        && entry.path().is_file()
+        && is_filtered_out_due_to_invert_regex(walk_data.invert_filter_regex, &entry.path())
+    {
+        return true;
+    }
+
+    (is_dot_file && walk_data.ignore_hidden) || is_ignored_path
+}
+
+fn walk(
+    dir: PathBuf,
+    permissions_flag: &AtomicBool,
+    walk_data: &WalkData,
+    depth: usize,
+) -> Option<Node> {
+    let mut children = vec![];
+
+    if let Ok(entries) = fs::read_dir(dir.clone()) {
+        children = entries
+            .into_iter()
+            .par_bridge()
+            .filter_map(|entry| {
+                if let Ok(ref entry) = entry {
+                    // uncommenting the below line gives simpler code but
+                    // rayon doesn't parallelise as well giving a 3X performance drop
+                    // hence we unravel the recursion a bit
+
+                    // return walk(entry.path(), permissions_flag, ignore_directories, allowed_filesystems, use_apparent_size, by_filecount, ignore_hidden);
+
+                    if !ignore_file(entry, walk_data) {
+                        if let Ok(data) = entry.file_type() {
+                            if data.is_dir() && !data.is_symlink() {
+                                return walk(entry.path(), permissions_flag, walk_data, depth + 1);
+                            }
+                            return build_node(
+                                entry.path(),
+                                vec![],
+                                walk_data.filter_regex,
+                                walk_data.invert_filter_regex,
+                                walk_data.use_apparent_size,
+                                data.is_symlink(),
+                                data.is_file(),
+                                walk_data.by_filecount,
+                                depth,
+                            );
+                        }
+                    }
+                } else {
+                    permissions_flag.store(true, atomic::Ordering::Relaxed);
+                }
+                None
+            })
+            .collect();
+    } else {
+        permissions_flag.store(true, atomic::Ordering::Relaxed);
+    }
+    build_node(
+        dir,
+        children,
+        walk_data.filter_regex,
+        walk_data.invert_filter_regex,
+        walk_data.use_apparent_size,
+        false,
+        false,
+        walk_data.by_filecount,
+        depth,
+    )
+}
+
+mod tests {
+    #[allow(unused_imports)]
+    use super::*;
+
+    #[cfg(test)]
+    fn create_node() -> Node {
+        Node {
+            name: PathBuf::new(),
+            size: 10,
+            children: vec![],
+            inode_device: Some((5, 6)),
+            depth: 0,
+        }
+    }
+
+    #[test]
+    fn test_should_ignore_file() {
+        let mut inodes = HashSet::new();
+        let n = create_node();
+
+        // First time we insert the node
+        assert!(clean_inodes(n.clone(), &mut inodes, false) == Some(n.clone()));
+
+        // Second time is a duplicate - we ignore it
+        assert!(clean_inodes(n.clone(), &mut inodes, false) == None);
+    }
+
+    #[test]
+    fn test_should_not_ignore_files_if_using_apparent_size() {
+        let mut inodes = HashSet::new();
+        let n = create_node();
+
+        // If using apparent size we include Nodes, even if duplicate inodes
+        assert!(clean_inodes(n.clone(), &mut inodes, true) == Some(n.clone()));
+        assert!(clean_inodes(n.clone(), &mut inodes, true) == Some(n.clone()));
+    }
+}
--- a/src/display.rs
+++ b/src/display.rs
@@ -1,6 +1,6 @@
 extern crate ansi_term;

-use crate::utils::{Errors, Node};
+use crate::display_node::DisplayNode;

 use self::ansi_term::Colour::Red;
 use lscolors::{LsColors, Style};
@@ -28,6 +28,7 @@ pub struct DisplayData {
    pub base_size: u64,
    pub longest_string_length: usize,
    pub ls_colors: LsColors,
+    pub iso: bool,
 }

 impl DisplayData {
@@ -60,7 +61,7 @@ impl DisplayData {
        }
    }

-    fn percent_size(&self, node: &Node) -> f32 {
+    fn percent_size(&self, node: &DisplayNode) -> f32 {
        let result = node.size as f32 / self.base_size as f32;
        if result.is_normal() {
            result
@@ -83,7 +84,7 @@ impl DrawData<'_> {
    }

    // TODO: can we test this?
-    fn generate_bar(&self, node: &Node, level: usize) -> String {
+    fn generate_bar(&self, node: &DisplayNode, level: usize) -> String {
        let chars_in_bar = self.percent_bar.chars().count();
        let num_bars = chars_in_bar as f32 * self.display_data.percent_size(node);
        let mut num_not_my_bar = (chars_in_bar as i32) - num_bars as i32;
@@ -107,65 +108,65 @@ impl DrawData<'_> {

 #[allow(clippy::too_many_arguments)]
 pub fn draw_it(
-    errors: Errors,
    use_full_path: bool,
    is_reversed: bool,
    no_colors: bool,
    no_percents: bool,
    terminal_width: usize,
    by_filecount: bool,
-    root_node: Node,
+    root_node: DisplayNode,
+    iso: bool,
 ) {
-    if errors.permissions {
-        eprintln!("Did not have permissions for all directories");
-    }
-    if errors.not_found {
-        eprintln!("Not all directories were found");
-    }
    let num_chars_needed_on_left_most = if by_filecount {
-        let max_size = root_node.children.iter().map(|n| n.size).fold(0, max);
+        let max_size = root_node.size;
        max_size.separate_with_commas().chars().count()
    } else {
        5 // Under normal usage we need 5 chars to display the size of a directory
    };

-    let terminal_width = terminal_width - 9 - num_chars_needed_on_left_most;
-    let num_indent_chars = 3;
-    let longest_string_length = root_node
-        .children
-        .iter()
-        .map(|c| find_longest_dir_name(&c, num_indent_chars, terminal_width, !use_full_path))
-        .fold(0, max);
+    assert!(
+        terminal_width > num_chars_needed_on_left_most + 2,
+        "Not enough terminal width"
+    );

-    let max_bar_length = if no_percents || longest_string_length >= terminal_width as usize {
+    let allowed_width = terminal_width - num_chars_needed_on_left_most - 2;
+    let num_indent_chars = 3;
+    let longest_string_length =
+        find_longest_dir_name(&root_node, num_indent_chars, allowed_width, !use_full_path);
+
+    let max_bar_length = if no_percents || longest_string_length + 7 >= allowed_width as usize {
        0
    } else {
-        terminal_width as usize - longest_string_length
+        allowed_width as usize - longest_string_length - 7
    };

    let first_size_bar = repeat(BLOCKS[0]).take(max_bar_length).collect::<String>();

-    for c in root_node.get_children_from_node(is_reversed) {
-        let display_data = DisplayData {
-            short_paths: !use_full_path,
-            is_reversed,
-            colors_on: !no_colors,
-            by_filecount,
-            num_chars_needed_on_left_most,
-            base_size: c.size,
-            longest_string_length,
-            ls_colors: LsColors::from_env().unwrap_or_default(),
-        };
-        let draw_data = DrawData {
-            indent: "".to_string(),
-            percent_bar: first_size_bar.clone(),
-            display_data: &display_data,
-        };
-        display_node(c, &draw_data, true, true);
-    }
+    let display_data = DisplayData {
+        short_paths: !use_full_path,
+        is_reversed,
+        colors_on: !no_colors,
+        by_filecount,
+        num_chars_needed_on_left_most,
+        base_size: root_node.size,
+        longest_string_length,
+        ls_colors: LsColors::from_env().unwrap_or_default(),
+        iso,
+    };
+    let draw_data = DrawData {
+        indent: "".to_string(),
+        percent_bar: first_size_bar,
+        display_data: &display_data,
+    };
+    display_node(root_node, &draw_data, true, true);
 }

-fn find_longest_dir_name(node: &Node, indent: usize, terminal: usize, long_paths: bool) -> usize {
+fn find_longest_dir_name(
+    node: &DisplayNode,
+    indent: usize,
+    terminal: usize,
+    long_paths: bool,
+) -> usize {
    let printable_name = get_printable_name(&node.name, long_paths);
    let longest = min(
        UnicodeWidthStr::width(&*printable_name) + 1 + indent,
@@ -179,7 +180,7 @@ fn find_longest_dir_name(node: &Node, indent: usize, terminal: usize, long_paths
        .fold(longest, max)
 }

-fn display_node(node: Node, draw_data: &DrawData, is_biggest: bool, is_last: bool) {
+fn display_node(node: DisplayNode, draw_data: &DrawData, is_biggest: bool, is_last: bool) {
    // hacky way of working out how deep we are in the tree
    let indent = draw_data.get_new_indent(!node.children.is_empty(), is_last);
    let level = ((indent.chars().count() - 1) / 2) - 1;
@@ -254,26 +255,35 @@ fn get_printable_name<P: AsRef<Path>>(dir_name: &P, long_paths: bool) -> String
    encode_u8(printable_name.display().to_string().as_bytes())
 }

-fn pad_or_trim_filename(node: &Node, indent: &str, display_data: &DisplayData) -> String {
+fn pad_or_trim_filename(node: &DisplayNode, indent: &str, display_data: &DisplayData) -> String {
    let name = get_printable_name(&node.name, display_data.short_paths);
    let indent_and_name = format!("{} {}", indent, name);
    let width = UnicodeWidthStr::width(&*indent_and_name);

+    assert!(
+        display_data.longest_string_length >= width,
+        "Terminal width not wide enough to draw directory tree"
+    );
+
    // Add spaces after the filename so we can draw the % used bar chart.
    let name_and_padding = name
-        + &(repeat(" ")
-            .take(display_data.longest_string_length - width)
-            .collect::<String>());
+        + " "
+            .repeat(display_data.longest_string_length - width)
+            .as_str();

-    maybe_trim_filename(name_and_padding, display_data)
+    name_and_padding
 }

-fn maybe_trim_filename(name_in: String, display_data: &DisplayData) -> String {
-    if UnicodeWidthStr::width(&*name_in) > display_data.longest_string_length {
-        let name = name_in
-            .chars()
-            .take(display_data.longest_string_length - 2)
-            .collect::<String>();
+fn maybe_trim_filename(name_in: String, indent: &str, display_data: &DisplayData) -> String {
+    let indent_length = UnicodeWidthStr::width(indent);
+    assert!(
+        display_data.longest_string_length >= indent_length + 2,
+        "Terminal width not wide enough to draw directory tree"
+    );
+
+    let max_size = display_data.longest_string_length - indent_length;
+    if UnicodeWidthStr::width(&*name_in) > max_size {
+        let name = name_in.chars().take(max_size - 2).collect::<String>();
        name + ".."
    } else {
        name_in
@@ -281,7 +291,7 @@ fn maybe_trim_filename(name_in: String, display_data: &DisplayData) -> String {
 }

 pub fn format_string(
-    node: &Node,
+    node: &DisplayNode,
    indent: &str,
    percent_bar: &str,
    is_biggest: bool,
@@ -294,7 +304,7 @@ pub fn format_string(
 }

 fn get_name_percent(
-    node: &Node,
+    node: &DisplayNode,
    indent: &str,
    bar_chart: &str,
    display_data: &DisplayData,
@@ -306,19 +316,19 @@ fn get_name_percent(
        (percents, name_and_padding)
    } else {
        let n = get_printable_name(&node.name, display_data.short_paths);
-        let name = maybe_trim_filename(n, display_data);
+        let name = maybe_trim_filename(n, indent, display_data);
        ("".into(), name)
    }
 }

-fn get_pretty_size(node: &Node, is_biggest: bool, display_data: &DisplayData) -> String {
+fn get_pretty_size(node: &DisplayNode, is_biggest: bool, display_data: &DisplayData) -> String {
    let output = if display_data.by_filecount {
        let size_as_str = node.size.separate_with_commas();
        let spaces_to_add =
            display_data.num_chars_needed_on_left_most - size_as_str.chars().count();
-        size_as_str + &*repeat(' ').take(spaces_to_add).collect::<String>()
+        size_as_str + " ".repeat(spaces_to_add).as_str()
    } else {
-        format!("{:>5}", human_readable_number(node.size))
+        format!("{:>5}", human_readable_number(node.size, display_data.iso))
    };

    if is_biggest && display_data.colors_on {
@@ -328,7 +338,11 @@ fn get_pretty_size(node: &Node, is_biggest: bool, display_data: &DisplayData) ->
    }
 }

-fn get_pretty_name(node: &Node, name_and_padding: String, display_data: &DisplayData) -> String {
+fn get_pretty_name(
+    node: &DisplayNode,
+    name_and_padding: String,
+    display_data: &DisplayData,
+) -> String {
    if display_data.colors_on {
        let meta_result = fs::metadata(node.name.clone());
        let directory_color = display_data
@@ -343,9 +357,10 @@ fn get_pretty_name(node: &Node, name_and_padding: String, display_data: &Display
    }
 }

-fn human_readable_number(size: u64) -> String {
+fn human_readable_number(size: u64, iso: bool) -> String {
    for (i, u) in UNITS.iter().enumerate() {
-        let marker = 1024u64.pow((UNITS.len() - i) as u32);
+        let num: u64 = if iso { 1000 } else { 1024 };
+        let marker = num.pow((UNITS.len() - i) as u32);
        if size >= marker {
            if size / marker < 10 {
                return format!("{:.1}{}", (size as f32 / marker as f32), u);
@@ -374,12 +389,13 @@ mod tests {
            base_size: 1,
            longest_string_length,
            ls_colors: LsColors::from_env().unwrap_or_default(),
+            iso: false,
        }
    }

    #[test]
    fn test_format_str() {
-        let n = Node {
+        let n = DisplayNode {
            name: PathBuf::from("/short"),
            size: 2_u64.pow(12), // This is 4.0K
            children: vec![],
@@ -393,7 +409,7 @@ mod tests {
            indent,
            percent_bar,
            is_biggest,
-            &get_fake_display_data(6),
+            &get_fake_display_data(20),
        );
        assert_eq!(s, " 4.0K ┌─┴ short");
    }
@@ -401,7 +417,7 @@ mod tests {
    #[test]
    fn test_format_str_long_name() {
        let name = "very_long_name_longer_than_the_eighty_character_limit_very_long_name_this_bit_will_truncate";
-        let n = Node {
+        let n = DisplayNode {
            name: PathBuf::from(name),
            size: 2_u64.pow(12), // This is 4.0K
            children: vec![],
@@ -414,21 +430,27 @@ mod tests {
        let s = format_string(&n, indent, percent_bar, is_biggest, &dd);
        assert_eq!(
            s,
-            " 4.0K ┌─┴ very_long_name_longer_than_the_eighty_character_limit_very_lon.."
+            " 4.0K ┌─┴ very_long_name_longer_than_the_eighty_character_limit_very_.."
        );
    }

    #[test]
    fn test_human_readable_number() {
-        assert_eq!(human_readable_number(1), "1B");
-        assert_eq!(human_readable_number(956), "956B");
-        assert_eq!(human_readable_number(1004), "1004B");
-        assert_eq!(human_readable_number(1024), "1.0K");
-        assert_eq!(human_readable_number(1536), "1.5K");
-        assert_eq!(human_readable_number(1024 * 512), "512K");
-        assert_eq!(human_readable_number(1024 * 1024), "1.0M");
-        assert_eq!(human_readable_number(1024 * 1024 * 1024 - 1), "1023M");
-        assert_eq!(human_readable_number(1024 * 1024 * 1024 * 20), "20G");
-        assert_eq!(human_readable_number(1024 * 1024 * 1024 * 1024), "1.0T");
+        assert_eq!(human_readable_number(1, false), "1B");
+        assert_eq!(human_readable_number(956, false), "956B");
+        assert_eq!(human_readable_number(1004, false), "1004B");
+        assert_eq!(human_readable_number(1024, false), "1.0K");
+        assert_eq!(human_readable_number(1536, false), "1.5K");
+        assert_eq!(human_readable_number(1024 * 512, false), "512K");
+        assert_eq!(human_readable_number(1024 * 1024, false), "1.0M");
+        assert_eq!(
+            human_readable_number(1024 * 1024 * 1024 - 1, false),
+            "1023M"
+        );
+        assert_eq!(human_readable_number(1024 * 1024 * 1024 * 20, false), "20G");
+        assert_eq!(
+            human_readable_number(1024 * 1024 * 1024 * 1024, false),
+            "1.0T"
+        );
    }
 }
--- a/src/display_node.rs
+++ b/src/display_node.rs
@@ -0,0 +1,47 @@
+use std::cmp::Ordering;
+use std::path::PathBuf;
+
+#[derive(Debug, Eq, Clone)]
+pub struct DisplayNode {
+    pub name: PathBuf, //todo: consider moving to a string?
+    pub size: u64,
+    pub children: Vec<DisplayNode>,
+}
+
+impl Ord for DisplayNode {
+    fn cmp(&self, other: &Self) -> Ordering {
+        if self.size == other.size {
+            self.name.cmp(&other.name)
+        } else {
+            self.size.cmp(&other.size)
+        }
+    }
+}
+
+impl PartialOrd for DisplayNode {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl PartialEq for DisplayNode {
+    fn eq(&self, other: &Self) -> bool {
+        self.name == other.name && self.size == other.size && self.children == other.children
+    }
+}
+
+impl DisplayNode {
+    pub fn num_siblings(&self) -> u64 {
+        self.children.len() as u64
+    }
+
+    pub fn get_children_from_node(&self, is_reversed: bool) -> impl Iterator<Item = DisplayNode> {
+        // we box to avoid the clippy lint warning
+        let out: Box<dyn Iterator<Item = DisplayNode>> = if is_reversed {
+            Box::new(self.children.clone().into_iter().rev())
+        } else {
+            Box::new(self.children.clone().into_iter())
+        };
+        out
+    }
+}
--- a/src/filter.rs
+++ b/src/filter.rs
@@ -0,0 +1,147 @@
+use crate::display_node::DisplayNode;
+use crate::node::Node;
+use std::collections::BinaryHeap;
+use std::collections::HashMap;
+use std::collections::HashSet;
+use std::path::PathBuf;
+
+pub fn get_biggest(
+    top_level_nodes: Vec<Node>,
+    n: usize,
+    depth: usize,
+    using_a_filter: bool,
+) -> Option<DisplayNode> {
+    if top_level_nodes.is_empty() {
+        // perhaps change this, bring back Error object?
+        return None;
+    }
+
+    let mut heap = BinaryHeap::new();
+    let number_top_level_nodes = top_level_nodes.len();
+    let root = get_new_root(top_level_nodes);
+    let mut allowed_nodes = HashSet::new();
+
+    allowed_nodes.insert(&root.name);
+    heap = add_children(using_a_filter, &root, depth, heap);
+
+    for _ in number_top_level_nodes..n {
+        let line = heap.pop();
+        match line {
+            Some(line) => {
+                allowed_nodes.insert(&line.name);
+                heap = add_children(using_a_filter, line, depth, heap);
+            }
+            None => break,
+        }
+    }
+    recursive_rebuilder(&allowed_nodes, &root)
+}
+
+pub fn get_all_file_types(top_level_nodes: Vec<Node>, n: usize) -> Option<DisplayNode> {
+    let mut map: HashMap<String, DisplayNode> = HashMap::new();
+    build_by_all_file_types(top_level_nodes, &mut map);
+    let mut by_types: Vec<DisplayNode> = map.into_iter().map(|(_k, v)| v).collect();
+    by_types.sort();
+    by_types.reverse();
+
+    let displayed = if by_types.len() <= n {
+        by_types
+    } else {
+        let (displayed, rest) = by_types.split_at(if n > 1 { n - 1 } else { 1 });
+        let remaining = DisplayNode {
+            name: PathBuf::from("(others)"),
+            size: rest.iter().map(|a| a.size).sum(),
+            children: vec![],
+        };
+
+        let mut displayed = displayed.to_vec();
+        displayed.push(remaining);
+        displayed
+    };
+
+    let result = DisplayNode {
+        name: PathBuf::from("(total)"),
+        size: displayed.iter().map(|a| a.size).sum(),
+        children: displayed,
+    };
+    Some(result)
+}
+
+fn add_children<'a>(
+    using_a_filter: bool,
+    file_or_folder: &'a Node,
+    depth: usize,
+    mut heap: BinaryHeap<&'a Node>,
+) -> BinaryHeap<&'a Node> {
+    if depth > file_or_folder.depth {
+        if using_a_filter {
+            file_or_folder.children.iter().for_each(|c| {
+                if c.name.is_file() || c.size > 0 {
+                    heap.push(c)
+                }
+            });
+        } else {
+            file_or_folder.children.iter().for_each(|c| heap.push(c));
+        }
+    }
+    heap
+}
+
+fn build_by_all_file_types(top_level_nodes: Vec<Node>, counter: &mut HashMap<String, DisplayNode>) {
+    for node in top_level_nodes {
+        if node.name.is_file() {
+            let ext = node.name.extension();
+            let key: String = match ext {
+                Some(e) => ".".to_string() + &e.to_string_lossy(),
+                None => "(no extension)".into(),
+            };
+            let mut display_node = counter.entry(key.clone()).or_insert(DisplayNode {
+                name: PathBuf::from(key),
+                size: 0,
+                children: vec![],
+            });
+            display_node.size += node.size;
+        }
+        build_by_all_file_types(node.children, counter)
+    }
+}
+
+fn get_new_root(top_level_nodes: Vec<Node>) -> Node {
+    if top_level_nodes.len() > 1 {
+        let total_size = top_level_nodes.iter().map(|node| node.size).sum();
+        Node {
+            name: PathBuf::from("(total)"),
+            size: total_size,
+            children: top_level_nodes,
+            inode_device: None,
+            depth: 0,
+        }
+    } else {
+        top_level_nodes.into_iter().next().unwrap()
+    }
+}
+
+fn recursive_rebuilder<'a>(
+    allowed_nodes: &'a HashSet<&PathBuf>,
+    current: &Node,
+) -> Option<DisplayNode> {
+    let mut new_children: Vec<_> = current
+        .children
+        .iter()
+        .filter_map(|c| {
+            if allowed_nodes.contains(&c.name) {
+                recursive_rebuilder(allowed_nodes, c)
+            } else {
+                None
+            }
+        })
+        .collect();
+    new_children.sort();
+    new_children.reverse();
+    let newnode = DisplayNode {
+        name: current.name.clone(),
+        size: current.size,
+        children: new_children,
+    };
+    Some(newnode)
+}
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,19 +1,29 @@
-#[macro_use]
 extern crate clap;
-extern crate crossbeam_channel as channel;
-extern crate ignore;
+extern crate rayon;
+extern crate regex;
 extern crate unicode_width;
-extern crate walkdir;
+
+use std::collections::HashSet;
+use std::process;

 use self::display::draw_it;
-use crate::utils::is_a_parent_of;
-use clap::{App, AppSettings, Arg};
+use clap::{crate_version, Arg};
+use clap::{Command, Values};
+use dir_walker::{walk_it, WalkData};
+use filter::{get_all_file_types, get_biggest};
+use regex::Regex;
 use std::cmp::max;
 use std::path::PathBuf;
 use terminal_size::{terminal_size, Height, Width};
-use utils::{find_big_ones, get_dir_tree, simplify_dir_names, sort, Node};
+use utils::get_filesystem_devices;
+use utils::simplify_dir_names;

+mod dir_walker;
 mod display;
+mod display_node;
+mod filter;
+mod node;
+mod platform;
 mod utils;

 static DEFAULT_NUMBER_OF_LINES: usize = 30;
@@ -53,6 +63,7 @@ fn get_height_of_terminal() -> usize {
    }
 }

+#[cfg(windows)]
 fn get_width_of_terminal() -> usize {
    // Windows CI runners detect a very low terminal width
    if let Some((Width(w), Height(_h))) = terminal_size() {
@@ -62,198 +73,258 @@ fn get_width_of_terminal() -> usize {
    }
 }

-fn main() {
-    let default_height = get_height_of_terminal();
-    let def_num_str = default_height.to_string();
+#[cfg(not(windows))]
+fn get_width_of_terminal() -> usize {
+    if let Some((Width(w), Height(_h))) = terminal_size() {
+        w as usize
+    } else {
+        DEFAULT_TERMINAL_WIDTH
+    }
+}

-    let options = App::new("Dust")
+fn get_regex_value(maybe_value: Option<Values>) -> Vec<Regex> {
+    let mut result = vec![];
+    if let Some(v) = maybe_value {
+        for reg in v {
+            match Regex::new(reg) {
+                Ok(r) => result.push(r),
+                Err(e) => {
+                    eprintln!("Ignoring bad value for regex {:?}", e);
+                    process::exit(1);
+                }
+            }
+        }
+    }
+    result
+}
+
+fn main() {
+    let options = Command::new("Dust")
        .about("Like du but more intuitive")
        .version(crate_version!())
-        .setting(AppSettings::TrailingVarArg)
+        .trailing_var_arg(true)
        .arg(
-            Arg::with_name("depth")
-                .short("d")
+            Arg::new("depth")
+                .short('d')
                .long("depth")
                .help("Depth to show")
-                .takes_value(true),
-        )
-        .arg(
-            Arg::with_name("number_of_lines")
-                .short("n")
-                .long("number-of-lines")
-                .help("Number of lines of output to show. This is Height, (but h is help)")
                .takes_value(true)
-                .default_value(def_num_str.as_ref()),
+                .default_value(usize::MAX.to_string().as_ref())
        )
        .arg(
-            Arg::with_name("display_full_paths")
-                .short("p")
+            Arg::new("number_of_lines")
+                .short('n')
+                .long("number-of-lines")
+                .help("Number of lines of output to show. (Default is terminal_height - 10)")
+                .takes_value(true)
+        )
+        .arg(
+            Arg::new("display_full_paths")
+                .short('p')
                .long("full-paths")
                .help("Subdirectories will not have their path shortened"),
        )
        .arg(
-            Arg::with_name("ignore_directory")
-                .short("X")
+            Arg::new("ignore_directory")
+                .short('X')
                .long("ignore-directory")
                .takes_value(true)
                .number_of_values(1)
-                .multiple(true)
+                .multiple_occurrences(true)
                .help("Exclude any file or directory with this name"),
        )
        .arg(
-            Arg::with_name("limit_filesystem")
-                .short("x")
+            Arg::new("limit_filesystem")
+                .short('x')
                .long("limit-filesystem")
                .help("Only count the files and directories on the same filesystem as the supplied directory"),
        )
        .arg(
-            Arg::with_name("display_apparent_size")
-                .short("s")
+            Arg::new("display_apparent_size")
+                .short('s')
                .long("apparent-size")
                .help("Use file length instead of blocks"),
        )
        .arg(
-            Arg::with_name("reverse")
-                .short("r")
+            Arg::new("reverse")
+                .short('r')
                .long("reverse")
                .help("Print tree upside down (biggest highest)"),
        )
        .arg(
-            Arg::with_name("no_colors")
-                .short("c")
+            Arg::new("no_colors")
+                .short('c')
                .long("no-colors")
-                .help("No colors will be printed (normally largest directories are colored)"),
+                .help("No colors will be printed (Useful for commands like: watch)"),
        )
        .arg(
-            Arg::with_name("no_bars")
-                .short("b")
+            Arg::new("no_bars")
+                .short('b')
                .long("no-percent-bars")
                .help("No percent bars or percentages will be displayed"),
        )
        .arg(
-            Arg::with_name("by_filecount")
-                .short("f")
+            Arg::new("by_filecount")
+                .short('f')
                .long("filecount")
                .help("Directory 'size' is number of child files/dirs not disk size"),
        )
        .arg(
-            Arg::with_name("ignore_hidden")
-                .short("i") // Do not use 'h' this is used by 'help'
+            Arg::new("ignore_hidden")
+                .short('i') // Do not use 'h' this is used by 'help'
                .long("ignore_hidden")
-                .help("Obey .git_ignore rules & Do not display hidden files"),
+                .help("Do not display hidden files"),
        )
        .arg(
-            Arg::with_name("width")
-                .short("w")
+            Arg::new("invert_filter")
+                .short('v')
+                .long("invert-filter")
+                .takes_value(true)
+                .number_of_values(1)
+                .multiple_occurrences(true)
+                .conflicts_with("filter")
+                .conflicts_with("types")
+                .help("Exclude filepaths matching this regex. To ignore png files type: -v \"\\.png$\" "),
+        )
+        .arg(
+            Arg::new("filter")
+                .short('e')
+                .long("filter")
+                .takes_value(true)
+                .number_of_values(1)
+                .multiple_occurrences(true)
+                .conflicts_with("types")
+                .help("Only include filepaths matching this regex. For png files type: -e \"\\.png$\" "),
+        )
+        .arg(
+            Arg::new("types")
+                .short('t')
+                .long("file_types")
+                .conflicts_with("depth")
+                .help("show only these file types"),
+        )
+        .arg(
+            Arg::new("width")
+                .short('w')
                .long("terminal_width")
                .takes_value(true)
                .number_of_values(1)
                .help("Specify width of output overriding the auto detection of terminal width"),
        )
-
-        .arg(Arg::with_name("inputs").multiple(true))
+        .arg(Arg::new("inputs").multiple_occurrences(true).default_value("."))
+        .arg(
+            Arg::new("iso")
+                .short('H')
+                .long("si")
+                .help("print sizes in powers of 1000 (e.g., 1.1G)")
+        )
        .get_matches();

-    let target_dirs = {
-        match options.values_of("inputs") {
-            None => vec!["."],
-            Some(r) => r.collect(),
-        }
-    };
+    let target_dirs = options
+        .values_of("inputs")
+        .expect("Should be a default value here")
+        .collect();

-    let number_of_lines = match value_t!(options.value_of("number_of_lines"), usize) {
-        Ok(v) => v,
-        Err(_) => {
-            eprintln!("Ignoring bad value for number_of_lines");
-            default_height
-        }
-    };
+    let summarize_file_types = options.is_present("types");

-    let terminal_width = match value_t!(options.value_of("width"), usize) {
+    let filter_regexs = get_regex_value(options.values_of("filter"));
+    let invert_filter_regexs = get_regex_value(options.values_of("invert_filter"));
+
+    let terminal_width = match options.value_of_t("width") {
        Ok(v) => v,
        Err(_) => get_width_of_terminal(),
    };

-    let depth = options.value_of("depth").and_then(|depth| {
-        depth
-            .parse::<usize>()
-            .map(|v| v + 1)
-            .map_err(|_| eprintln!("Ignoring bad value for depth"))
-            .ok()
-    });
-    if options.is_present("depth") && number_of_lines != default_height {
-        eprintln!("Use either -n or -d. Not both");
-        return;
-    }
+    let depth = match options.value_of_t("depth") {
+        Ok(v) => v,
+        Err(_) => {
+            eprintln!("Ignoring bad value for depth");
+            usize::MAX
+        }
+    };
+    // If depth is set we set the default number_of_lines to be max
+    // instead of screen height
+    let default_height = if depth != usize::MAX {
+        usize::MAX
+    } else {
+        get_height_of_terminal()
+    };
+
+    let number_of_lines = match options.value_of("number_of_lines") {
+        Some(v) => match v.parse::<usize>() {
+            Ok(num_lines) => num_lines,
+            Err(_) => {
+                eprintln!("Ignoring bad value for number_of_lines");
+                default_height
+            }
+        },
+        None => default_height,
+    };

    let no_colors = init_color(options.is_present("no_colors"));
    let use_apparent_size = options.is_present("display_apparent_size");
-    let limit_filesystem = options.is_present("limit_filesystem");
-    let ignore_directories = match options.values_of("ignore_directory") {
-        Some(i) => Some(i.map(PathBuf::from).collect()),
-        None => None,
-    };
+    let ignore_directories: Vec<PathBuf> = options
+        .values_of("ignore_directory")
+        .map(|i| i.map(PathBuf::from).collect())
+        .unwrap_or_default();
+
    let by_filecount = options.is_present("by_filecount");
-    let show_hidden = !options.is_present("ignore_hidden");
+    let ignore_hidden = options.is_present("ignore_hidden");
+    let limit_filesystem = options.is_present("limit_filesystem");

    let simplified_dirs = simplify_dir_names(target_dirs);
-    let (errors, nodes) = get_dir_tree(
-        &simplified_dirs,
-        &ignore_directories,
-        use_apparent_size,
-        limit_filesystem,
-        by_filecount,
-        show_hidden,
-    );
-    let sorted_data = sort(nodes);
-    let biggest_ones = {
-        match depth {
-            None => find_big_ones(sorted_data, number_of_lines),
-            Some(_) => sorted_data,
+    let allowed_filesystems = {
+        if limit_filesystem {
+            get_filesystem_devices(simplified_dirs.iter())
+        } else {
+            HashSet::new()
        }
    };
-    let tree = build_tree(biggest_ones, depth);

-    draw_it(
-        errors,
-        options.is_present("display_full_paths"),
-        !options.is_present("reverse"),
-        no_colors,
-        options.is_present("no_bars"),
-        terminal_width,
+    let ignored_full_path: HashSet<PathBuf> = ignore_directories
+        .into_iter()
+        .flat_map(|x| simplified_dirs.iter().map(move |d| d.join(x.clone())))
+        .collect();
+
+    let walk_data = WalkData {
+        ignore_directories: ignored_full_path,
+        filter_regex: &filter_regexs,
+        invert_filter_regex: &invert_filter_regexs,
+        allowed_filesystems,
+        use_apparent_size,
        by_filecount,
-        tree,
-    );
-}
-
-fn build_tree(biggest_ones: Vec<(PathBuf, u64)>, depth: Option<usize>) -> Node {
-    let mut top_parent = Node::default();
-
-    // assume sorted order
-    for b in biggest_ones {
-        let n = Node {
-            name: b.0,
-            size: b.1,
-            children: Vec::default(),
-        };
-        recursively_build_tree(&mut top_parent, n, depth);
-    }
-    top_parent
-}
-
-fn recursively_build_tree(parent_node: &mut Node, new_node: Node, depth: Option<usize>) {
-    let new_depth = match depth {
-        None => None,
-        Some(0) => return,
-        Some(d) => Some(d - 1),
+        ignore_hidden,
    };
-    if let Some(c) = parent_node
-        .children
-        .iter_mut()
-        .find(|c| is_a_parent_of(&c.name, &new_node.name))
-    {
-        recursively_build_tree(c, new_node, new_depth);
-    } else {
-        parent_node.children.push(new_node);
+
+    let (top_level_nodes, has_errors) = walk_it(simplified_dirs, walk_data);
+
+    let tree = {
+        match (depth, summarize_file_types) {
+            (_, true) => get_all_file_types(top_level_nodes, number_of_lines),
+            (depth, _) => get_biggest(
+                top_level_nodes,
+                number_of_lines,
+                depth,
+                options.values_of("filter").is_some()
+                    || options.value_of("invert_filter").is_some(),
+            ),
+        }
+    };
+
+    if has_errors {
+        eprintln!("Did not have permissions for all directories");
+    }
+    match tree {
+        None => {}
+        Some(root_node) => draw_it(
+            options.is_present("display_full_paths"),
+            !options.is_present("reverse"),
+            no_colors,
+            options.is_present("no_bars"),
+            terminal_width,
+            by_filecount,
+            root_node,
+            options.is_present("iso"),
+        ),
    }
 }
--- a/src/node.rs
+++ b/src/node.rs
@@ -0,0 +1,82 @@
+use crate::platform::get_metadata;
+use crate::utils::is_filtered_out_due_to_invert_regex;
+use crate::utils::is_filtered_out_due_to_regex;
+
+use regex::Regex;
+use std::cmp::Ordering;
+use std::path::PathBuf;
+
+#[derive(Debug, Eq, Clone)]
+pub struct Node {
+    pub name: PathBuf,
+    pub size: u64,
+    pub children: Vec<Node>,
+    pub inode_device: Option<(u64, u64)>,
+    pub depth: usize,
+}
+
+#[allow(clippy::too_many_arguments)]
+pub fn build_node(
+    dir: PathBuf,
+    children: Vec<Node>,
+    filter_regex: &[Regex],
+    invert_filter_regex: &[Regex],
+    use_apparent_size: bool,
+    is_symlink: bool,
+    is_file: bool,
+    by_filecount: bool,
+    depth: usize,
+) -> Option<Node> {
+    match get_metadata(&dir, use_apparent_size) {
+        Some(data) => {
+            let inode_device = if is_symlink && !use_apparent_size {
+                None
+            } else {
+                data.1
+            };
+
+            let size = if is_filtered_out_due_to_regex(filter_regex, &dir)
+                || is_filtered_out_due_to_invert_regex(invert_filter_regex, &dir)
+                || (is_symlink && !use_apparent_size)
+                || by_filecount && !is_file
+            {
+                0
+            } else if by_filecount {
+                1
+            } else {
+                data.0
+            };
+
+            Some(Node {
+                name: dir,
+                size,
+                children,
+                inode_device,
+                depth,
+            })
+        }
+        None => None,
+    }
+}
+
+impl PartialEq for Node {
+    fn eq(&self, other: &Self) -> bool {
+        self.name == other.name && self.size == other.size && self.children == other.children
+    }
+}
+
+impl Ord for Node {
+    fn cmp(&self, other: &Self) -> Ordering {
+        if self.size == other.size {
+            self.name.cmp(&other.name)
+        } else {
+            self.size.cmp(&other.size)
+        }
+    }
+}
+
+impl PartialOrd for Node {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
--- a/src/utils/platform.rs
+++ b/src/utils/platform.rs
@@ -1,7 +1,8 @@
-use ignore::DirEntry;
 #[allow(unused_imports)]
 use std::fs;

+use std::path::Path;
+
 #[cfg(target_family = "unix")]
 fn get_block_size() -> u64 {
    // All os specific implementations of MetatdataExt seem to define a block as 512 bytes
@@ -10,7 +11,7 @@ fn get_block_size() -> u64 {
 }

 #[cfg(target_family = "unix")]
-pub fn get_metadata(d: &DirEntry, use_apparent_size: bool) -> Option<(u64, Option<(u64, u64)>)> {
+pub fn get_metadata(d: &Path, use_apparent_size: bool) -> Option<(u64, Option<(u64, u64)>)> {
    use std::os::unix::fs::MetadataExt;
    match d.metadata() {
        Ok(md) => {
@@ -25,7 +26,7 @@ pub fn get_metadata(d: &DirEntry, use_apparent_size: bool) -> Option<(u64, Optio
 }

 #[cfg(target_family = "windows")]
-pub fn get_metadata(d: &DirEntry, _use_apparent_size: bool) -> Option<(u64, Option<(u64, u64)>)> {
+pub fn get_metadata(d: &Path, _use_apparent_size: bool) -> Option<(u64, Option<(u64, u64)>)> {
    // On windows opening the file to get size, file ID and volume can be very
    // expensive because 1) it causes a few system calls, and more importantly 2) it can cause
    // windows defender to scan the file.
@@ -63,7 +64,6 @@ pub fn get_metadata(d: &DirEntry, _use_apparent_size: bool) -> Option<(u64, Opti
    // With this optimization:         8 sec.

    use std::io;
-    use std::path::Path;
    use winapi_util::Handle;
    fn handle_from_path_limited<P: AsRef<Path>>(path: P) -> io::Result<Handle> {
        use std::fs::OpenOptions;
@@ -90,10 +90,10 @@ pub fn get_metadata(d: &DirEntry, _use_apparent_size: bool) -> Option<(u64, Opti
        Ok(Handle::from_file(file))
    }

-    fn get_metadata_expensive(d: &DirEntry) -> Option<(u64, Option<(u64, u64)>)> {
+    fn get_metadata_expensive(d: &Path) -> Option<(u64, Option<(u64, u64)>)> {
        use winapi_util::file::information;

-        let h = handle_from_path_limited(d.path()).ok()?;
+        let h = handle_from_path_limited(d).ok()?;
        let info = information(&h).ok()?;

        Some((
@@ -114,15 +114,15 @@ pub fn get_metadata(d: &DirEntry, _use_apparent_size: bool) -> Option<(u64, Opti

            let attr_filtered = md.file_attributes()
                & !(FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM);
-            if attr_filtered == FILE_ATTRIBUTE_ARCHIVE
-                || attr_filtered == FILE_ATTRIBUTE_DIRECTORY
+            if (attr_filtered & FILE_ATTRIBUTE_ARCHIVE) != 0
+                || (attr_filtered & FILE_ATTRIBUTE_DIRECTORY) != 0
                || md.file_attributes() == FILE_ATTRIBUTE_NORMAL
            {
                Some((md.len(), None))
            } else {
-                get_metadata_expensive(&d)
+                get_metadata_expensive(d)
            }
        }
-        _ => get_metadata_expensive(&d),
+        _ => get_metadata_expensive(d),
    }
 }
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -0,0 +1,161 @@
+use platform::get_metadata;
+use std::collections::HashSet;
+use std::path::{Path, PathBuf};
+
+use crate::platform;
+use regex::Regex;
+
+pub fn simplify_dir_names<P: AsRef<Path>>(filenames: Vec<P>) -> HashSet<PathBuf> {
+    let mut top_level_names: HashSet<PathBuf> = HashSet::with_capacity(filenames.len());
+    for t in filenames {
+        let top_level_name = normalize_path(t);
+        let mut can_add = true;
+        let mut to_remove: Vec<PathBuf> = Vec::new();
+
+        for tt in top_level_names.iter() {
+            if is_a_parent_of(&top_level_name, tt) {
+                to_remove.push(tt.to_path_buf());
+            } else if is_a_parent_of(tt, &top_level_name) {
+                can_add = false;
+            }
+        }
+        for r in to_remove {
+            top_level_names.remove(&r);
+        }
+        if can_add {
+            top_level_names.insert(top_level_name);
+        }
+    }
+    top_level_names
+}
+
+pub fn get_filesystem_devices<'a, P: IntoIterator<Item = &'a PathBuf>>(paths: P) -> HashSet<u64> {
+    // Gets the device ids for the filesystems which are used by the argument paths
+    paths
+        .into_iter()
+        .filter_map(|p| {
+            let meta = get_metadata(p, false);
+
+            if let Some((_size, Some((_id, dev)))) = meta {
+                Some(dev)
+            } else {
+                None
+            }
+        })
+        .collect()
+}
+
+pub fn normalize_path<P: AsRef<Path>>(path: P) -> PathBuf {
+    // normalize path ...
+    // 1. removing repeated separators
+    // 2. removing interior '.' ("current directory") path segments
+    // 3. removing trailing extra separators and '.' ("current directory") path segments
+    // * `Path.components()` does all the above work; ref: <https://doc.rust-lang.org/std/path/struct.Path.html#method.components>
+    // 4. changing to os preferred separator (automatically done by recollecting components back into a PathBuf)
+    path.as_ref().components().collect::<PathBuf>()
+}
+
+pub fn is_filtered_out_due_to_regex(filter_regex: &[Regex], dir: &Path) -> bool {
+    if filter_regex.is_empty() {
+        false
+    } else {
+        filter_regex
+            .iter()
+            .all(|f| !f.is_match(&dir.as_os_str().to_string_lossy()))
+    }
+}
+
+pub fn is_filtered_out_due_to_invert_regex(filter_regex: &[Regex], dir: &Path) -> bool {
+    filter_regex
+        .iter()
+        .any(|f| f.is_match(&dir.as_os_str().to_string_lossy()))
+}
+
+fn is_a_parent_of<P: AsRef<Path>>(parent: P, child: P) -> bool {
+    let parent = parent.as_ref();
+    let child = child.as_ref();
+    child.starts_with(parent) && !parent.starts_with(child)
+}
+
+mod tests {
+    #[allow(unused_imports)]
+    use super::*;
+
+    #[test]
+    fn test_simplify_dir() {
+        let mut correct = HashSet::new();
+        correct.insert(PathBuf::from("a"));
+        assert_eq!(simplify_dir_names(vec!["a"]), correct);
+    }
+
+    #[test]
+    fn test_simplify_dir_rm_subdir() {
+        let mut correct = HashSet::new();
+        correct.insert(["a", "b"].iter().collect::<PathBuf>());
+        assert_eq!(simplify_dir_names(vec!["a/b/c", "a/b", "a/b/d/f"]), correct);
+        assert_eq!(simplify_dir_names(vec!["a/b", "a/b/c", "a/b/d/f"]), correct);
+    }
+
+    #[test]
+    fn test_simplify_dir_duplicates() {
+        let mut correct = HashSet::new();
+        correct.insert(["a", "b"].iter().collect::<PathBuf>());
+        correct.insert(PathBuf::from("c"));
+        assert_eq!(
+            simplify_dir_names(vec![
+                "a/b",
+                "a/b//",
+                "a/././b///",
+                "c",
+                "c/",
+                "c/.",
+                "c/././",
+                "c/././."
+            ]),
+            correct
+        );
+    }
+    #[test]
+    fn test_simplify_dir_rm_subdir_and_not_substrings() {
+        let mut correct = HashSet::new();
+        correct.insert(PathBuf::from("b"));
+        correct.insert(["c", "a", "b"].iter().collect::<PathBuf>());
+        correct.insert(["a", "b"].iter().collect::<PathBuf>());
+        assert_eq!(simplify_dir_names(vec!["a/b", "c/a/b/", "b"]), correct);
+    }
+
+    #[test]
+    fn test_simplify_dir_dots() {
+        let mut correct = HashSet::new();
+        correct.insert(PathBuf::from("src"));
+        assert_eq!(simplify_dir_names(vec!["src/."]), correct);
+    }
+
+    #[test]
+    fn test_simplify_dir_substring_names() {
+        let mut correct = HashSet::new();
+        correct.insert(PathBuf::from("src"));
+        correct.insert(PathBuf::from("src_v2"));
+        assert_eq!(simplify_dir_names(vec!["src/", "src_v2"]), correct);
+    }
+
+    #[test]
+    fn test_is_a_parent_of() {
+        assert!(is_a_parent_of("/usr", "/usr/andy"));
+        assert!(is_a_parent_of("/usr", "/usr/andy/i/am/descendant"));
+        assert!(!is_a_parent_of("/usr", "/usr/."));
+        assert!(!is_a_parent_of("/usr", "/usr/"));
+        assert!(!is_a_parent_of("/usr", "/usr"));
+        assert!(!is_a_parent_of("/usr/", "/usr"));
+        assert!(!is_a_parent_of("/usr/andy", "/usr"));
+        assert!(!is_a_parent_of("/usr/andy", "/usr/sibling"));
+        assert!(!is_a_parent_of("/usr/folder", "/usr/folder_not_a_child"));
+    }
+
+    #[test]
+    fn test_is_a_parent_of_root() {
+        assert!(is_a_parent_of("/", "/usr/andy"));
+        assert!(is_a_parent_of("/", "/usr"));
+        assert!(!is_a_parent_of("/", "/"));
+    }
+}
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -1,402 +0,0 @@
-use std::cmp::Ordering;
-use std::collections::HashMap;
-use std::collections::HashSet;
-use std::path::{Path, PathBuf};
-use std::sync::atomic::AtomicBool;
-
-use channel::Receiver;
-use std::thread::JoinHandle;
-
-use ignore::{WalkBuilder, WalkState};
-use std::sync::atomic;
-use std::thread;
-
-mod platform;
-use self::platform::*;
-
-type PathData = (PathBuf, u64, Option<(u64, u64)>);
-
-#[derive(Debug, Default, Eq, Clone)]
-pub struct Node {
-    pub name: PathBuf,
-    pub size: u64,
-    pub children: Vec<Node>,
-}
-
-impl Ord for Node {
-    fn cmp(&self, other: &Self) -> Ordering {
-        if self.size == other.size {
-            self.name.cmp(&other.name)
-        } else {
-            self.size.cmp(&other.size)
-        }
-    }
-}
-
-impl PartialOrd for Node {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl PartialEq for Node {
-    fn eq(&self, other: &Self) -> bool {
-        self.name == other.name && self.size == other.size && self.children == other.children
-    }
-}
-
-impl Node {
-    pub fn num_siblings(&self) -> u64 {
-        self.children.len() as u64
-    }
-
-    pub fn get_children_from_node(&self, is_reversed: bool) -> impl Iterator<Item = Node> {
-        if is_reversed {
-            let children: Vec<Node> = self.children.clone().into_iter().rev().collect();
-            children.into_iter()
-        } else {
-            self.children.clone().into_iter()
-        }
-    }
-}
-
-pub struct Errors {
-    pub permissions: bool,
-    pub not_found: bool,
-}
-
-pub fn is_a_parent_of<P: AsRef<Path>>(parent: P, child: P) -> bool {
-    let parent = parent.as_ref();
-    let child = child.as_ref();
-    child.starts_with(parent) && !parent.starts_with(child)
-}
-
-pub fn simplify_dir_names<P: AsRef<Path>>(filenames: Vec<P>) -> HashSet<PathBuf> {
-    let mut top_level_names: HashSet<PathBuf> = HashSet::with_capacity(filenames.len());
-    let mut to_remove: Vec<PathBuf> = Vec::with_capacity(filenames.len());
-
-    for t in filenames {
-        let top_level_name = normalize_path(t);
-        let mut can_add = true;
-
-        for tt in top_level_names.iter() {
-            if is_a_parent_of(&top_level_name, tt) {
-                to_remove.push(tt.to_path_buf());
-            } else if is_a_parent_of(tt, &top_level_name) {
-                can_add = false;
-            }
-        }
-        to_remove.sort_unstable();
-        top_level_names.retain(|tr| to_remove.binary_search(tr).is_err());
-        to_remove.clear();
-        if can_add {
-            top_level_names.insert(top_level_name);
-        }
-    }
-
-    top_level_names
-}
-
-fn prepare_walk_dir_builder<P: AsRef<Path>>(
-    top_level_names: &HashSet<P>,
-    limit_filesystem: bool,
-    show_hidden: bool,
-) -> WalkBuilder {
-    let mut it = top_level_names.iter();
-    let mut builder = WalkBuilder::new(it.next().unwrap());
-    builder.follow_links(false);
-    if show_hidden {
-        builder.hidden(false);
-        builder.ignore(false);
-        builder.git_global(false);
-        builder.git_ignore(false);
-        builder.git_exclude(false);
-    }
-
-    if limit_filesystem {
-        builder.same_file_system(true);
-    }
-
-    for b in it {
-        builder.add(b);
-    }
-    builder
-}
-
-fn is_not_found(e: &ignore::Error) -> bool {
-    use ignore::Error;
-    if let Error::WithPath { err, .. } = e {
-        if let Error::Io(e) = &**err {
-            if e.kind() == std::io::ErrorKind::NotFound {
-                return true;
-            }
-        }
-    }
-    false
-}
-
-pub fn get_dir_tree<P: AsRef<Path>>(
-    top_level_names: &HashSet<P>,
-    ignore_directories: &Option<Vec<PathBuf>>,
-    apparent_size: bool,
-    limit_filesystem: bool,
-    by_filecount: bool,
-    show_hidden: bool,
-) -> (Errors, HashMap<PathBuf, u64>) {
-    let (tx, rx) = channel::bounded::<PathData>(1000);
-
-    let permissions_flag = AtomicBool::new(false);
-    let not_found_flag = AtomicBool::new(false);
-
-    let t2 = top_level_names
-        .iter()
-        .map(|p| p.as_ref().to_path_buf())
-        .collect();
-
-    let t = create_reader_thread(rx, t2, apparent_size);
-    let walk_dir_builder = prepare_walk_dir_builder(top_level_names, limit_filesystem, show_hidden);
-
-    walk_dir_builder.build_parallel().run(|| {
-        let txc = tx.clone();
-        let pf = &permissions_flag;
-        let nf = &not_found_flag;
-        Box::new(move |path| {
-            match path {
-                Ok(p) => {
-                    if let Some(dirs) = ignore_directories {
-                        let path = p.path();
-                        let parts = path.components().collect::<Vec<std::path::Component>>();
-                        for d in dirs {
-                            if parts
-                                .windows(d.components().count())
-                                .any(|window| window.iter().collect::<PathBuf>() == *d)
-                            {
-                                return WalkState::Continue;
-                            }
-                        }
-                    }
-
-                    let maybe_size_and_inode = get_metadata(&p, apparent_size);
-
-                    match maybe_size_and_inode {
-                        Some(data) => {
-                            let (size, inode_device) =
-                                if by_filecount { (1, data.1) } else { data };
-                            txc.send((p.into_path(), size, inode_device)).unwrap();
-                        }
-                        None => {
-                            pf.store(true, atomic::Ordering::Relaxed);
-                        }
-                    }
-                }
-                Err(e) => {
-                    if is_not_found(&e) {
-                        nf.store(true, atomic::Ordering::Relaxed);
-                    } else {
-                        pf.store(true, atomic::Ordering::Relaxed);
-                    }
-                }
-            };
-            WalkState::Continue
-        })
-    });
-
-    drop(tx);
-    let data = t.join().unwrap();
-    let errors = Errors {
-        permissions: permissions_flag.load(atomic::Ordering::SeqCst),
-        not_found: not_found_flag.load(atomic::Ordering::SeqCst),
-    };
-    (errors, data)
-}
-
-fn create_reader_thread(
-    rx: Receiver<PathData>,
-    top_level_names: HashSet<PathBuf>,
-    apparent_size: bool,
-) -> JoinHandle<HashMap<PathBuf, u64>> {
-    // Receiver thread
-    thread::spawn(move || {
-        let mut hash: HashMap<PathBuf, u64> = HashMap::new();
-        let mut inodes: HashSet<(u64, u64)> = HashSet::new();
-
-        for dent in rx {
-            let (path, size, maybe_inode_device) = dent;
-
-            if should_ignore_file(apparent_size, &mut inodes, maybe_inode_device) {
-                continue;
-            } else {
-                for p in path.ancestors() {
-                    let s = hash.entry(p.to_path_buf()).or_insert(0);
-                    *s += size;
-
-                    if top_level_names.contains(p) {
-                        break;
-                    }
-                }
-            }
-        }
-        hash
-    })
-}
-
-pub fn normalize_path<P: AsRef<Path>>(path: P) -> PathBuf {
-    // normalize path ...
-    // 1. removing repeated separators
-    // 2. removing interior '.' ("current directory") path segments
-    // 3. removing trailing extra separators and '.' ("current directory") path segments
-    // * `Path.components()` does all the above work; ref: <https://doc.rust-lang.org/std/path/struct.Path.html#method.components>
-    // 4. changing to os preferred separator (automatically done by recollecting components back into a PathBuf)
-    path.as_ref().components().collect::<PathBuf>()
-}
-
-fn should_ignore_file(
-    apparent_size: bool,
-    inodes: &mut HashSet<(u64, u64)>,
-    maybe_inode_device: Option<(u64, u64)>,
-) -> bool {
-    match maybe_inode_device {
-        None => false,
-        Some(data) => {
-            let (inode, device) = data;
-            if !apparent_size {
-                // Ignore files already visited or symlinked
-                if inodes.contains(&(inode, device)) {
-                    return true;
-                }
-                inodes.insert((inode, device));
-            }
-            false
-        }
-    }
-}
-
-pub fn sort_by_size_first_name_second(a: &(PathBuf, u64), b: &(PathBuf, u64)) -> Ordering {
-    let result = b.1.cmp(&a.1);
-    if result == Ordering::Equal {
-        a.0.cmp(&b.0)
-    } else {
-        result
-    }
-}
-
-pub fn sort(data: HashMap<PathBuf, u64>) -> Vec<(PathBuf, u64)> {
-    let mut new_l: Vec<(PathBuf, u64)> = data.iter().map(|(a, b)| (a.clone(), *b)).collect();
-    new_l.sort_unstable_by(sort_by_size_first_name_second);
-    new_l
-}
-
-pub fn find_big_ones(new_l: Vec<(PathBuf, u64)>, max_to_show: usize) -> Vec<(PathBuf, u64)> {
-    if max_to_show > 0 && new_l.len() > max_to_show {
-        new_l[0..max_to_show].to_vec()
-    } else {
-        new_l
-    }
-}
-
-mod tests {
-    #[allow(unused_imports)]
-    use super::*;
-
-    #[test]
-    fn test_simplify_dir() {
-        let mut correct = HashSet::new();
-        correct.insert(PathBuf::from("a"));
-        assert_eq!(simplify_dir_names(vec!["a"]), correct);
-    }
-
-    #[test]
-    fn test_simplify_dir_rm_subdir() {
-        let mut correct = HashSet::new();
-        correct.insert(["a", "b"].iter().collect::<PathBuf>());
-        assert_eq!(simplify_dir_names(vec!["a/b", "a/b/c", "a/b/d/f"]), correct);
-    }
-
-    #[test]
-    fn test_simplify_dir_duplicates() {
-        let mut correct = HashSet::new();
-        correct.insert(["a", "b"].iter().collect::<PathBuf>());
-        correct.insert(PathBuf::from("c"));
-        assert_eq!(
-            simplify_dir_names(vec![
-                "a/b",
-                "a/b//",
-                "a/././b///",
-                "c",
-                "c/",
-                "c/.",
-                "c/././",
-                "c/././."
-            ]),
-            correct
-        );
-    }
-    #[test]
-    fn test_simplify_dir_rm_subdir_and_not_substrings() {
-        let mut correct = HashSet::new();
-        correct.insert(PathBuf::from("b"));
-        correct.insert(["c", "a", "b"].iter().collect::<PathBuf>());
-        correct.insert(["a", "b"].iter().collect::<PathBuf>());
-        assert_eq!(simplify_dir_names(vec!["a/b", "c/a/b/", "b"]), correct);
-    }
-
-    #[test]
-    fn test_simplify_dir_dots() {
-        let mut correct = HashSet::new();
-        correct.insert(PathBuf::from("src"));
-        assert_eq!(simplify_dir_names(vec!["src/."]), correct);
-    }
-
-    #[test]
-    fn test_simplify_dir_substring_names() {
-        let mut correct = HashSet::new();
-        correct.insert(PathBuf::from("src"));
-        correct.insert(PathBuf::from("src_v2"));
-        assert_eq!(simplify_dir_names(vec!["src/", "src_v2"]), correct);
-    }
-
-    #[test]
-    fn test_is_a_parent_of() {
-        assert!(is_a_parent_of("/usr", "/usr/andy"));
-        assert!(is_a_parent_of("/usr", "/usr/andy/i/am/descendant"));
-        assert!(!is_a_parent_of("/usr", "/usr/."));
-        assert!(!is_a_parent_of("/usr", "/usr/"));
-        assert!(!is_a_parent_of("/usr", "/usr"));
-        assert!(!is_a_parent_of("/usr/", "/usr"));
-        assert!(!is_a_parent_of("/usr/andy", "/usr"));
-        assert!(!is_a_parent_of("/usr/andy", "/usr/sibling"));
-        assert!(!is_a_parent_of("/usr/folder", "/usr/folder_not_a_child"));
-    }
-
-    #[test]
-    fn test_is_a_parent_of_root() {
-        assert!(is_a_parent_of("/", "/usr/andy"));
-        assert!(is_a_parent_of("/", "/usr"));
-        assert!(!is_a_parent_of("/", "/"));
-    }
-
-    #[test]
-    fn test_should_ignore_file() {
-        let mut files = HashSet::new();
-        files.insert((10, 20));
-
-        assert!(!should_ignore_file(true, &mut files, Some((0, 0))));
-
-        // New file is not known it will be inserted to the hashmp and should not be ignored
-        assert!(!should_ignore_file(false, &mut files, Some((11, 12))));
-        assert!(files.contains(&(11, 12)));
-
-        // The same file will be ignored the second time
-        assert!(should_ignore_file(false, &mut files, Some((11, 12))));
-    }
-
-    #[test]
-    fn test_should_ignore_file_on_different_device() {
-        let mut files = HashSet::new();
-        files.insert((10, 20));
-
-        // We do not ignore files on the same device
-        assert!(!should_ignore_file(false, &mut files, Some((2, 99))));
-        assert!(!should_ignore_file(true, &mut files, Some((2, 99))));
-    }
-}
--- a/tests/test_exact_output.rs
+++ b/tests/test_exact_output.rs
@@ -1,11 +1,10 @@
 use assert_cmd::Command;
+use std::ffi::OsStr;
 use std::str;
 use std::sync::Once;

 static INIT: Once = Once::new();

-mod tests_symlinks;
-
 /**
 * This file contains tests that verify the exact output of the command.
 * This output differs on Linux / Mac so the tests are harder to write and debug
@@ -37,7 +36,7 @@ fn copy_test_data(dir: &str) {
    };
 }

-pub fn initialize() {
+fn initialize() {
    INIT.call_once(|| {
        copy_test_data("tests/test_dir");
        copy_test_data("tests/test_dir2");
@@ -45,228 +44,168 @@ pub fn initialize() {
    });
 }

+fn exact_output_test<T: AsRef<OsStr>>(valid_outputs: Vec<String>, command_args: Vec<T>) {
+    initialize();
+
+    let mut a = &mut Command::cargo_bin("dust").unwrap();
+    for p in command_args {
+        a = a.arg(p);
+    }
+    let output: String = str::from_utf8(&a.unwrap().stdout).unwrap().into();
+
+    assert!(valid_outputs
+        .iter()
+        .fold(false, |sum, i| sum || output.contains(i)));
+}
+
 // "windows" result data can vary by host (size seems to be variable by one byte); fix code vs test and re-enable
 #[cfg_attr(target_os = "windows", ignore)]
 #[test]
 pub fn test_main_basic() {
    // -c is no color mode - This makes testing much simpler
-    initialize();
-    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let assert = cmd.arg("-c").arg("/tmp/test_dir/").unwrap().stdout;
-    let output = str::from_utf8(&assert).unwrap();
-    assert!(output.contains(&main_output()));
+    exact_output_test(main_output(), vec!["-c", "/tmp/test_dir/"])
 }

 #[cfg_attr(target_os = "windows", ignore)]
 #[test]
 pub fn test_main_multi_arg() {
-    initialize();
-    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let assert = cmd
-        .arg("-c")
-        .arg("/tmp/test_dir/many/")
-        .arg("/tmp/test_dir")
-        .arg("/tmp/test_dir")
-        .unwrap()
-        .stdout;
-    let output = str::from_utf8(&assert).unwrap();
-    assert!(output.contains(&main_output()));
+    let command_args = vec![
+        "-c",
+        "/tmp/test_dir/many/",
+        "/tmp/test_dir",
+        "/tmp/test_dir",
+    ];
+    exact_output_test(main_output(), command_args);
 }

-#[cfg(target_os = "macos")]
-fn main_output() -> String {
-    r#"
+fn main_output() -> Vec<String> {
+    // Some linux currently thought to be Manjaro, Arch
+    // Although probably depends on how drive is formatted
+    let mac_and_some_linux = r#"
   0B     ┌── a_file    │░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█ │   0%
 4.0K     ├── hello_file│████████████████████████████████████████████████ │ 100%
 4.0K   ┌─┴ many        │████████████████████████████████████████████████ │ 100%
 4.0K ┌─┴ test_dir      │████████████████████████████████████████████████ │ 100%
 "#
    .trim()
-    .to_string()
-}
+    .to_string();

-#[cfg(target_os = "linux")]
-fn main_output() -> String {
-    r#"
+    let ubuntu = r#"
   0B     ┌── a_file    │               ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█ │   0%
 4.0K     ├── hello_file│               ░░░░░░░░░░░░░░░░█████████████████ │  33%
 8.0K   ┌─┴ many        │               █████████████████████████████████ │  67%
  12K ┌─┴ test_dir      │████████████████████████████████████████████████ │ 100%
  "#
    .trim()
-    .to_string()
-}
+    .to_string();

-#[cfg(target_os = "windows")]
-fn main_output() -> String {
-    "windows results vary by host".to_string()
+    vec![mac_and_some_linux, ubuntu]
 }

 #[cfg_attr(target_os = "windows", ignore)]
 #[test]
 pub fn test_main_long_paths() {
-    initialize();
-    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let assert = cmd
-        .arg("-c")
-        .arg("-p")
-        .arg("/tmp/test_dir/")
-        .unwrap()
-        .stdout;
-    let output = str::from_utf8(&assert).unwrap();
-    println!("{:?}", output.trim());
-    println!("{:?}", main_output_long_paths().trim());
-    assert!(output.contains(&main_output_long_paths()));
+    let command_args = vec!["-c", "-p", "/tmp/test_dir/"];
+    exact_output_test(main_output_long_paths(), command_args);
 }

-#[cfg(target_os = "macos")]
-fn main_output_long_paths() -> String {
-    r#"
+fn main_output_long_paths() -> Vec<String> {
+    let mac_and_some_linux = r#"
   0B     ┌── /tmp/test_dir/many/a_file    │░░░░░░░░░░░░░░░░░░░░░░░░░░░░█ │   0%
 4.0K     ├── /tmp/test_dir/many/hello_file│█████████████████████████████ │ 100%
 4.0K   ┌─┴ /tmp/test_dir/many             │█████████████████████████████ │ 100%
 4.0K ┌─┴ /tmp/test_dir                    │█████████████████████████████ │ 100%
 "#
    .trim()
-    .to_string()
-}
-
-#[cfg(target_os = "linux")]
-fn main_output_long_paths() -> String {
-    r#"   
+    .to_string();
+    let ubuntu = r#"
   0B     ┌── /tmp/test_dir/many/a_file    │         ░░░░░░░░░░░░░░░░░░░█ │   0%
 4.0K     ├── /tmp/test_dir/many/hello_file│         ░░░░░░░░░░██████████ │  33%
 8.0K   ┌─┴ /tmp/test_dir/many             │         ████████████████████ │  67%
  12K ┌─┴ /tmp/test_dir                    │█████████████████████████████ │ 100%
 "#
    .trim()
-    .to_string()
-}
-
-#[cfg(target_os = "windows")]
-fn main_output_long_paths() -> String {
-    "windows results vary by host".to_string()
-}
-
-#[cfg_attr(target_os = "windows", ignore)]
-#[test]
-pub fn test_apparent_size() {
-    initialize();
-    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let assert = cmd.arg("-c").arg("-s").arg("/tmp/test_dir").unwrap().stdout;
-    let output = str::from_utf8(&assert).unwrap();
-    assert!(output.contains(&output_apparent_size()));
-}
-
-#[cfg(target_os = "linux")]
-fn output_apparent_size() -> String {
-    r#"
-   0B     ┌── a_file    │                       ░░░░░░░░░░░░░░░░░░░░░░░░█ │   0%
-   6B     ├── hello_file│                       ░░░░░░░░░░░░░░░░░░░░░░░░█ │   0%
- 4.0K   ┌─┴ many        │                       █████████████████████████ │  50%
- 8.0K ┌─┴ test_dir      │████████████████████████████████████████████████ │ 100%     
-"#
-    .trim()
-    .to_string()
-}
-
-#[cfg(target_os = "macos")]
-fn output_apparent_size() -> String {
-    r#"
-   0B     ┌── a_file    │                    ░░░░░░░░░░░░░░░░░░░░░░░░░░░█ │   0%
-   6B     ├── hello_file│                    ░░░░░░░░░░░░░░░░░░░░░░░░░░██ │   3%
- 134B   ┌─┴ many        │                    ████████████████████████████ │  58%
- 230B ┌─┴ test_dir      │████████████████████████████████████████████████ │ 100%
-"#
-    .trim()
-    .to_string()
-}
-
-#[cfg(target_os = "windows")]
-fn output_apparent_size() -> String {
-    "windows results vary by host".to_string()
+    .to_string();
+    vec![mac_and_some_linux, ubuntu]
 }

 // Check against directories and files whos names are substrings of each other
 #[cfg_attr(target_os = "windows", ignore)]
 #[test]
 pub fn test_substring_of_names_and_long_names() {
-    initialize();
-    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let output = cmd.arg("-c").arg("/tmp/test_dir2").unwrap().stdout;
-    let output = str::from_utf8(&output).unwrap();
-    assert!(output.contains(&no_substring_of_names_output()));
+    let command_args = vec!["-c", "/tmp/test_dir2"];
+    exact_output_test(no_substring_of_names_output(), command_args);
 }

-#[cfg(target_os = "linux")]
-fn no_substring_of_names_output() -> String {
-    "
-   0B   ┌── long_dir_name_what_a_very_long_dir_name_what_happens_when_this_g..
+fn no_substring_of_names_output() -> Vec<String> {
+    let ubuntu = "
+   0B   ┌── long_dir_name_what_a_very_long_dir_name_what_happens_when_this_goe..
 4.0K   ├── dir_name_clash
 4.0K   │ ┌── hello
- 8.0K   ├─┴ dir_substring
- 4.0K   │ ┌── hello
 8.0K   ├─┴ dir
+ 4.0K   │ ┌── hello
+ 8.0K   ├─┴ dir_substring
  24K ┌─┴ test_dir2
    "
    .trim()
-    .into()
-}
+    .into();

-#[cfg(target_os = "macos")]
-fn no_substring_of_names_output() -> String {
-    "
-   0B   ┌── long_dir_name_what_a_very_long_dir_name_what_happens_when_this_g..
- 4.0K   │ ┌── hello
- 4.0K   ├─┴ dir_substring
- 4.0K   ├── dir_name_clash
+    let mac_and_some_linux = "
+   0B   ┌── long_dir_name_what_a_very_long_dir_name_what_happens_when_this_goe..
 4.0K   │ ┌── hello
 4.0K   ├─┴ dir
+ 4.0K   ├── dir_name_clash
+ 4.0K   │ ┌── hello
+ 4.0K   ├─┴ dir_substring
  12K ┌─┴ test_dir2
  "
    .trim()
-    .into()
-}
-
-#[cfg(target_os = "windows")]
-fn no_substring_of_names_output() -> String {
-    "PRs".into()
+    .into();
+    vec![mac_and_some_linux, ubuntu]
 }

 #[cfg_attr(target_os = "windows", ignore)]
 #[test]
 pub fn test_unicode_directories() {
-    initialize();
-    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let output = cmd.arg("-c").arg("/tmp/test_dir_unicode").unwrap().stdout;
-    let output = str::from_utf8(&output).unwrap();
-    assert!(output.contains(&unicode_dir()));
+    let command_args = vec!["-c", "/tmp/test_dir_unicode"];
+    exact_output_test(unicode_dir(), command_args);
 }

-#[cfg(target_os = "linux")]
-fn unicode_dir() -> String {
+fn unicode_dir() -> Vec<String> {
    // The way unicode & asian characters are rendered on the terminal should make this line up
-    "
-   0B   ┌── 👩.unicode                │                                 █ │   0%
-   0B   ├── ラウトは難しいです！.japan│                                 █ │   0%
+    let ubuntu = "
+   0B   ┌── ラウトは難しいです！.japan│                                 █ │   0%
+   0B   ├── 👩.unicode                │                                 █ │   0%
 4.0K ┌─┴ test_dir_unicode            │██████████████████████████████████ │ 100%
    "
    .trim()
-    .into()
-}
+    .into();

-#[cfg(target_os = "macos")]
-fn unicode_dir() -> String {
-    "
-   0B   ┌── 👩.unicode                │                                 █ │   0%
-   0B   ├── ラウトは難しいです！.japan│                                 █ │   0%
+    let mac_and_some_linux = "
+   0B   ┌── ラウトは難しいです！.japan│                                 █ │   0%
+   0B   ├── 👩.unicode                │                                 █ │   0%
   0B ┌─┴ test_dir_unicode            │                                 █ │   0%
    "
    .trim()
-    .into()
+    .into();
+    vec![mac_and_some_linux, ubuntu]
 }

-#[cfg(target_os = "windows")]
-fn unicode_dir() -> String {
-    "".into()
+#[cfg_attr(target_os = "windows", ignore)]
+#[test]
+pub fn test_apparent_size() {
+    let command_args = vec!["-c", "-s", "-b", "/tmp/test_dir"];
+    exact_output_test(apparent_size_output(), command_args);
+}
+
+fn apparent_size_output() -> Vec<String> {
+    // The apparent directory sizes are too unpredictable and system dependant to try and match
+    let files = r#"
+   0B     ┌── a_file
+   6B     ├── hello_file
+ "#
+    .trim()
+    .to_string();
+
+    vec![files]
 }
--- a/tests/test_flags.rs
+++ b/tests/test_flags.rs
@@ -1,17 +1,25 @@
 use assert_cmd::Command;
+use std::ffi::OsStr;
 use std::str;
+
 /**
 * This file contains tests that test a substring of the output using '.contains'
 *
 * These tests should be the same cross platform
 */

+fn build_command<T: AsRef<OsStr>>(command_args: Vec<T>) -> String {
+    let mut a = &mut Command::cargo_bin("dust").unwrap();
+    for p in command_args {
+        a = a.arg(p);
+    }
+    str::from_utf8(&a.unwrap().stdout).unwrap().into()
+}
+
 // We can at least test the file names are there
 #[test]
 pub fn test_basic_output() {
-    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let output = cmd.arg("tests/test_dir/").unwrap().stdout;
-    let output = str::from_utf8(&output).unwrap();
+    let output = build_command(vec!["tests/test_dir/"]);

    assert!(output.contains(" ┌─┴ "));
    assert!(output.contains("test_dir "));
@@ -25,9 +33,7 @@ pub fn test_basic_output() {

 #[test]
 pub fn test_output_no_bars_means_no_excess_spaces() {
-    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let output = cmd.arg("-b").arg("tests/test_dir/").unwrap().stdout;
-    let output = str::from_utf8(&output).unwrap();
+    let output = build_command(vec!["-b", "tests/test_dir/"]);
    // If bars are not being shown we don't need to pad the output with spaces
    assert!(output.contains("many"));
    assert!(!output.contains("many    "));
@@ -35,15 +41,7 @@ pub fn test_output_no_bars_means_no_excess_spaces() {

 #[test]
 pub fn test_reverse_flag() {
-    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let output = cmd
-        .arg("-c")
-        .arg("-r")
-        .arg("tests/test_dir/")
-        .unwrap()
-        .stdout;
-    let output = str::from_utf8(&output).unwrap();
-
+    let output = build_command(vec!["-r", "-c", "tests/test_dir/"]);
    assert!(output.contains(" └─┬ test_dir "));
    assert!(output.contains("  └─┬ many "));
    assert!(output.contains("    ├── hello_file"));
@@ -53,15 +51,7 @@ pub fn test_reverse_flag() {
 #[test]
 pub fn test_d_flag_works() {
    // We should see the top level directory but not the sub dirs / files:
-    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let output = cmd
-        .arg("-d")
-        .arg("1")
-        .arg("-s")
-        .arg("tests/test_dir/")
-        .unwrap()
-        .stdout;
-    let output = str::from_utf8(&output).unwrap();
+    let output = build_command(vec!["-d", "1", "tests/test_dir/"]);
    assert!(!output.contains("hello_file"));
 }

@@ -69,31 +59,14 @@ pub fn test_d_flag_works() {
 pub fn test_d_flag_works_and_still_recurses_down() {
    // We had a bug where running with '-d 1' would stop at the first directory and the code
    // would fail to recurse down
-    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let output = cmd
-        .arg("-d")
-        .arg("1")
-        .arg("-f")
-        .arg("-c")
-        .arg("tests/test_dir2/")
-        .unwrap()
-        .stdout;
-    let output = str::from_utf8(&output).unwrap();
-    assert!(output.contains("7 ┌─┴ test_dir2"));
+    let output = build_command(vec!["-d", "1", "-f", "-c", "tests/test_dir2/"]);
+    assert!(output.contains("4 ┌─┴ test_dir2"));
 }

 // Check against directories and files whos names are substrings of each other
 #[test]
 pub fn test_ignore_dir() {
-    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let output = cmd
-        .arg("-c")
-        .arg("-X")
-        .arg("dir_substring")
-        .arg("tests/test_dir2")
-        .unwrap()
-        .stdout;
-    let output = str::from_utf8(&output).unwrap();
+    let output = build_command(vec!["-c", "-X", "dir_substring", "tests/test_dir2/"]);
    assert!(!output.contains("dir_substring"));
 }

@@ -108,25 +81,12 @@ pub fn test_with_bad_param() {
 #[test]
 pub fn test_hidden_flag() {
    // Check we can see the hidden file normally
-    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let output = cmd
-        .arg("-c")
-        .arg("tests/test_dir_hidden_entries")
-        .unwrap()
-        .stdout;
-    let output = str::from_utf8(&output).unwrap();
+    let output = build_command(vec!["-c", "tests/test_dir_hidden_entries/"]);
    assert!(output.contains(".hidden_file"));
    assert!(output.contains("┌─┴ test_dir_hidden_entries"));

    // Check that adding the '-h' flag causes us to not see hidden files
-    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let output = cmd
-        .arg("-c")
-        .arg("-i")
-        .arg("tests/test_dir_hidden_entries")
-        .unwrap()
-        .stdout;
-    let output = str::from_utf8(&output).unwrap();
+    let output = build_command(vec!["-c", "-i", "tests/test_dir_hidden_entries/"]);
    assert!(!output.contains(".hidden_file"));
    assert!(output.contains("┌── test_dir_hidden_entries"));
 }
@@ -134,16 +94,87 @@ pub fn test_hidden_flag() {
 #[test]
 pub fn test_number_of_files() {
    // Check we can see the hidden file normally
-    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let output = cmd
-        .arg("-c")
-        .arg("-f")
-        .arg("tests/test_dir")
-        .unwrap()
-        .stdout;
-    let output = str::from_utf8(&output).unwrap();
-    assert!(output.contains("1     ┌── hello_file"));
-    assert!(output.contains("1     ├── a_file "));
-    assert!(output.contains("3   ┌─┴ many"));
-    assert!(output.contains("4 ┌─┴ test_dir"));
+    let output = build_command(vec!["-c", "-f", "tests/test_dir"]);
+    assert!(output.contains("1     ┌── a_file "));
+    assert!(output.contains("1     ├── hello_file"));
+    assert!(output.contains("2   ┌─┴ many"));
+    assert!(output.contains("2 ┌─┴ test_dir"));
+}
+
+#[test]
+pub fn test_show_files_by_type() {
+    // Check we can list files by type
+    let output = build_command(vec!["-c", "-t", "tests"]);
+    assert!(output.contains(" .unicode"));
+    assert!(output.contains(" .japan"));
+    assert!(output.contains(" .rs"));
+    assert!(output.contains(" (no extension)"));
+    assert!(output.contains("┌─┴ (total)"));
+}
+
+#[test]
+pub fn test_show_files_by_regex_match_lots() {
+    // Check we can see '.rs' files in the tests directory
+    let output = build_command(vec!["-c", "-e", "\\.rs$", "tests"]);
+    assert!(output.contains(" ┌─┴ tests"));
+    assert!(!output.contains("0B ┌── tests"));
+    assert!(!output.contains("0B ┌─┴ tests"));
+}
+
+#[test]
+pub fn test_show_files_by_regex_match_nothing() {
+    // Check there are no files named: '.match_nothing' in the tests directory
+    let output = build_command(vec!["-c", "-e", "match_nothing$", "tests"]);
+    assert!(output.contains("0B ┌── tests"));
+}
+
+#[test]
+pub fn test_show_files_by_regex_match_multiple() {
+    let output = build_command(vec![
+        "-c",
+        "-e",
+        "test_dir_hidden",
+        "-e",
+        "test_dir2",
+        "-n",
+        "100",
+        "tests",
+    ]);
+    assert!(output.contains("test_dir2"));
+    assert!(output.contains("test_dir_hidden"));
+    assert!(!output.contains("many")); // We do not find the 'many' folder in the 'test_dir' folder
+}
+
+#[test]
+pub fn test_show_files_by_invert_regex() {
+    let output = build_command(vec!["-c", "-f", "-v", "e", "tests/test_dir2"]);
+    // There are 0 files without 'e' in the name
+    assert!(output.contains("0 ┌── test_dir2"));
+
+    let output = build_command(vec!["-c", "-f", "-v", "a", "tests/test_dir2"]);
+    // There are 2 files without 'a' in the name
+    assert!(output.contains("2 ┌─┴ test_dir2"));
+
+    // There are 4 files in the test_dir2 hierarchy
+    let output = build_command(vec!["-c", "-f", "-v", "match_nothing$", "tests/test_dir2"]);
+    assert!(output.contains("4 ┌─┴ test_dir2"));
+}
+
+#[test]
+pub fn test_show_files_by_invert_regex_match_multiple() {
+    // We ignore test_dir2 & test_dir_unicode, leaving the test_dir folder
+    // which has the 'many' folder inside
+    let output = build_command(vec![
+        "-c",
+        "-v",
+        "test_dir2",
+        "-v",
+        "test_dir_unicode",
+        "-n",
+        "100",
+        "tests",
+    ]);
+    assert!(!output.contains("test_dir2"));
+    assert!(!output.contains("test_dir_unicode"));
+    assert!(output.contains("many"));
 }
--- a/tests/tests_symlinks.rs
+++ b/tests/tests_symlinks.rs
@@ -2,7 +2,6 @@ use assert_cmd::Command;
 use std::cmp::max;
 use std::fs::File;
 use std::io::Write;
-use std::panic;
 use std::path::PathBuf;
 use std::str;

@@ -25,7 +24,7 @@ fn get_width_of_terminal() -> u16 {

 // Mac test runners create tmp files with very long names, hence it may be shortened in the output
 fn get_file_name(name: String) -> String {
-    let terminal_plus_buffer = (get_width_of_terminal() - 14) as usize;
+    let terminal_plus_buffer = (get_width_of_terminal() - 12) as usize;
    if UnicodeWidthStr::width(&*name) > terminal_plus_buffer {
        let trimmed_name = name
            .chars()
@@ -61,12 +60,12 @@ pub fn test_soft_sym_link() {
        .output();
    assert!(c.is_ok());

-    let c = format!(" ┌── {}", get_file_name(link_name_s.into()));
-    let b = format!(" ├── {}", get_file_name(file_path_s.into()));
+    let c = format!(" ├── {}", get_file_name(link_name_s.into()));
+    let b = format!(" ┌── {}", get_file_name(file_path_s.into()));
    let a = format!("─┴ {}", dir_s);

    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let output = cmd.arg("-p").arg("-c").arg(dir_s).unwrap().stdout;
+    let output = cmd.arg("-p").arg("-c").arg("-s").arg(dir_s).unwrap().stdout;

    let output = str::from_utf8(&output).unwrap();

@@ -125,9 +124,16 @@ pub fn test_recursive_sym_link() {
    let b = format!(" └── {}", get_file_name(link_name_s.into()));

    let mut cmd = Command::cargo_bin("dust").unwrap();
-    let output = cmd.arg("-p").arg("-c").arg("-r").arg(dir_s).unwrap().stdout;
-
+    let output = cmd
+        .arg("-p")
+        .arg("-c")
+        .arg("-r")
+        .arg("-s")
+        .arg(dir_s)
+        .unwrap()
+        .stdout;
    let output = str::from_utf8(&output).unwrap();
+
    assert!(output.contains(a.as_str()));
    assert!(output.contains(b.as_str()));
 }
Author	SHA1	Message	Date
andy.boot	c4f12b3c42	New Version	2022-07-14 08:07:48 +01:00
andy.boot	fc70f9ba30	Rename variable	2022-07-13 09:38:21 +01:00
andy.boot	a00d1f0719	Fix: Allow -n to be used with -d Allow -n for number_of_lines to be used with -d 'max depth' Remove depth specific functions, the job is now handled by the mainline Add depth as a field onto the Node object.	2022-07-13 09:38:21 +01:00
andy.boot	c4ea7815f8	Refactor: tweak utils function Refactor simplify_dir_names to make it more readable	2022-07-01 12:04:31 +01:00
dependabot[bot]	afc36a633f	Bump regex from 1.5.4 to 1.5.5 Bumps [regex](https://github.com/rust-lang/regex) from 1.5.4 to 1.5.5. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.5.4...1.5.5) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-07 09:00:43 +01:00
unknown	7275b273d4	Fix archive/directory check in platform.rs	2022-05-02 12:11:22 +01:00
andy.boot	a3e59f9c25	Update README.md	2022-03-05 22:02:09 +00:00
Adam Stephens	48bf656123	add aarch64 gnu and musl cross targets	2022-02-27 10:09:38 +00:00
andy.boot	fabb27908d	Increment version	2022-02-26 11:47:06 +00:00
andy.boot	52aeeebe1f	Improve help text	2022-02-26 11:47:06 +00:00
andy.boot	1e27288ec2	Fix test: Remove unwanted mod This line caused the test_symlinks files to be run twice.	2022-02-26 11:10:26 +00:00
andy.boot	9f4a5daee6	Update library: Clap Required several changes to main.rs as v3 had breaking changes.	2022-02-26 11:10:26 +00:00
andy.boot	27f0a015ef	Update cargo packages	2022-02-26 11:10:26 +00:00
andy.boot	20d89bef91	Neaten code	2022-02-26 09:58:47 +00:00
andy.boot	469e6d0a69	Fix: Bug: names may be shortened unnecessarily The code calculating the width of a row to use vs the width of the terminal wasn't quite right. If we had 2 long filepaths one at the top of the dir tree and one at the bottom the old code would shorten both equally. This doesn't make sense as the one at the shallowest part of the tree would have used less screen real estate and so should show a longer part of the filepath.	2022-02-26 09:58:47 +00:00
andy.boot	2d58609d54	Fix: Add assert for low terminal width If terminal is not wide enought to print text, then print an error message https://github.com/bootandy/dust/issues/204	2022-01-02 22:41:02 +00:00
andy.boot	109a0b90d4	Update help text: number_of_lines Remove note about 'height' and '-h being help' because it confused people. Add text to explain default height is terminal height - 10 https://github.com/bootandy/dust/issues/201	2022-01-02 22:41:02 +00:00
andy.boot	ab67c1a50e	Update help text: Add note for -c about watch Issue was raised about using dust with watch. The solution is to use watch --color dust or watch dust -c https://github.com/bootandy/dust/issues/205	2022-01-02 22:41:02 +00:00
Sourajyoti Basak	6a34b52d15	docs(readme): add pacstall installation method	2021-12-21 10:07:28 +00:00
Gustavobb	f708305190	Feature: Implement ISO output	2021-11-20 12:13:30 +00:00
andy.boot	2749f56b7a	Tests: Fix test on mac (hack) For some unknown reason mac takes offence to searching for 'test_dir_unicode'. 'test_dir_hidden' seems to work fine. This isn't a proper fix as I've just hacked round the problem. Ideally I'd need a mac user to do some investigation.	2021-11-20 12:05:48 +00:00
andy.boot	d983175189	Cleanup: Vec -> &[]. Remove println.	2021-10-24 14:05:14 +01:00
andy.boot	4b3dc3988d	Tests: Move test apparent size to exact_output Because apparent_size uses the test files created in /tmp it needs to be in the test_exact_output where those files are copied. Otherwise the files may not be there when the test is run.	2021-10-24 14:05:14 +01:00
andy.boot	fa4405b58b	Cleanup: Remove unused comment This was fixed a few commits ago	2021-10-24 14:05:14 +01:00
andy.boot	abb08f8e1a	Tests: Add tests for multi regex support	2021-10-24 14:05:14 +01:00
andy.boot	9f91d446c1	Feature/Bugfix: Allow multiple regexs to be used The -e and -v flags allow multiple values. Before values after the first were ignored. This change allows the user to specify multiple regexs and have them all applied.	2021-10-24 14:05:14 +01:00
andy.boot	1b07c3c4f3	Update README.md add note from https://github.com/bootandy/dust/issues/191	2021-10-24 09:33:02 +01:00
andy.boot	e55b917c96	Add .deb files to release procedure	2021-10-11 18:33:27 +01:00
andy.boot	0301c7a058	Increment version (skipped several due to build difficulties)	2021-09-19 13:50:10 +01:00
andy.boot	bbed8d7478	Revert "Fix ci: Github actions: Publish step" This reverts commit `5116c1c8a1`.	2021-09-19 13:50:10 +01:00
andy.boot	17e7390e25	Increment version new flags added -e -v -t	2021-09-19 11:40:21 +01:00
andy.boot	1cb731533b	bugfix: Allow dust to work on low width terminal Do not assume the min width is 80 (unless on windows).	2021-09-19 11:40:21 +01:00
andy.boot	d6c2482150	Clap: use default_value on input This avoids uses one less 'match' statement	2021-09-19 11:12:23 +01:00
andy.boot	9d2e6d2b36	Feature: Filter by invert_filter: reverse match Mimic grep's -v option. Allows dust to only match files that do not match the given filter	2021-09-19 11:12:23 +01:00
andy.boot	124c19b5c9	Feature: Adding file types filter & F flag changed -t = Show summary of types -e = Filter by regex allows you to specify a file type like -e "\.txt$" Change behaviour of '-f' flag - it now counts only files. Before it counted files & directories. This was needed for compatibility with the new '-e' filter flag	2021-09-19 11:12:23 +01:00
Ethan Smith	d8a334df3b	Make the other parts of the workflow conditional	2021-09-06 08:54:27 +01:00
Ethan Smith	c485e84145	Use single quotes?	2021-09-06 08:54:27 +01:00
Ethan Smith	f51e9dd222	Conditionally build on musl and fix typo	2021-09-06 08:54:27 +01:00
Ethan Smith	c25f7d342c	Build Debian packages in CI	2021-09-06 08:54:27 +01:00
andy.boot	ca0a93f222	Tests: Refactor Move apparent size test to 'test_flags' file. We can no longer test the exact output of this test as it changes too much on different filesystems Move common code to shared initialization function in test_flags.rs	2021-08-06 11:07:48 +01:00
andy.boot	9cf260e42b	Tests: Refactor: Improve exact output tests Move more shared code into single function	2021-08-06 11:07:48 +01:00
andy.boot	87b1f50b39	Tests: Refactor: Neaten	2021-08-06 11:07:48 +01:00
andy.boot	3458c98bd0	Tests: Refactor: More code reuse	2021-08-06 11:07:48 +01:00
andy.boot	2ad420d370	Possible test fix: Some tests fail on some linux An issue raised that the test output looked a lot like the mac output. This change causes test to pass if output is either mac or linux style	2021-08-06 10:21:46 +01:00
andy.boot	2047f99c6d	Update README.md	2021-08-06 10:11:10 +01:00
andy.boot	9bd2f9fc2a	Update README.md	2021-08-06 10:01:10 +01:00
andy.boot	5116c1c8a1	Fix ci: Github actions: Publish step The rules for github actions appear to have changed	2021-08-05 19:10:48 +01:00
andy.boot	07ffd04950	Increment version This version includes fix for the -f flag	2021-08-05 08:47:47 +01:00
andy.boot	dfa574375b	clippy: Fix clippy lints New rustup adds more lints	2021-08-05 08:47:47 +01:00
andy.boot	9de2e7d723	bugfix: Fix crash when using '-f' flag The old code was subtly different in the way the root node worked. This changed in the v0.6.0 version when dependencies were removed. The code to handle file count was never updated https://github.com/bootandy/dust/issues/162	2021-07-29 08:54:32 +01:00
andy.boot	8fddb24165	Increment version	2021-07-19 14:09:21 +01:00
andy.boot	ed3902f07e	Rename file: dirwalker -> dir_walker Felt like this file was missing an '_'	2021-07-16 14:13:12 +01:00
andy.boot	f219a752d6	Refactor: Compress arguemnts to one object Several arguments were passed around the dirwalker file. Compress them into a single struct.	2021-07-16 14:13:12 +01:00
andy.boot	f6e36aba52	Feature: Re-introduce -x flag to limit filesystem -x flag allows dust to limit itself to the current filesystem	2021-07-16 14:13:12 +01:00
andy.boot	c286b8ba97	Revert "README: Remove -x option" This reverts commit `1d062cf683`.	2021-07-16 14:13:12 +01:00
andy.boot	3dad7abfb8	Change size of softlinks to 0 Instead of the size of what they point at	2021-07-16 14:13:12 +01:00
andy.boot	42163abb73	Cargo: Remove num_cpus library. Ran update Not needed since v0.6.0 Ran cargo update	2021-07-07 18:35:05 +01:00
andy.boot	8e0188c755	README: Update usage examples of dust	2021-07-07 18:35:05 +01:00
andy.boot	555d86206d	ci: update versions of ubuntu	2021-06-23 10:05:48 +01:00
andy.boot	02392881c5	Update version	2021-06-23 09:40:58 +01:00
andy.boot	6f1175ef8d	README: Add another tool to list of alternatives	2021-06-23 09:40:58 +01:00
andy.boot	1d062cf683	README: Remove -x option This behaviour was removed in previous commit	2021-06-23 09:40:58 +01:00
andy.boot	be7a9181b2	Add alternative tools	2021-06-22 13:13:51 +01:00
andy.boot	9dcd4d0de4	Merge pull request #149 from bootandy/rewrite Large Rewrite	2021-06-22 13:09:58 +01:00
andy.boot	00c7ce8f15	Large refactor. Use rayon, 10X performance boost Code changes: Removed ignore & channel crates. Using a single reciever thread to build a hashmap to prevend duplicate inodes being reported gave a severe performance penalty Using rayon crate with some hand crafted file traversal has improved performance aprox 10X Behaviour changes: Removed parameter 'limit by filesystem' - don't think this is used, and I only added it as it was easy to add with the ignore crate. Sym links will now not appear in the output tree unless using '-s' 'apparent-size' flag Change behaviour of multiple args so that it unifies them and compares them under one tree instead of treating them individually: https://github.com/bootandy/dust/issues/136	2021-06-22 12:20:48 +01:00
andy.boot	c4a73d5921	Merge pull request #147 from QuarticCat/master Beautify help messages	2021-06-08 10:40:34 +01:00
andy.boot	e1ffc92589	Merge branch 'master' into master	2021-06-08 10:24:31 +01:00
andy.boot	18729762ad	Fix style for new version of clippy	2021-06-08 10:20:23 +01:00
ttay	8a499201de	Updated crossbeam-channel to 0.5 and ran Cargo update	2021-06-08 10:11:11 +01:00
QuarticCat	551c5d3bfa	Simplify conflict implementation	2021-06-05 21:09:31 +08:00
QuarticCat	15a867636f	Add wrap_help feature to clap	2021-06-05 20:39:59 +08:00
andy.boot	1b3d0b2724	Update packages	2021-01-16 15:42:39 +00:00
andy.boot	d5fa7f0861	Increment version	2021-01-16 15:42:39 +00:00
andy.boot	e15cf0c42e	[core] New flag: width Add support for width flag https://github.com/bootandy/dust/issues/126 Requested because some people may cat the output All terminal height/width detection is now in the main file. One method now has too many args for clippy, this complaint is valid and in the future we should consider pulling these out into a separate object.	2021-01-16 15:42:39 +00:00
andy.boot	1891de7fa3	Notes on how to publish	2021-01-16 15:42:39 +00:00