working commit

cmd/mbasedump/dump.go

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
+ */
+package main
+
+import (
+	"context"
+	"os"
+
+	"mbase/app/config"
+	"mbase/app/maindb"
+	"mbase/pkg/descr"
+	"mbase/pkg/auxtool"
+
+	"github.com/spf13/cobra"
+	"go.yaml.in/yaml/v4"
+)
+
+func (util *Util) DumpDatabase(cmd *cobra.Command, args []string) {
+	util.dumpDatabaseParams.Filename = args[0]
+	res, err := util.dumpDatabase(util.dumpDatabaseParams)
+	printResponse(res, err)
+}
+
+type dumpDatabaseParams struct {
+	Filename string
+}
+type dumpDatabaseResult struct{}
+
+func (util *Util) dumpDatabase(params dumpDatabaseParams) (dumpDatabaseResult, error) {
+	var err error
+	res := dumpDatabaseResult{}
+	ctx := context.Background()
+
+	conf := config.NewConfig()
+	err = conf.ReadFile()
+	if err != nil {
+		return res, err
+	}
+	err = conf.ReadEnv()
+	if err != nil {
+		return res, err
+	}
+	db, err := maindb.NewDatabase(conf.DataDir)
+	if err != nil {
+		return res, err
+	}
+	err = db.OpenDatabase()
+	if err != nil {
+		return res, err
+	}
+	file := os.Stdout
+	if params.Filename != "-" {
+		file, err = os.OpenFile(params.Filename, os.O_CREATE|os.O_WRONLY, 0640)
+		if err != nil {
+			return res, err
+		}
+		defer file.Close()
+	}
+	listAccounts, err := db.CompletedListAccounts(ctx)
+	if err != nil {
+		return res, err
+	}
+	listGrants, err := db.ListGrants(ctx)
+	if err != nil {
+		return res, err
+	}
+	dump := descr.Dump{
+		Timestamp: auxtool.TimeNow(),
+		Accounts:  listAccounts,
+		Grants:    listGrants,
+	}
+	dumpBytes, err := yaml.Marshal(dump)
+	if err != nil {
+		return res, err
+	}
+	_, err = file.Write(dumpBytes)
+	if err != nil {
+		return res, err
+	}
+	return res, err
+}
+

cmd/mbasedump/rest.go

@@ -0,0 +1,96 @@
+/*
+ * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
+ */
+package main
+
+import (
+	"bytes"
+	"context"
+	"io"
+	"os"
+
+	"mbase/app/config"
+	"mbase/app/maindb"
+	"mbase/pkg/descr"
+	"mbase/pkg/logger"
+
+	"github.com/spf13/cobra"
+	"go.yaml.in/yaml/v4"
+)
+
+func (util *Util) RestoreDatabase(cmd *cobra.Command, args []string) {
+	util.restoreDatabaseParams.Filename = args[0]
+	res, err := util.restoreDatabase(util.restoreDatabaseParams)
+	printResponse(res, err)
+}
+
+type restoreDatabaseParams struct {
+	Filename         string
+	DeleteAllRecords bool
+}
+type restoreDatabaseResult struct{}
+
+func (util *Util) restoreDatabase(params restoreDatabaseParams) (restoreDatabaseResult, error) {
+	var err error
+	res := restoreDatabaseResult{}
+	ctx := context.Background()
+	log := logger.NewLogger("restore")
+
+	conf := config.NewConfig()
+	err = conf.ReadFile()
+	if err != nil {
+		return res, err
+	}
+	err = conf.ReadEnv()
+	if err != nil {
+		return res, err
+	}
+
+	db, err := maindb.NewDatabase(conf.DataDir)
+	if err != nil {
+		return res, err
+	}
+	err = db.OpenDatabase()
+	if err != nil {
+		return res, err
+	}
+	file := os.Stdin
+	if params.Filename != "-" {
+		file, err = os.Open(params.Filename)
+		if err != nil {
+			return res, err
+		}
+		defer file.Close()
+	}
+	buffer := bytes.NewBuffer(nil)
+	_, err = io.Copy(buffer, file)
+	if err != nil {
+		return res, err
+	}
+	dump := descr.Dump{}
+	err = yaml.Unmarshal(buffer.Bytes(), &dump)
+	if err != nil {
+		return res, err
+	}
+	if params.DeleteAllRecords {
+		err = db.CleanDatabase(ctx)
+		if err != nil {
+			return res, err
+		}
+	}
+	for _, account := range dump.Accounts {
+		log.Infof("Insert account %s", account.Username)
+		err = db.InsertAccount(ctx, &account)
+		if err != nil {
+			log.Errorf("Insert account error: %v", err)
+		}
+	}
+	for _, grant := range dump.Grants {
+		log.Infof("Insert grant %s for account %d", grant.Operation, grant.AccountID)
+		err = db.InsertGrant(ctx, &grant)
+		if err != nil {
+			log.Errorf("Insert account error: %v", err)
+		}
+	}
+	return res, err
+}

