Fix comments:

 - use image, remove separate svg logic,
 - clean yazi-default.toml, but make it configurable with lua plugin.

Author: JustForFun88

yazi-adapter/src/adapter.rs

@@ -50,21 +50,6 @@ impl Adapter {
 		}
 	}
 
-	pub async fn svg_show(self, path: &Path, max: Rect) -> Result<Rect> {
-		if max.is_empty() {
-			return Ok(Rect::default());
-		}
-
-		match self {
-			Self::Kgp => drivers::Kgp::svg_show(path, max).await,
-			Self::KgpOld => drivers::KgpOld::svg_show(path, max).await,
-			Self::Iip => drivers::Iip::svg_show(path, max).await,
-			Self::Sixel => drivers::Sixel::svg_show(path, max).await,
-			Self::X11 | Self::Wayland => drivers::Ueberzug::svg_show(path, max).await,
-			Self::Chafa => drivers::Chafa::svg_show(path, max).await,
-		}
-	}
-
 	pub fn image_hide(self) -> Result<()> {
 		if let Some(area) = SHOWN.replace(None) { self.image_erase(area) } else { Ok(()) }
 	}

yazi-adapter/src/drivers/chafa.rs

@@ -64,10 +64,6 @@ impl Chafa {
 		})
 	}
 
