Standardize SQLite Database Path Management

Author: Amazing-Stardom

frontend/db.toml

@@ -0,0 +1,11 @@
+[db]
+path = "db/all_dbs/"
+bannerdb = "banner-db.db"
+cheatsheetsdb = "cheatsheets-db-v5.db"
+emojidb = "emoji-db-v5.db"
+ipmdb = "ipm-db-v6.db"
+manpagesdb = "man-pages-db-v5.db"
+mcpdb = "mcp-db-v6.db"
+pngiconsdb = "png-icons-db-v5.db"
+svgiconsdb = "svg-icons-db-v5.db"
+tldrdb = "tldr-db-v5.db"

frontend/internal/config/config.go

@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
+	"sync"
 
 	"github.com/pelletier/go-toml/v2"
 )
@@ -21,10 +22,24 @@ type Config struct {
 	B2AccountID      string              `toml:"b2_account_id"`
 	B2ApplicationKey string              `toml:"b2_application_key"`
 	MeiliWriteKey    string              `toml:"meili_write_key"`
-	GeminiKeys		 string              `toml:"gemini_keys"`
+	GeminiKeys       string              `toml:"gemini_keys"`
 	EnableAds        bool                `toml:"enable_ads"`
 	Ads              map[string][]string `toml:"ads"`
-	FdtPgDB       FdtPgDBConfig    `toml:"fdt_pg_db"`
+	FdtPgDB          FdtPgDBConfig       `toml:"fdt_pg_db"`
+}
+
+// DBTomlConfig holds the dynamic database paths and filenames from db.toml
+type DBTomlConfig struct {
+	Path          string `toml:"path"`
+	BannerDB      string `toml:"bannerdb"`
+	CheatsheetsDB string `toml:"cheatsheetsdb"`
+	EmojiDB       string `toml:"emojidb"`
+	IpmDB         string `toml:"ipmdb"`
+	ManPagesDB    string `toml:"manpagesdb"`
+	McpDB         string `toml:"mcpdb"`
+	PngIconsDB    string `toml:"pngiconsdb"`
+	SvgIconsDB    string `toml:"svgiconsdb"`
+	TldrDB        string `toml:"tldrdb"`
 }
 
 // FdtPgDBConfig holds PostgreSQL database configuration for Free DevTools
