update:multi selector

This commit is contained in:
2026-04-18 04:42:35 +09:00
parent dc72658fe4
commit 5e1dce6082
4 changed files with 160 additions and 23 deletions

View File

@@ -2,7 +2,8 @@ package pages
type FileActionPageMsg struct { type FileActionPageMsg struct {
ServerName string ServerName string
Filename string Filename string // single-file mode
Filenames []string // multi-file mode
} }
func FileActionItems() []MenuItem { func FileActionItems() []MenuItem {

View File

@@ -48,8 +48,10 @@ type TUIInterface struct {
FileFocused bool // true = ↑↓ drives file list, false = action menu FileFocused bool // true = ↑↓ drives file list, false = action menu
FileScrollOff int // first visible row in StorageFiles list FileScrollOff int // first visible row in StorageFiles list
FileViewHeight int // available visible rows for StorageFiles list FileViewHeight int // available visible rows for StorageFiles list
FileMultiSelect map[int]bool // selected rows in StorageFiles
// file action page // file action page
ActiveFile string ActiveFile string
ActiveFiles []string
FileOpLoading bool FileOpLoading bool
FileOpErr error FileOpErr error
FileOpSuccess string FileOpSuccess string
@@ -69,6 +71,7 @@ func NewTUIInterface(store *services.ServicesStore, localDir string) TUIInterfac
Page: pageHome, Page: pageHome,
MenuItems: pages.HomeMenuItems(), MenuItems: pages.HomeMenuItems(),
LocalDir: localDir, LocalDir: localDir,
FileMultiSelect: make(map[int]bool),
} }
} }

View File

