From bf04e97850865ef04a7e89d500c522e85e188360eac26171d51fdbcc953bc565 Mon Sep 17 00:00:00 2001 From: Daan Selen Date: Tue, 21 Apr 2026 23:46:20 +0200 Subject: [PATCH] chore: add intermediate changes --- .gitignore | 2 +- internal/api/routes_file.go | 2 -- internal/database/database.go | 2 +- internal/database/watchdog.go | 15 ++++++++++++--- internal/runtime/runtime.go | 5 ++--- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 446d086..d59bf5e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # Eden specific +data/* *.db -content/* *.pptx *.odp *.mp4 diff --git a/internal/api/routes_file.go b/internal/api/routes_file.go index c82a08c..2cfa3f6 100644 --- a/internal/api/routes_file.go +++ b/internal/api/routes_file.go @@ -4,7 +4,6 @@ import ( "eden-server/internal/crypto" "eden-server/internal/database" "eden-server/internal/runtime" - "log" "log/slog" "net/http" "path/filepath" @@ -63,7 +62,6 @@ func spawnFileRoutes(file *gin.RouterGroup, env runtime.Environment, db *gorm.DB Msg: ieMes, }) } - log.Println(cSum) fData := database.File{ MediaType: m, diff --git a/internal/database/database.go b/internal/database/database.go index 774a165..e28d056 100644 --- a/internal/database/database.go +++ b/internal/database/database.go @@ -12,7 +12,7 @@ import ( //var watchdogStop = make(chan struct{}) func KickoffDatabase(workDir string) (*gorm.DB, error) { - dbLoc := filepath.Join(workDir, "data", "garden.db") + dbLoc := filepath.Join(workDir, "garden.db") db, err := gorm.Open(sqlite.Open(dbLoc), &gorm.Config{}) if err != nil { return nil, err diff --git a/internal/database/watchdog.go b/internal/database/watchdog.go index fadbd3f..fbd0562 100644 --- a/internal/database/watchdog.go +++ b/internal/database/watchdog.go @@ -1,7 +1,6 @@ package database import ( - "log" "log/slog" "os" @@ -17,11 +16,21 @@ func watchdog(w string, db *gorm.DB) { return } + var purgeList []string for _, f := range files { i, err := os.Stat(f.Filepath) if err != nil { - slog.Error("failed to stat the details for one or more files", "error", err) + if os.IsNotExist(err) { + purgeList = append(purgeList, f.Filepath) + continue + } + slog.Warn("stat failed", "file", f.Filepath, "error", err) + continue + } + + if i.IsDir() { + purgeList = append(purgeList, f.Filepath) // also mark it for purger if its a directory. We do not want that here } - log.Println(i) } + slog.Info("purge list", "files", purgeList) } diff --git a/internal/runtime/runtime.go b/internal/runtime/runtime.go index 25b9b42..772d1e4 100644 --- a/internal/runtime/runtime.go +++ b/internal/runtime/runtime.go @@ -58,9 +58,8 @@ func GrabEnvironment() Environment { func EnsureOperation(workDir string) error { nDirs := []string{ workDir, - filepath.Join(workDir, "data"), - filepath.Join(workDir, "data", "content"), - filepath.Join(workDir, "web"), + filepath.Join(workDir), + filepath.Join(workDir, "content"), } for _, p := range nDirs {