cmd/mbasedump/util.go

@@ -4,20 +4,10 @@
 package main
 
 import (
-	"bytes"
-	"context"
-	"io"
 	"os"
 	"path/filepath"
 
-	"mbase/app/config"
-	"mbase/app/maindb"
-	"mbase/app/descr"
-	"mbase/pkg/auxtool"
-	"mbase/pkg/logger"
-
 	"github.com/spf13/cobra"
-	"go.yaml.in/yaml/v4"
 )
 
 type Util struct {
@@ -72,144 +62,3 @@ func (util *Util) Exec(args []string) error {
 	return err
 }
 
-func (util *Util) DumpDatabase(cmd *cobra.Command, args []string) {
-	util.dumpDatabaseParams.Filename = args[0]
-	res, err := util.dumpDatabase(util.dumpDatabaseParams)
-	printResponse(res, err)
-}
-
-type dumpDatabaseParams struct {
-	Filename string
-}
-type dumpDatabaseResult struct{}
-
-func (util *Util) dumpDatabase(params dumpDatabaseParams) (dumpDatabaseResult, error) {
-	var err error
-	res := dumpDatabaseResult{}
-	ctx := context.Background()
-
-	conf := config.NewConfig()
-	err = conf.ReadFile()
-	if err != nil {
-		return res, err
-	}
-	err = conf.ReadEnv()
-	if err != nil {
-		return res, err
-	}
-	db, err := maindb.NewDatabase(conf.DataDir)
-	if err != nil {
-		return res, err
-	}
-	err = db.OpenDatabase()
-	if err != nil {
-		return res, err
-	}
-	file := os.Stdout
-	if params.Filename != "-" {
-		file, err = os.OpenFile(params.Filename, os.O_CREATE|os.O_WRONLY, 0640)
-		if err != nil {
-			return res, err
-		}
-		defer file.Close()
-	}
-	listAccounts, err := db.CompletedListAccounts(ctx)
-	if err != nil {
-		return res, err
-	}
-	listGrants, err := db.ListGrants(ctx)
-	if err != nil {
-		return res, err
-	}
-	dump := descr.Dump{
-		Timestamp: auxtool.TimeNow(),
-		Accounts:  listAccounts,
-		Grants:    listGrants,
-	}
-	dumpBytes, err := yaml.Marshal(dump)
-	if err != nil {
-		return res, err
-	}
-	_, err = file.Write(dumpBytes)
-	if err != nil {
-		return res, err
-	}
-	return res, err
-}
-
-func (util *Util) RestoreDatabase(cmd *cobra.Command, args []string) {
-	util.restoreDatabaseParams.Filename = args[0]
-	res, err := util.restoreDatabase(util.restoreDatabaseParams)
-	printResponse(res, err)
-}
-
-type restoreDatabaseParams struct {
-	Filename         string
-	DeleteAllRecords bool
-}
-type restoreDatabaseResult struct{}
-
-func (util *Util) restoreDatabase(params restoreDatabaseParams) (restoreDatabaseResult, error) {
-	var err error
-	res := restoreDatabaseResult{}
-	ctx := context.Background()
-	log := logger.NewLogger("restore")
-
-	conf := config.NewConfig()
-	err = conf.ReadFile()
-	if err != nil {
-		return res, err
-	}
-	err = conf.ReadEnv()
-	if err != nil {
-		return res, err
-	}
-
-	db, err := maindb.NewDatabase(conf.DataDir)
-	if err != nil {
-		return res, err
-	}
-	err = db.OpenDatabase()
-	if err != nil {
-		return res, err
-	}
-	file := os.Stdin
-	if params.Filename != "-" {
-		file, err = os.Open(params.Filename)
-		if err != nil {
-			return res, err
-		}
-		defer file.Close()
-	}
-	buffer := bytes.NewBuffer(nil)
-	_, err = io.Copy(buffer, file)
-	if err != nil {
-		return res, err
-	}
-	dump := descr.Dump{}
-	err = yaml.Unmarshal(buffer.Bytes(), &dump)
-	if err != nil {
-		return res, err
-	}
-	if params.DeleteAllRecords {
-		err = db.CleanDatabase(ctx)
-		if err != nil {
-			return res, err
-		}
-	}
-	for _, account := range dump.Accounts {
-		log.Infof("Insert account %s", account.Username)
-		err = db.InsertAccount(ctx, &account)
-		if err != nil {
-			log.Errorf("Insert account error: %v", err)
-		}
-	}
-	for _, grant := range dump.Grants {
-		log.Infof("Insert grant %s for account %d", grant.Operation, grant.AccountID)
-		err = db.InsertGrant(ctx, &grant)
-		if err != nil {
-			log.Errorf("Insert account error: %v", err)
-		}
-	}
-	return res, err
-}