@@ -1,6 +1,7 @@
package tui package tui
import ( import (
"fmt"
"path/filepath" "path/filepath"
"sort" "sort"
"strings" "strings"
@@ -73,6 +74,62 @@ func deleteFileCmd(store *services.ServicesStore, serverName, filename string) t
} }
} }
func getFilesCmd(store *services.ServicesStore, serverName string, filenames []string, destDir string) tea.Cmd {
return func() tea.Msg {
storage, err := store.NewStorageService(serverName)
if err != nil {
return fileOpMsg{op: "get", err: err}
}
success := 0
var failed []string
for _, name := range filenames {
if err := storage.Get(name, destDir); err != nil {
failed = append(failed, fmt.Sprintf("%s: %v", name, err))
continue
}
success++
}
if len(failed) > 0 {
if success == 0 {
return fileOpMsg{op: "get", err: fmt.Errorf("download failed for %d file(s): %s", len(failed), strings.Join(failed, "; "))}
}
return fileOpMsg{op: "get", err: fmt.Errorf("downloaded %d/%d file(s), failed %d: %s", success, len(filenames), len(failed), strings.Join(failed, "; "))}
}
return fileOpMsg{op: "get", success: fmt.Sprintf("✓ Downloaded %d file(s)", success)}
}
}
func deleteFilesCmd(store *services.ServicesStore, serverName string, filenames []string) tea.Cmd {
return func() tea.Msg {
storage, err := store.NewStorageService(serverName)
if err != nil {
return fileOpMsg{op: "delete", err: err}
}
success := 0
var failed []string
for _, name := range filenames {
if err := storage.Delete(name); err != nil {
failed = append(failed, fmt.Sprintf("%s: %v", name, err))
continue
}
success++
}
if len(failed) > 0 {
if success == 0 {
return fileOpMsg{op: "delete", err: fmt.Errorf("delete failed for %d file(s): %s", len(failed), strings.Join(failed, "; "))}
}
return fileOpMsg{op: "delete", err: fmt.Errorf("deleted %d/%d file(s), failed %d: %s", success, len(filenames), len(failed), strings.Join(failed, "; "))}
}
return fileOpMsg{op: "delete", success: fmt.Sprintf("✓ Deleted %d file(s)", success)}
}
}
type cleanAllMsg struct { type cleanAllMsg struct {
err error err error
} }
@@ -160,6 +217,28 @@ func (m TUIInterface) nextSelectable(from, dir int) int {
return from return from
} }
func (m TUIInterface) selectedStorageFiles() []string {
if len(m.FileMultiSelect) == 0 || len(m.StorageFiles) == 0 {
return nil
}
idxs := make([]int, 0, len(m.FileMultiSelect))
for idx, selected := range m.FileMultiSelect {
if !selected {
continue
}
if idx < 0 || idx >= len(m.StorageFiles) {
continue
}
idxs = append(idxs, idx)
}
sort.Ints(idxs)
files := make([]string, 0, len(idxs))
for _, idx := range idxs {
files = append(files, m.StorageFiles[idx])
}
return files
}
func (m TUIInterface) Update(msg tea.Msg) (tea.Model, tea.Cmd) { func (m TUIInterface) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
switch msg := msg.(type) { switch msg := msg.(type) {
@@ -195,6 +274,9 @@ func (m TUIInterface) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
m.FileFocused = true m.FileFocused = true
m.FileViewHeight = m.fileListHeight() m.FileViewHeight = m.fileListHeight()
m.FileScrollOff = 0 m.FileScrollOff = 0
m.FileMultiSelect = make(map[int]bool)
m.ActiveFiles = nil
m.ActiveFile = ""
m.StorageFiles = nil m.StorageFiles = nil
m.StorageErr = nil m.StorageErr = nil
m.StorageLoading = true m.StorageLoading = true
@@ -202,7 +284,16 @@ func (m TUIInterface) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case pages.FileActionPageMsg: case pages.FileActionPageMsg:
m.Page = pageFileAction m.Page = pageFileAction
m.ActiveFile = msg.Filename targets := msg.Filenames
if len(targets) == 0 && msg.Filename != "" {
targets = []string{msg.Filename}
}
m.ActiveFiles = append([]string(nil), targets...)
if len(m.ActiveFiles) > 0 {
m.ActiveFile = m.ActiveFiles[0]
} else {
m.ActiveFile = ""
}
m.MenuItems = pages.FileActionItems() m.MenuItems = pages.FileActionItems()
m.Selected = 0 m.Selected = 0
m.FileOpLoading = false m.FileOpLoading = false
@@ -305,6 +396,7 @@ func (m TUIInterface) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
m.StorageFiles = msg.files m.StorageFiles = msg.files
m.StorageErr = msg.err m.StorageErr = msg.err
m.FileSelected = 0 m.FileSelected = 0
m.FileMultiSelect = make(map[int]bool)
m.FileScrollOff = syncScroll(m.FileSelected, len(m.StorageFiles), m.FileViewHeight, 0) m.FileScrollOff = syncScroll(m.FileSelected, len(m.StorageFiles), m.FileViewHeight, 0)
return m, nil return m, nil
@@ -454,12 +546,27 @@ func (m TUIInterface) updateServerActions(msg tea.KeyPressMsg) (tea.Model, tea.C
} }
} }
case "space":
if m.FileFocused && len(m.StorageFiles) > 0 {
if m.FileMultiSelect == nil {
m.FileMultiSelect = make(map[int]bool)
}
idx := m.FileSelected
m.FileMultiSelect[idx] = !m.FileMultiSelect[idx]
if !m.FileMultiSelect[idx] {
delete(m.FileMultiSelect, idx)
}
}
case "enter": case "enter":
if m.FileFocused && len(m.StorageFiles) > 0 { if m.FileFocused && len(m.StorageFiles) > 0 {
file := m.StorageFiles[m.FileSelected] targets := m.selectedStorageFiles()
if len(targets) == 0 {
targets = []string{m.StorageFiles[m.FileSelected]}
}
server := m.ActiveServer server := m.ActiveServer
return m, func() tea.Msg { return m, func() tea.Msg {
return pages.FileActionPageMsg{ServerName: server, Filename: file} return pages.FileActionPageMsg{ServerName: server, Filenames: targets}
} }
} }
server := m.ActiveServer server := m.ActiveServer
@@ -502,18 +609,30 @@ func (m TUIInterface) updateFileAction(msg tea.KeyPressMsg) (tea.Model, tea.Cmd)
} }
case "enter": case "enter":
server := m.ActiveServer server := m.ActiveServer
file := m.ActiveFile targets := m.ActiveFiles
if len(targets) == 0 && m.ActiveFile != "" {
targets = []string{m.ActiveFile}
}
if len(targets) == 0 {
return m, nil
}
switch m.MenuItems[m.Selected].Key { switch m.MenuItems[m.Selected].Key {
case "get": case "get":
m.FileOpLoading = true m.FileOpLoading = true
m.FileOpErr = nil m.FileOpErr = nil
m.FileOpSuccess = "" m.FileOpSuccess = ""
return m, getFileCmd(m.Services, server, file, m.LocalDir) if len(targets) == 1 {
return m, getFileCmd(m.Services, server, targets[0], m.LocalDir)
}
return m, getFilesCmd(m.Services, server, targets, m.LocalDir)
case "delete": case "delete":
m.FileOpLoading = true m.FileOpLoading = true
m.FileOpErr = nil m.FileOpErr = nil
m.FileOpSuccess = "" m.FileOpSuccess = ""
return m, deleteFileCmd(m.Services, server, file) if len(targets) == 1 {
return m, deleteFileCmd(m.Services, server, targets[0])
}
return m, deleteFilesCmd(m.Services, server, targets)
} }
case "ctrl+c": case "ctrl+c":
m.Quitting = true m.Quitting = true

