fix: reordering connections #5

Merged
jamie merged 2 commits from v1.1.3 into main 2026-06-09 16:24:24 +01:00
5 changed files with 71 additions and 27 deletions
Showing only changes of commit 5f7c977f77 - Show all commits
+43 -20
View File
@@ -16,6 +16,7 @@ import (
"goexplore/internal/transfer" "goexplore/internal/transfer"
"os" "os"
"path/filepath" "path/filepath"
"sync"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/wailsapp/wails/v2/pkg/runtime" "github.com/wailsapp/wails/v2/pkg/runtime"
@@ -25,6 +26,8 @@ type App struct {
ctx context.Context ctx context.Context
cfg *config.Config cfg *config.Config
transferManager *transfer.Manager transferManager *transfer.Manager
explorers map[string]explorer.Explorer
explorersMu sync.Mutex
} }
func NewApp() *App { func NewApp() *App {
@@ -38,6 +41,7 @@ func NewApp() *App {
return &App{ return &App{
cfg: cfg, cfg: cfg,
transferManager: transfer.NewManager(3), transferManager: transfer.NewManager(3),
explorers: make(map[string]explorer.Explorer),
} }
} }
@@ -123,6 +127,41 @@ func (a *App) ReorderConnections(ids []string) error {
return config.SaveConfig(a.cfg) return config.SaveConfig(a.cfg)
} }
func (a *App) getConnection(id string) (explorer.Explorer, error) {
if id == "local" {
return local.New(), nil
}
a.explorersMu.Lock()
defer a.explorersMu.Unlock()
if exp, ok := a.explorers[id]; ok {
return exp, nil
}
exp, err := a.getExplorerForConnection(id)
if err != nil {
return nil, err
}
if err := exp.Connect(); err != nil {
return nil, err
}
a.explorers[id] = exp
return exp, nil
}
func (a *App) DisconnectConnection(id string) {
a.explorersMu.Lock()
defer a.explorersMu.Unlock()
if exp, ok := a.explorers[id]; ok {
exp.Disconnect()
delete(a.explorers, id)
}
}
func (a *App) getExplorerForConnection(id string) (explorer.Explorer, error) { func (a *App) getExplorerForConnection(id string) (explorer.Explorer, error) {
if id == "local" { if id == "local" {
return local.New(), nil return local.New(), nil
@@ -160,38 +199,26 @@ func (a *App) getExplorerForConnection(id string) (explorer.Explorer, error) {
} }
func (a *App) ListDir(connId, path string) ([]explorer.FileEntry, error) { func (a *App) ListDir(connId, path string) ([]explorer.FileEntry, error) {
exp, err := a.getExplorerForConnection(connId) exp, err := a.getConnection(connId)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if err := exp.Connect(); err != nil {
return nil, err
}
defer exp.Disconnect()
return exp.ListDir(path) return exp.ListDir(path)
} }
func (a *App) MkDir(connId, path string) error { func (a *App) MkDir(connId, path string) error {
exp, err := a.getExplorerForConnection(connId) exp, err := a.getConnection(connId)
if err != nil { if err != nil {
return err return err
} }
if err := exp.Connect(); err != nil {
return err
}
defer exp.Disconnect()
return exp.MkDir(path) return exp.MkDir(path)
} }
func (a *App) Delete(connId, path string) error { func (a *App) Delete(connId, path string) error {
exp, err := a.getExplorerForConnection(connId) exp, err := a.getConnection(connId)
if err != nil { if err != nil {
return err return err
} }
if err := exp.Connect(); err != nil {
return err
}
defer exp.Disconnect()
return exp.Delete(path) return exp.Delete(path)
} }
@@ -225,14 +252,10 @@ func (a *App) ClearTransfers() {
} }
func (a *App) Rename(connId, src, dst string) error { func (a *App) Rename(connId, src, dst string) error {
exp, err := a.getExplorerForConnection(connId) exp, err := a.getConnection(connId)
if err != nil { if err != nil {
return err return err
} }
if err := exp.Connect(); err != nil {
return err
}
defer exp.Disconnect()
return exp.Rename(src, dst) return exp.Rename(src, dst)
} }
+2
View File
@@ -11,6 +11,8 @@ export function Delete(arg1:string,arg2:string):Promise<void>;
export function DeleteConnection(arg1:string):Promise<void>; export function DeleteConnection(arg1:string):Promise<void>;
export function DisconnectConnection(arg1:string):Promise<void>;
export function GetConnections():Promise<Array<config.ConnectionConfig>>; export function GetConnections():Promise<Array<config.ConnectionConfig>>;
export function GetTransfers():Promise<Array<transfer.Transfer>>; export function GetTransfers():Promise<Array<transfer.Transfer>>;
+4
View File
@@ -14,6 +14,10 @@ export function DeleteConnection(arg1) {
return window['go']['main']['App']['DeleteConnection'](arg1); return window['go']['main']['App']['DeleteConnection'](arg1);
} }
export function DisconnectConnection(arg1) {
return window['go']['main']['App']['DisconnectConnection'](arg1);
}
export function GetConnections() { export function GetConnections() {
return window['go']['main']['App']['GetConnections'](); return window['go']['main']['App']['GetConnections']();
} }
+16 -7
View File
@@ -9,10 +9,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/pkg/sftp"
"golang.org/x/crypto/ssh"
"goexplore/internal/config" "goexplore/internal/config"
"goexplore/internal/explorer" "goexplore/internal/explorer"
"github.com/pkg/sftp"
"golang.org/x/crypto/ssh"
) )
type SFTPExplorer struct { type SFTPExplorer struct {
@@ -31,9 +32,9 @@ func (e *SFTPExplorer) Connect() error {
if port == 0 { if port == 0 {
port = 22 port = 22
} }
var authMethods []ssh.AuthMethod var authMethods []ssh.AuthMethod
secretStr := strings.TrimSpace(e.secret) secretStr := strings.TrimSpace(e.secret)
// Handle case where newlines might be escaped by mistake // Handle case where newlines might be escaped by mistake
secretStr = strings.ReplaceAll(secretStr, "\\n", "\n") secretStr = strings.ReplaceAll(secretStr, "\\n", "\n")
@@ -70,8 +71,8 @@ func (e *SFTPExplorer) Connect() error {
})) }))
config := &ssh.ClientConfig{ config := &ssh.ClientConfig{
User: e.cfg.Username, User: e.cfg.Username,
Auth: authMethods, Auth: authMethods,
HostKeyCallback: ssh.InsecureIgnoreHostKey(), HostKeyCallback: ssh.InsecureIgnoreHostKey(),
} }
@@ -102,9 +103,17 @@ func (e *SFTPExplorer) Disconnect() error {
func (e *SFTPExplorer) ListDir(path string) ([]explorer.FileEntry, error) { func (e *SFTPExplorer) ListDir(path string) ([]explorer.FileEntry, error) {
if path == "" { if path == "" {
path = "." if e.cfg.Bucket != "" {
path = e.cfg.Bucket
} else {
path = "/"
}
} else if path == "." {
path = "/"
} }
files, err := e.client.ReadDir(path) files, err := e.client.ReadDir(path)
if err != nil { if err != nil {
return nil, err return nil, err
} }
+6
View File
@@ -27,6 +27,12 @@ func installLinux() {
return return
} }
for _, arg := range os.Args {
if arg == "--debug" {
return
}
}
exe, err := os.Executable() exe, err := os.Executable()
if err != nil { if err != nil {
return return