From 5c860a45e11ff16518bab16058aab04d96e79437 Mon Sep 17 00:00:00 2001
From: Graham Steffaniak <gtsteff@gmail.com>
Date: Fri, 1 Sep 2023 17:53:22 -0500
Subject: [PATCH] new

---
 backend/cmd/root.go        | 2 --
 backend/cmd/utils.go       | 4 ++--
 backend/filebrowser.yml    | 4 ++--
 backend/settings/config.go | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/backend/cmd/root.go b/backend/cmd/root.go
index 79e16d8e..a59d0318 100644
--- a/backend/cmd/root.go
+++ b/backend/cmd/root.go
@@ -82,10 +82,8 @@ Also, if the database path doesn't exist, File Browser will enter into
 the quick setup mode and a new database will be bootstraped and a new
 user created with the credentials from options "username" and "password".`,
 	Run: python(func(cmd *cobra.Command, args []string, d pythonData) {
-		settings.Initialize()
 		serverConfig := settings.GlobalConfiguration.Server
 		log.Println(cfgFile)
-
 		if !d.hadDB {
 			quickSetup(cmd.Flags(), d)
 		}
diff --git a/backend/cmd/utils.go b/backend/cmd/utils.go
index ef0b9a7c..0ae50265 100644
--- a/backend/cmd/utils.go
+++ b/backend/cmd/utils.go
@@ -85,8 +85,7 @@ func dbExists(path string) (bool, error) {
 func python(fn pythonFunc, cfg pythonConfig) cobraFunc {
 	return func(cmd *cobra.Command, args []string) {
 		data := pythonData{hadDB: true}
-
-		path := getParam(cmd.Flags(), "database")
+		path := settings.GlobalConfiguration.Server.Database
 		exists, err := dbExists(path)
 
 		if err != nil {
@@ -100,6 +99,7 @@ func python(fn pythonFunc, cfg pythonConfig) cobraFunc {
 		data.hadDB = exists
 		db, err := storm.Open(path)
 		checkErr(err)
+
 		defer db.Close()
 		data.store, err = bolt.NewStorage(db)
 		checkErr(err)
diff --git a/backend/filebrowser.yml b/backend/filebrowser.yml
index 4c1631f7..58b2636f 100644
--- a/backend/filebrowser.yml
+++ b/backend/filebrowser.yml
@@ -1,9 +1,9 @@
 server:
   port: 8050
-  baseURL: /
+  #baseURL: /
   address: ''
   log: stdout
-  database: ./database.db
+  database: database.db
   root: /srv
 general:
   disable-thumbnails: false
diff --git a/backend/settings/config.go b/backend/settings/config.go
index ac46b743..130ac7d0 100644
--- a/backend/settings/config.go
+++ b/backend/settings/config.go
@@ -10,7 +10,7 @@ import (
 
 var GlobalConfiguration Settings
 
-func Initialize() {
+func init() {
 	// Open and read the YAML file
 	yamlFile, err := os.Open("filebrowser.yml")
 	if err != nil {