feat: support reading non-UTF8 data with Child:read_line() API (#1816)

sxyazi · Oct 20, 2024 · ae6c872 · ae6c872
1 parent 24a77d8
commit ae6c872
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 16 deletions.
diff --git a/yazi-plugin/preset/plugins/archive.lua b/yazi-plugin/preset/plugins/archive.lua
@@ -14,7 +14,7 @@ function M:peek()
 
 	for _, f in ipairs(files) do
 		local icon = File({
-			url = Url(f.path),
+			url = Url(ya.str_lossy(f.path)),
 			cha = Cha { kind = f.attr:sub(1, 1) == "D" and 1 or 0 },
 		}):icon()
 

diff --git a/yazi-plugin/src/process/child.rs b/yazi-plugin/src/process/child.rs
@@ -26,21 +26,19 @@ impl Child {
 impl UserData for Child {
 	fn add_methods<'lua, M: mlua::UserDataMethods<'lua, Self>>(methods: &mut M) {
 		#[inline]
-		// TODO: return mlua::String instead of String
-		async fn read_line(me: &mut Child) -> (String, u8) {
-			async fn read(r: Option<impl AsyncBufReadExt + Unpin>) -> Option<String> {
-				let mut r = r?;
-				let mut buf = String::new();
-				match r.read_line(&mut buf).await {
+		async fn read_line(me: &mut Child) -> (Option<Vec<u8>>, u8) {
+			async fn read(r: Option<impl AsyncBufReadExt + Unpin>) -> Option<Vec<u8>> {
+				let mut buf = Vec::new();
+				match r?.read_until(b'\n', &mut buf).await {
 					Ok(0) | Err(_) => None,
 					Ok(_) => Some(buf),
 				}
 			}
 
 			select! {
-				Some(r) = read(me.stdout.as_mut()) => (r, 0u8),
-				Some(r) = read(me.stderr.as_mut()) => (r, 1u8),
-				else => (String::new(), 2u8),
+				r @ Some(_) = read(me.stdout.as_mut()) => (r, 0u8),
+				r @ Some(_) = read(me.stderr.as_mut()) => (r, 1u8),
+				else => (None, 2u8),
 			}
 		}
 
@@ -61,12 +59,20 @@ impl UserData for Child {
 				else => (vec![], 2u8)
 			})
 		});
-		methods.add_async_method_mut("read_line", |_, me, ()| async move { Ok(read_line(me).await) });
-		methods.add_async_method_mut("read_line_with", |_, me, options: Table| async move {
-			let timeout: u64 = options.raw_get("timeout")?;
-			match tokio::time::timeout(Duration::from_millis(timeout), read_line(me)).await {
-				Ok(value) => Ok(value),
-				Err(_) => Ok((String::new(), 3u8)),
+		methods.add_async_method_mut("read_line", |lua, me, ()| async move {
+			match read_line(me).await {
+				(Some(b), event) => (lua.create_string(b)?, event).into_lua_multi(lua),
+				(None, event) => (Value::Nil, event).into_lua_multi(lua),
+			}
+		});
+		methods.add_async_method_mut("read_line_with", |lua, me, options: Table| async move {
+			let timeout = Duration::from_millis(options.raw_get("timeout")?);
+			let Ok(result) = tokio::time::timeout(timeout, read_line(me)).await else {
+				return (Value::Nil, 3u8).into_lua_multi(lua);
+			};
+			match result {
+				(Some(b), event) => (lua.create_string(b)?, event).into_lua_multi(lua),
+				(None, event) => (Value::Nil, event).into_lua_multi(lua),
 			}
 		});
 

diff --git a/yazi-plugin/src/utils/text.rs b/yazi-plugin/src/utils/text.rs
@@ -53,6 +53,12 @@ impl Utils {
 			})?,
 		)?;
 
+		ya.raw_set(
+			"str_lossy",
+			lua
+				.create_function(|lua, s: mlua::String| lua.create_string(s.to_string_lossy().as_ref()))?,
+		)?;
+
 		Ok(())
 	}