Cargo: Bump version to 1.4.0

Main: Add percent to progress bar
Main: Add spinner printing out hashing throughput
2025-01-03 17:50:37 +01:00 · 2025-01-03 17:50:06 +01:00 · 2025-01-03 17:48:16 +01:00 · 2025-01-03 17:47:08 +01:00 · 2025-01-03 17:45:35 +01:00 · 2025-01-03 17:45:02 +01:00
7 changed files with 458 additions and 188 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -0,0 +1,8 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_size = 4
+indent_style = space
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,5 @@
+# editor
+.vscode
+
+# cargo
 /target
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1,6 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]

 [[package]]
 name = "atty"
@ -15,9 +30,9 @@ dependencies = [

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

 [[package]]
 name = "bitflags"
@ -27,13 +42,28 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

 [[package]]
 name = "block-buffer"
-version = "0.10.2"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
 "generic-array",
 ]

+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "cc"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
+dependencies = [
+ "shlex",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@ -41,17 +71,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
-name = "clap"
-version = "3.1.8"
+name = "chrono"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71c47df61d9e16dc010b55dba1952a57d8c215dbb533fd13cdd13369aac73b1c"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-targets",
+]
+
+[[package]]
+name = "clap"
+version = "3.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
 dependencies = [
 "atty",
 "bitflags",
 "clap_derive",
+ "clap_lex",
 "indexmap",
- "lazy_static",
- "os_str_bytes",
+ "once_cell",
 "strsim",
 "termcolor",
 "textwrap",
@ -59,89 +103,84 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "3.1.7"
+version = "3.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1"
+checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
 dependencies = [
 "heck",
 "proc-macro-error",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+dependencies = [
+ "os_str_bytes",
 ]

 [[package]]
 name = "console"
-version = "0.15.0"
+version = "0.15.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31"
+checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b"
 dependencies = [
 "encode_unicode",
 "libc",
 "once_cell",
- "terminal_size",
- "winapi",
+ "unicode-width",
+ "windows-sys",
 ]

 [[package]]
-name = "cpufeatures"
-version = "0.2.2"
+name = "core-foundation-sys"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
 "libc",
 ]

-[[package]]
-name = "crossbeam-channel"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.1"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
 dependencies = [
- "cfg-if",
 "crossbeam-epoch",
 "crossbeam-utils",
 ]

 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.8"
+version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "autocfg",
- "cfg-if",
 "crossbeam-utils",
- "lazy_static",
- "memoffset",
- "scopeguard",
 ]

 [[package]]
 name = "crossbeam-utils"
-version = "0.8.8"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
-dependencies = [
- "cfg-if",
- "lazy_static",
-]
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"

 [[package]]
 name = "crypto-common"
-version = "0.1.3"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
 "generic-array",
 "typenum",
@ -149,9 +188,9 @@ dependencies = [

 [[package]]
 name = "digest"
-version = "0.10.3"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
 "block-buffer",
 "crypto-common",
@ -159,21 +198,21 @@ dependencies = [

 [[package]]
 name = "either"
-version = "1.6.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"

 [[package]]
 name = "encode_unicode"
-version = "0.3.6"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"

 [[package]]
 name = "generic-array"
-version = "0.14.5"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
 "typenum",
 "version_check",
@ -181,15 +220,15 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.11.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"

 [[package]]
 name = "heck"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"

 [[package]]
 name = "hermit-abi"
@ -201,10 +240,33 @@ dependencies = [
 ]

 [[package]]
-name = "indexmap"
-version = "1.8.1"
+name = "iana-time-zone"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
 "autocfg",
 "hashbrown",
@ -212,54 +274,49 @@ dependencies = [

 [[package]]
 name = "indicatif"
-version = "0.16.2"
+version = "0.17.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b"
+checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281"
 dependencies = [
 "console",
- "lazy_static",
 "number_prefix",
+ "portable-atomic",
 "rayon",
- "regex",
+ "unicode-width",
+ "web-time",
 ]

 [[package]]
-name = "lazy_static"
-version = "1.4.0"
+name = "js-sys"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]

 [[package]]
 name = "libc"
-version = "0.2.122"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec647867e2bf0772e28c8bcde4f0d19a9216916e890543b5a03ed8ef27b8f259"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"

 [[package]]
-name = "memchr"
-version = "2.4.1"
+name = "log"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"

 [[package]]
-name = "memoffset"
-version = "0.6.5"
+name = "num-traits"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
 "autocfg",
 ]

-[[package]]
-name = "num_cpus"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
 [[package]]
 name = "number_prefix"
 version = "0.4.0"
@ -268,18 +325,21 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"

 [[package]]
 name = "once_cell"
-version = "1.10.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"

 [[package]]
 name = "os_str_bytes"
-version = "6.0.0"
+version = "6.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
-dependencies = [
- "memchr",
-]
+checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
+
+[[package]]
+name = "portable-atomic"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"

 [[package]]
 name = "proc-macro-error"
@ -290,7 +350,7 @@ dependencies = [
 "proc-macro-error-attr",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.109",
 "version_check",
 ]

@ -307,89 +367,70 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.37"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
- "unicode-xid",
+ "unicode-ident",
 ]

 [[package]]
 name = "quote"
