fix memory & extra log & prompt prefix

Sora233 · Jan 10, 2021 · 2b54c6f · 2b54c6f
1 parent 797d985
commit 2b54c6f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/cli/executor.go b/cli/executor.go
@@ -41,7 +41,6 @@ func BuntdbExecutor(s string) {
 	}
 	tx, rw := db.GetCurrentTransaction()
 	if ctx.Selected().Name == "use" {
-		fmt.Printf("tx %v", tx)
 		err = ctx.Run(tx)
 		if err != nil {
 			fmt.Printf("ERR: %v\n", err)

diff --git a/cli/grammar.go b/cli/grammar.go
@@ -112,6 +112,9 @@ func (u *UseGrammar) Run(ctx *kong.Context, tx *buntdb.Tx) error {
 	if tx != nil {
 		return db.ErrTransactionExist
 	}
+	if u.Path == ":memory:" {
+		return db.InitBuntDB(u.Path)
+	}
 	f, err := os.Lstat(u.Path)
 	if err != nil {
 		if !os.IsNotExist(err) {

diff --git a/main.go b/main.go
@@ -38,9 +38,9 @@ func main() {
 		prompt.OptionLivePrefix(func() (prefix string, useLivePrefix bool) {
 			tx, rw := db.GetCurrentTransaction()
 			if tx != nil {
-				return path.Base(CLI.Path) + fmt.Sprintf("(%v)", db.RWDescribe(rw)) + "> ", true
+				return path.Base(db.GetDbPath()) + fmt.Sprintf("(%v)", db.RWDescribe(rw)) + "> ", true
 			} else {
-				return path.Base(CLI.Path) + "> ", true
+				return path.Base(db.GetDbPath()) + "> ", true
 			}
 		}),
 		prompt.OptionSetExitCheckerOnInput(func(in string, breakline bool) bool {