chore: init settings

.github/workflows/build.yml

@@ -1,6 +1,7 @@
 name: ci
 
 on:
+  pull_request:
   push:
     branches:
       - main

lib/api/static/init.go

@@ -147,8 +147,8 @@ func buildStaticPadCSSInDev(retrievedSettings *settings.Settings) {
 	}
 }
 
-func buildCssInDev(nodeEnv string, retrievedSettings *settings.Settings) {
-	if nodeEnv == "production" {
+func buildCssInDev(retrievedSettings *settings.Settings) {
+	if !utils.IsDevModeEnabled() {
 		return
 	}
 
@@ -157,8 +157,7 @@ func buildCssInDev(nodeEnv string, retrievedSettings *settings.Settings) {
 }
 
 func Init(store *lib.InitStore) {
-	var nodeEnv = os.Getenv("NODE_ENV")
-	buildCssInDev(nodeEnv, store.RetrievedSettings)
+	buildCssInDev(store.RetrievedSettings)
 
 	store.C.Get("/health", func(c *fiber.Ctx) error {
 		return c.SendString("OK")
@@ -191,7 +190,7 @@ func Init(store *lib.InitStore) {
 	}
 
 	store.C.Get("/css/static/pad.css", func(ctx *fiber.Ctx) error {
-		if nodeEnv != "production" {
+		if utils.IsDevModeEnabled() {
 			fileContent, err := os.ReadFile("assets/css/build/static/pad.css")
 			if err != nil {
 				store.Logger.Errorf("Error setting up build page: %v. Did you forget to run the build script in ui directory?", err)
@@ -207,7 +206,7 @@ func Init(store *lib.InitStore) {
 	})
 
 	store.C.Get("/css/skin/colibris/pad.css", func(ctx *fiber.Ctx) error {
-		if nodeEnv != "production" {
+		if utils.IsDevModeEnabled() {
 			fileContent, err := os.ReadFile("assets/css/build/skin/colibris/pad.css")
 			if err != nil {
 				store.Logger.Errorf("Error setting up build page: %v. Did you forget to run the build script in ui directory?", err)
@@ -257,7 +256,7 @@ func Init(store *lib.InitStore) {
 		return adaptor.HTTPHandler(templ.Handler(component))(c)
 	})
 
-	if nodeEnv == "production" {
+	if !utils.IsDevModeEnabled() {
 		registerEmbeddedStatic(store.C, "/js/pad/assets/", "assets/js/pad/assets", store.UiAssets)
 		registerEmbeddedStatic(store.C, "/js/welcome/assets/", "assets/js/welcome/assets", store.UiAssets)
 		registerEmbeddedStatic(store.C, "/admin/assets", "assets/js/admin/assets", store.UiAssets)

lib/settings/Settings.go

@@ -7,6 +7,7 @@ import (
 	"runtime"
 
 	clientVars2 "github.com/ether/etherpad-go/lib/models/clientVars"
+	"go.uber.org/zap"
 )
 
 type DBSettings struct {
@@ -403,7 +404,7 @@ func StripWithOptions(jsonString string, options *Options) string {
 	return result + buffer + end
 }
 
-func init() {
+func InitSettings(logger *zap.SugaredLogger) {
 	var pathToRoot string
 
 	var envPathToSettings = os.Getenv("ETHERPAD_SETTINGS_PATH")
@@ -412,44 +413,45 @@ func init() {
 	}
 
 	if pathToRoot == "" {
-		for i := 0; i < 10; i++ {
-			var builtPath = ""
-			for j := 0; j < i; j++ {
-				builtPath += "../"
-			}
-
-			var assetDir string
-
-			if i == 0 {
-				assetDir = "./assets"
-			} else {
-				assetDir = "assets"
-			}
-
-			pathToAssets, err := filepath.Abs(builtPath + assetDir)
-
-			_, err = os.Stat(pathToAssets)
+		execPath, err := os.Executable()
+		if err != nil {
+			panic("Error finding executable path: " + err.Error())
+		}
+		pathToRoot = filepath.Dir(execPath)
 
+		assetsPath := filepath.Join(pathToRoot, "assets")
+		if _, err := os.Stat(assetsPath); os.IsNotExist(err) {
+			wd, err := os.Getwd()
 			if err == nil {
-				pathToRoot, _ = filepath.Abs(builtPath)
-				break
-			}
-
-			if i == 9 {
-				panic("Error finding root")
+				if _, err := os.Stat(filepath.Join(wd, "assets")); err == nil {
+					pathToRoot = wd
+				}
 			}
 		}
 	}
 
 	var settingsFilePath = filepath.Join(pathToRoot, "settings.json")
 	settings, err := os.ReadFile(settingsFilePath)
+	if err != nil {
+		logger.Infof("No settings file found. Using default settings.")
+	}
 	settings = []byte(StripWithOptions(string(settings), &Options{Whitespace: true, TrailingCommas: true}))
 
 	setting, err := ReadConfig(string(settings))
 	if err != nil {
-		println("error is " + err.Error())
+		logger.Errorf("error is " + err.Error())
 		return
 	}
+
+	if setting.DBSettings != nil && setting.DBSettings.Filename != "" {
+		dbDir := filepath.Dir(setting.DBSettings.Filename)
+		if dbDir != "" && dbDir != "." {
+			if err := os.MkdirAll(dbDir, 0755); err != nil {
+				panic("Error creating database directory: " + err.Error())
+			}
+		}
+	}
+
 	setting.GitVersion = GitVersion()
 	setting.Root = pathToRoot
 	Displayed = *setting

lib/utils/isDev.go

@@ -0,0 +1,8 @@
+package utils
+
+import "os"
+
+func IsDevModeEnabled() bool {
+	nodeEnv := os.Getenv("NODE_ENV")
+	return nodeEnv == "development" || nodeEnv == "dev"
+}

main.go

@@ -66,6 +66,8 @@ var uiAssets embed.FS
 func main() {
 	setupLogger := utils.SetupLogger()
 	defer setupLogger.Sync()
+	settings2.InitSettings(setupLogger)
+
 	var settings = settings2.Displayed
 	validatorEvaluator := validator.New(validator.WithRequiredStructEnabled())