feat: 完成了 file list 右键简单菜单
feat: 完成了 file 下载 todo: 桶右键菜单和删除桶
This commit is contained in:
loveuer
zhaoyupeng
@ -25,6 +25,7 @@ func Resolve(path string) (ndh.Handler, bool) {
|
||||
|
||||
func Init(ctx context.Context) error {
|
||||
register("/runtime/dialog/open", handler.DialogOpen(ctx))
|
||||
register("/runtime/dialog/save", handler.DialogSave(ctx))
|
||||
register("/api/connection/test", handler.ConnectionTest)
|
||||
register("/api/connection/create", handler.ConnectionCreate)
|
||||
register("/api/connection/list", handler.ConnectionList)
|
||||
@ -34,6 +35,9 @@ func Init(ctx context.Context) error {
|
||||
register("/api/bucket/files", handler.BucketFiles)
|
||||
register("/api/bucket/create", handler.BucketCreate)
|
||||
register("/api/file/upload", handler.FileUpload)
|
||||
register("/api/file/info", handler.FileInfo)
|
||||
register("/api/file/get", handler.FileGet)
|
||||
register("/api/file/download", handler.FileDownload)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -5,6 +5,8 @@ import (
|
||||
"github.com/loveuer/nf-disk/ndh"
|
||||
"github.com/samber/lo"
|
||||
"github.com/wailsapp/wails/v2/pkg/runtime"
|
||||
"os"
|
||||
"path/filepath"
|
||||
)
|
||||
|
||||
func DialogOpen(ctx context.Context) ndh.Handler {
|
||||
@ -54,3 +56,58 @@ func DialogOpen(ctx context.Context) ndh.Handler {
|
||||
return c.Send200(map[string]interface{}{"result": result})
|
||||
}
|
||||
}
|
||||
|
||||
func DialogSave(ctx context.Context) ndh.Handler {
|
||||
return func(c *ndh.Ctx) error {
|
||||
type Req struct {
|
||||
Title string `json:"title"`
|
||||
Filters []string `json:"filters"`
|
||||
DefaultDirectory string `json:"default_directory"`
|
||||
DefaultFilename string `json:"default_filename"`
|
||||
}
|
||||
|
||||
var (
|
||||
err error
|
||||
req = new(Req)
|
||||
opt = runtime.SaveDialogOptions{
|
||||
Title: "将文件保存到",
|
||||
}
|
||||
result any
|
||||
)
|
||||
|
||||
if err = c.ReqParse(req); err != nil {
|
||||
return c.Send400(err.Error())
|
||||
}
|
||||
|
||||
if req.Title != "" {
|
||||
opt.Title = req.Title
|
||||
}
|
||||
|
||||
if req.DefaultFilename != "" {
|
||||
opt.DefaultFilename = req.DefaultFilename
|
||||
}
|
||||
|
||||
if req.DefaultDirectory != "" {
|
||||
opt.DefaultDirectory = req.DefaultDirectory
|
||||
}
|
||||
|
||||
if opt.DefaultDirectory == "" {
|
||||
var home string
|
||||
if home, err = os.UserHomeDir(); err != nil {
|
||||
opt.DefaultDirectory = filepath.Join(home, "Downloads")
|
||||
}
|
||||
}
|
||||
|
||||
if len(req.Filters) > 0 {
|
||||
opt.Filters = lo.Map(req.Filters, func(item string, index int) runtime.FileFilter {
|
||||
return runtime.FileFilter{Pattern: item}
|
||||
})
|
||||
}
|
||||
|
||||
if result, err = runtime.SaveFileDialog(ctx, opt); err != nil {
|
||||
return c.Send500(err.Error())
|
||||
}
|
||||
|
||||
return c.Send200(map[string]interface{}{"result": result})
|
||||
}
|
||||
}
|
||||
|
||||
@ -86,3 +86,100 @@ func FileUpload(c *ndh.Ctx) error {
|
||||
|
||||
return c.Send200(req)
|
||||
}
|
||||
|
||||
func FileInfo(c *ndh.Ctx) error {
|
||||
type Req struct {
|
||||
ConnId uint64 `json:"conn_id"`
|
||||
Bucket string `json:"bucket"`
|
||||
Key string `json:"key"`
|
||||
}
|
||||
|
||||
var (
|
||||
err error
|
||||
req = new(Req)
|
||||
client *s3.Client
|
||||
info *s3.ObjectInfo
|
||||
)
|
||||
|
||||
if err = c.ReqParse(req); err != nil {
|
||||
return c.Send400(err.Error())
|
||||
}
|
||||
|
||||
if _, client, err = manager.Manager.Use(req.ConnId); err != nil {
|
||||
return c.Send500(err.Error())
|
||||
}
|
||||
|
||||
if info, err = client.GetObjectInfo(c.Context(), req.Bucket, req.Key); err != nil {
|
||||
return c.Send500(err.Error())
|
||||
}
|
||||
|
||||
return c.Send200(info)
|
||||
}
|
||||
|
||||
func FileGet(c *ndh.Ctx) error {
|
||||
type Req struct {
|
||||
ConnId uint64 `json:"conn_id"`
|
||||
Bucket string `json:"bucket"`
|
||||
Key string `json:"key"`
|
||||
}
|
||||
|
||||
var (
|
||||
err error
|
||||
req = new(Req)
|
||||
client *s3.Client
|
||||
link *s3.ObjectEntry
|
||||
)
|
||||
|
||||
if err = c.ReqParse(req); err != nil {
|
||||
return c.Send400(err.Error())
|
||||
}
|
||||
|
||||
if _, client, err = manager.Manager.Use(req.ConnId); err != nil {
|
||||
return c.Send500(err.Error())
|
||||
}
|
||||
|
||||
if link, err = client.GetObjectEntry(c.Context(), req.Bucket, req.Key); err != nil {
|
||||
return c.Send500(err.Error())
|
||||
}
|
||||
|
||||
return c.Send200(link)
|
||||
}
|
||||
|
||||
func FileDownload(c *ndh.Ctx) error {
|
||||
type Req struct {
|
||||
ConnId uint64 `json:"conn_id"`
|
||||
Bucket string `json:"bucket"`
|
||||
Key string `json:"key"`
|
||||
Location string `json:"location"`
|
||||
}
|
||||
|
||||
var (
|
||||
err error
|
||||
req = new(Req)
|
||||
client *s3.Client
|
||||
obj *s3.ObjectEntity
|
||||
target *os.File
|
||||
)
|
||||
|
||||
if err = c.ReqParse(req); err != nil {
|
||||
return c.Send400(err.Error())
|
||||
}
|
||||
|
||||
if _, client, err = manager.Manager.Use(req.ConnId); err != nil {
|
||||
return c.Send500(err.Error())
|
||||
}
|
||||
|
||||
if obj, err = client.GetObject(c.Context(), req.Bucket, req.Key); err != nil {
|
||||
return c.Send500(err.Error())
|
||||
}
|
||||
|
||||
if target, err = os.OpenFile(filepath.Clean(req.Location), os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0644); err != nil {
|
||||
return c.Send500(err.Error())
|
||||
}
|
||||
|
||||
if _, err = io.Copy(target, obj.Body); err != nil {
|
||||
return c.Send500(err.Error())
|
||||
}
|
||||
|
||||
return c.Send200(req)
|
||||
}
|
||||
|
||||
121
internal/s3/get.go
Normal file
121
internal/s3/get.go
Normal file
@ -0,0 +1,121 @@
|
||||
package s3
|
||||
|
||||
import (
|
||||
"context"
|
||||
"github.com/aws/aws-sdk-go-v2/aws"
|
||||
v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4"
|
||||
"github.com/aws/aws-sdk-go-v2/service/s3"
|
||||
"github.com/labstack/gommon/log"
|
||||
"io"
|
||||
"net/http"
|
||||
"time"
|
||||
)
|
||||
|
||||
type ObjectInfo struct {
|
||||
Bucket string
|
||||
Key string
|
||||
ContentType string
|
||||
Expire int64
|
||||
}
|
||||
|
||||
func (c *Client) GetObjectInfo(ctx context.Context, bucket string, key string) (*ObjectInfo, error) {
|
||||
var (
|
||||
err error
|
||||
input = &s3.HeadObjectInput{
|
||||
Bucket: aws.String(bucket),
|
||||
Key: aws.String(key),
|
||||
}
|
||||
output *s3.HeadObjectOutput
|
||||
)
|
||||
|
||||
if output, err = c.client.HeadObject(ctx, input); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &ObjectInfo{
|
||||
Bucket: bucket,
|
||||
Key: key,
|
||||
ContentType: aws.ToString(output.ContentType),
|
||||
Expire: aws.ToTime(output.Expires).UnixMilli(),
|
||||
}, nil
|
||||
}
|
||||
|
||||
// GetObject
|
||||
// https://docs.aws.amazon.com/AmazonS3/latest/userguide/example_s3_Scenario_PresignedUrl_section.html
|
||||
|
||||
type Presigner struct {
|
||||
PresignClient *s3.PresignClient
|
||||
}
|
||||
|
||||
func (presigner *Presigner) GetObject(ctx context.Context, bucketName string, objectKey string, lifetimeSecs int64) (*v4.PresignedHTTPRequest, error) {
|
||||
request, err := presigner.PresignClient.PresignGetObject(ctx, &s3.GetObjectInput{
|
||||
Bucket: aws.String(bucketName),
|
||||
Key: aws.String(objectKey),
|
||||
}, func(opts *s3.PresignOptions) {
|
||||
opts.Expires = time.Duration(lifetimeSecs * int64(time.Second))
|
||||
})
|
||||
if err != nil {
|
||||
log.Error("Presigner: couldn't get a presigned request to get %v:%v. Here's why: %v\n",
|
||||
bucketName, objectKey, err)
|
||||
}
|
||||
return request, err
|
||||
}
|
||||
|
||||
type ObjectEntry struct {
|
||||
URL string
|
||||
Method string
|
||||
Header http.Header
|
||||
}
|
||||
|
||||
func (c *Client) GetObjectEntry(ctx context.Context, bucket string, key string, lifetimes ...int64) (*ObjectEntry, error) {
|
||||
var (
|
||||
err error
|
||||
lifetime int64 = 5 * 60
|
||||
pc = &Presigner{PresignClient: s3.NewPresignClient(c.client)}
|
||||
output *v4.PresignedHTTPRequest
|
||||
)
|
||||
|
||||
if len(lifetimes) > 0 && lifetimes[0] > 0 {
|
||||
lifetime = lifetimes[0]
|
||||
}
|
||||
|
||||
if output, err = pc.GetObject(ctx, bucket, key, lifetime); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &ObjectEntry{
|
||||
URL: output.URL,
|
||||
Method: output.Method,
|
||||
Header: output.SignedHeader,
|
||||
}, nil
|
||||
}
|
||||
|
||||
type ObjectEntity struct {
|
||||
ObjectInfo
|
||||
Body io.ReadCloser
|
||||
}
|
||||
|
||||
func (c *Client) GetObject(ctx context.Context, bucket string, key string) (*ObjectEntity, error) {
|
||||
var (
|
||||
err error
|
||||
input = &s3.GetObjectInput{
|
||||
Bucket: aws.String(bucket),
|
||||
Key: aws.String(key),
|
||||
}
|
||||
output *s3.GetObjectOutput
|
||||
)
|
||||
|
||||
if output, err = c.client.GetObject(ctx, input); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &ObjectEntity{
|
||||
ObjectInfo: ObjectInfo{
|
||||
Bucket: bucket,
|
||||
Key: key,
|
||||
ContentType: aws.ToString(output.ContentType),
|
||||
Expire: aws.ToTime(output.Expires).UnixMilli(),
|
||||
},
|
||||
Body: output.Body,
|
||||
}, nil
|
||||
}
|
||||
Reference in New Issue
Block a user