cli can pass -db /path/to/sql.db

main
Bel LaPointe 2025-05-07 19:45:52 -06:00
parent 2f503497e9
commit 49064f1ea2
4 changed files with 31 additions and 5 deletions

View File

@ -2,6 +2,7 @@ package main
import ( import (
"context" "context"
"os"
"os/signal" "os/signal"
"show-rss/src/cmd" "show-rss/src/cmd"
"syscall" "syscall"
@ -17,7 +18,7 @@ func Main(ctx context.Context) error {
ctx, can := signal.NotifyContext(ctx, syscall.SIGINT) ctx, can := signal.NotifyContext(ctx, syscall.SIGINT)
defer can() defer can()
if err := cmd.Main(ctx); err != nil && ctx.Err() == nil { if err := cmd.Main(ctx, os.Args[1:]); err != nil && ctx.Err() == nil {
return err return err
} }

View File

@ -2,6 +2,8 @@ package main_test
import ( import (
"context" "context"
"os"
"path"
main "show-rss" main "show-rss"
"show-rss/src/db" "show-rss/src/db"
"testing" "testing"
@ -12,6 +14,8 @@ func TestMain(t *testing.T) {
ctx, can := context.WithTimeout(context.Background(), 2*time.Second) ctx, can := context.WithTimeout(context.Background(), 2*time.Second)
defer can() defer can()
os.Args = []string{os.Args[0], "-db", path.Join(t.TempDir(), "db.db")}
if err := main.Main(db.Test(t, ctx)); err != nil && ctx.Err() == nil { if err := main.Main(db.Test(t, ctx)); err != nil && ctx.Err() == nil {
t.Fatal(err) t.Fatal(err)
} }

View File

@ -2,12 +2,33 @@ package cmd
import ( import (
"context" "context"
"flag"
"os"
"show-rss/src/cleanup" "show-rss/src/cleanup"
"show-rss/src/db" "show-rss/src/db"
) )
func Config(ctx context.Context) (context.Context, func(), error) { type Flags struct {
ctx, err := db.Inject(ctx, "/tmp/f.db") DB string
}
func NewFlags(args []string) (Flags, error) {
var result Flags
fs := flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
fs.StringVar(&result.DB, "db", "/tmp/f.db", "path to sqlite.db")
err := fs.Parse(args)
return result, err
}
func Config(ctx context.Context, args []string) (context.Context, func(), error) {
flags, err := NewFlags(args)
if err != nil {
return ctx, nil, err
}
ctx, err = db.Inject(ctx, flags.DB)
if err != nil { if err != nil {
return ctx, nil, err return ctx, nil, err
} }

View File

@ -10,11 +10,11 @@ import (
"time" "time"
) )
func Main(ctx context.Context) error { func Main(ctx context.Context, args []string) error {
ctx, can := context.WithCancel(ctx) ctx, can := context.WithCancel(ctx)
defer can() defer can()
ctx, can, err := Config(ctx) ctx, can, err := Config(ctx, args)
if err != nil { if err != nil {
return fmt.Errorf("failed to inject: %w", err) return fmt.Errorf("failed to inject: %w", err)
} }