feat: truncate long paths in archive preview file list (#2778)

Author: sxyazi

yazi-plugin/preset/components/entity.lua

@@ -79,8 +79,8 @@ end
 function Entity:redraw()
 	local lines = {}
 	for _, c in ipairs(self._children) do
-		local line = ui.Line((type(c[1]) == "string" and self[c[1]] or c[1])(self))
-		c.width, lines[#lines + 1] = line:width(), line
+		local line = (type(c[1]) == "string" and self[c[1]] or c[1])(self)
+		c.width, lines[#lines + 1] = ui.width(line), line
 	end
 	return ui.Line(lines):style(self:style())
 end
@@ -101,12 +101,11 @@ function Entity:ellipsis(max)
 	for _, child in ipairs(self._children) do
 		adv = adv + child.width
 		if adv >= max then
-			return not f.cha.is_dir and f.url.ext and "…." .. f.url.ext or "…"
+			return not f.cha.is_dir and f.url.ext and "…." .. f.url.ext or nil
 		elseif child.id == 4 then
 			break
 		end
 	end
-	return "…"
 end
 
 -- Children

yazi-plugin/preset/plugins/archive.lua

@@ -2,7 +2,6 @@ local M = {}
 
 function M:peek(job)
 	local limit = job.area.h
-	local paths, sizes = {}, {}
 
 	local files, bound, code = self.list_files({ "-p", tostring(job.file.url) }, job.skip, limit)
 	if code ~= 0 then
@@ -13,31 +12,40 @@ function M:peek(job)
 		)
 	end
 
+	local left, right = {}, {}
 	for _, f in ipairs(files) do
 		local icon = File({
 			url = Url(f.path),
 			cha = Cha { kind = f.attr:sub(1, 1) == "D" and 1 or 0 },
 		}):icon()
 
-		if icon then
-			paths[#paths + 1] = ui.Line { ui.Span(" " .. icon.text .. " "):style(icon.style), f.path }
+		if f.size > 0 then
+			right[#right + 1] = string.format(" %s ", ya.readable_size(f.size))
 		else
-			paths[#paths + 1] = f.path
+			right[#right + 1] = " "
 		end
 
-		if f.size > 0 then
-			sizes[#sizes + 1] = string.format(" %s ", ya.readable_size(f.size))
+		if icon then
+			left[#left + 1] = ui.Span(" " .. icon.text .. " "):style(icon.style)
 		else
-			sizes[#sizes + 1] = ""
+			left[#left + 1] = " "
 		end
+
+		left[#left] = ui.Line {
+			left[#left],
+			ya.truncate(f.path, {
+				rtl = true,
+				max = math.max(0, job.area.w - ui.width(left[#left]) - ui.width(right[#right])),
+			}),
+		}
 	end
 
 	if job.skip > 0 and bound < job.skip + limit then
 		ya.emit("peek", { math.max(0, bound - limit), only_if = job.file.url, upper_bound = true })
 	else
 		ya.preview_widget(job, {
-			ui.Text(paths):area(job.area),
-			ui.Text(sizes):area(job.area):align(ui.Text.RIGHT),
+			ui.Text(left):area(job.area),
+			ui.Text(right):area(job.area):align(ui.Text.RIGHT),
 		})
 	end
 end

yazi-plugin/src/elements/bar.rs

@@ -1,4 +1,4 @@
-use mlua::{AnyUserData, Lua, MetaMethod, Table, UserData};
+use mlua::{AnyUserData, IntoLua, Lua, MetaMethod, Table, UserData, Value};
 use ratatui::widgets::Borders;
 
 use super::Area;
@@ -13,7 +13,7 @@ pub struct Bar {
 }
 
 impl Bar {
-	pub fn compose(lua: &Lua) -> mlua::Result<Table> {
+	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
 		let new = lua.create_function(|_, (_, direction): (Table, u8)| {
 			Ok(Self { direction: Borders::from_bits_truncate(direction), ..Default::default() })
 		})?;
@@ -29,7 +29,7 @@ impl Bar {
 		])?;
 
 		bar.set_metatable(Some(lua.create_table_from([(MetaMethod::Call.name(), new)])?));
-		Ok(bar)
+		bar.into_lua(lua)
 	}
 
 	pub(super) fn render(

yazi-plugin/src/elements/border.rs

@@ -1,4 +1,4 @@
-use mlua::{AnyUserData, Lua, MetaMethod, Table, UserData, Value};
+use mlua::{AnyUserData, IntoLua, Lua, MetaMethod, Table, UserData, Value};
 use ratatui::widgets::{Borders, Widget};
 
 use super::Area;
@@ -24,7 +24,7 @@ pub struct Border {
 }
 
 impl Border {
-	pub fn compose(lua: &Lua) -> mlua::Result<Table> {
+	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
 		let new = lua.create_function(|_, (_, position): (Table, u8)| {
 			Ok(Border {
 				position: ratatui::widgets::Borders::from_bits_truncate(position),
@@ -50,7 +50,7 @@ impl Border {
 		])?;
 
 		border.set_metatable(Some(lua.create_table_from([(MetaMethod::Call.name(), new)])?));
-		Ok(border)
+		border.into_lua(lua)
 	}
 
 	pub(super) fn render(

yazi-plugin/src/elements/clear.rs

@@ -1,6 +1,6 @@
 use std::sync::atomic::{AtomicBool, Ordering};
 
-use mlua::{Lua, MetaMethod, Table, UserData};
+use mlua::{IntoLua, Lua, MetaMethod, Table, UserData, Value};
 use yazi_adapter::ADAPTOR;
 
 use super::Area;
@@ -13,13 +13,13 @@ pub struct Clear {
 }
 
 impl Clear {
-	pub fn compose(lua: &Lua) -> mlua::Result<Table> {
+	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
 		let new = lua.create_function(|_, (_, area): (Table, Area)| Ok(Clear { area }))?;
 
 		let clear = lua.create_table()?;
 		clear.set_metatable(Some(lua.create_table_from([(MetaMethod::Call.name(), new)])?));
 
-		Ok(clear)
+		clear.into_lua(lua)
 	}
 
 	pub(super) fn render(

yazi-plugin/src/elements/constraint.rs

@@ -1,20 +1,22 @@
-use mlua::{FromLua, Lua, Table, UserData};
+use mlua::{FromLua, IntoLua, Lua, UserData, Value};
 
 #[derive(Clone, Copy, Default, FromLua)]
 pub struct Constraint(pub(super) ratatui::layout::Constraint);
 
 impl Constraint {
-	pub fn compose(lua: &Lua) -> mlua::Result<Table> {
+	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
 		use ratatui::layout::Constraint as C;
 
-		lua.create_table_from([
-			("Min", lua.create_function(|_, n: u16| Ok(Self(C::Min(n))))?),
-			("Max", lua.create_function(|_, n: u16| Ok(Self(C::Max(n))))?),
-			("Length", lua.create_function(|_, n: u16| Ok(Self(C::Length(n))))?),
-			("Percentage", lua.create_function(|_, n: u16| Ok(Self(C::Percentage(n))))?),
-			("Ratio", lua.create_function(|_, (a, b): (u32, u32)| Ok(Self(C::Ratio(a, b))))?),
-			("Fill", lua.create_function(|_, n: u16| Ok(Self(C::Fill(n))))?),
-		])
+		lua
+			.create_table_from([
+				("Min", lua.create_function(|_, n: u16| Ok(Self(C::Min(n))))?),
+				("Max", lua.create_function(|_, n: u16| Ok(Self(C::Max(n))))?),
+				("Length", lua.create_function(|_, n: u16| Ok(Self(C::Length(n))))?),
+				("Percentage", lua.create_function(|_, n: u16| Ok(Self(C::Percentage(n))))?),
+				("Ratio", lua.create_function(|_, (a, b): (u32, u32)| Ok(Self(C::Ratio(a, b))))?),
+				("Fill", lua.create_function(|_, n: u16| Ok(Self(C::Fill(n))))?),
+			])?
+			.into_lua(lua)
 	}
 }
 

yazi-plugin/src/elements/elements.rs

@@ -23,6 +23,8 @@ pub fn compose(lua: &Lua) -> mlua::Result<Value> {
 			b"Style" => super::Style::compose(lua)?,
 			b"Table" => super::Table::compose(lua)?,
 			b"Text" => super::Text::compose(lua)?,
+
+			b"width" => super::Utils::width(lua)?,
 			_ => return Ok(Value::Nil),
 		}
 		.into_lua(lua)

yazi-plugin/src/elements/gauge.rs

@@ -1,4 +1,4 @@
-use mlua::{AnyUserData, ExternalError, Lua, MetaMethod, Table, UserData, UserDataMethods, Value};
+use mlua::{AnyUserData, ExternalError, IntoLua, Lua, MetaMethod, Table, UserData, UserDataMethods, Value};
 use ratatui::widgets::Widget;
 
 use super::{Area, Span};
@@ -15,13 +15,13 @@ pub struct Gauge {
 }
 
 impl Gauge {
-	pub fn compose(lua: &Lua) -> mlua::Result<Table> {
+	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
 		let new = lua.create_function(|_, _: Table| Ok(Gauge::default()))?;
 
 		let gauge = lua.create_table()?;
 		gauge.set_metatable(Some(lua.create_table_from([(MetaMethod::Call.name(), new)])?));
 
-		Ok(gauge)
+		gauge.into_lua(lua)
 	}
 
 	pub(super) fn render(

yazi-plugin/src/elements/layout.rs

@@ -1,4 +1,4 @@
-use mlua::{AnyUserData, Lua, MetaMethod, Table, UserData, UserDataMethods};
+use mlua::{AnyUserData, IntoLua, Lua, MetaMethod, Table, UserData, UserDataMethods, Value};
 
 use super::{Constraint, Rect};
 
@@ -13,13 +13,13 @@ pub struct Layout {
 }
 
 impl Layout {
-	pub fn compose(lua: &Lua) -> mlua::Result<Table> {
+	pub fn compose(lua: &Lua) -> mlua::Result<Value> {
 		let new = lua.create_function(|_, _: Table| Ok(Self::default()))?;
 
 		let layout = lua.create_table_from([("HORIZONTAL", HORIZONTAL), ("VERTICAL", VERTICAL)])?;
 		layout.set_metatable(Some(lua.create_table_from([(MetaMethod::Call.name(), new)])?));
 
-		Ok(layout)
+		layout.into_lua(lua)
 	}
 }