waveterm/backup
0
0
Fork 0
mirror of https://github.com/wavetermdev/backup.git synced 2026-08-05 13:57:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

merge branch 'main' into sylvie/preview-dir

Browse Source
This commit is contained in:
Sylvia Crowe
2024-05-21 13:49:49 -07:00
parent c8a8f108ba 0eeacecc06
commit 259bbf44db
25 changed files with 335 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/service/blockservice/blockservice.go
+4 -3
View File
@@ -9,17 +9,18 @@ import (
"github.com/wavetermdev/thenextwave/pkg/blockcontroller"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/wstore"
)
type BlockService struct{}
func (bs *BlockService) CreateBlock(bdefMap map[string]any, rtOptsMap map[string]any) (map[string]any, error) {
var bdef blockcontroller.BlockDef
var bdef wstore.BlockDef
err := utilfn.JsonMapToStruct(bdefMap, &bdef)
if err != nil {
return nil, fmt.Errorf("error unmarshalling BlockDef: %w", err)
}
var rtOpts blockcontroller.RuntimeOpts
var rtOpts wstore.RuntimeOpts
err = utilfn.JsonMapToStruct(rtOptsMap, &rtOpts)
if err != nil {
return nil, fmt.Errorf("error unmarshalling RuntimeOpts: %w", err)
@@ -40,7 +41,7 @@ func (bs *BlockService) CloseBlock(blockId string) {
}
func (bs *BlockService) GetBlockData(blockId string) (map[string]any, error) {
blockData := blockcontroller.GetBlockData(blockId)
blockData := wstore.BlockMap.Get(blockId)
if blockData == nil {
return nil, nil
}