From d2277c376c4bf602b49bbd99869e64ad4cc71e1e Mon Sep 17 00:00:00 2001 From: Zef Hemel Date: Mon, 22 Sep 2025 15:57:26 +0200 Subject: [PATCH] Fixes #1559 --- server/cmd/server.go | 14 +++++++------- server/disk_space_primitives_test.go | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/cmd/server.go b/server/cmd/server.go index 079b5467..2c7f79d5 100644 --- a/server/cmd/server.go +++ b/server/cmd/server.go @@ -58,12 +58,18 @@ func buildConfig(bundledFiles fs.FS, args []string) *server.ServerConfig { log.Println("Client log push enabled") } + rootSpaceConfig.GitIgnore = os.Getenv("SB_SPACE_IGNORE") + + if os.Getenv("SB_SPACE_IGNORE") != "" { + log.Printf("Ignoring files matching: %s", os.Getenv("SB_SPACE_IGNORE")) + } + if rootSpaceConfig.SpaceFolderPath == "" { log.Fatal("No folder specified. Please pass a folder as an argument or set SB_FOLDER environment variable.") } var spacePrimitives server.SpacePrimitives - spacePrimitives, err := server.NewDiskSpacePrimitives(rootSpaceConfig.SpaceFolderPath, os.Getenv("SB_GIT_IGNORE")) + spacePrimitives, err := server.NewDiskSpacePrimitives(rootSpaceConfig.SpaceFolderPath, rootSpaceConfig.GitIgnore) if err != nil { log.Fatal(err) @@ -115,12 +121,6 @@ func buildConfig(bundledFiles fs.FS, args []string) *server.ServerConfig { log.Println("Starting in read-only mode.") } - rootSpaceConfig.GitIgnore = os.Getenv("SB_GIT_IGNORE") - - if os.Getenv("SB_SPACE_IGNORE") != "" { - log.Printf("Ignoring files matching: %s", os.Getenv("SB_SPACE_IGNORE")) - } - if os.Getenv("SB_URL_PREFIX") != "" { hostUrlPrefix := os.Getenv("SB_URL_PREFIX") // Normalize the host URL prefix (if set) diff --git a/server/disk_space_primitives_test.go b/server/disk_space_primitives_test.go index 3775291a..2f44e8e2 100644 --- a/server/disk_space_primitives_test.go +++ b/server/disk_space_primitives_test.go @@ -37,7 +37,7 @@ func TestSafePath(t *testing.T) { assert.NoError(t, err, "Valid relative path should not error") } -func TestGitIngore(t *testing.T) { +func TestGitIgnore(t *testing.T) { space, err := NewDiskSpacePrimitives(t.TempDir(), "*.txt\n*.jpg") assert.NoError(t, err, "Failed to create DiskSpacePrimitives")