release: 1.2.0

Author: joshstoik1

CREDITS.md

@@ -1,6 +1,6 @@
 [package]
 name = "refract"
-version = "1.1.0"
+version = "1.2.0"
 license = "WTFPL"
 authors = ["Josh Stoik <josh@blobfolio.com>"]
 edition = "2024"
@@ -99,7 +99,6 @@ description = "Image and/or directory paths to re-encode. Directories will be cr
 
 [build-dependencies]
 argyle = "0.13.*"
-dowser = "0.15.*"
 
 [build-dependencies.refract_core]
 path = "../refract_core"
@@ -108,10 +107,10 @@ features = [ "png" ]
 
 [dependencies]
 dactyl = "0.13.*"
-dowser = "0.15.*"
+dowser = "0.16.*"
 fyi_ansi = "2.2.*"
 open = "=5.3.2"
-rfd = "=0.15.3"
+rfd = "=0.15.4"
 unicode-width = "0.2.*"
 write_atomic = "0.7.*"
 
@@ -132,5 +131,5 @@ path = "../refract_core"
 features = [ "images" ]
 
 [dependencies.utc2k]
-version = "0.15.*"
+version = "0.17.*"
 features = [ "local" ]

refract/Cargo.toml

@@ -3,7 +3,6 @@
 */
 
 use argyle::KeyWordsBuilder;
