release: 1.3.0

Author: joshstoik1

CREDITS.md

@@ -28,11 +28,12 @@ release_dir := justfile_directory() + "/release"
 
 
 
-#export RUSTFLAGS := "-Ctarget-cpu=x86-64-v3 -Cllvm-args=--cost-kind=throughput -Clinker-plugin-lto -Clink-arg=-fuse-ld=lld"
-#export CC := "clang"
-#export CXX := "clang++"
-#export CFLAGS := "-Wall -Wextra -flto -march=x86-64-v3"
-#export CXXFLAGS := "-Wall -Wextra -flto -march=x86-64-v3"
+export RUSTFLAGS := "-Ctarget-cpu=x86-64-v3 -Cllvm-args=--cost-kind=throughput -Clinker-plugin-lto -Clink-arg=-fuse-ld=lld"
+export CC        := "clang"
+export CXX       := "clang++"
+export CFLAGS    := `llvm-config --cflags` + " -march=x86-64-v3 -Wall -Wextra -flto"
+export CXXFLAGS  := `llvm-config --cxxflags` + " -march=x86-64-v3 -Wall -Wextra -flto"
+export LDFLAGS   := `llvm-config --ldflags` + " -fuse-ld=lld -flto"
 
 
 
@@ -132,46 +133,50 @@ release_dir := justfile_directory() + "/release"
 # Unit tests!
 @test:
 	clear
+
 	cargo test \
+		--release \
 		--workspace \
 		--target-dir "{{ cargo_dir }}"
+
+	just _test-debug
+
+# Unit Tests (Debug).
+_test-debug:
+	#!/usr/bin/env bash
+	set -e
+
+	unset -v RUSTFLAGS CC CXX CFLAGS CXXFLAGS LDFLAGS
+
 	cargo test \
-		--release \
 		--workspace \
 		--target-dir "{{ cargo_dir }}"
 
 
 # Get/Set version.
 version:
 	#!/usr/bin/env bash
+	set -e
 
 	# Current version.
-	_ver1="$( toml get "{{ pkg_dir1 }}/Cargo.toml" package.version | \
-		sed 's/"//g' )"
+	_ver1="$( tomli query -f "{{ pkg_dir1 }}/Cargo.toml" package.version | \
+		sed 's/[" ]//g' )"
 
 	# Find out if we want to bump it.
+	set +e
 	_ver2="$( whiptail --inputbox "Set {{ pkg_name }} version:" --title "Release Version" 0 0 "$_ver1" 3>&1 1>&2 2>&3 )"
 
 	exitstatus=$?
 	if [ $exitstatus != 0 ] || [ "$_ver1" = "$_ver2" ]; then
 		exit 0
 	fi
-
-	fyi success "Setting version to $_ver2."
+	set -e
 
 	# Set the release version!
-	just _version "{{ pkg_dir1 }}" "$_ver2"
-	just _version "{{ pkg_dir2 }}" "$_ver2"
+	tomli set -f "{{ pkg_dir1 }}/Cargo.toml" -i package.version "$_ver2"
+	tomli set -f "{{ pkg_dir2 }}/Cargo.toml" -i package.version "$_ver2"
 
-
-# Set version for real.
-@_version DIR VER:
-	[ -f "{{ DIR }}/Cargo.toml" ] || exit 1
-
-	# Set the release version!
-	toml set "{{ DIR }}/Cargo.toml" package.version "{{ VER }}" > /tmp/Cargo.toml
-	just _fix-chown "/tmp/Cargo.toml"
-	mv "/tmp/Cargo.toml" "{{ DIR }}/Cargo.toml"
+	fyi success "Set version to $_ver2."
 
 
 # Init dependencies.

justfile

@@ -1,6 +1,6 @@
 [package]
 name = "refract"
-version = "1.2.0"
+version = "1.3.0"
 license = "WTFPL"
 authors = ["Josh Stoik <josh@blobfolio.com>"]
 edition = "2024"
@@ -107,7 +107,7 @@ features = [ "png" ]
 
 [dependencies]
 dactyl = "0.13.*"
-dowser = "0.16.*"
+dowser = "0.17.*"
 fyi_ansi = "2.2.*"
 open = "=5.3.2"
 rfd = "=0.15.4"
@@ -118,18 +118,19 @@ write_atomic = "0.7.*"
 version = "0.13.*"
 features = [ "try_paths" ]
 
