chore: add intermediate changes
This commit is contained in:
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
# Eden specific
|
# Eden specific
|
||||||
|
|
||||||
|
data/*
|
||||||
*.db
|
*.db
|
||||||
content/*
|
|
||||||
*.pptx
|
*.pptx
|
||||||
*.odp
|
*.odp
|
||||||
*.mp4
|
*.mp4
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import (
|
|||||||
"eden-server/internal/crypto"
|
"eden-server/internal/crypto"
|
||||||
"eden-server/internal/database"
|
"eden-server/internal/database"
|
||||||
"eden-server/internal/runtime"
|
"eden-server/internal/runtime"
|
||||||
"log"
|
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
@@ -63,7 +62,6 @@ func spawnFileRoutes(file *gin.RouterGroup, env runtime.Environment, db *gorm.DB
|
|||||||
Msg: ieMes,
|
Msg: ieMes,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
log.Println(cSum)
|
|
||||||
|
|
||||||
fData := database.File{
|
fData := database.File{
|
||||||
MediaType: m,
|
MediaType: m,
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import (
|
|||||||
//var watchdogStop = make(chan struct{})
|
//var watchdogStop = make(chan struct{})
|
||||||
|
|
||||||
func KickoffDatabase(workDir string) (*gorm.DB, error) {
|
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{})
|
db, err := gorm.Open(sqlite.Open(dbLoc), &gorm.Config{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package database
|
package database
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"log"
|
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
@@ -17,11 +16,21 @@ func watchdog(w string, db *gorm.DB) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var purgeList []string
|
||||||
for _, f := range files {
|
for _, f := range files {
|
||||||
i, err := os.Stat(f.Filepath)
|
i, err := os.Stat(f.Filepath)
|
||||||
if err != nil {
|
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
|
||||||
}
|
}
|
||||||
log.Println(i)
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
slog.Info("purge list", "files", purgeList)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,9 +58,8 @@ func GrabEnvironment() Environment {
|
|||||||
func EnsureOperation(workDir string) error {
|
func EnsureOperation(workDir string) error {
|
||||||
nDirs := []string{
|
nDirs := []string{
|
||||||
workDir,
|
workDir,
|
||||||
filepath.Join(workDir, "data"),
|
filepath.Join(workDir),
|
||||||
filepath.Join(workDir, "data", "content"),
|
filepath.Join(workDir, "content"),
|
||||||
filepath.Join(workDir, "web"),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, p := range nDirs {
|
for _, p := range nDirs {
|
||||||
|
|||||||
Reference in New Issue
Block a user