refactor(backend): move cmd_*.go to cmd packagev0.4.3

4 files changed, 16 insertions, 14 deletions

diff --git a/backend/cmd_createuser.go b/backend/cmd/createuser.go
index f953bf0..8c776a7 100644
--- a/backend/cmd_createuser.go
+++ b/backend/cmd/createuser.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"bufio"
@@ -14,7 +14,7 @@ import (
 	"undef.ninja/x/feedaka/db"
 )
 
-func runCreateUser(database *sql.DB) {
+func RunCreateUser(database *sql.DB) {
 	queries := db.New(database)
 	reader := bufio.NewReader(os.Stdin)
 
diff --git a/backend/cmd_migrate.go b/backend/cmd/migrate.go
index 1a2f9f6..26804e7 100644
--- a/backend/cmd_migrate.go
+++ b/backend/cmd/migrate.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"database/sql"
@@ -7,7 +7,7 @@ import (
 	"undef.ninja/x/feedaka/db"
 )
 
-func runMigrate(database *sql.DB) {
+func RunMigrate(database *sql.DB) {
 	log.Println("Running database migrations...")
 	err := db.RunMigrations(database)
 	if err != nil {
diff --git a/backend/cmd_serve.go b/backend/cmd/serve.go
index f7b99ca..28b1282 100644
--- a/backend/cmd_serve.go
+++ b/backend/cmd/serve.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"context"
@@ -30,11 +30,6 @@ import (
 	"undef.ninja/x/feedaka/graphql/resolver"
 )
 
-var (
-	//go:embed public/*
-	publicFS embed.FS
-)
-
 func fetchOneFeed(feedID int64, url string, ctx context.Context, queries *db.Queries) error {
 	log.Printf("Fetching %s...\n", url)
 	fp := gofeed.NewParser()
@@ -139,7 +134,7 @@ func scheduled(ctx context.Context, d time.Duration, fn func()) {
 	}()
 }
 
-func runServe(database *sql.DB, cfg *config.Config) {
+func RunServe(database *sql.DB, cfg *config.Config, publicFS embed.FS) {
 	err := db.ValidateSchemaVersion(database)
 	if err != nil {
 		log.Fatal(err)
diff --git a/backend/main.go b/backend/main.go
index e392a33..1d09685 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -2,17 +2,24 @@ package main
 
 import (
 	"database/sql"
+	"embed"
 	"flag"
 	"log"
 
 	_ "github.com/mattn/go-sqlite3"
 
+	"undef.ninja/x/feedaka/cmd"
 	"undef.ninja/x/feedaka/config"
 )
 
 //go:generate go tool sqlc generate
 //go:generate go tool gqlgen generate
 
+var (
+	//go:embed public/*
+	publicFS embed.FS
+)
+
 func main() {
 	cfg, err := config.LoadConfig()
 	if err != nil {
@@ -30,10 +37,10 @@ func main() {
 	defer database.Close()
 
 	if *migrate {
-		runMigrate(database)
+		cmd.RunMigrate(database)
 	} else if *createUser {
-		runCreateUser(database)
+		cmd.RunCreateUser(database)
 	} else {
-		runServe(database, cfg)
+		cmd.RunServe(database, cfg, publicFS)
 	}
 }