galt #1

Merged
bartha.gabor merged 19 commits from galt into main 2025-10-20 08:06:40 +02:00
3 changed files with 70 additions and 7 deletions
Showing only changes of commit fd24695764 - Show all commits

View File

@@ -2,22 +2,48 @@ package main
import (
"database/sql"
"fmt"
"log"
"log/slog"
"os"
"path/filepath"
"strings"
_ "modernc.org/sqlite"
)
// Create new sqlite database
// If filepath parameter is empty
func NewDatabaseConnection(dataDir string, dbName string) (*sql.DB, error) {
var dbFilePath string
if dbName == "" {
dbFilePath = filepath.Join(dataDir, "app.db")
} else {
dbFilePath = filepath.Join(dataDir, filepath.Base(dbName))
}
db, err := sql.Open("sqlite", dbFilePath)
if err != nil {
return nil, fmt.Errorf("database open error: %w", err)
}
if err := db.Ping(); err != nil {
return nil, fmt.Errorf("database connection error: %w", err)
}
return db, nil
}
// database
//
// Manage database connection to ./app.db
// Handles CRUD
func database() *sql.DB {
db, err := sql.Open("sqlite", "./app.db")
if err != nil {
log.Fatal(err)
func database(db *sql.DB) *sql.DB {
if db == nil {
slog.Error("No connection to the database!")
os.Exit(1)
}
// Seed default menu items if empty
row := db.QueryRow("SELECT COUNT(*) FROM menu_items")
var count int
@@ -65,7 +91,7 @@ func database() *sql.DB {
}
// Create users table
_, err = db.Exec(`
_, err := db.Exec(`
CREATE TABLE IF NOT EXISTS users (
id INTEGER PRIMARY KEY AUTOINCREMENT,
username TEXT NOT NULL UNIQUE,

View File

@@ -36,7 +36,20 @@ func main() {
os.Exit(1)
}
db := database()
// Setup data directory
dataDir, err := setupDataDir()
if err != nil {
slog.Error("Cannot set data directory: %s; %w", os.Getenv("DATA_DIR"), err)
os.Exit(1)
}
// Setup database connection
dbConnection, err := NewDatabaseConnection(dataDir, "app.db")
if err != nil {
slog.Error("Databse error", "error", err)
os.Exit(1)
}
db := database(dbConnection)
defer db.Close()
// Create App

24
backend/setup_data_dir.go Normal file
View File

@@ -0,0 +1,24 @@
package main
import (
"fmt"
"os"
"path/filepath"
)
func setupDataDir() (string, error) {
var dataDir string
if os.Getenv("DATA_DIR") == "" {
dataDir = filepath.Join(".", "data")
} else {
dataDir = filepath.Join(".", os.Getenv("DATA_DIR"))
}
if _, err := os.Stat(dataDir); os.IsNotExist(err) {
err := os.Mkdir(dataDir, 0o755)
if err != nil {
return "", fmt.Errorf("cannot create '%s' directory: %w", dataDir, err)
}
}
return dataDir, nil
}