@@ -38,6 +53,12 @@ type FdtPgDBConfig struct {
 
 var appConfig *Config
 
+var (
+	DBConfig   *DBTomlConfig
+	dbTomlOnce sync.Once
+	dbTomlErr  error
+)
+
 // loadNodeEnvFromDotEnv reads NODE_ENV from .env file
 // Returns the value if found, otherwise returns empty string
 func loadNodeEnvFromDotEnv() string {
@@ -82,6 +103,10 @@ func LoadConfig() (*Config, error) {
 		return appConfig, nil
 	}
 
+	if err := LoadDBToml(); err != nil {
+		log.Printf("Warning: Failed to load db.toml: %v", err)
+	}
+
 	// First try to read from .env file
 	env := loadNodeEnvFromDotEnv()
 	// If not found in .env, try environment variable
@@ -105,17 +130,17 @@ func LoadConfig() (*Config, error) {
 			NodeEnv:          "dev",
 			B2AccountID:      "",
 			B2ApplicationKey: "",
-			MeiliWriteKey: "",
-			GeminiKeys: "",
+			MeiliWriteKey:    "",
+			GeminiKeys:       "",
 			EnableAds:        false,
 			Ads:              make(map[string][]string),
-		FdtPgDB: FdtPgDBConfig{
-			Host:     "",
-			Port:     "5432",
-			User:     "freedevtools_user",
-			Password: "",
-			DBName:   "freedevtools",
-		},
+			FdtPgDB: FdtPgDBConfig{
+				Host:     "",
+				Port:     "5432",
+				User:     "freedevtools_user",
+				Password: "",
+				DBName:   "freedevtools",
+			},
 		}
 		return appConfig, nil
 	}
@@ -163,8 +188,8 @@ func GetConfig() *Config {
 				NodeEnv:          "dev",
 				B2AccountID:      "",
 				B2ApplicationKey: "",
-				MeiliWriteKey: "",
-				GeminiKeys: "",
+				MeiliWriteKey:    "",
+				GeminiKeys:       "",
 				EnableAds:        false,
 			}
 		} else {
@@ -364,3 +389,73 @@ func LoadConfigFromPath(path string) (*Config, error) {
 
 	return &config, nil
 }
+
+// LoadDBToml loads database versions and paths from db.toml in a thread-safe manner
+func LoadDBToml() error {
+	dbTomlOnce.Do(func() {
+		dbTomlErr = loadDBTomlInternal()
+	})
+	return dbTomlErr
+}
+
+func loadDBTomlInternal() error {
+	var tomlPath string
+	fallbackPaths := []string{
+		"db.toml",
+		"../db.toml",
+		"../../db.toml",
+	}
+
+	for _, p := range fallbackPaths {
+		if _, err := os.Stat(p); !os.IsNotExist(err) {
+			tomlPath = p
+			break
+		}
+	}
+
+	if tomlPath == "" {
+		return fmt.Errorf("could not find db.toml file")
+	}
+
+	data, err := os.ReadFile(tomlPath)
+	if err != nil {
+		return fmt.Errorf("failed to read db.toml from %s: %w", tomlPath, err)
+	}
+
+	// Wrap struct to match the [db] section in TOML
+	var wrapper struct {
+		DB DBTomlConfig `toml:"db"`
+	}
+
+	if err := toml.Unmarshal(data, &wrapper); err != nil {
+		return fmt.Errorf("failed to parse db.toml: %w", err)
+	}
+
+	basePathStr := wrapper.DB.Path
+	if basePathStr == "" {
+		basePathStr = "db/all_dbs/"
+	}
+
+	// Prepend paths safely
+	safeJoin := func(filename string) string {
+		if filename == "" {
+			return ""
+		}
+		return filepath.Join(basePathStr, filename)
+	}
+
+	DBConfig = &DBTomlConfig{
+		Path:          basePathStr,
+		BannerDB:      safeJoin(wrapper.DB.BannerDB),
+		CheatsheetsDB: safeJoin(wrapper.DB.CheatsheetsDB),
+		EmojiDB:       safeJoin(wrapper.DB.EmojiDB),
+		IpmDB:         safeJoin(wrapper.DB.IpmDB),
+		ManPagesDB:    safeJoin(wrapper.DB.ManPagesDB),
+		McpDB:         safeJoin(wrapper.DB.McpDB),
+		PngIconsDB:    safeJoin(wrapper.DB.PngIconsDB),
+		SvgIconsDB:    safeJoin(wrapper.DB.SvgIconsDB),
+		TldrDB:        safeJoin(wrapper.DB.TldrDB),
+	}
+
+	return nil
+}

frontend/internal/db/banner/utils.go

@@ -2,8 +2,8 @@ package banner
 
 import (
 	"database/sql"
-	"log"
-	"path/filepath"
+	"fdt-templ/internal/config"
+	"fmt"
 	"sync"
 	"time"
 
@@ -17,20 +17,30 @@ var (
 
 // GetDB returns a singleton database connection
 func GetDB() (*sql.DB, error) {
-	var err error
+	var initErr error
 	dbOnce.Do(func() {
-		dbPath := filepath.Join("db", "all_dbs", "banner-db.db")
-		dbInstance, err = sql.Open("sqlite3", dbPath+"?mode=ro")
-		if err != nil {
-			log.Printf("Failed to open banner database: %v", err)
+		// Ensure config is loaded
+		if e := config.LoadDBToml(); e != nil {
+			initErr = fmt.Errorf("failed to load db.toml for Banner DB: %w", e)
+			return
+		}
+		dbPath := config.DBConfig.BannerDB
+		if dbPath == "" {
+			initErr = fmt.Errorf("Banner DB path is empty in db.toml")
+			return
+		}
+
+		dbInstance, initErr = sql.Open("sqlite3", dbPath+"?mode=ro")
+		if initErr != nil {
+			initErr = fmt.Errorf("failed to open banner database: %w", initErr)
 			return
 		}
 		// Set connection pool settings
 		dbInstance.SetMaxOpenConns(1)
 		dbInstance.SetMaxIdleConns(1)
 		dbInstance.SetConnMaxLifetime(time.Hour)
 	})
-	return dbInstance, err
+	return dbInstance, initErr
 }
 
 // CloseDB closes the database connection
@@ -39,4 +49,3 @@ func CloseDB() {
 		dbInstance.Close()
 	}
 }
-

frontend/internal/db/cheatsheets/queries.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	db_config "fdt-templ/db/config"
+	"fdt-templ/internal/config"
 
 	_ "github.com/mattn/go-sqlite3"
 )
@@ -43,12 +44,24 @@ func (db *DB) Close() error {
 
 // GetDB returns a database instance
 func GetDB() (*DB, error) {
-	dbPath := GetDBPath()
+	if err := config.LoadDBToml(); err != nil {
+		return nil, fmt.Errorf("failed to load db.toml for Cheatsheets DB: %w", err)
+	}
+	dbPath := config.DBConfig.CheatsheetsDB
+	if dbPath == "" {
+		return nil, fmt.Errorf("Cheatsheets DB path is empty in db.toml")
+	}
+
 	absPath, err := filepath.Abs(dbPath)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to resolve absolute path for Cheatsheets DB: %w", err)
+	}
+
+	db, err := NewDB(absPath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to open Cheatsheets DB: %w", err)
 	}
-	return NewDB(absPath)
+	return db, nil
 }
 
 // GetTotalCheatsheets returns the total number of cheatsheets

frontend/internal/db/cheatsheets/utils.go

@@ -3,12 +3,21 @@ package cheatsheets
 import (
 	"crypto/sha256"
 	"encoding/binary"
-	"path/filepath"
+	"fdt-templ/internal/config"
+	"fmt"
 )
 
 // GetDBPath returns the path to the cheatsheets database
-func GetDBPath() string {
-	return filepath.Join("db", "all_dbs", "cheatsheets-db-v5.db")
+func GetDBPath() (string, error) {
+	if config.DBConfig == nil {
+		if err := config.LoadDBToml(); err != nil {
+			return "", err
+		}
+	}
+	if config.DBConfig.CheatsheetsDB == "" {
+		return "", fmt.Errorf("Cheatsheets DB path is empty in db.toml")
+	}
+	return config.DBConfig.CheatsheetsDB, nil
 }
 
 // HashURLToKeyInt generates a hash ID from category and slug.

frontend/internal/db/emojis/queries.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	db_config "fdt-templ/db/config"
+	"fdt-templ/internal/config"
 
 	_ "github.com/mattn/go-sqlite3"
 )
@@ -468,13 +469,24 @@ func (db *DB) GetSitemapEmojis() ([]SitemapEmoji, error) {
 
 // GetDB returns a database instance using the default path
 func GetDB() (*DB, error) {
-	dbPath := GetDBPath()
-	// Resolve to absolute path
+	if err := config.LoadDBToml(); err != nil {
+		return nil, fmt.Errorf("failed to load db.toml for Emoji DB: %w", err)
+	}
+	dbPath := config.DBConfig.EmojiDB
+	if dbPath == "" {
+		return nil, fmt.Errorf("Emoji DB path is empty in db.toml")
+	}
+
 	absPath, err := filepath.Abs(dbPath)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to resolve absolute path for Emoji DB: %w", err)
+	}
+
+	db, err := NewDB(absPath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to open Emoji DB: %w", err)
 	}
-	return NewDB(absPath)
+	return db, nil
 }
 
 // GetEmojiCategoryUpdatedAt returns the updated_at timestamp for a category

frontend/internal/db/emojis/utils.go

@@ -1,11 +1,19 @@
 package emojis
 
 import (
-	"path/filepath"
+	"fdt-templ/internal/config"
+	"fmt"
 )
 
 // GetDBPath returns the path to the emoji database
-func GetDBPath() string {
-	// Assuming we're running from project root
-	return filepath.Join("db", "all_dbs", "emoji-db-v6.db")
+func GetDBPath() (string, error) {
+	if config.DBConfig == nil {
+		if err := config.LoadDBToml(); err != nil {
+			return "", err
+		}
+	}
+	if config.DBConfig.EmojiDB == "" {
+		return "", fmt.Errorf("Emoji DB path is empty in db.toml")
+	}
+	return config.DBConfig.EmojiDB, nil
 }