code.ivysaur.me/yvbolt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

db: return error from contextAction.Callback (2)

Browse Source
This commit is contained in:
mappu 2024-07-14 15:28:18 +12:00
parent 1ac96eb133
commit 8f5e1054fb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db_bolt.go
View File

@ -151,7 +151,7 @@ func (ld *boltLoadedDatabase) NavContext(ndata *navData) (ret []contextAction, e
return return
} }
func (ld *boltLoadedDatabase) AddChildBucket(ndata *navData) error { func (ld *boltLoadedDatabase) AddChildBucket(sender vcl.IComponent, ndata *navData) error {
bucketName := "" bucketName := ""
if !vcl.InputQuery(APPNAME, "Enter a name for the new bucket:", &bucketName) { if !vcl.InputQuery(APPNAME, "Enter a name for the new bucket:", &bucketName) {
return nil // cancel return nil // cancel
@ -174,7 +174,7 @@ func (ld *boltLoadedDatabase) AddChildBucket(ndata *navData) error {
return nil return nil
} }
func (ld *boltLoadedDatabase) DeleteBucket(ndata *navData) error { func (ld *boltLoadedDatabase) DeleteBucket(sender vcl.IComponent, ndata *navData) error {
err := ld.db.Update(func(tx *bbolt.Tx) error { err := ld.db.Update(func(tx *bbolt.Tx) error {
// Find parent of this bucket. // Find parent of this bucket.
if len(ndata.bucketPath) >= 2 { if len(ndata.bucketPath) >= 2 {

2
loadedDatabase.go
View File

@ -11,7 +11,7 @@ var ErrNotSupported error = errors.New("Unsupported action for this database typ
type contextAction struct { type contextAction struct {
Name string Name string
Callback func(ndata *navData) error Callback func(sender vcl.IComponent, ndata *navData) error
} }
// loadedDatabase is a DB-agnostic interface for each loaded database. // loadedDatabase is a DB-agnostic interface for each loaded database.

2
main.go
View File

@ -507,7 +507,7 @@ func (f *TMainForm) OnNavContextPopup(sender vcl.IObject, mousePos types.TPoint,
mnuAction.SetCaption(action.Name) mnuAction.SetCaption(action.Name)
cb := action.Callback // Copy to avoid reuse of loop variable cb := action.Callback // Copy to avoid reuse of loop variable
mnuAction.SetOnClick(func(sender vcl.IObject) { mnuAction.SetOnClick(func(sender vcl.IObject) {
err = cb(ndata) err = cb(f, ndata)
if err != nil { if err != nil {
vcl.ShowMessage(err.Error()) vcl.ShowMessage(err.Error())
} }