Update refs for send

picosh · Oct 8, 2024 · bbbfc34 · bbbfc34
1 parent c92bd8e
commit bbbfc34
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 13 deletions.
diff --git a/asset.go b/asset.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/charmbracelet/ssh"
-	"github.com/picosh/send/send/utils"
+	"github.com/picosh/send/utils"
 )
 
 type AssetNames interface {

diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/charmbracelet/wish v1.2.0
 	github.com/minio/madmin-go/v3 v3.0.29
 	github.com/minio/minio-go/v7 v7.0.63
-	github.com/picosh/send v0.0.0-20240709135413-81b1dd703a11
+	github.com/picosh/send v0.0.0-20241008013240-6fdbff00f848
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -128,6 +128,8 @@ github.com/picosh/go-rsync-receiver v0.0.0-20240709135253-1daf4b12a9fc h1:bvcsoO
 github.com/picosh/go-rsync-receiver v0.0.0-20240709135253-1daf4b12a9fc/go.mod h1:i0iR3W4GSm1PuvVxB9OH32E5jP+CYkVb2NQSe0JCtlo=
 github.com/picosh/send v0.0.0-20240709135413-81b1dd703a11 h1:ElTyYxJPPfAz+NLRL9qy+SQ9UYaSGlWXWl2yYrLPzCU=
 github.com/picosh/send v0.0.0-20240709135413-81b1dd703a11/go.mod h1:RAgLDK3LrDK6pNeXtU9tjo28obl5DxShcTUk2nm/KCM=
+github.com/picosh/send v0.0.0-20241008013240-6fdbff00f848 h1:VWbjNNOqpJ8AB3zdw+M5+XC/SINooWLGi6WCozKwt1o=
+github.com/picosh/send v0.0.0-20241008013240-6fdbff00f848/go.mod h1:RAgLDK3LrDK6pNeXtU9tjo28obl5DxShcTUk2nm/KCM=
 github.com/pkg/sftp v1.13.6 h1:JFZT4XbOU7l77xGSpOdW+pwIMqP044IyjXX6FGyEKFo=
 github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

diff --git a/handler.go b/handler.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/charmbracelet/ssh"
 	"github.com/picosh/pobj/storage"
-	"github.com/picosh/send/send/utils"
+	"github.com/picosh/send/utils"
 )
 
 type ctxBucketKey struct{}

diff --git a/main.go b/main.go
@@ -4,14 +4,14 @@ import (
 	"github.com/charmbracelet/ssh"
 	"github.com/charmbracelet/wish"
 	lm "github.com/charmbracelet/wish/logging"
+	"github.com/picosh/send/auth"
 	"github.com/picosh/send/list"
 	"github.com/picosh/send/pipe"
+	wishrsync "github.com/picosh/send/protocols/rsync"
+	"github.com/picosh/send/protocols/scp"
+	"github.com/picosh/send/protocols/sftp"
 	"github.com/picosh/send/proxy"
-	"github.com/picosh/send/send/auth"
-	wishrsync "github.com/picosh/send/send/rsync"
-	"github.com/picosh/send/send/scp"
-	"github.com/picosh/send/send/sftp"
-	"github.com/picosh/send/send/utils"
+	"github.com/picosh/send/utils"
 )
 
 func createRouter(handler utils.CopyFromClientHandler) proxy.Router {

diff --git a/reader.go b/reader.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 
 	"github.com/minio/minio-go/v7"
-	"github.com/picosh/send/send/utils"
+	"github.com/picosh/send/utils"
 )
 
 type AllReaderAt struct {

diff --git a/storage/fs.go b/storage/fs.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/picosh/send/send/utils"
+	"github.com/picosh/send/utils"
 )
 
 // https://stackoverflow.com/a/32482941

diff --git a/storage/minio.go b/storage/minio.go
@@ -14,7 +14,7 @@ import (
 	"github.com/minio/madmin-go/v3"
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
-	"github.com/picosh/send/send/utils"
+	"github.com/picosh/send/utils"
 )
 
 type StorageMinio struct {

diff --git a/storage/s3.go b/storage/s3.go
@@ -17,7 +17,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/aws/smithy-go"
-	"github.com/picosh/send/send/utils"
+	"github.com/picosh/send/utils"
 )
 
 type StorageS3 struct {

diff --git a/storage/storage.go b/storage/storage.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/picosh/send/send/utils"
+	"github.com/picosh/send/utils"
 )
 
 type Bucket struct {
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ import ( @@
     	"os"
     	"time"
-    	"github.com/picosh/send/send/utils"
+    	"github.com/picosh/send/utils"
     )
     type Bucket struct {
@@ Expand Down @@