-[dependencies.async-std]
-version = "=1.13.*"
-default-features = false
-
 [dependencies.iced]
 version = "=0.13.1"
-features = [ "async-std", "image-without-codecs" ]
+features = [ "image-without-codecs", "tokio" ]
 
 [dependencies.refract_core]
 path = "../refract_core"
 features = [ "images" ]
 
+[dependencies.tokio]
+version = "=1.47.*"
+default-features = false
+features = [ "rt", "rt-multi-thread", "time" ]
+
 [dependencies.utc2k]
 version = "0.17.*"
 features = [ "local" ]

refract/Cargo.toml

@@ -262,7 +262,7 @@ impl App {
 				Argument::Key("-V" | "--version") => return Err(RefractError::PrintVersion),
 
 				Argument::KeyWithValue("-l" | "--list", s) => {
-					let _res = paths.read_paths_from_file(s);
+					let _res = paths.push_paths_from_file(s);
 				},
 
 				Argument::Path(s) => { paths = paths.with_path(s); },
@@ -501,7 +501,7 @@ impl App {
 				let confirm = ! self.has_flag(OTHER_SAVE_AUTO);
 				if let Some(current) = &mut self.current {
 					// Advance iterator and wait for feedback.
-					if current.next_candidate_done(wrapper) {
+					if let Some(wrapper) = wrapper && current.next_candidate_done(wrapper) {
 						self.flags |= OTHER_BSIDE;
 						return Task::none();
 					}
@@ -574,7 +574,7 @@ impl App {
 		else {
 			self.flags |= SWITCHED_ENCODER;
 			Task::future(async {
-				async_std::task::sleep(Duration::from_millis(1500)).await;
+				tokio::time::sleep(Duration::from_millis(1500)).await;
 				Message::UnsetFlag(SWITCHED_ENCODER)
 			})
 				.chain(Task::done(Message::NextStep))
@@ -1423,9 +1423,9 @@ impl App {
 				.await
 				.map(|paths| Task::done(
 					Message::AddPaths(
-						Dowser::default().with_paths(
-							paths.iter().map(rfd::FileHandle::path)
-						)
+						paths.iter()
+							.map(rfd::FileHandle::path)
+							.fold(Dowser::default(), Dowser::with_path)
 					)
 				))
 		}).and_then(|t| t)
@@ -1703,11 +1703,11 @@ impl CurrentImage {
 		self.candidate = None;
 		let borrow = self.iter.take()?;
 		Some(Task::future(async {
-			let enc = async_std::task::spawn_blocking(||
+			let enc = tokio::task::spawn_blocking(||
 				EncodeWrapper::from(borrow).advance()
 			).await;
 
-			Message::NextStepDone(enc)
+			Message::NextStepDone(enc.ok())
 		}))
 	}
 
@@ -2086,7 +2086,7 @@ pub(super) enum Message {
 	/// In most contexts the program will idle after this, waiting for user
 	/// feedback, but if we're out of candidates to generate, it'll move onto
 	/// `SaveImage`, or `NextEncoder` depending on the state of things.
-	NextStepDone(EncodeWrapper),
+	NextStepDone(Option<EncodeWrapper>),
 
 	/// # Save Image (and Continue).
 	///

refract/src/app.rs

@@ -1,6 +1,6 @@
 [package]
 name = "refract_core"
-version = "1.2.0"
+version = "1.3.0"
 license = "WTFPL"
 authors = ["Josh Stoik <josh@blobfolio.com>"]
 edition = "2024"
@@ -21,7 +21,7 @@ version = "=0.3.2"
 optional = true
 
 [dependencies.link-cplusplus]
-version = "=1.0.10"
+version = "=1.0.12"
 optional = true
 
 [dependencies.lodepng]

refract_core/Cargo.toml

@@ -1,6 +1,6 @@
-.TH "REFRACT" "1" "August 2025" "refract v1.2.0" "User Commands"
+.TH "REFRACT" "1" "September 2025" "refract v1.3.0" "User Commands"
 .SH NAME
-REFRACT \- Manual page for refract v1.2.0.
+REFRACT \- Manual page for refract v1.3.0.
 .SH DESCRIPTION
 Guided AVIF/JPEG XL/WebP conversion for JPEG and PNG sources.
 .SS USAGE: