From 7c5d319043f6f6f3a68f1c9ca8f2064dcc894b0e Mon Sep 17 00:00:00 2001
From: Tueem <tueem@tomatentum.net>
Date: Mon, 9 Feb 2026 23:23:24 +0100
Subject: [PATCH] fix(database): move database file to storage dir

---
 cmd/svg-templater/main.go       |  9 ---------
 internal/command/commandline.go | 14 +++++++++++++-
 internal/database/database.go   |  5 +++--
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/cmd/svg-templater/main.go b/cmd/svg-templater/main.go
index 0eec781..e025df7 100644
--- a/cmd/svg-templater/main.go
+++ b/cmd/svg-templater/main.go
@@ -1,10 +1,7 @@
 package main
 
 import (
-	"log"
-
 	"tomatentum.net/svg-templater/internal/command"
-	"tomatentum.net/svg-templater/internal/database"
 	"tomatentum.net/svg-templater/pkg/format"
 )
 
@@ -12,12 +9,6 @@ func main() {
 	if !format.CheckInkscape() {
 		panic("Inkscape not found")
 	}
-	if err := database.OpenSQLite(); err != nil {
-		log.Fatal("Failed opening DB:\n", err)
-		return
-	}
-	defer database.Close()
-	database.InitDB()
 	command.PrepareCommandLine()
 	command.HandleCommandline()
 }
diff --git a/internal/command/commandline.go b/internal/command/commandline.go
index 768256d..609c076 100644
--- a/internal/command/commandline.go
+++ b/internal/command/commandline.go
@@ -2,7 +2,9 @@ package command
 
 import (
 	"flag"
+	"log"
 
+	"tomatentum.net/svg-templater/internal/database"
 	"tomatentum.net/svg-templater/internal/server"
 	"tomatentum.net/svg-templater/pkg/svg"
 )
@@ -23,6 +25,17 @@ func PrepareCommandLine() {
 
 func HandleCommandline() {
 	flag.Parse()
+
+	if !help {
+		svg.Storage = svg.NewFileStorage(datapath, "public")
+		if err := database.OpenSQLite(datapath); err != nil {
+			log.Fatal("Failed opening DB:\n", err)
+			return
+		}
+		database.InitDB()
+	}
+	defer database.Close()
+
 	if generateTokenFlag {
 		GenerateTokenCommand()
 	} else if deleteTokenFlag {
@@ -30,7 +43,6 @@ func HandleCommandline() {
 	} else if help {
 		flag.PrintDefaults()
 	} else {
-		svg.Storage = svg.NewFileStorage(datapath, "public")
 		server.PrepareHTTP()
 		server.Start()
 	}
diff --git a/internal/database/database.go b/internal/database/database.go
index 64bb0a1..03a4d12 100644
--- a/internal/database/database.go
+++ b/internal/database/database.go
@@ -3,6 +3,7 @@ package database
 import (
 	"database/sql"
 	"log"
+	"path/filepath"
 
 	_ "github.com/glebarez/go-sqlite"
 )
@@ -11,8 +12,8 @@ const FILENAME string = "storage.db"
 
 var database *sql.DB
 
-func OpenSQLite() error {
-	db, err := sql.Open("sqlite", FILENAME)
+func OpenSQLite(basepath string) error {
+	db, err := sql.Open("sqlite", filepath.Join(basepath, FILENAME))
 	if err != nil {
 		return err
 	}