-	pub(crate) async fn svg_show(path: &Path, max: Rect) -> Result<Rect> {
-		Self::image_show(path, max).await
-	}
-
 	pub(crate) fn image_erase(area: Rect) -> Result<()> {
 		let s = " ".repeat(area.width as usize);
 		Emulator::move_lock((0, 0), |w| {

yazi-adapter/src/drivers/iip.rs

@@ -7,22 +7,13 @@ use image::{DynamicImage, ExtendedColorType, ImageEncoder, codecs::{jpeg::JpegEn
 use ratatui::layout::Rect;
 use yazi_config::YAZI;
 
-use crate::{CLOSE, Emulator, Image, START, Svg, adapter::Adapter};
+use crate::{CLOSE, Emulator, Image, START, adapter::Adapter};
 
 pub(crate) struct Iip;
 
 impl Iip {
 	pub(crate) async fn image_show(path: &Path, max: Rect) -> Result<Rect> {
 		let img = Image::downscale(path, max).await?;
-		Self::draw_image(img, max).await
-	}
-
-	pub(crate) async fn svg_show(path: &Path, max: Rect) -> Result<Rect> {
-		let img = Svg::downscale(path, max).await?;
-		Self::draw_image(img, max).await
-	}
-
-	async fn draw_image(img: DynamicImage, max: Rect) -> Result<Rect> {
 		let area = Image::pixel_area((img.width(), img.height()), max);
 		let b = Self::encode(img).await?;
 

yazi-adapter/src/drivers/kgp.rs

@@ -7,7 +7,7 @@ use crossterm::{cursor::MoveTo, queue};
 use image::DynamicImage;
 use ratatui::layout::Rect;
 
-use crate::{CLOSE, ESCAPE, Emulator, START, Svg, adapter::Adapter, image::Image};
+use crate::{CLOSE, ESCAPE, Emulator, START, adapter::Adapter, image::Image};
 
 static DIACRITICS: [char; 297] = [
 	'\u{0305}',
@@ -314,15 +314,6 @@ pub(crate) struct Kgp;
 impl Kgp {
 	pub(crate) async fn image_show(path: &Path, max: Rect) -> Result<Rect> {
 		let img = Image::downscale(path, max).await?;
-		Self::draw_image(img, max).await
-	}
-
-	pub(crate) async fn svg_show(path: &Path, max: Rect) -> Result<Rect> {
-		let img = Svg::downscale(path, max).await?;
-		Self::draw_image(img, max).await
-	}
-
-	async fn draw_image(img: DynamicImage, max: Rect) -> Result<Rect> {
 		let area = Image::pixel_area((img.width(), img.height()), max);
 
 		let b1 = Self::encode(img).await?;

yazi-adapter/src/drivers/kgp_old.rs

@@ -7,22 +7,13 @@ use image::DynamicImage;
 use ratatui::layout::Rect;
 use yazi_shared::tty::TTY;
 
-use crate::{CLOSE, ESCAPE, Emulator, Image, START, Svg, adapter::Adapter};
+use crate::{CLOSE, ESCAPE, Emulator, Image, START, adapter::Adapter};
 
 pub(crate) struct KgpOld;
 
 impl KgpOld {
 	pub(crate) async fn image_show(path: &Path, max: Rect) -> Result<Rect> {
 		let img = Image::downscale(path, max).await?;
-		Self::draw_image(img, max).await
-	}
-
-	pub(crate) async fn svg_show(path: &Path, max: Rect) -> Result<Rect> {
-		let img = Svg::downscale(path, max).await?;
-		Self::draw_image(img, max).await
-	}
-
-	async fn draw_image(img: DynamicImage, max: Rect) -> Result<Rect> {
 		let area = Image::pixel_area((img.width(), img.height()), max);
 		let b = Self::encode(img).await?;
 

yazi-adapter/src/drivers/sixel.rs

@@ -7,22 +7,13 @@ use image::DynamicImage;
 use ratatui::layout::Rect;
 use yazi_config::YAZI;
 
-use crate::{CLOSE, ESCAPE, Emulator, Image, START, Svg, adapter::Adapter};
+use crate::{CLOSE, ESCAPE, Emulator, Image, START, adapter::Adapter};
 
 pub(crate) struct Sixel;
 
 impl Sixel {
 	pub(crate) async fn image_show(path: &Path, max: Rect) -> Result<Rect> {
 		let img = Image::downscale(path, max).await?;
-		Self::draw_image(img, max).await
-	}
-
-	pub(crate) async fn svg_show(path: &Path, max: Rect) -> Result<Rect> {
-		let img = Svg::downscale(path, max).await?;
-		Self::draw_image(img, max).await
-	}
-
-	async fn draw_image(img: DynamicImage, max: Rect) -> Result<Rect> {
 		let area = Image::pixel_area((img.width(), img.height()), max);
 		let b = Self::encode(img).await?;
 

yazi-adapter/src/drivers/ueberzug.rs

@@ -67,10 +67,6 @@ impl Ueberzug {
 		Ok(area)
 	}
 
-	pub(crate) async fn svg_show(path: &Path, max: Rect) -> Result<Rect> {
-		Self::image_show(path, max).await
-	}
-
 	pub(crate) fn image_erase(_: Rect) -> Result<()> {
 		if let Some(tx) = &*DEMON {
 			Ok(tx.send(None)?)

yazi-adapter/src/image.rs

@@ -1,27 +1,24 @@
-use std::path::{Path, PathBuf};
+use std::{path::{Path, PathBuf}, sync::{Arc, LazyLock, RwLock}};
 
 use anyhow::Result;
-use image::{DynamicImage, ExtendedColorType, ImageDecoder, ImageEncoder, ImageError, ImageReader, ImageResult, Limits, codecs::{jpeg::JpegEncoder, png::PngEncoder}, imageops::FilterType, metadata::Orientation};
+use image::{DynamicImage, ExtendedColorType, ImageBuffer, ImageDecoder, ImageEncoder, ImageError, ImageReader, ImageResult, Limits, codecs::{jpeg::JpegEncoder, png::PngEncoder}, error::UnsupportedErrorKind, imageops::FilterType, metadata::Orientation};
 use ratatui::layout::Rect;
+use resvg::{tiny_skia::{Pixmap, Transform}, usvg::{Options, Tree, fontdb::Database}};
 use yazi_config::YAZI;
 
 use crate::Dimension;
 
+pub static GLOBAL_OPTIONS: LazyLock<RwLock<Options<'static>>> =
+	LazyLock::new(|| RwLock::new(Options::default()));
+
 pub struct Image;
 
 impl Image {
 	pub async fn precache(path: &Path, cache: PathBuf) -> Result<()> {
-		let (mut img, orientation, icc) = Self::decode_from(path).await?;
-		let (w, h) = Self::flip_size(orientation, (YAZI.preview.max_width, YAZI.preview.max_height));
+		let (img, icc) =
+			Self::decode_to_fit_from(path, YAZI.preview.max_width, YAZI.preview.max_height).await?;
 
 		let buf = tokio::task::spawn_blocking(move || {
-			if img.width() > w || img.height() > h {
-				img = img.resize(w, h, Self::filter());
-			}
-			if orientation != Orientation::NoTransforms {
-				img.apply_orientation(orientation);
-			}
-
 			let mut buf = Vec::new();
 			if img.color().has_alpha() {
 				let rgba = img.into_rgba8();
@@ -42,25 +39,8 @@ impl Image {
 	}
 
 	pub(super) async fn downscale(path: &Path, rect: Rect) -> Result<DynamicImage> {
-		let (mut img, orientation, _) = Self::decode_from(path).await?;
-		let (w, h) = Self::flip_size(orientation, Self::max_pixel(rect));
-
-		// Fast path.
-		if img.width() <= w && img.height() <= h && orientation == Orientation::NoTransforms {
-			return Ok(img);
-		}
-
-		let img = tokio::task::spawn_blocking(move || {
-			if img.width() > w || img.height() > h {
-				img = img.resize(w, h, Self::filter())
-			}
-			if orientation != Orientation::NoTransforms {
-				img.apply_orientation(orientation);
-			}
-			img
-		})
-		.await?;
-
+		let (width, height) = Self::max_pixel(rect);
+		let (img, _) = Self::decode_to_fit_from(path, width, height).await?;
 		Ok(img)
 	}
 
@@ -96,7 +76,54 @@ impl Image {
 		}
 	}
 
-	async fn decode_from(path: &Path) -> ImageResult<(DynamicImage, Orientation, Option<Vec<u8>>)> {
+	async fn decode_to_fit_from(
+		path: &Path,
+		width: u32,
+		height: u32,
+	) -> Result<(DynamicImage, Option<Vec<u8>>)> {
+		let path = path.to_owned();
+
+		tokio::task::spawn_blocking(move || {
+			Self::try_decode_raster(&path, width, height).or_else(|err| match err {
+				ImageError::Unsupported(ref unsupported) => match unsupported.kind() {
+					UnsupportedErrorKind::Format(_) => Self::try_decode_svg(&path, width, height),
+					_ => Err(err.into()),
+				},
+				_ => Err(err.into()),
+			})
+		})
+		.await
+		.map_err(|e| ImageError::IoError(e.into()))?
+	}
+
+	#[inline]
+	fn try_decode_raster(
+		path: &Path,
+		width: u32,
+		height: u32,
+	) -> ImageResult<(DynamicImage, Option<Vec<u8>>)> {
+		let limits = Self::build_limits();
+		let mut reader = ImageReader::open(path)?;
+		reader.limits(limits);
+		let mut decoder = reader.with_guessed_format()?.into_decoder()?;
+		let orientation = decoder.orientation().unwrap_or(Orientation::NoTransforms);
+		let icc = decoder.icc_profile().unwrap_or_default();
+
+		let mut img = DynamicImage::from_decoder(decoder)?;
+		let (w, h) = Self::flip_size(orientation, (width, height));
+
+		if img.width() > w || img.height() > h {
+			img = img.resize(w, h, Self::filter());
+		}
+		if orientation != Orientation::NoTransforms {
+			img.apply_orientation(orientation);
+		}
+
+		Ok((img, icc))
+	}
+
+	#[inline]
+	fn build_limits() -> Limits {
 		let mut limits = Limits::no_limits();
 		if YAZI.tasks.image_alloc > 0 {
 			limits.max_alloc = Some(YAZI.tasks.image_alloc as u64);
@@ -107,20 +134,76 @@ impl Image {
 		if YAZI.tasks.image_bound[1] > 0 {
 			limits.max_image_height = Some(YAZI.tasks.image_bound[1] as u32);
 		}
+		limits
+	}
 
-		let path = path.to_owned();
-		tokio::task::spawn_blocking(move || {
-			let mut reader = ImageReader::open(path)?;
-			reader.limits(limits);
+	#[inline]
+	fn try_decode_svg(
+		path: &Path,
+		width: u32,
+		height: u32,
+	) -> Result<(DynamicImage, Option<Vec<u8>>)> {
+		let pixmap = Self::render_svg_to_fit_from(path, width, height)?;
+		let (width, height) = (pixmap.width(), pixmap.height());
+		let mut container = pixmap.take();
+
+		for rgba in container.chunks_exact_mut(4) {
+			let alpha = rgba[3];
+			if alpha != 0xff {
+				let pixel: &mut [u8; 4] = unsafe { rgba.try_into().unwrap_unchecked() };
+				let a = alpha as f64 / 255.0;
+				pixel[0] = (pixel[0] as f64 / a + 0.5) as u8;
+				pixel[1] = (pixel[1] as f64 / a + 0.5) as u8;
+				pixel[2] = (pixel[2] as f64 / a + 0.5) as u8;
+			}
+		}
 
-			let mut decoder = reader.with_guessed_format()?.into_decoder()?;
-			let orientation = decoder.orientation().unwrap_or(Orientation::NoTransforms);
-			let icc = decoder.icc_profile().unwrap_or_default();
+		let img = ImageBuffer::from_raw(width, height, container)
+			.ok_or_else(|| anyhow::anyhow!("Failed to create image buffer"))?;
 
-			Ok((DynamicImage::from_decoder(decoder)?, orientation, icc))
-		})
-		.await
-		.map_err(|e| ImageError::IoError(e.into()))?
+		Ok((DynamicImage::ImageRgba8(img), None))
+	}
+
+	/// Helper function to rasterize an SVG to a pixmap fitting within max_width
+	/// and max_height.
+	fn render_svg_to_fit_from(path: &Path, max_width: u32, max_height: u32) -> Result<Pixmap> {
+		let svg = std::fs::read(path)?;
+		let options_guard =
+			GLOBAL_OPTIONS.read().map_err(|e| anyhow::anyhow!("RwLock poisoned: {}", e))?;
+		let tree = Tree::from_data(&svg, &options_guard)?;
+		let (width, height, transform) = Self::svg_size_and_scale(&tree, max_width, max_height);
+
+		let mut pixmap =
+			Pixmap::new(width, height).ok_or_else(|| anyhow::anyhow!("Cannot create pixmap"))?;
+
+		resvg::render(&tree, transform, &mut pixmap.as_mut());
+
+		Ok(pixmap)
+	}
+
+	fn svg_size_and_scale(tree: &Tree, max_width: u32, max_height: u32) -> (u32, u32, Transform) {
+		// It is Ok. The max_width and max_height could not be larger then monitor
+		// dimensions which much less then f32::MAX
+		let max_width = max_width as f32;
+		let max_height = max_height as f32;
+		let mut width = tree.size().width();
+		let mut height = tree.size().height();
+
+		for node in tree.root().children() {
+			if let Some(bounding_box) = node.abs_layer_bounding_box() {
+				width = width.max(bounding_box.width());
+				height = height.max(bounding_box.height());
+			}
+		}
+		if width <= max_width && height <= max_height {
+			return (width.floor() as u32, height.floor() as u32, Transform::from_scale(1.0, 1.0));
+		}
+		let ratio = f32::min(max_width / width, max_height / height);
+		(
+			(width * ratio).floor() as u32,
+			(height * ratio).floor() as u32,
+			Transform::from_scale(ratio, ratio),
+		)
 	}
 
 	fn flip_size(orientation: Orientation, (w, h): (u32, u32)) -> (u32, u32) {

yazi-adapter/src/info.rs

@@ -3,7 +3,7 @@ use std::{collections::HashSet, path::Path};
 use image::{ImageDecoder, ImageError};
 use resvg::usvg::{Font, Group, ImageKind, Node, Tree};
 
-use super::svg::GLOBAL_FONTDB;
+use super::image::GLOBAL_OPTIONS;
 
 pub type ImageFormat = image::ImageFormat;
 pub type ImageColor = image::ColorType;
@@ -59,8 +59,9 @@ impl SvgInfo {
 		let path = path.to_owned();
 		tokio::task::spawn_blocking(move || {
 			let svg = std::fs::read(path)?;
-
-			let tree = Tree::from_data(&svg, &GLOBAL_FONTDB)?;
+			let options_guard =
+				GLOBAL_OPTIONS.read().map_err(|e| anyhow::anyhow!("RwLock poisoned: {}", e))?;
+			let tree = Tree::from_data(&svg, &options_guard)?;
 
 			let mut info = SvgInfo {
 				width:  tree.size().width().round(),

yazi-adapter/src/lib.rs

@@ -2,7 +2,7 @@
 
 yazi_macro::mod_pub!(drivers);
 
-yazi_macro::mod_flat!(adapter brand dimension emulator image info mux svg unknown);
+yazi_macro::mod_flat!(adapter brand dimension emulator image info mux unknown);
 
 use yazi_shared::{SyncCell, in_wsl};