nixos-contrib/ficsit-cli-flake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity Actions

fix help in new_installation, follow symlinks

Browse source
This commit is contained in:
Samuel Recker 2023-01-16 22:42:36 +01:00
parent 29e82341fd
commit ca84300ef3
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tea/scenes/new_installation.go
View file

@ -3,6 +3,7 @@ package scenes
import ( import (
"fmt" "fmt"
"io" "io"
"io/fs"
"os" "os"
"path/filepath" "path/filepath"
"sort" "sort"
@ -42,8 +43,16 @@ func NewNewInstallation(root components.RootModel, parent tea.Model) tea.Model {
l.SetShowTitle(false) l.SetShowTitle(false)
l.Styles = utils.ListStyles l.Styles = utils.ListStyles
l.SetSize(l.Width(), l.Height()) l.SetSize(l.Width(), l.Height())
l.KeyMap.Quit.SetHelp("esc", "back")
l.SetShowStatusBar(false) l.SetShowStatusBar(false)
l.KeyMap.ShowFullHelp.Unbind()
l.KeyMap.Quit.SetHelp("esc", "back")
l.KeyMap.CursorDown.SetHelp("↓", "down")
l.KeyMap.CursorUp.SetHelp("↑", "up")
l.AdditionalShortHelpKeys = func() []key.Binding {
return []key.Binding{
key.NewBinding(key.WithKeys(KeyTab), key.WithHelp(KeyTab, "select")),
}
}
model := newInstallation{ model := newInstallation{
root: root, root: root,
@ -167,7 +176,7 @@ func (m newInstallation) View() string {
} }
m.dirList.SetSize(m.dirList.Width(), m.root.Size().Height-lipgloss.Height(mandatory)-1) m.dirList.SetSize(m.dirList.Width(), m.root.Size().Height-lipgloss.Height(mandatory)-1)
return lipgloss.JoinVertical(lipgloss.Left, mandatory, style.Render(m.dirList.View())) return lipgloss.JoinVertical(lipgloss.Left, mandatory, m.dirList.View())
} }
// I know this is awful, but beats re-implementing the entire list model // I know this is awful, but beats re-implementing the entire list model
@ -191,7 +200,7 @@ func getDirItems(inputValue string) []list.Item {
if filter != "" { if filter != "" {
dirNames := make([]string, 0) dirNames := make([]string, 0)
for _, entry := range dir { for _, entry := range dir {
if entry.IsDir() { if entry.IsDir() || entry.Type() == fs.ModeSymlink {
dirNames = append(dirNames, entry.Name()) dirNames = append(dirNames, entry.Name())
} }
} }
@ -211,7 +220,7 @@ func getDirItems(inputValue string) []list.Item {
globalMatches = matches globalMatches = matches
} else { } else {
for _, entry := range dir { for _, entry := range dir {
if entry.IsDir() { if entry.IsDir() || entry.Type() == fs.ModeSymlink {
newItems = append(newItems, utils.SimpleItemExtra[newInstallation, string]{ newItems = append(newItems, utils.SimpleItemExtra[newInstallation, string]{
SimpleItem: utils.SimpleItem[newInstallation]{ SimpleItem: utils.SimpleItem[newInstallation]{
ItemTitle: entry.Name(), ItemTitle: entry.Name(),