View File

@@ -38,6 +38,9 @@ func (m TUIInterface) subtitle() string {
} }
return "Server" return "Server"
case pageFileAction: case pageFileAction:
if len(m.ActiveFiles) > 1 {
return fmt.Sprintf("%d files selected", len(m.ActiveFiles))
}
return m.ActiveFile return m.ActiveFile
case pageSend: case pageSend:
return "Send File" return "Send File"
@@ -116,7 +119,9 @@ func (m TUIInterface) View() tea.View {
footerSep() + footerSep() +
footerHint("↑↓", "navigate") + footerHint("↑↓", "navigate") +
footerSep() + footerSep() +
footerHint("enter", "select") + footerHint("space", "select") +
footerSep() +
footerHint("enter", "actions") +
footerSep() + footerSep() +
footerHint("esc", "back") footerHint("esc", "back")
case pageFileAction: case pageFileAction:
@@ -236,7 +241,12 @@ func (m TUIInterface) viewServerActions() string {
for i := start; i < end; i++ { for i := start; i < end; i++ {
f := m.StorageFiles[i] f := m.StorageFiles[i]
active := m.FileFocused && i == m.FileSelected active := m.FileFocused && i == m.FileSelected
fileRows = append(fileRows, styles.FileItemStyle(active).Render(f)) checked := m.FileMultiSelect[i]
mark := "[ ] "
if checked {
mark = "[✓] "
}
fileRows = append(fileRows, styles.FileItemStyle(active).Render(mark+f))
} }
} }
fileList := lipgloss.JoinVertical(lipgloss.Left, fileRows...) fileList := lipgloss.JoinVertical(lipgloss.Left, fileRows...)
@@ -254,7 +264,11 @@ func (m TUIInterface) viewServerActions() string {
} }
func (m TUIInterface) viewFileAction() string { func (m TUIInterface) viewFileAction() string {
filenameLabel := styles.FilenameLabelStyle.Render(m.ActiveFile) label := m.ActiveFile
if len(m.ActiveFiles) > 1 {
label = fmt.Sprintf("%d file(s) selected", len(m.ActiveFiles))
}
filenameLabel := styles.FilenameLabelStyle.Render(label)
var menuRows []string var menuRows []string
for i, item := range m.MenuItems { for i, item := range m.MenuItems {