update yazi
This commit is contained in:
parent
b70d88c06f
commit
71ac4ef6b4
2 changed files with 33 additions and 54 deletions
|
@ -1,35 +1,19 @@
|
|||
Manager = {
|
||||
area = ui.Rect.default,
|
||||
}
|
||||
|
||||
function Manager:layout(area)
|
||||
self.area = area
|
||||
|
||||
return ui.Layout()
|
||||
:direction(ui.Layout.HORIZONTAL)
|
||||
:constraints({
|
||||
ui.Constraint.Ratio(MANAGER.ratio.parent, MANAGER.ratio.all),
|
||||
ui.Constraint.Ratio(MANAGER.ratio.current, MANAGER.ratio.all),
|
||||
ui.Constraint.Ratio(MANAGER.ratio.preview, MANAGER.ratio.all),
|
||||
})
|
||||
:split(area)
|
||||
end
|
||||
-- Full Border
|
||||
|
||||
function Manager:render(area)
|
||||
local chunks = self:layout(area)
|
||||
|
||||
local bar = function(c, x, y)
|
||||
x, y = math.max(0, x), math.max(0, y)
|
||||
return ui.Bar(ui.Rect { x = x, y = y, w = ya.clamp(0, area.w - x, 1), h = math.min(1, area.h) }, ui.Bar.TOP)
|
||||
:symbol(c)
|
||||
end
|
||||
local bar = function(c, x, y)
|
||||
x, y = math.max(0, x), math.max(0, y)
|
||||
return ui.Bar(ui.Rect { x = x, y = y, w = ya.clamp(0, area.w - x, 1), h = math.min(1, area.h) }, ui.Bar.TOP):symbol(c)
|
||||
end
|
||||
|
||||
return ya.flat {
|
||||
-- Borders
|
||||
ui.Border(area, ui.Border.ALL):type(ui.Border.ROUNDED),
|
||||
ui.Bar(chunks[1], ui.Bar.RIGHT),
|
||||
ui.Bar(chunks[3], ui.Bar.LEFT),
|
||||
|
||||
|
||||
bar("┬", chunks[1].right - 1, chunks[1].y),
|
||||
bar("┴", chunks[1].right - 1, chunks[1].bottom - 1),
|
||||
bar("┬", chunks[2].right, chunks[2].y),
|
||||
|
@ -44,23 +28,7 @@ function Manager:render(area)
|
|||
}
|
||||
end
|
||||
|
||||
function Header:host()
|
||||
if ya.target_family() ~= "unix" then
|
||||
return ui.Line {}
|
||||
end
|
||||
return ui.Span(ya.user_name() .. "@" .. ya.host_name() .. ":"):fg("blue")
|
||||
end
|
||||
|
||||
function Header:render(area)
|
||||
local chunks = self:render(area)
|
||||
|
||||
local left = ui.Line { self:host(), self:cwd() }
|
||||
local right = ui.Line { self:tabs() }
|
||||
return {
|
||||
ui.Paragraph(chunks[1], { left }),
|
||||
ui.Paragraph(chunks[2], { right }):align(ui.Paragraph.RIGHT),
|
||||
}
|
||||
end
|
||||
-- Show owner in status bar
|
||||
|
||||
function Status:owner()
|
||||
local h = cx.active.current.hovered
|
||||
|
@ -76,28 +44,34 @@ function Status:owner()
|
|||
}
|
||||
end
|
||||
|
||||
function Status:mtime()
|
||||
local h = cx.active.current.hovered
|
||||
if h == nil or ya.target_family() ~= "unix" then
|
||||
return ui.Line {}
|
||||
end
|
||||
|
||||
-- fix unix timestamp format
|
||||
return ui.Line {
|
||||
ui.Span(h.cha.modified):fg("magenta"),
|
||||
ui.Span(" ")
|
||||
}
|
||||
end
|
||||
|
||||
function Status:render(area)
|
||||
self.area = area
|
||||
|
||||
local left = ui.Line { self:mode(), self:size(), self:name() }
|
||||
--local right = ui.Line { self:mtime(), self:owner(), self:percentage(), self:position() }
|
||||
local right = ui.Line { self:owner(), self:percentage(), self:position() }
|
||||
local right = ui.Line { self:owner(), self:permissions(), self:percentage(), self:position() }
|
||||
return {
|
||||
ui.Paragraph(area, { left }),
|
||||
ui.Paragraph(area, { right }):align(ui.Paragraph.RIGHT),
|
||||
table.unpack(Progress:render(area, right:width())),
|
||||
}
|
||||
end
|
||||
|
||||
-- Show hostname in header
|
||||
|
||||
function Header:host()
|
||||
if ya.target_family() ~= "unix" then
|
||||
return ui.Line {}
|
||||
end
|
||||
return ui.Span(ya.user_name() .. "@" .. ya.host_name() .. ":"):fg("blue")
|
||||
end
|
||||
|
||||
function Header:render(area)
|
||||
self.area = area
|
||||
|
||||
local right = ui.Line { self:count(), self:tabs() }
|
||||
local left = ui.Line { self:host(), self:cwd(math.max(0, area.w - right:width())) }
|
||||
return {
|
||||
ui.Paragraph(area, { left }),
|
||||
ui.Paragraph(area, { right }):align(ui.Paragraph.RIGHT),
|
||||
}
|
||||
end
|
|
@ -3,6 +3,11 @@ on = [ "<Esc>" ]
|
|||
run = "close"
|
||||
desc = "Cancel input"
|
||||
|
||||
[[manager.prepend_keymap]]
|
||||
on = [ "<C-s>" ]
|
||||
run = 'shell "$SHELL" --block --confirm'
|
||||
desc = "Open shell here"
|
||||
|
||||
[[manager.prepend_keymap]]
|
||||
on = [ "l" ]
|
||||
run = "plugin --sync smart-enter"
|
||||
|
|
Loading…
Add table
Reference in a new issue