dashboard / erock/pubsub / refactor: unsub method to interface #20 rss

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49

diff --git a/send/sftp/handler.go b/send/sftp/handler.go
index 9fc8e61..af0038b 100644
--- a/send/sftp/handler.go
+++ b/send/sftp/handler.go
@@ -10,6 +10,7 @@ import (
 	"slices"
 
 	"github.com/charmbracelet/ssh"
+	"github.com/charmbracelet/wish"
 	"github.com/picosh/send/send/utils"
 	"github.com/pkg/sftp"
 )
@@ -127,3 +128,36 @@ func (f *handler) Fileread(r *sftp.Request) (io.ReaderAt, error) {
 
 	return reader, err
 }
+
+type handlererr struct {
+	Handler *handler
+}
+
+func (f *handlererr) Filecmd(r *sftp.Request) error {
+	err := f.Handler.Filecmd(r)
+	if err != nil {
+		wish.Errorln(f.Handler.session, err)
+	}
+	return err
+}
+func (f *handlererr) Filelist(r *sftp.Request) (sftp.ListerAt, error) {
+	result, err := f.Handler.Filelist(r)
+	if err != nil {
+		wish.Errorln(f.Handler.session, err)
+	}
+	return result, err
+}
+func (f *handlererr) Filewrite(r *sftp.Request) (io.WriterAt, error) {
+	result, err := f.Handler.Filewrite(r)
+	if err != nil {
+		wish.Errorln(f.Handler.session, err)
+	}
+	return result, err
+}
+func (f *handlererr) Fileread(r *sftp.Request) (io.ReaderAt, error) {
+	result, err := f.Handler.Fileread(r)
+	if err != nil {
+		wish.Errorln(f.Handler.session, err)
+	}
+	return result, err
+}

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47

diff --git a/send/sftp/sftp.go b/send/sftp/sftp.go
index b4c2003..489d443 100644
--- a/send/sftp/sftp.go
+++ b/send/sftp/sftp.go
@@ -5,6 +5,7 @@ import (
 	"io"
 
 	"github.com/charmbracelet/ssh"
+	"github.com/charmbracelet/wish"
 	"github.com/picosh/send/send/utils"
 	"github.com/pkg/sftp"
 )
@@ -25,19 +26,21 @@ func SubsystemHandler(writeHandler utils.CopyFromClientHandler) ssh.SubsystemHan
 		defer func() {
 			if r := recover(); r != nil {
 				writeHandler.GetLogger().Error("error running sftp middleware", "err", r)
-				_, _ = session.Stderr().Write([]byte("error running sftp middleware, check the flags you are using\r\n"))
+				wish.Println(session, "error running sftp middleware, check the flags you are using")
 			}
 		}()
 
 		err := writeHandler.Validate(session)
 		if err != nil {
-			utils.ErrorHandler(session, err)
+			wish.Errorln(session, err)
 			return
 		}
 
-		handler := &handler{
-			session:      session,
-			writeHandler: writeHandler,
+		handler := &handlererr{
+			Handler: &handler{
+				session:      session,
+				writeHandler: writeHandler,
+			},
 		}
 
 		handlers := sftp.Handlers{
@@ -51,6 +54,7 @@ func SubsystemHandler(writeHandler utils.CopyFromClientHandler) ssh.SubsystemHan
 
 		err = requestServer.Serve()
 		if err != nil && !errors.Is(err, io.EOF) {
+			wish.Errorln(session, err)
 			writeHandler.GetLogger().Error("Error serving sftp subsystem", "err", err)
 		}
 	}