From 5c0b6fb9b7363582e351f90e594ef5e17f5e50d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deluan=20Quint=C3=A3o?= Date: Thu, 13 Mar 2025 07:10:45 -0400 Subject: [PATCH] fix(server): skip non-UTF encoding during the database migration. (#3803) Fix #3787 Signed-off-by: Deluan --- .../20241026183640_support_new_scanner.go | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/db/migrations/20241026183640_support_new_scanner.go b/db/migrations/20241026183640_support_new_scanner.go index bdf68c7cc..3e7c47f54 100644 --- a/db/migrations/20241026183640_support_new_scanner.go +++ b/db/migrations/20241026183640_support_new_scanner.go @@ -172,14 +172,20 @@ join library on media_file.library_id = library.id`, string(os.PathSeparator))) // Finally, walk the in-mem filesystem and insert all folders into the DB. err = fs.WalkDir(fsys, ".", func(path string, d fs.DirEntry, err error) error { if err != nil { - return err + // Don't abort the walk, just log the error + log.Error("error walking folder to DB", "path", path, err) + return nil } - if d.IsDir() { - f := model.NewFolder(lib, path) - _, err = stmt.ExecContext(ctx, f.ID, lib.ID, f.Path, f.Name, f.ParentID) - if err != nil { - log.Error("error writing folder to DB", "path", path, err) - } + // Skip entries that are not directories + if !d.IsDir() { + return nil + } + + // Create a folder in the DB + f := model.NewFolder(lib, path) + _, err = stmt.ExecContext(ctx, f.ID, lib.ID, f.Path, f.Name, f.ParentID) + if err != nil { + log.Error("error writing folder to DB", "path", path, err) } return err })