2a0f007 · crush · git.iko.soy

chore: pass datadir to db

commit2a0f007d41faccd3f31b3375e2f18f1d384a75f8 authorKujtim Hoxha <kujtimii.h@gmail.com> dateSat 5 Jul 2025, 17:29 (1 year ago) parentfc065de

2 files changed+3−6

unifiedsplit

cmd/root.go+2−2

@@ -76,7 +76,7 @@ to assist developers in writing, debugging, and understanding code directly from

7676 cwd = c

7777 }

7878

79− _, err := config.Init(cwd, debug)

79+ cfg, err := config.Init(cwd, debug)

8080 if err != nil {

8181 return err

8282 }

@@ -86,7 +86,7 @@ to assist developers in writing, debugging, and understanding code directly from

8686 defer cancel()

8787

8888 // Connect DB, this will also run migrations

89− conn, err := db.Connect(ctx)

89+ conn, err := db.Connect(ctx, cfg.Options.DataDirectory)

9090 if err != nil {

9191 return err

9292 }

internal/db/connect.go+1−4

@@ -11,13 +11,10 @@ import (

1111 _ "github.com/ncruces/go-sqlite3/driver"

1212 _ "github.com/ncruces/go-sqlite3/embed"

1313

14− "github.com/charmbracelet/crush/internal/config"

15−

1614 "github.com/pressly/goose/v3"

1715)

1816

19−func Connect(ctx context.Context) (*sql.DB, error) {

20− dataDir := config.Get().Options.DataDirectory

17+func Connect(ctx context.Context, dataDir string) (*sql.DB, error) {

2118 if dataDir == "" {

2219 return nil, fmt.Errorf("data.dir is not set")

2320 }