From 2a15a217deb49f6838bed6634f81c49e5a4f43da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deluan=20Quint=C3=A3o?= Date: Tue, 11 Mar 2025 10:09:09 -0400 Subject: [PATCH] fix(server): db migration does not work for MusicFolders ending with a trailing slash. (#3797) * fix(server): db migration was not working for MusicFolders ending with a trailing slash. Signed-off-by: Deluan * fix(server): db migration for relative paths Signed-off-by: Deluan --------- Signed-off-by: Deluan --- db/migrations/20241026183640_support_new_scanner.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/db/migrations/20241026183640_support_new_scanner.go b/db/migrations/20241026183640_support_new_scanner.go index a9c48cc7d..bdf68c7cc 100644 --- a/db/migrations/20241026183640_support_new_scanner.go +++ b/db/migrations/20241026183640_support_new_scanner.go @@ -178,7 +178,7 @@ join library on media_file.library_id = library.id`, string(os.PathSeparator))) 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) + log.Error("error writing folder to DB", "path", path, err) } } return err @@ -187,7 +187,12 @@ join library on media_file.library_id = library.id`, string(os.PathSeparator))) return fmt.Errorf("error populating folder table: %w", err) } - libPathLen := utf8.RuneCountInString(lib.Path) + // Count the number of characters in the library path + libPath := filepath.Clean(lib.Path) + libPathLen := utf8.RuneCountInString(libPath) + + // In one go, update all paths in the media_file table, removing the library path prefix + // and replacing any backslashes with slashes (the path separator used by the io/fs package) _, err = tx.ExecContext(ctx, fmt.Sprintf(` update media_file set path = replace(substr(path, %d), '\', '/');`, libPathLen+2)) if err != nil {