Update 2026-01-31

Update 2026-01-27

config/yazi/plugins/ouch.yazi/README.md

@@ -35,29 +35,38 @@ Make sure you have [ouch](https://github.com/ouch-org/ouch) installed and in you
 For archive preview, add this to your `yazi.toml`:
 
 ```toml
-[plugin]
-prepend_previewers = [
-	# Archive previewer
-	{ mime = "application/*zip",            run = "ouch" },
-	{ mime = "application/x-tar",           run = "ouch" },
-	{ mime = "application/x-bzip2",         run = "ouch" },
-	{ mime = "application/x-7z-compressed", run = "ouch" },
-	{ mime = "application/x-rar",           run = "ouch" },
-	{ mime = "application/vnd.rar",         run = "ouch" },
-	{ mime = "application/x-xz",            run = "ouch" },
-	{ mime = "application/xz",              run = "ouch" },
-	{ mime = "application/x-zstd",          run = "ouch" },
-	{ mime = "application/zstd",            run = "ouch" },
-	{ mime = "application/java-archive",    run = "ouch" },
-]
+[[plugin.prepend_previewers]]
+mime = "application/{*zip,tar,bzip2,7z*,rar,xz,zstd,java-archive}"
+run  = "ouch"
 ```
 
 Now go to an archive on Yazi, you should see the archive's content in the preview pane. You can use `J` and `K` to roll up and down the preview.
 
-If you want to change the icon or the style of text, you can modify the `peek` function in `init.lua` file (all of them are stored in the `lines` variable).
+#### Customization
+
+Previews can be customized by adding extra arguments in the `run` string:
+
+```toml
+[plugin]
+prepend_previewers = [
+	# Change the top-level archive icon
+	{ ..., run = "ouch --archive-icon='🗄️ '" },
+	# Or remove it by setting it to ''
+	{ ..., run = "ouch --archive-icon=''" },
+
+	# Enable file icons
+	{ ..., run = "ouch --show-file-icons" },
+
+	# Disable tree view
+	{ ..., run = "ouch --list-view" },
+
+	# These can be combined
+	{ ..., run = "ouch --archive-icon='🗄️ ' --show-file-icons --list-view" },
+]
+```
 
 ### Compression
-For compession, add this to your `keymap.toml`:
+For compression, add this to your `keymap.toml`:
 
 ```toml
 [[mgr.prepend_keymap]]

config/yazi/plugins/ouch.yazi/main.lua

@@ -1,15 +1,50 @@
 local M = {}
 
+-- Extract the tree prefix (if any) from a line
+local function get_tree_prefix(line)
+  local _, prefix_len = line:find("─ ", 1, true)
+  if prefix_len then
+    return line:sub(1, prefix_len)
+  else
+    return ""
+  end
+end
+
+-- Add a filetype icon to a line
+local function line_with_icon(line)
+  line = line:gsub("[\r\n]+$", "") -- Trailing newlines mess with filetype detection
+
+  local tree_prefix = get_tree_prefix(line)
+  local url = line:sub(#tree_prefix + 1)
+  local icon = File({
+    url = Url(url),
+    cha = Cha {
+      mode = tonumber(url:sub(-1) == "/" and "40700" or "100644", 8),
+      kind = url:sub(-1) == "/" and 1 or 0, -- For Yazi <25.9.x compatibility
+    }
+  }):icon()
+
+  if icon then
+    line =  ui.Line { tree_prefix, ui.Span(icon.text .. " "):style(icon.style), url }
+  end
+
+  return line
+end
+
 function M:peek(job)
-  local child = Command("ouch")
-      :arg({ "l", "-t", "-y", tostring(job.file.url) })
+  local cmd = Command("ouch"):arg("l")
+  if not job.args.list_view then
+    cmd:arg("-t")
+  end
+  cmd:arg({ "-y", tostring(job.file.url) })
       :stdout(Command.PIPED)
       :stderr(Command.PIPED)
-      :spawn()
+
+  local child = cmd:spawn()
   local limit = job.area.h
+  local archive_icon = job.args.archive_icon or "\u{1f4c1} "
   local file_name = string.match(tostring(job.file.url), ".*[/\\](.*)")
-  local lines = string.format("\u{1f4c1} %s\n", file_name)
-  local num_lines = 1
+  local lines = { string.format(" %s%s", archive_icon, file_name) }
   local num_skip = 0
   repeat
     local line, event = child:read_line()
@@ -21,19 +56,29 @@ function M:peek(job)
 
     if line:find('Archive', 1, true) ~= 1 and line:find('[INFO]', 1, true) ~= 1 then
       if num_skip >= job.skip then
-        lines = lines .. line
-        num_lines = num_lines + 1
+        if job.args.show_file_icons then
+          if line:find ('[ERROR]', 1, true) == 1 then
+            -- On error, disable file icons for the rest of the output
+            job.args.show_file_icons = false
+          elseif line:find ('[WARNING]', 1, true) ~= 1 then
+            -- Show icons for non-warning lines only
+            line = line_with_icon(line)
+          end
+        end
+
+        line = ui.Line { " ", line } -- One space padding
+        table.insert(lines, line)
       else
         num_skip = num_skip + 1
       end
     end
-  until num_lines >= limit
+  until #lines >= limit
 
   child:start_kill()
-  if job.skip > 0 and num_lines < limit then
+  if job.skip > 0 and #lines < limit then
     ya.emit(
       "peek",
-      { tostring(math.max(0, job.skip - (limit - num_lines))), only_if = tostring(job.file.url), upper_bound = "" }
+      { tostring(math.max(0, job.skip - (limit - #lines))), only_if = tostring(job.file.url), upper_bound = "" }
     )
   else
     ya.preview_widget(job, { ui.Text(lines):area(job.area) })
@@ -125,7 +170,6 @@ function M:entry(job)
   local output_name, name_event = ya.input({
     title = "Create archive:",
     value = default_name .. "." .. default_fmt,
-    position = { "top-center", y = 3, w = 40 },
     pos = { "top-center", y = 3, w = 40 },
   })
   if name_event ~= 1 then
@@ -136,7 +180,6 @@ function M:entry(job)
   if file_exists(output_name) then
     local confirm, confirm_event = ya.input({
       title = "Overwrite " .. output_name .. "? (y/N)",
-      position = { "top-center", y = 3, w = 40 },
       pos = { "top-center", y = 3, w = 40 },
     })
     if not (confirm_event == 1 and confirm:lower() == "y") then