celediel/gt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 2 Wiki Activity

less magic numbers

Browse source
This commit is contained in:
Lilian Jónsdóttir 2024-07-30 13:03:33 -07:00
parent 84e0c9c926
commit b6cb6df999
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
internal/interactive/interactive.go
View file

@ -26,6 +26,14 @@ const (
space string = " " space string = " "
woffset int = 13 // why this number, I don't know woffset int = 13 // why this number, I don't know
hoffset int = 6 hoffset int = 6
poffset int = 2
// TODO: figure these out dynamically based on longest of each
filenameColumn float64 = 0.46
pathColumn float64 = 0.25
dateColumn float64 = 0.15
sizeColumn float64 = 0.12
checkColumn float64 = 0.02
// TODO: make these configurable or something // TODO: make these configurable or something
borderbg string = "5" borderbg string = "5"
@ -41,7 +49,7 @@ var (
BorderStyle(lipgloss.RoundedBorder()). BorderStyle(lipgloss.RoundedBorder()).
BorderForeground(lipgloss.Color(borderbg)) BorderForeground(lipgloss.Color(borderbg))
regulartext = lipgloss.NewStyle(). regulartext = lipgloss.NewStyle().
Padding(0, 2) Padding(0, poffset)
darktext = lipgloss.NewStyle(). darktext = lipgloss.NewStyle().
Foreground(lipgloss.Color(darkgray)) Foreground(lipgloss.Color(darkgray))
darkertext = lipgloss.NewStyle(). darkertext = lipgloss.NewStyle().
@ -67,13 +75,12 @@ type model struct {
func newModel(fls []files.File, width, height int, readonly, preselected, once bool, workdir string, mode modes.Mode) model { func newModel(fls []files.File, width, height int, readonly, preselected, once bool, workdir string, mode modes.Mode) model {
var ( var (
// TODO: figure this out dynamically based on longest of each fwidth = int(math.Round(float64(width-woffset) * filenameColumn))
fwidth int = int(math.Round(float64(width-woffset) * 0.46)) owidth = int(math.Round(float64(width-woffset) * pathColumn))
owidth int = int(math.Round(float64(width-woffset) * 0.25)) dwidth = int(math.Round(float64(width-woffset) * dateColumn))
dwidth int = int(math.Round(float64(width-woffset) * 0.15)) swidth = int(math.Round(float64(width-woffset) * sizeColumn))
swidth int = int(math.Round(float64(width-woffset) * 0.12)) cwidth = int(math.Round(float64(width-woffset) * checkColumn))
cwidth int = int(math.Round(float64(width-woffset) * 0.02)) theight = min(height-hoffset, len(fls))
theight int = min(height-hoffset, len(fls))
mdl = model{ mdl = model{
keys: defaultKeyMap(), keys: defaultKeyMap(),
@ -293,7 +300,7 @@ func (m model) header() string {
left = fmt.Sprintf("%d/%d %s %s", len(m.selected), len(m.table.Rows()), dot, humanize.Bytes(uint64(m.selectsize))) left = fmt.Sprintf("%d/%d %s %s", len(m.selected), len(m.table.Rows()), dot, humanize.Bytes(uint64(m.selectsize)))
// offset of 2 again because of table border // offset of 2 again because of table border
spacerWidth = m.termwidth - lipgloss.Width(right) - lipgloss.Width(left) - 2 spacerWidth = m.termwidth - lipgloss.Width(right) - lipgloss.Width(left) - poffset
if spacerWidth <= 0 { if spacerWidth <= 0 {
spacerWidth = 1 // always at least one space spacerWidth = 1 // always at least one space
} }
@ -521,7 +528,7 @@ func newRow(file files.File, workdir string) table.Row {
var time, bar string var time, bar string
time = humanize.Time(file.Date()) time = humanize.Time(file.Date())
if file.IsDir() { if file.IsDir() {
bar = strings.Repeat("─", 3) bar = strings.Repeat("─", poffset+1)
} else { } else {
bar = humanize.Bytes(uint64(file.Filesize())) bar = humanize.Bytes(uint64(file.Filesize()))
} }