-version = "1.0.17"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
 "proc-macro2",
 ]

 [[package]]
 name = "rayon"
-version = "1.5.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
- "autocfg",
- "crossbeam-deque",
 "either",
 "rayon-core",
 ]

 [[package]]
 name = "rayon-core"
-version = "1.9.1"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
- "crossbeam-channel",
 "crossbeam-deque",
 "crossbeam-utils",
- "lazy_static",
- "num_cpus",
 ]

-[[package]]
-name = "regex"
-version = "1.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
-dependencies = [
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
-
 [[package]]
 name = "restic-integrity"
-version = "1.0.0"
+version = "1.4.0"
 dependencies = [
+ "chrono",
 "clap",
 "indicatif",
 "rayon",
 "sha2",
 ]

-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
 [[package]]
 name = "sha2"
-version = "0.10.2"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
 "cfg-if",
 "cpufeatures",
 "digest",
 ]

+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "strsim"
 version = "0.10.0"
@ -398,57 +439,128 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"

 [[package]]
 name = "syn"
-version = "1.0.91"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
 "proc-macro2",
 "quote",
- "unicode-xid",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
 ]

 [[package]]
 name = "termcolor"
-version = "1.1.3"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 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.15.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
+checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"

 [[package]]
 name = "typenum"
-version = "1.15.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"

 [[package]]
-name = "unicode-xid"
-version = "0.2.2"
+name = "unicode-ident"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"

 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.94",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.94",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]

 [[package]]
 name = "winapi"
@ -468,11 +580,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "winapi",
+ "windows-sys",
 ]

 [[package]]
@ -480,3 +592,85 @@ name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,12 +1,19 @@
 [package]
 name = "restic-integrity"
-version = "1.0.0"
+version = "1.4.0"
 edition = "2021"
 authors = [ "networkException" ]
 description = "Check the integrity of a restic repository without unlocking it"
+license = "BSD-2-Clause"
+repository = "https://gitlab.upi.li/networkException/restic-integrity"

 [dependencies]
 clap = { version = "3.1.8", features = [ "derive" ] }
 sha2 = "0.10.2"
 rayon = "1.5.1"
-indicatif = { version = "0.16.2", features = [ "rayon" ] }
+indicatif = { version = "0.17.9", features = [ "rayon" ] }
+chrono = "0.4.38"
+
+[[bin]]
+name = "restic-integrity"
+path = "src/main.rs"
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 BSD 2-Clause License

-Copyright (c) 2022, networkException
+Copyright (c) 2022-2025, networkException <git@nwex.de>
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
--- a/README.md
+++ b/README.md
@ -15,7 +15,12 @@ ARGS:
 OPTIONS:
    -h, --help                Print help information
    -j, --jobs <JOBS>         The number of jobs to use for hashing [default: 0]