-use dowser::Extension;
 use std::{
 	fs::File,
 	io::Write,
@@ -22,7 +21,6 @@ fn main() {
 	println!("cargo:rerun-if-changed=skel");
 
 	build_cli();
-	build_exts();
 	build_imgs();
 }
 
@@ -45,44 +43,6 @@ fn build_cli() {
 	builder.save(_out_path("argyle.rs").expect("Missing OUT_DIR."));
 }
 
-/// # Build Extensions.
-///
-/// While we're here, we may as we pre-compute our various image extension
-/// constants.
-fn build_exts() {
-	let out = format!(
-		r"
-/// # Extension: AVIF.
-const E_AVIF: Extension = {};
-/// # Extension: JPEG.
-const E_JPEG: Extension = {};
-/// # Extension: JPG.
-const E_JPG: Extension = {};
-/// # Extension: JXL.
-const E_JXL: Extension = {};
-/// # Extension: PNG.
-const E_PNG: Extension = {};
-/// # Extension: WEBP.
-const E_WEBP: Extension = {};
-",
-		Extension::codegen(b"avif"),
-		Extension::codegen(b"jpeg"),
-		Extension::codegen(b"jpg"),
-		Extension::codegen(b"jxl"),
-		Extension::codegen(b"png"),
-		Extension::codegen(b"webp"),
-	);
-
-	// Save them as a slice value!
-	let mut file = _out_path("refract-extensions.rs")
-		.and_then(|p| File::create(p).ok())
-		.expect("Missing OUT_DIR.");
-
-	file.write_all(out.as_bytes())
-		.and_then(|_| file.flush())
-		.expect("Unable to save extensions.");
-}
-
 /// # Build Images.
 ///
 /// Pre-decode a couple images for embed to lessen the runtime costs of using

refract/build.rs

@@ -596,7 +596,7 @@ impl App {
 	///
 	/// Under the hood, this defers to either `view_home`, `view_encoder`, or
 	/// `view_ab` depending on the state of things.
-	pub(super) fn view(&self) -> Container<Message> {
+	pub(super) fn view(&self) -> Container<'_, Message> {
 		// If we're processing an image, return the A/B screen.
 		if self.current.as_ref().is_some_and(CurrentImage::active) {
 			// Unless we _just_ switched encoders, in which case we should
@@ -624,7 +624,7 @@ impl App {
 	///
 	/// (A warning/error message may also be presented, but they're short-
 	/// lived and uncommon.)
-	fn view_home(&self) -> Container<Message> {
+	fn view_home(&self) -> Container<'_, Message> {
 		container(
 			column!(
 				self.view_settings(),
@@ -641,7 +641,7 @@ impl App {
 	/// # View: About.
 	///
 	/// This returns the application name, version, and repository URL.
-	fn view_about(&self) -> Column<Message> {
+	fn view_about(&self) -> Column<'_, Message> {
 		column!(
 			rich_text!(
 				emphasize!(span("Refract "), Skin::PINK),
@@ -663,7 +663,7 @@ impl App {
 	/// If the user did something that did nothing instead of something, this
 	/// returns a message explaining why they got nothing instead of something,
 	/// lest they think it's our fault!
-	fn view_error(&self) -> Option<Container<Message>> {
+	fn view_error(&self) -> Option<Container<'_, Message>> {
 		use iced::widget::container::Style;
 
 		self.error.map(|err|
@@ -690,7 +690,7 @@ impl App {
 	///
 	/// This returns button widgets for adding file(s) or directories, and
 	/// some basic instructions for same.
-	fn view_enqueue_buttons(&self) -> Container<Message> {
+	fn view_enqueue_buttons(&self) -> Container<'_, Message> {
 		container(
 			column!(
 				row!(
@@ -865,7 +865,7 @@ impl App {
 	///
 	/// This collects and returns the contents of the `view_settings_*`
 	/// helpers, along with the add-file buttons and about information.
-	fn view_settings(&self) -> Container<Message> {
+	fn view_settings(&self) -> Container<'_, Message> {
 		container(
 			row!(
 				self.view_settings_fmt(),
@@ -889,7 +889,7 @@ impl App {
 	///
 	/// This returns a list of checkboxes corresponding to the available
 	/// next-gen image formats (the encoders that will be used).
-	fn view_settings_fmt(&self) -> Column<Message> {
+	fn view_settings_fmt(&self) -> Column<'_, Message> {
 		column!(
 			emphasize!(text("Formats"), Skin::PINK),
 			chk!(self, "AVIF", FMT_AVIF),
@@ -902,7 +902,7 @@ impl App {
 	/// # View: Mode Checkboxes.
 	///
 	/// This returns checkboxes for the various compression modes.
-	fn view_settings_mode(&self) -> Column<Message> {
+	fn view_settings_mode(&self) -> Column<'_, Message> {
 		column!(
 			emphasize!(text("Compression"), Skin::PINK),
 			chk!(self, "Lossless", MODE_LOSSLESS),
@@ -922,7 +922,7 @@ impl App {
 	///
 	/// This returns checkboxes for the program's one-off settings, i.e.
 	/// night mode and automatic saving.
-	fn view_settings_other(&self) -> Column<Message> {
+	fn view_settings_other(&self) -> Column<'_, Message> {
 		column!(
 			emphasize!(text("Other"), Skin::PINK),
 			tip!(
@@ -948,7 +948,7 @@ impl App {
 	///
 	/// The constant format changes can get confusing. This screen is used to
 	/// (very briefly) announce the changes.
-	fn view_encoder(&self, kind: ImageKind) -> Container<Message> {
+	fn view_encoder(&self, kind: ImageKind) -> Container<'_, Message> {
 		use iced::widget::container::Style;
 
 		container(
@@ -1001,7 +1001,7 @@ impl App {
 	///
 	/// It comprises a title-like bar, image stack, and footer with
 	/// instructions, progress, and action buttons.
-	fn view_ab(&self) -> Container<Message> {
+	fn view_ab(&self) -> Container<'_, Message> {
 		container(
 			column!(
 				self.view_ab_header(),
@@ -1027,7 +1027,7 @@ impl App {
 	/// This returns the "Accept" and "Reject" buttons used for candidate image
 	/// feedback, though they'll only be enabled if the program is ready to
 	/// receive said feedback.
-	fn view_ab_feedback(&self) -> Column<Message> {
+	fn view_ab_feedback(&self) -> Column<'_, Message> {
 		let Some(current) = &self.current else { return Column::new(); };
 		let active = current.candidate.is_some();
 		let b_side = active && self.has_flag(OTHER_BSIDE);
@@ -1102,7 +1102,7 @@ impl App {
 	/// 1. In A/B mode, it contains the format and quality details for the image actively being displayed, i.e. the source or candidate.
 	/// 2. In lossless-only mode, it lets the user know that no feedback will be required.
 	/// 3. Otherwise a generic "reticulating splines" message, since there's nothing to do but wait.
-	fn view_ab_header(&self) -> Container<Message> {
+	fn view_ab_header(&self) -> Container<'_, Message> {
 		use iced::widget::container::Style;
 
 		let mut row = Row::new()
@@ -1182,7 +1182,7 @@ impl App {
 	///
 	/// It also includes a checkbox to toggle night mode, since visually it
 	/// fits better in this column than anywhere else.
-	fn view_ab_progress(&self) -> Column<Message> {
+	fn view_ab_progress(&self) -> Column<'_, Message> {
 		let Some(current) = self.current.as_ref() else { return Column::new(); };
 
 		let active = current.candidate.is_some();
@@ -1245,7 +1245,7 @@ impl App {
 	///
 	/// The image itself is technically optional, but should always be present
 	/// in practice.
-	fn view_image(&self) -> Stack<Message> {
+	fn view_image(&self) -> Stack<'_, Message> {
 		Stack::with_capacity(3)
 			.push(self.view_image_checkers_a())
 			.push_maybe(self.view_image_checkers_b())
@@ -1258,7 +1258,7 @@ impl App {
 	///
 	/// Produce a checkered background to make it easier to visualize image
 	/// transparency.
-	fn view_image_checkers_a(&self) -> Container<Message> {
+	fn view_image_checkers_a(&self) -> Container<'_, Message> {
 		container(
 			image(self.cache.checkers_a.clone())
 			.content_fit(ContentFit::None)
@@ -1272,7 +1272,7 @@ impl App {
 	///
 	/// This adds a "B" to every fourth square for added emphasis, but only
 	/// when viewing a candidate image.
-	fn view_image_checkers_b(&self) -> Option<Container<Message>> {
+	fn view_image_checkers_b(&self) -> Option<Container<'_, Message>> {
 		if self.has_flag(OTHER_BSIDE) && self.has_candidate() {
 			Some(
 				container(
@@ -1296,7 +1296,7 @@ impl App {
 	///
 	/// This method is technically fallible, but in practice it should never
 	/// not return something.
-	fn view_image_image(&self) -> Option<Container<Message>> {
+	fn view_image_image(&self) -> Option<Container<'_, Message>> {
 		use iced::widget::scrollable::{
 			Direction,
 			Rail,
@@ -1355,7 +1355,7 @@ impl App {
 	///
 	/// This returns a simple legend illustrating the available keyboard
 	/// shortcuts that can be used in lieu of the button widgets.
-	fn view_keyboard_shortcuts(&self) -> Column<Message> {
+	fn view_keyboard_shortcuts(&self) -> Column<'_, Message> {
 		let Some(current) = self.current.as_ref() else { return Column::new(); };
 		let src_kind = current.input_kind();
 		let dst_kind = current.output_kind().unwrap_or(ImageKind::Invalid);
@@ -2287,7 +2287,7 @@ fn cli_log_arg(arg: &str) {
 ///
 /// Split the file name into stem and extension parts, trimming the stem if
 /// too long, and checking that the extension is appropriate for JPEG/PNG.
-fn split_ext(src: &Path) -> Option<(Cow<str>, &str)> {
+fn split_ext(src: &Path) -> Option<(Cow<'_, str>, &str)> {
 	use unicode_width::UnicodeWidthStr;
 
 	let ext = src.extension().and_then(OsStr::to_str)?;

refract/src/app.rs

@@ -18,9 +18,23 @@ use std::path::{
 
 
 
-// The E_AVIF, E_JPEG, E_JPG, E_JXL, E_PNG, and E_WEBP constants are generated
-// by build.rs.
-include!(concat!(env!("OUT_DIR"), "/refract-extensions.rs"));
+/// # Extension: AVIF.
+const E_AVIF: Extension = Extension::new("avif").unwrap();
+
+/// # Extension: JPEG.
+const E_JPEG: Extension = Extension::new("jpeg").unwrap();
+
+/// # Extension: JPG.
+const E_JPG: Extension = Extension::new("jpg").unwrap();
+
+/// # Extension: JXL.
+const E_JXL: Extension = Extension::new("jxl").unwrap();
+
+/// # Extension: PNG.
+const E_PNG: Extension = Extension::new("png").unwrap();
+
+/// # Extension: WEBP.
+const E_WEBP: Extension = Extension::new("webp").unwrap();
 
 // The image helpers for icons, logos, checkboards, etc., are likewise
 // generated by build.rs.
@@ -30,10 +44,7 @@ include!(concat!(env!("OUT_DIR"), "/refract-img.rs"));
 
 /// # Is JPEG/PNG File.
 pub(super) fn is_jpeg_png(path: &Path) -> bool {
-	Extension::try_from3(path).map_or_else(
-		|| matches!(Extension::try_from4(path), Some(E_JPEG)),
-		|e| matches!(e, E_JPG | E_PNG),
-	)
+	matches!(Extension::from_path(path), Some(E_JPEG | E_JPG | E_PNG))
 }
 
 /// # Fix Path Extension.
@@ -46,22 +57,19 @@ pub(super) fn with_ng_extension(path: &Path, kind: ImageKind) -> Option<PathBuf>
 	// Check the extension, though; we may need to add our own on top.
 	let ext = match kind {
 		ImageKind::Avif =>
-			if Extension::try_from4(&out) == Some(E_AVIF) { return Some(out); }
+			if E_AVIF.matches_path(&out) { return Some(out); }
 			else { ".avif" },
 		ImageKind::Jxl =>
-			if Extension::try_from3(&out) == Some(E_JXL) { return Some(out); }
+			if E_JXL.matches_path(&out) { return Some(out); }
 			else { ".jxl" },
 		ImageKind::Webp =>
-			if Extension::try_from4(&out) == Some(E_WEBP) { return Some(out); }
+			if E_WEBP.matches_path(&out) { return Some(out); }
 			else { ".webp" },
 		ImageKind::Jpeg =>
-			if Extension::try_from3(&out).map_or_else(
-				|| Extension::try_from4(&out) == Some(E_JPEG),
-				|e| e == E_JPG
-			) { return Some(out); }
+			if matches!(Extension::from_path(&out), Some(E_JPEG | E_JPG)) { return Some(out); }
 			else { ".jpg" },
 		ImageKind::Png =>
-			if Extension::try_from3(&out) == Some(E_PNG) { return Some(out); }
+			if E_PNG.matches_path(&out) { return Some(out); }
 			else { ".png" },
 		ImageKind::Invalid => return None,
 	};

refract/src/img.rs

@@ -1,6 +1,6 @@
 [package]
 name = "refract_core"
-version = "1.1.0"
+version = "1.2.0"
 license = "WTFPL"
 authors = ["Josh Stoik <josh@blobfolio.com>"]
 edition = "2024"
@@ -25,9 +25,9 @@ version = "=1.0.10"
 optional = true
 
 [dependencies.lodepng]
-version = "=3.11.0"
+version = "=3.12.1"
 default-features = false
-features = [ "rust_backend" ]
+features = [ "zlibrs" ]
 optional = true
 
 [dependencies.jpegxl-sys]

refract_core/Cargo.toml

@@ -234,7 +234,7 @@ impl QualityValueFmt {
 	///
 	/// This requires allocation for `Self::Float` variants, but everything
 	/// else can enjoy a cheap borrow.
-	pub fn as_str(&self) -> Cow<str> {
+	pub fn as_str(&self) -> Cow<'_, str> {
 		match self {
 			Self::None => Cow::Borrowed(""),
 			Self::Int(n) => Cow::Borrowed(n.as_str()),

refract_core/src/enc/quality.rs

@@ -294,7 +294,7 @@ impl Input {
 	///
 	/// Return the pixels as 4-byte RGBA, upsampling the colorspace as
 	/// necessary.
-	pub fn pixels_rgba(&self) -> Cow<[u8]> {
+	pub fn pixels_rgba(&self) -> Cow<'_, [u8]> {
 		// The expected size.
 		let size = self.width() * self.height() * 4;
 

refract_core/src/input.rs

@@ -46,9 +46,11 @@ pub(super) trait Decoder {
 /// This is implemented for image formats capable of encoding from RGBA pixels
 /// into a raw image.
 pub(super) trait Encoder {
+	#[allow(dead_code, clippy::allow_attributes, reason = "Feature-specific.")]
 	/// # Minimum Quality.
 	const MIN_QUALITY: NonZeroU8 = NonZeroU8::MIN;
 
+	#[allow(dead_code, clippy::allow_attributes, reason = "Feature-specific.")]
 	/// # Maximum Quality.
 	const MAX_QUALITY: NonZeroU8 = NZ_100;