feat: 完成了连接, 断开连接
update: 慢慢过渡到 css-in-js refactory: 新建连接改为 dialog wip: 没找到合适和适应的状态管理方便全局状态管理
This commit is contained in:
@ -1,13 +1,13 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"github.com/loveuer/nf-disk/internal/db"
|
||||
"github.com/loveuer/nf-disk/internal/manager"
|
||||
"github.com/loveuer/nf-disk/internal/model"
|
||||
"github.com/loveuer/nf-disk/internal/s3"
|
||||
"github.com/loveuer/nf-disk/ndh"
|
||||
"github.com/pkg/errors"
|
||||
"gorm.io/gorm"
|
||||
"github.com/samber/lo"
|
||||
)
|
||||
|
||||
func ConnectionTest(c *ndh.Ctx) error {
|
||||
@ -80,7 +80,7 @@ func ConnectionCreate(c *ndh.Ctx) error {
|
||||
return c.Send500(err.Error(), "创建连接失败(1)")
|
||||
}
|
||||
|
||||
if err = manager.Register(connection, client); err != nil {
|
||||
if err = manager.Manager.Register(connection, client); err != nil {
|
||||
return c.Send500(err.Error(), "创建连接失败(2)")
|
||||
}
|
||||
|
||||
@ -108,6 +108,18 @@ func ConnectionList(c *ndh.Ctx) error {
|
||||
return err
|
||||
}
|
||||
|
||||
listMap := lo.SliceToMap(list, func(item *model.Connection) (uint64, *model.Connection) {
|
||||
return item.Id, item
|
||||
})
|
||||
|
||||
manager.Manager.Map(func(c *model.Connection, s *s3.Client) error {
|
||||
if item, ok := listMap[c.Id]; ok {
|
||||
item.Active = true
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
|
||||
return c.Send200(map[string]any{"list": list})
|
||||
}
|
||||
|
||||
@ -119,27 +131,49 @@ func ConnectionConnect(c *ndh.Ctx) error {
|
||||
var (
|
||||
err error
|
||||
req = new(Req)
|
||||
conn = new(model.Connection)
|
||||
client *s3.Client
|
||||
)
|
||||
|
||||
if err = c.ReqParse(req); err != nil {
|
||||
return c.Send400(nil, "参数错误")
|
||||
return c.Send400(req)
|
||||
}
|
||||
|
||||
if err = db.Default.Session().Take(conn, req.Id).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return c.Send400(c, "不存在的连接")
|
||||
}
|
||||
|
||||
return c.Send500(nil)
|
||||
conn := &model.Connection{Id: req.Id}
|
||||
if err = conn.Get(db.Default.Session(), c); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if client, err = s3.New(c.Context(), conn.Endpoint, conn.Access, conn.Key); err != nil {
|
||||
return c.Send500(err.Error())
|
||||
return c.Send500(err.Error(), "连接失败")
|
||||
}
|
||||
|
||||
if err = manager.Register(conn, client); err != nil {
|
||||
if err = manager.Manager.Register(conn, client); err != nil {
|
||||
return c.Send500(err.Error(), "连接失败")
|
||||
}
|
||||
|
||||
return c.Send200(conn, "连接成功")
|
||||
}
|
||||
|
||||
func ConnectionDisconnect(c *ndh.Ctx) error {
|
||||
type Req struct {
|
||||
Id uint64 `json:"id"`
|
||||
}
|
||||
|
||||
var (
|
||||
err error
|
||||
req = new(Req)
|
||||
)
|
||||
|
||||
if err = c.ReqParse(req); err != nil {
|
||||
return c.Send400(req)
|
||||
}
|
||||
|
||||
conn := &model.Connection{Id: req.Id}
|
||||
if err = conn.Get(db.Default.Session(), c); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err = manager.Manager.UnRegister(conn.Id); err != nil {
|
||||
return c.Send500(err.Error())
|
||||
}
|
||||
|
||||
@ -153,13 +187,27 @@ func ConnectionBuckets(c *ndh.Ctx) error {
|
||||
}
|
||||
|
||||
var (
|
||||
err error
|
||||
req = new(Req)
|
||||
err error
|
||||
req = new(Req)
|
||||
client *s3.Client
|
||||
buckets []*s3.ListBucketRes
|
||||
)
|
||||
|
||||
if err = c.ReqParse(req); err != nil {
|
||||
return c.Send400(nil, "参数错误")
|
||||
}
|
||||
|
||||
panic("implement me: ConnectionBuckets")
|
||||
if _, client, err = manager.Manager.Use(req.Id); err != nil {
|
||||
if errors.Is(err, manager.ErrNotFound) {
|
||||
return c.Send400(nil, "所选连接未激活")
|
||||
}
|
||||
|
||||
return c.Send500(err.Error())
|
||||
}
|
||||
|
||||
if buckets, err = client.ListBucket(c.Context()); err != nil {
|
||||
return c.Send500(err.Error())
|
||||
}
|
||||
|
||||
return c.Send200(map[string]any{"list": buckets})
|
||||
}
|
||||
|
21
internal/handler/item.go
Normal file
21
internal/handler/item.go
Normal file
@ -0,0 +1,21 @@
|
||||
package handler
|
||||
|
||||
import "github.com/loveuer/nf-disk/ndh"
|
||||
|
||||
func ListItem(c *ndh.Ctx) error {
|
||||
type Req struct {
|
||||
Id uint64 `json:"id"`
|
||||
Bucket string `json:"bucket"`
|
||||
}
|
||||
|
||||
var (
|
||||
err error
|
||||
req = new(Req)
|
||||
)
|
||||
|
||||
if err = c.ReqParse(req); err != nil {
|
||||
return c.Send400(err.Error())
|
||||
}
|
||||
|
||||
panic("implement me!!!")
|
||||
}
|
Reference in New Issue
Block a user