add:send functionality
This commit is contained in:
@@ -14,15 +14,16 @@ type entry struct {
|
||||
|
||||
// picker is the state for the send file picker page.
|
||||
type picker struct {
|
||||
dir string // current directory being browsed
|
||||
entries []entry // unfiltered entries in dir
|
||||
filtered []entry // entries matching query
|
||||
query string // current filter string
|
||||
cursor int // index within filtered
|
||||
dir string // current directory being browsed
|
||||
entries []entry // unfiltered entries in dir
|
||||
filtered []entry // entries matching query
|
||||
query string // current filter string
|
||||
cursor int // index within filtered
|
||||
queryFocused bool // true = typing goes to query; false = list navigation only
|
||||
}
|
||||
|
||||
func newPicker(startDir string) picker {
|
||||
p := picker{dir: startDir}
|
||||
p := picker{dir: startDir, queryFocused: false}
|
||||
p.entries = readDir(startDir)
|
||||
p.filtered = p.entries
|
||||
return p
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package tui
|
||||
|
||||
import (
|
||||
"path/filepath"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -86,6 +87,25 @@ func cleanAllCmd(store *services.ServicesStore, serverName string) tea.Cmd {
|
||||
}
|
||||
}
|
||||
|
||||
type sendFileMsg struct {
|
||||
filename string
|
||||
err error
|
||||
}
|
||||
|
||||
func sendFileCmd(store *services.ServicesStore, serverName, localPath string) tea.Cmd {
|
||||
return func() tea.Msg {
|
||||
storage, err := store.NewStorageService(serverName)
|
||||
if err != nil {
|
||||
return sendFileMsg{err: err}
|
||||
}
|
||||
filename := filepath.Base(localPath)
|
||||
if err := storage.Send(localPath); err != nil {
|
||||
return sendFileMsg{err: err}
|
||||
}
|
||||
return sendFileMsg{filename: filename}
|
||||
}
|
||||
}
|
||||
|
||||
func newCleanInput() textinput.Model {
|
||||
ti := textinput.New()
|
||||
ti.Placeholder = "yes"
|
||||
@@ -261,6 +281,23 @@ func (m TUIInterface) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
clearFlashAfter(0), // immediate clear of any stale flash
|
||||
)
|
||||
|
||||
case sendFileMsg:
|
||||
if msg.err != nil {
|
||||
// return to server actions with error flash
|
||||
server := m.ActiveServer
|
||||
m.FlashMsg = "✗ send failed: " + msg.err.Error()
|
||||
return m, tea.Batch(
|
||||
func() tea.Msg { return pages.ServerActionsPageMsg{ServerName: server} },
|
||||
clearFlashAfter(4*time.Second),
|
||||
)
|
||||
}
|
||||
server := m.ActiveServer
|
||||
m.FlashMsg = "✓ \"" + msg.filename + "\" sent."
|
||||
return m, tea.Batch(
|
||||
func() tea.Msg { return pages.ServerActionsPageMsg{ServerName: server} },
|
||||
clearFlashAfter(3*time.Second),
|
||||
)
|
||||
|
||||
case storageFilesMsg:
|
||||
m.StorageLoading = false
|
||||
m.StorageFiles = msg.files
|
||||
@@ -482,6 +519,11 @@ func (m TUIInterface) updateSend(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
|
||||
p := m.Picker
|
||||
|
||||
switch msg.String() {
|
||||
case "tab":
|
||||
p.queryFocused = !p.queryFocused
|
||||
m.Picker = p
|
||||
return m, nil
|
||||
|
||||
case "up", "k":
|
||||
if p.cursor > 0 {
|
||||
p.cursor--
|
||||
@@ -506,16 +548,16 @@ func (m TUIInterface) updateSend(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
|
||||
return m, nil
|
||||
}
|
||||
// file selected — send it
|
||||
path := p.selectedPath()
|
||||
_ = path // TODO: wire to send service
|
||||
localPath := p.selectedPath()
|
||||
server := m.ActiveServer
|
||||
return m, func() tea.Msg { return pages.ServerActionsPageMsg{ServerName: server} }
|
||||
return m, sendFileCmd(m.Services, server, localPath)
|
||||
|
||||
case "backspace":
|
||||
newP, consumed := p.backspace()
|
||||
m.Picker = newP
|
||||
_ = consumed
|
||||
return m, nil
|
||||
if p.queryFocused {
|
||||
newP, _ := p.backspace()
|
||||
m.Picker = newP
|
||||
return m, nil
|
||||
}
|
||||
|
||||
case "ctrl+c":
|
||||
m.Quitting = true
|
||||
@@ -526,8 +568,8 @@ func (m TUIInterface) updateSend(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
|
||||
return m, func() tea.Msg { return pages.ServerActionsPageMsg{ServerName: server} }
|
||||
|
||||
default:
|
||||
// printable single rune → append to query
|
||||
if msg.Text != "" {
|
||||
// printable rune → only append to query when query pane is focused
|
||||
if msg.Text != "" && p.queryFocused {
|
||||
m.Picker = p.typeRune([]rune(msg.Text)[0])
|
||||
return m, nil
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package tui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"filepass/internal/styles"
|
||||
|
||||
@@ -141,12 +142,12 @@ func (m TUIInterface) View() tea.View {
|
||||
footerSep() +
|
||||
footerHint("esc", "back")
|
||||
case pageSend:
|
||||
footerStr = footerHint("↑↓", "navigate") +
|
||||
footerStr = footerHint("tab", "switch pane") +
|
||||
footerSep() +
|
||||
footerHint("↑↓", "navigate") +
|
||||
footerSep() +
|
||||
footerHint("enter", "open/send") +
|
||||
footerSep() +
|
||||
footerHint("backspace", "up a level") +
|
||||
footerSep() +
|
||||
footerHint("esc", "back")
|
||||
default:
|
||||
footerStr = footerHint("↑↓", "navigate") +
|
||||
@@ -191,6 +192,12 @@ func (m TUIInterface) viewMenu() string {
|
||||
statusLine = styles.StatusWarnStyle.Render("⚠ No servers configured. Select Config to add one.")
|
||||
case m.FlashMsg != "" && m.Page == pageConfig:
|
||||
statusLine = styles.StatusOKStyle.Render(m.FlashMsg)
|
||||
case m.FlashMsg != "" && m.Page == pageServerActions:
|
||||
if strings.HasPrefix(m.FlashMsg, "✗") {
|
||||
statusLine = styles.StatusErrStyle.Render(m.FlashMsg)
|
||||
} else {
|
||||
statusLine = styles.StatusOKStyle.Render(m.FlashMsg)
|
||||
}
|
||||
}
|
||||
|
||||
if statusLine != "" {
|
||||
@@ -266,8 +273,19 @@ func (m TUIInterface) viewSend() string {
|
||||
// breadcrumb showing current directory
|
||||
crumb := styles.LocalDirStyle.Render(" " + p.dir)
|
||||
|
||||
// search input
|
||||
queryLine := styles.PickerQueryStyle.Render(" / " + p.query + "█")
|
||||
// search input — shows cursor block and accent colour when focused, dim when not
|
||||
var queryLine string
|
||||
if p.queryFocused {
|
||||
queryLine = styles.PickerQueryStyle.Render(" / " + p.query + "█")
|
||||
} else {
|
||||
var queryHint string
|
||||
if p.query != "" {
|
||||
queryHint = " / " + p.query
|
||||
} else {
|
||||
queryHint = " / (tab to filter)"
|
||||
}
|
||||
queryLine = styles.PickerQueryBlurredStyle.Render(queryHint)
|
||||
}
|
||||
|
||||
// file/dir entries
|
||||
var rows []string
|
||||
|
||||
Reference in New Issue
Block a user