-    -s, --single-directory    If the path argument should be used to check all files in a directory
+    -s, --start <START>       [default: 0]
+        --single-directory    If the path argument should be used to check all files in a directory
                              it points to instead of a restic repository (use for testing)
    -V, --version             Print version information
 ```
+
+## Installing
+
+This package is available as `restic-integrity` from nixpkgs
--- a/src/main.rs
+++ b/src/main.rs
@ -1,8 +1,18 @@
+/*
+ * Copyright (c) 2022-2025, networkException <git@nwex.de>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+use chrono::Local;
 use clap::Parser;
-use indicatif::{ParallelProgressIterator, ProgressBar, ProgressStyle, ProgressFinish};
+use indicatif::{MultiProgress, ParallelProgressIterator, ProgressBar, ProgressFinish, ProgressStyle};
 use rayon::ThreadPoolBuilder;
 use rayon::iter::{ParallelIterator, IntoParallelRefIterator};
-use std::fs::File;
+use core::option::Option::None;
+use core::time::Duration;
+use std::fs::{File, OpenOptions};
+use std::io::Write;
 use std::path::Path;
 use std::io::{self, Result, Error, ErrorKind};
 use sha2::{Sha256, Digest};
@ -17,14 +27,18 @@ struct Args {
    #[clap(short, long, default_value_t = 0)]
    jobs: u8,

+    #[clap(short, long, default_value_t = 0)]
+    start: usize,
+
    /// If the path argument should be used to check all files in a directory it points to instead of a restic repository (use for testing)
-    #[clap(short, long)]
+    #[clap(long)]
    single_directory: bool
 }

 fn run() -> Result<()> {
    let args = Args::parse();
    let path = Path::new(&args.path);
+    let start = args.start;

    let mut directories_with_hashed_files = Vec::new();

@ -47,39 +61,77 @@ fn run() -> Result<()> {
    for directory in directories_with_hashed_files {
        for file in directory.read_dir()? {
            let file = file?;
-            let path = file.path();
+            let path = file.path().canonicalize()?;

            hashed_files.push(path);
        }
    }

-    let progress_bar = ProgressBar::new(hashed_files.len() as u64);
-    progress_bar.set_style(ProgressStyle::default_bar()
-        .template("Hashing files... {bar} {pos:>7}/{len:7} [{elapsed_precise}] ")
-        .on_finish(ProgressFinish::AndLeave));
+    let multi_progress = MultiProgress::new();
+
+    let progress_bar = ProgressBar::new(hashed_files.len() as u64)
+        .with_finish(ProgressFinish::AndLeave)
+        .with_style(ProgressStyle::default_bar()
+            .template("Hashing files... {bar} {percent_precise}% {pos:>7}/{len:7} [{elapsed_precise}]").unwrap());
+
+    let throughput_spinner = ProgressBar::new_spinner()
+        .with_style(ProgressStyle::default_spinner()
+        .template("{bytes_per_sec}").unwrap());
+
+    multi_progress.add(progress_bar.clone());
+    multi_progress.add(throughput_spinner.clone());

    let pool = ThreadPoolBuilder::new().num_threads(args.jobs as usize).build().unwrap();

-    return pool.install(|| {
-        return hashed_files.par_iter().progress_with(progress_bar).try_for_each(|path| -> Result<()> {
-            // Just opening the file and hashing using io::copy is roughly ~2.5x fater compared to sha256::digest_file
-            let mut hasher = Sha256::new();
-            let mut file = File::open(path)?;
+    hashed_files.sort();

-            io::copy(&mut file, &mut hasher)?;
+    let hashed_files_len = hashed_files.len();

-            let hash = format!("{:x}", hasher.finalize());
-            let filename = path.file_name().unwrap().to_str().unwrap();
+    if start != 0 {
+        match hashed_files_len.checked_sub(start) {
+            None => return Err(Error::new(ErrorKind::Other, format!("Specified start at {} is larger than the total number of files {}", start, hashed_files_len))),
+            Some(remaining) => {
+                println!("Starting at {} files, {} remaining...", start, remaining);

-            if filename != hash {
-                let path_string = path.to_str().unwrap();
-
-                return Err(Error::new(ErrorKind::Other, format!("Integrity check failed for {}: Expected {}, got {}", path_string, filename, hash)));
+                hashed_files.drain(0..start);
            }
+        }
+    }

-            Ok(())
-        });
-    });
+    throughput_spinner.enable_steady_tick(Duration::from_millis(100));
+
+    pool.install(|| hashed_files.par_iter().progress_with(progress_bar).try_for_each(|path| -> Result<()> {
+        // Just opening the file and hashing using io::copy is roughly ~2.5x faster compared to sha256::digest_file
+        let mut hasher = Sha256::new();
+        let mut file = File::open(path)?;
+
+        io::copy(&mut file, &mut throughput_spinner.wrap_write(&mut hasher))?;
+
+        let hash = format!("{:x}", hasher.finalize());
+        let filename = path.file_name().unwrap().to_str().unwrap();
+
+        if filename != hash {
+            let path_string = path.to_str().unwrap();
+
+            eprintln!("Integrity check failed for {}: Expected {}, got {}", path_string, filename, hash);
+
+            let file = OpenOptions::new()
+                .create(true)
+                .append(true)
+                .open("restic-integrity-log");
+
+            match file {
+                Err(error) => eprintln!("Unable to write to restic-integrity-log: {}", error),
+                Ok(mut file) => {
+                    if let Err(error) = writeln!(file, "{}: Integrity check failed for {}: Expected {}, got {}", Local::now().format("%Y-%m-%d %H:%M:%S"), path_string, filename, hash) {
+                        eprintln!("Unable to write to restic-integrity-log: {}", error)
+                    }
+                }
+            }
+        }
+
+        Ok(())
+    }))
 }

 fn main() {
Author	SHA1	Message	Date
networkException	b58441b90e	Cargo: Bump version to 1.4.0	2025-01-03 17:50:37 +01:00
networkException	1e88c1cca8	Main: Add percent to progress bar	2025-01-03 17:50:06 +01:00
networkException	24398c0994	Main: Add spinner printing out hashing throughput	2025-01-03 17:48:16 +01:00
networkException	9056adb574	LICENSE+Everywhere: Update copyright header to use date range	2025-01-03 17:47:08 +01:00
networkException	1d52082d40	Dependencies: Bump to latest	2025-01-03 17:45:35 +01:00
networkException	9b31693493	Dependencies: Bump indicatif to 0.17.9	2025-01-03 17:45:02 +01:00
networkException	91a3d33fb2	Cargo: Bump version to 1.3.1	2024-08-02 17:19:06 +02:00
networkException	1dbc9a159d	README: Add installing section with reference to nixpkgs package	2024-08-02 17:02:35 +02:00
networkException	4ff1be7022	Dependencies: Remove dependabot config The forge this project is on now doesn't have a dependabot	2024-08-02 16:59:09 +02:00
networkException	e4377daa42	LICENSE: Bump year	2024-08-02 16:58:33 +02:00
networkException	b0be2cc988	Everywhere: Remove support for building on Arch Linux	2024-08-02 16:53:44 +02:00
networkException	7b96470260	Cargo: Bump version to 1.3.0	2024-08-02 16:52:15 +02:00
networkException	2e3c1b6a97	Main: Write failed integrity checks to "restic-integrity-log"	2024-08-02 16:52:14 +02:00
networkException	0f7b8cf4e5	Dependencies: Add chrono	2024-08-02 16:52:14 +02:00
networkException	ec963fb675	Cargo: Bump version to 1.2.2	2024-08-02 16:52:13 +02:00
networkException	7ae511ac17	Dependencies: Bump to latest	2024-08-02 16:52:12 +02:00
networkException	a481840baf	Dependencies: Add dependabot config	2024-08-02 16:52:12 +02:00
networkException	9ade297b0c	README: Update help output	2024-08-02 16:52:11 +02:00
networkException	bc472d237f	Editor: Add editorconfig	2024-08-02 16:52:10 +02:00
networkException	0c8214717b	PKGBUILD: Upgrade to 1.2.1	2024-08-02 16:52:09 +02:00
networkException	3c38a669cd	PKGBUILD: Update maintainer information	2024-08-02 16:52:09 +02:00
networkException	c405899e3b	Cargo: Bump version to 1.2.1	2024-08-02 16:52:08 +02:00
networkException	9ab827fd3d	Dependencies: Update to latest	2024-08-02 16:52:07 +02:00
networkException	eb64d353c8	Main: Add licence header	2024-08-02 16:52:06 +02:00
networkException	a5b576108e	Main: Fix typo in comment	2024-08-02 16:52:06 +02:00
networkException	8f646713ef	Git: Ignore vscode workspace files	2024-08-02 16:52:05 +02:00
networkException	6fb9e13dac	Git: Ignore temporary files and directories created by makepkg	2024-08-02 16:52:04 +02:00
networkException	8e13650e8d	Cargo: Add more crate metadata	2024-08-02 16:52:04 +02:00
networkException	1d7620cc65	Cargo+Main: Move from /src to /source This avoids clashes with makepkg directories	2024-08-02 16:52:03 +02:00
networkException	9576f922a6	PKGBUILD: Upgrade to 1.2.0	2024-08-02 16:52:02 +02:00
networkException	7c5a1e9e6e	Cargo: Bump version to 1.2.0	2024-08-02 16:52:01 +02:00
networkException	f4274e3dfa	Main: Print failed integrity check instead of erroring	2024-08-02 16:52:01 +02:00
networkException	7d1529ae44	PKGBUILD: Upgrade to 1.1.0	2024-08-02 16:52:00 +02:00
networkException	2b800ba835	Cargo: Bump version to 1.1.0	2024-08-02 16:51:59 +02:00
networkException	19e26b2dbd	Main: Canonicalize paths before sorting	2024-08-02 16:51:58 +02:00
networkException	c8b2d6951b	Main: Sort hashed files before iterating To ensure the start flag working properly it is required to have a deterministic order to start with the same vector of hashed files each run.	2024-08-02 16:51:58 +02:00
networkException	91da8d374b	Main: Allow specifying which number of files to start with This patch introduces a new flag `-s` or `--start`, allowing users to start running the tool with a starting index into the list of hashed files generated from traversing either the repository or a single directory.	2024-08-02 16:51:57 +02:00
networkException	279dc41175	Main: Remove short argument version for single_directory The -s specifying is too ambigous for a debug flag and can easily clash with other flags.	2024-08-02 16:51:56 +02:00
networkException	fe10bdde7d	Main: Remove unnecessary return statement	2024-08-02 16:51:56 +02:00
networkException	26313c4c7e	PKGBUILD: Initial commit	2024-08-02 16:51:55 +02:00