release: 0.9.4

Blobfolio · Nov 28, 2024 · 0279ff6 · 0279ff6
2 parents 0cb3e27 + 1d443ba
commit 0279ff6
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 68 deletions.
diff --git a/CREDITS.md b/CREDITS.md
@@ -1,30 +1,46 @@
 # Project Dependencies
     Package:   channelz
-    Version:   0.9.3
-    Generated: 2024-10-17 20:29:31 UTC
+    Version:   0.9.4
+    Target:    x86_64-unknown-linux-gnu
+    Generated: 2024-11-28 20:35:34 UTC
 
 | Package | Version | Author(s) | License |
 | ---- | ---- | ---- | ---- |
-| [ahash](https://github.com/tkaitchuck/ahash) | 0.8.11 | [Tom Kaitchuck](mailto:[email protected]) | Apache-2.0 or MIT |
+| [ahash](https://github.com/tkaitchuck/ahash) | 0.8.11 | [Tom Kaitchuck](mailto:[email protected]) | MIT OR Apache-2.0 |
 | [alloc-no-stdlib](https://github.com/dropbox/rust-alloc-no-stdlib) | 2.0.4 | [Daniel Reiter Horn](mailto:[email protected]) | BSD-3-Clause |
 | [alloc-stdlib](https://github.com/dropbox/rust-alloc-no-stdlib) | 0.2.2 | [Daniel Reiter Horn](mailto:[email protected]) | BSD-3-Clause |
-| [argyle](https://github.com/Blobfolio/argyle) | 0.10.0 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
-| [brotli](https://github.com/dropbox/rust-brotli) | 7.0.0 | [Daniel Reiter Horn](mailto:[email protected]) and The Brotli Authors | BSD-3-Clause AND MIT |
-| [brotli-decompressor](https://github.com/dropbox/rust-brotli-decompressor) | 4.0.1 | [Daniel Reiter Horn](mailto:[email protected]) and The Brotli Authors | BSD-3-Clause or MIT |
-| [bytecount](https://github.com/llogiq/bytecount) | 0.6.8 | [Andre Bogus](mailto:[email protected]) and [Joshua Landau](mailto:[email protected]) | Apache-2.0 or MIT |
-| [cfg-if](https://github.com/alexcrichton/cfg-if) | 1.0.0 | [Alex Crichton](mailto:[email protected]) | Apache-2.0 or MIT |
-| [crossbeam-channel](https://github.com/crossbeam-rs/crossbeam) | 0.5.13 |  | Apache-2.0 or MIT |
-| [crossbeam-utils](https://github.com/crossbeam-rs/crossbeam) | 0.8.20 |  | Apache-2.0 or MIT |
-| [ctrlc](https://github.com/Detegr/rust-ctrlc.git) | 3.4.5 | [Antti Keränen](mailto:[email protected]) | Apache-2.0 or MIT |
-| [dactyl](https://github.com/Blobfolio/dactyl) | 0.7.4 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
-| [dowser](https://github.com/Blobfolio/dowser) | 0.9.3 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
-| [fastrand](https://github.com/smol-rs/fastrand) | 2.1.1 | [Stjepan Glavina](mailto:[email protected]) | Apache-2.0 or MIT |
-| [fyi_msg](https://github.com/Blobfolio/fyi) | 1.1.1 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
+| [**argyle**](https://github.com/Blobfolio/argyle) | 0.10.1 | [Josh Stoik](mailto:[email protected]) | WTFPL |
+| [bitflags](https://github.com/bitflags/bitflags) | 2.6.0 | The Rust Project Developers | MIT OR Apache-2.0 |
+| [**brotli**](https://github.com/dropbox/rust-brotli) | 7.0.0 | [Daniel Reiter Horn](mailto:[email protected]) and The Brotli Authors | BSD-3-Clause AND MIT |
+| [brotli-decompressor](https://github.com/dropbox/rust-brotli-decompressor) | 4.0.1 | [Daniel Reiter Horn](mailto:[email protected]) and The Brotli Authors | BSD-3-Clause OR MIT |
+| [bytecount](https://github.com/llogiq/bytecount) | 0.6.8 | [Andre Bogus](mailto:[email protected]) and [Joshua Landau](mailto:[email protected]) | Apache-2.0 OR MIT |
+| [cc](https://github.com/rust-lang/cc-rs) ⚒️ | 1.2.1 | [Alex Crichton](mailto:[email protected]) | MIT OR Apache-2.0 |
+| [cfg-if](https://github.com/alexcrichton/cfg-if) | 1.0.0 | [Alex Crichton](mailto:[email protected]) | MIT OR Apache-2.0 |
+| [cfg_aliases](https://github.com/katharostech/cfg_aliases) ⚒️ | 0.2.1 | [Zicklag](mailto:[email protected]) | MIT |
+| [**crossbeam-channel**](https://github.com/crossbeam-rs/crossbeam) | 0.5.13 |  | MIT OR Apache-2.0 |
+| [crossbeam-utils](https://github.com/crossbeam-rs/crossbeam) | 0.8.20 |  | MIT OR Apache-2.0 |
+| [**ctrlc**](https://github.com/Detegr/rust-ctrlc.git) | 3.4.5 | [Antti Keränen](mailto:[email protected]) | MIT OR Apache-2.0 |
+| [**dactyl**](https://github.com/Blobfolio/dactyl) | 0.8.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
+| [**dowser**](https://github.com/Blobfolio/dowser) | 0.10.1 | [Josh Stoik](mailto:[email protected]) | WTFPL |
+| [fastrand](https://github.com/smol-rs/fastrand) | 2.2.0 | [Stjepan Glavina](mailto:[email protected]) | Apache-2.0 OR MIT |
+| [**fyi_msg**](https://github.com/Blobfolio/fyi) | 1.3.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
+| [libc](https://github.com/rust-lang/libc) | 0.2.166 | The Rust Project Developers | MIT OR Apache-2.0 |
 | [libdeflate-sys](https://github.com/adamkewley/libdeflater) | 1.22.0 | [Adam Kewley](mailto:[email protected]) | Apache-2.0 |
-| [libdeflater](https://github.com/adamkewley/libdeflater) | 1.22.0 | [Adam Kewley](mailto:[email protected]) | Apache-2.0 |
-| [once_cell](https://github.com/matklad/once_cell) | 1.20.2 | [Aleksey Kladov](mailto:[email protected]) | Apache-2.0 or MIT |
-| [tempfile](https://github.com/Stebalien/tempfile) | 3.13.0 | [Steven Allen](mailto:[email protected]), The Rust Project Developers, [Ashley Mannix](mailto:[email protected]), and [Jason White](mailto:[email protected]) | Apache-2.0 or MIT |
-| [terminal_size](https://github.com/eminence/terminal-size) | 0.4.0 | [Andrew Chin](mailto:[email protected]) | Apache-2.0 or MIT |
-| [unicode-width](https://github.com/unicode-rs/unicode-width) | 0.2.0 | [kwantam](mailto:[email protected]) and [Manish Goregaokar](mailto:[email protected]) | Apache-2.0 or MIT |
-| [write_atomic](https://github.com/Blobfolio/write_atomic) | 0.5.1 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
-| [zerocopy](https://github.com/google/zerocopy) | 0.7.35 | [Joshua Liebow-Feeser](mailto:[email protected]) | Apache-2.0, BSD-2-Clause, or MIT |
+| [**libdeflater**](https://github.com/adamkewley/libdeflater) | 1.22.0 | [Adam Kewley](mailto:[email protected]) | Apache-2.0 |
+| [linux-raw-sys](https://github.com/sunfishcode/linux-raw-sys) | 0.4.14 | [Dan Gohman](mailto:[email protected]) | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT |
+| [nix](https://github.com/nix-rust/nix) | 0.29.0 | The nix-rust Project Developers | MIT |
+| [once_cell](https://github.com/matklad/once_cell) | 1.20.2 | [Aleksey Kladov](mailto:[email protected]) | MIT OR Apache-2.0 |
+| [rustix](https://github.com/bytecodealliance/rustix) | 0.38.41 | [Dan Gohman](mailto:[email protected]) and [Jakub Konka](mailto:[email protected]) | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT |
+| [shlex](https://github.com/comex/rust-shlex) ⚒️ | 1.3.0 | [comex](mailto:[email protected]), [Fenhl](mailto:[email protected]), [Adrian Taylor](mailto:[email protected]), [Alex Touchet](mailto:[email protected]), [Daniel Parks](mailto:dp&#43;[email protected]), and [Garrett Berg](mailto:[email protected]) | MIT OR Apache-2.0 |
+| [tempfile](https://github.com/Stebalien/tempfile) | 3.14.0 | [Steven Allen](mailto:[email protected]), The Rust Project Developers, [Ashley Mannix](mailto:[email protected]), and [Jason White](mailto:[email protected]) | MIT OR Apache-2.0 |
+| [terminal_size](https://github.com/eminence/terminal-size) | 0.4.0 | [Andrew Chin](mailto:[email protected]) | MIT OR Apache-2.0 |
+| [unicode-width](https://github.com/unicode-rs/unicode-width) | 0.2.0 | [kwantam](mailto:[email protected]) and [Manish Goregaokar](mailto:[email protected]) | MIT OR Apache-2.0 |
+| [version_check](https://github.com/SergioBenitez/version_check) ⚒️ | 0.9.5 | [Sergio Benitez](mailto:[email protected]) | MIT OR Apache-2.0 |
+| [**write_atomic**](https://github.com/Blobfolio/write_atomic) | 0.5.2 | [Josh Stoik](mailto:[email protected]) | WTFPL |
+| [zerocopy](https://github.com/google/zerocopy) | 0.7.35 | [Joshua Liebow-Feeser](mailto:[email protected]) | BSD-2-Clause OR Apache-2.0 OR MIT |
+
+### Legend
+
+* **Direct Dependency**
+* Child Dependency
+* ⚒️ Build-Only
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "channelz"
-version = "0.9.3"
+version = "0.9.4"
 license = "WTFPL"
 authors = ["Josh Stoik <[email protected]>"]
 edition = "2021"
@@ -10,7 +10,7 @@ readme = "./README.md"
 publish = false
 
 [package.metadata.deb]
-maintainer = "Josh Stoik <hello@blobfolio.com>"
+maintainer = "Josh Stoik <josh@blobfolio.com>"
 copyright = "2024, Blobfolio, LLC <[email protected]>"
 license-file = ["./LICENSE", "0"]
 revision = "1"
@@ -34,7 +34,6 @@ assets = [
 name = "ChannelZ"
 bash-dir = "./release/completions"
 man-dir = "./release/man"
-credits-dir = "./"
 
 [[package.metadata.bashman.switches]]
 long = "--clean"
@@ -94,14 +93,14 @@ lines = [
 
 [build-dependencies]
 argyle = "0.10.*"
-dactyl = "0.7.*"
+dactyl = "0.8.*"
 
 [dependencies]
 argyle = "0.10.*"
 crossbeam-channel = "=0.5.*"
 ctrlc = "=3.4.5"
-dactyl = "0.7.*"
-dowser = "0.9.*"
+dactyl = "0.8.*"
+dowser = "0.10.*"
 write_atomic = "0.5.*"
 
 [dependencies.brotli]
@@ -110,7 +109,7 @@ default-features = false
 features = [ "std" ]
 
 [dependencies.fyi_msg]
-version = "1.1.*"
+version = "1.3.*"
 features = [ "progress" ]
 
 [dependencies.libdeflater]

diff --git a/README.md b/README.md
@@ -138,27 +138,3 @@ These benchmarks were performed on a Intel® Core™ i7-10610U with four discret
 | ---- | ---- | ---- | ---- |
 | ChannelZ | **10.5045** | **7,539,948** | **6,522,810** |
 | Find + Gzip + Brotli | 43.9917 | 7,856,120 | 6,557,240 |
-
-
-
-## License
-
-See also: [CREDITS.md](CREDITS.md)
-
-Copyright © 2024 [Blobfolio, LLC](https://blobfolio.com) &lt;[email protected]&gt;
-
-This work is free. You can redistribute it and/or modify it under the terms of the Do What The Fuck You Want To Public License, Version 2.
-
-    DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-    Version 2, December 2004
-
-    Copyright (C) 2004 Sam Hocevar <[email protected]>
-
-    Everyone is permitted to copy and distribute verbatim or modified
-    copies of this license document, and changing it is allowed as long
-    as the name is changed.
-
-    DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-    0. You just DO WHAT THE FUCK YOU WANT TO.
diff --git a/build.rs b/build.rs
@@ -25,6 +25,8 @@ use std::{
 /// There are a few other, longer extensions that aren't worth optimizing in
 /// this way. They're just dealt with inline in `ext.rs`.
 pub fn main() {
+	println!("cargo:rerun-if-env-changed=CARGO_PKG_VERSION");
+
 	// CLI Arguments.
 	write_cli();
 

diff --git a/justfile b/justfile
@@ -78,7 +78,7 @@ export CXXFLAGS := "-Wall -Wextra -flto -march=x86-64-v3"
 # Generate CREDITS.
 @credits:
 	# Do completions/man.
-	cargo bashman -m "{{ justfile_directory() }}/Cargo.toml"
+	cargo bashman -m "{{ justfile_directory() }}/Cargo.toml" -t x86_64-unknown-linux-gnu
 	just _fix-chown "{{ justfile_directory() }}/CREDITS.md"
 
 

diff --git a/release/man/channelz.1 b/release/man/channelz.1
@@ -1,6 +1,6 @@
-.TH "CHANNELZ" "1" "October 2024" "channelz v0.9.3" "User Commands"
+.TH "CHANNELZ" "1" "November 2024" "channelz v0.9.4" "User Commands"
 .SH NAME
-CHANNELZ \- Manual page for channelz v0.9.3.
+CHANNELZ \- Manual page for channelz v0.9.4.
 .SH DESCRIPTION
 Fast, multi\-threaded static Gzip/Brotli encoding tool for the CLI.
 .SS USAGE:
@@ -35,8 +35,9 @@ Print version information and exit.
 .TP
 \fB\-l\fR, \fB\-\-list\fR <FILE>
 Read (absolute) file and/or directory paths to compress from this text file — or STDIN if '\-' — one entry per line, instead of or in addition to specifying <PATH(S)> directly at the end of the command.
-.SS <PATH(S)…>:
+.SS TRAILING:
 .TP
+\fB<PATH(s)…>\fR
 One or more file and/or directory paths to compress and/or (recursively) crawl.
 .SH FILE TYPES
 Static copies will only be generated for files with these extensions:

diff --git a/src/err.rs b/src/err.rs
@@ -70,6 +70,7 @@ Note: static copies will only be generated for files with these extensions:
 pub(super) enum ChannelZError {
 	Jobserver,
 	Killed,
+	ListFile,
 	NoEncoders,
 	NoFiles,
 	PrintHelp,
@@ -91,6 +92,7 @@ impl ChannelZError {
 		match self {
 			Self::Jobserver => "One or more threads terminated early; please try again.",
 			Self::Killed => "The process was aborted early.",
+			Self::ListFile => "Invalid -l/--list text file.",
 			Self::NoEncoders => "At least one encoder needs to be enabled.",
 			Self::NoFiles => "No encodeable files were found.",
 			Self::PrintHelp => HELP,

diff --git a/src/ext.rs b/src/ext.rs
@@ -16,7 +16,7 @@ include!(concat!(env!("OUT_DIR"), "/channelz-matchers.rs"));
 /// This checks that the path (as a byte slice) ends with one of the supported
 /// extensions.
 pub(super) fn match_extension(ext: &[u8]) -> bool {
-	Extension::slice_ext(ext).map_or(false, |ext|
+	Extension::slice_ext(ext).is_some_and(|ext|
 		match ext.len() {
 			2 => match2(u16::from_le_bytes([
 				ext[0].to_ascii_lowercase(),

diff --git a/src/main.rs b/src/main.rs
@@ -125,7 +125,7 @@ const EXT_GZ: u16 = u16::from_le_bytes([b'g', b'z']);
 
 /// # Main.
 fn main() {
-	match _main() {
+	match main__() {
 		Ok(()) => {},
 		Err(e @ (ChannelZError::PrintHelp | ChannelZError::PrintVersion)) => {
 			println!("{e}");
@@ -136,7 +136,7 @@ fn main() {
 
 #[inline]
 /// # Actual Main.
-fn _main() -> Result<(), ChannelZError> {
+fn main__() -> Result<(), ChannelZError> {
 	let args = argyle::args()
 		.with_keywords(include!(concat!(env!("OUT_DIR"), "/argyle.rs")));
 
@@ -156,14 +156,9 @@ fn _main() -> Result<(), ChannelZError> {
 			Argument::Key("-h" | "--help") => return Err(ChannelZError::PrintHelp),
 			Argument::Key("-V" | "--version") => return Err(ChannelZError::PrintVersion),
 
-			Argument::KeyWithValue("-l" | "--list", s) =>
-				if let Ok(raw) = std::fs::read_to_string(s) {
-					paths = paths.with_paths(raw.lines().filter_map(|line| {
-						let line = line.trim();
-						if line.is_empty() { None }
-						else { Some(line) }
-					}));
-				},
+			Argument::KeyWithValue("-l" | "--list", s) => {
+				paths.read_paths_from_file(s).map_err(|_| ChannelZError::ListFile)?;
+			},
 
 			// Assume paths.
 			Argument::Other(s) => { paths = paths.with_path(s); },