release: 2.4.5

Blobfolio · Jan 21, 2024 · d3ea252 · d3ea252
2 parents 2854bcf + bac3a9b
commit d3ea252
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 28 deletions.
diff --git a/CREDITS.md b/CREDITS.md
@@ -1,19 +1,19 @@
 # Project Dependencies
     Package:   flaca
-    Version:   2.4.4
-    Generated: 2024-01-08 04:24:33 UTC
+    Version:   2.4.5
+    Generated: 2024-01-21 05:28:01 UTC
 
 | Package | Version | Author(s) | License |
 | ---- | ---- | ---- | ---- |
 | [ahash](https://github.com/tkaitchuck/ahash) | 0.8.7 | [Tom Kaitchuck](mailto:tom.kaitchuck@gmail.com) | Apache-2.0 or MIT |
-| [argyle](https://github.com/Blobfolio/argyle) | 0.6.8 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL |
+| [argyle](https://github.com/Blobfolio/argyle) | 0.7.0 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL |
 | [bitvec](https://github.com/bitvecto-rs/bitvec) | 1.0.1 |  | MIT |
 | [bytecount](https://github.com/llogiq/bytecount) | 0.6.7 | [Andre Bogus](mailto:bogusandre@gmail.de) and [Joshua Landau](mailto:joshua@landau.ws) | Apache-2.0 or MIT |
 | [bytemuck](https://github.com/Lokathor/bytemuck) | 1.14.0 | [Lokathor](mailto:zefria@gmail.com) | Apache-2.0, MIT, or Zlib |
 | [cfg-if](https://github.com/alexcrichton/cfg-if) | 1.0.0 | [Alex Crichton](mailto:alex@alexcrichton.com) | Apache-2.0 or MIT |
-| [crossbeam-deque](https://github.com/crossbeam-rs/crossbeam) | 0.8.4 |  | Apache-2.0 or MIT |
-| [crossbeam-epoch](https://github.com/crossbeam-rs/crossbeam) | 0.9.17 |  | Apache-2.0 or MIT |
-| [crossbeam-utils](https://github.com/crossbeam-rs/crossbeam) | 0.8.18 |  | Apache-2.0 or MIT |
+| [crossbeam-deque](https://github.com/crossbeam-rs/crossbeam) | 0.8.5 |  | Apache-2.0 or MIT |
+| [crossbeam-epoch](https://github.com/crossbeam-rs/crossbeam) | 0.9.18 |  | Apache-2.0 or MIT |
+| [crossbeam-utils](https://github.com/crossbeam-rs/crossbeam) | 0.8.19 |  | Apache-2.0 or MIT |
 | [ctrlc](https://github.com/Detegr/rust-ctrlc.git) | 3.4.2 | [Antti Keränen](mailto:detegr@gmail.com) | Apache-2.0 or MIT |
 | [dactyl](https://github.com/Blobfolio/dactyl) | 0.6.0 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL |
 | [dowser](https://github.com/Blobfolio/dowser) | 0.8.1 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL |
@@ -31,8 +31,8 @@
 | [mozjpeg-sys](https://github.com/kornelski/mozjpeg-sys.git) | 2.0.5 | [Kornel](mailto:kornel@geekhood.net) | IJG AND Zlib AND BSD-3-Clause |
 | [oxipng](https://github.com/shssoichiro/oxipng) | 9.0.0 | [Joshua Holmer](mailto:jholmer.in@gmail.com) | MIT |
 | [radium](https://github.com/bitvecto-rs/radium) | 0.7.0 | [Nika Layzell](mailto:nika@thelayzells.com) and [myrrlyn](mailto:self@myrrlyn.dev) | MIT |
-| [rayon](https://github.com/rayon-rs/rayon) | 1.8.0 | [Niko Matsakis](mailto:niko@alum.mit.edu) and [Josh Stone](mailto:cuviper@gmail.com) | Apache-2.0 or MIT |
-| [rayon-core](https://github.com/rayon-rs/rayon) | 1.12.0 | [Niko Matsakis](mailto:niko@alum.mit.edu) and [Josh Stone](mailto:cuviper@gmail.com) | Apache-2.0 or MIT |
+| [rayon](https://github.com/rayon-rs/rayon) | 1.8.1 | [Niko Matsakis](mailto:niko@alum.mit.edu) and [Josh Stone](mailto:cuviper@gmail.com) | Apache-2.0 or MIT |
+| [rayon-core](https://github.com/rayon-rs/rayon) | 1.12.1 | [Niko Matsakis](mailto:niko@alum.mit.edu) and [Josh Stone](mailto:cuviper@gmail.com) | Apache-2.0 or MIT |
 | [rgb](https://github.com/kornelski/rust-rgb) | 0.8.37 | [Kornel Lesiński](mailto:kornel@geekhood.net) | MIT |
 | [rustc-hash](https://github.com/rust-lang-nursery/rustc-hash) | 1.1.0 | The Rust Project Developers | Apache-2.0 or MIT |
 | [tap](https://github.com/myrrlyn/tap) | 1.0.1 | [Elliott Linder](mailto:elliott.darfink@gmail.com) and [myrrlyn](mailto:self@myrrlyn.dev) | MIT |

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "flaca"
-version = "2.4.4"
+version = "2.4.5"
 license = "WTFPL"
 authors = ["Josh Stoik <josh@blobfolio.com>"]
 edition = "2021"
@@ -28,7 +28,7 @@ revision = "1"
 depends = "$auto"
 section = "graphics"
 assets = [
-    ["./target/x86_64-unknown-linux-gnu/release/flaca", "usr/bin/", "755"],
+    ["./target/release/flaca", "usr/bin/", "755"],
     ["./release/completions/flaca.bash", "etc/bash_completion.d/", "644"],
     ["./release/man/flaca.1.gz", "usr/share/man/man1/", "644"],
 ]
@@ -66,7 +66,7 @@ description = "Print version information and exit."
 short = "-l"
 long = "--list"
 label = "<FILE>"
-description = "Read (absolute) image and/or directory paths from this text file, one entry per line."
+description = "Read (absolute) image and/or directory paths from this text file — or STDIN if '-' — one entry per line, instead of or in addition to (actually trailing) <PATH(S)>."
 path = true
 
 [[package.metadata.bashman.options]]
@@ -101,7 +101,7 @@ items = [
 ]
 
 [dependencies]
-argyle = "0.6.*"
+argyle = "0.7.*"
 ctrlc = "3.4.*"
 dactyl = "0.6.*"
 dowser = "0.8.*"

diff --git a/justfile b/justfile
@@ -21,7 +21,7 @@ pkg_dir1    := justfile_directory() + "/src"
 
 bench_dir   := "/tmp/bench-data"
 cargo_dir   := "/tmp/" + pkg_id + "-cargo"
-cargo_bin   := cargo_dir + "/x86_64-unknown-linux-gnu/release/" + pkg_id
+cargo_bin   := cargo_dir + "/release/" + pkg_id
 doc_dir     := justfile_directory() + "/doc"
 release_dir := justfile_directory() + "/release"
 skel_dir    := justfile_directory() + "/skel"
@@ -36,7 +36,6 @@ export RUSTFLAGS := "-C target-cpu=x86-64-v3"
 	cargo build \
 		--bin "{{ pkg_id }}" \
 		--release \
-		--target x86_64-unknown-linux-gnu \
 		--target-dir "{{ cargo_dir }}"
 
 
@@ -50,8 +49,7 @@ export RUSTFLAGS := "-C target-cpu=x86-64-v3"
 	cargo-deb \
 		--no-build \
 		-p {{ pkg_id }} \
-		-o "{{ release_dir }}" \
-		--target x86_64-unknown-linux-gnu
+		-o "{{ release_dir }}"
 
 	just _fix-chown "{{ release_dir }}"
 	mv "{{ justfile_directory() }}/target" "{{ cargo_dir }}"
@@ -74,7 +72,6 @@ export RUSTFLAGS := "-C target-cpu=x86-64-v3"
 	clear
 	cargo clippy \
 		--release \
-		--target x86_64-unknown-linux-gnu \
 		--target-dir "{{ cargo_dir }}"
 
 
@@ -94,12 +91,11 @@ export RUSTFLAGS := "-C target-cpu=x86-64-v3"
 	cargo +nightly doc \
 		--release \
 		--no-deps \
-		--target x86_64-unknown-linux-gnu \
 		--target-dir "{{ cargo_dir }}"
 
 	# Move the docs and clean up ownership.
 	[ ! -d "{{ doc_dir }}" ] || rm -rf "{{ doc_dir }}"
-	mv "{{ cargo_dir }}/x86_64-unknown-linux-gnu/doc" "{{ justfile_directory() }}"
+	mv "{{ cargo_dir }}/doc" "{{ justfile_directory() }}"
 	just _fix-chown "{{ doc_dir }}"
 
 
@@ -108,7 +104,6 @@ export RUSTFLAGS := "-C target-cpu=x86-64-v3"
 	cargo run \
 		--bin "{{ pkg_id }}" \
 		--release \
-		--target x86_64-unknown-linux-gnu \
 		--target-dir "{{ cargo_dir }}" \
 		-- {{ ARGS }}
 
@@ -117,11 +112,9 @@ export RUSTFLAGS := "-C target-cpu=x86-64-v3"
 @test:
 	clear
 	RUST_TEST_THREADS=1 cargo test \
-		--target x86_64-unknown-linux-gnu \
 		--target-dir "{{ cargo_dir }}"
 	RUST_TEST_THREADS=1 cargo test \
 		--release \
-		--target x86_64-unknown-linux-gnu \
 		--target-dir "{{ cargo_dir }}"
 
 

diff --git a/release/man/flaca.1 b/release/man/flaca.1
@@ -1,6 +1,6 @@
-.TH "FLACA" "1" "January 2024" "Flaca v2.4.4" "User Commands"
+.TH "FLACA" "1" "January 2024" "Flaca v2.4.5" "User Commands"
 .SH NAME
-Flaca \- Manual page for flaca v2.4.4.
+Flaca \- Manual page for flaca v2.4.5.
 .SH DESCRIPTION
 Brute\-force, lossless JPEG and PNG compression.
 .SS USAGE:
@@ -25,7 +25,7 @@ Print version information and exit.
 .SS OPTIONS:
 .TP
 \fB\-l\fR, \fB\-\-list\fR <FILE>
-Read (absolute) image and/or directory paths from this text file, one entry per line.
+Read (absolute) image and/or directory paths from this text file — or STDIN if '\-' — one entry per line, instead of or in addition to (actually trailing) <PATH(S)>.
 .TP
 \fB\-z\fR <NUM>
 Run NUM lz77 backward/forward iterations during zopfli PNG encoding passes. More iterations yield better compression (up to a point), but require *significantly* longer processing times. In practice, values beyond 500 are unlikely to save more than a few bytes, and could take *days* to complete! Haha. [default: 20 or 60, depending on the file size]

diff --git a/src/main.rs b/src/main.rs
@@ -223,7 +223,7 @@ fn helper() {
  `.   `--'        \__,--'-.
    `--/       ,-.  ______/
      (o-.     ,o- /
-      `. ;        \    ", "\x1b[38;5;199mFlaca\x1b[0;38;5;69m v", env!("CARGO_PKG_VERSION"), "\x1b[0m", r"
+      `. ;        \    ", "\x1b[38;5;199mFlaca\x1b[0;38;5;69m v", env!("CARGO_PKG_VERSION"), "\x1b[0m", r#"
        |:          \   Brute-force, lossless
       ,'`       ,   \  JPEG and PNG compression.
      (o o ,  --'     :
@@ -246,7 +246,8 @@ FLAGS:
 
 OPTIONS:
     -l, --list <FILE> Read (absolute) image and/or directory paths from this
-                      text file, one entry per line.
+                      text file — or STDIN if "-" — one entry per line, instead
+                      of or in addition to (actually trailing) <PATH(S)>.
     -z <NUM>          Run NUM lz77 backward/forward iterations during zopfli
                       PNG encoding passes. More iterations yield better
                       compression (up to a point), but require *significantly*
@@ -259,7 +260,7 @@ ARGS:
                       compress.
 
 EARLY EXIT:
-    Press ", "\x1b[38;5;208mCTRL\x1b[0m+\x1b[38;5;208mC\x1b[0m once to quit as soon as the already-in-progress operations
+    Press "#, "\x1b[38;5;208mCTRL\x1b[0m+\x1b[38;5;208mC\x1b[0m once to quit as soon as the already-in-progress operations
     have finished (ignoring any pending images still in the queue).
 
     Press \x1b[38;5;208mCTRL\x1b[0m+\x1b[38;5;208mC\x1b[0m a second time if you need to exit IMMEDIATELY, but note that