commands: open and close the backend in a single place, simplify commands

1 files changed, 5 insertions, 13 deletions

diff --git a/commands/comment.go b/commands/comment.go
index 82e7d9f6..e81405a6 100644
--- a/commands/comment.go
+++ b/commands/comment.go
@@ -4,19 +4,18 @@ import (
 	text "github.com/MichaelMure/go-term-text"
 	"github.com/spf13/cobra"
 
-	"github.com/MichaelMure/git-bug/cache"
 	"github.com/MichaelMure/git-bug/commands/select"
 	"github.com/MichaelMure/git-bug/util/colors"
-	"github.com/MichaelMure/git-bug/util/interrupt"
 )
 
 func newCommentCommand() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:     "comment [<id>]",
-		Short:   "Display or add comments to a bug.",
-		PreRunE: loadRepo(env),
+		Use:      "comment [<id>]",
+		Short:    "Display or add comments to a bug.",
+		PreRunE:  loadBackend(env),
+		PostRunE: closeBackend(env),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runComment(env, args)
 		},
@@ -28,14 +27,7 @@ func newCommentCommand() *cobra.Command {
 }
 
 func runComment(env *Env, args []string) error {
-	backend, err := cache.NewRepoCache(env.repo)
-	if err != nil {
-		return err
-	}
-	defer backend.Close()
-	interrupt.RegisterCleaner(backend.Close)
-
-	b, args, err := _select.ResolveBug(backend, args)
+	b, args, err := _select.ResolveBug(env.backend, args)
 	if err != nil {
 		return err
 	}