mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-03 20:47:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix(server): db migration not working when MusicFolder is a relative path (#3766)

Browse source 
* fix(server): db migration not working when MusicFolder is a relative path

Signed-off-by: Deluan <deluan@navidrome.org>

* remove todo

Signed-off-by: Deluan <deluan@navidrome.org>

* fix migration of paths in Windows

---------

Signed-off-by: Deluan <deluan@navidrome.org>
This commit is contained in:
Deluan Quintão 2025-03-09 19:14:29 -04:00 • committed by GitHub
parent b2b5c00331
commit 365df5220b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
db/migrations/20241026183640_support_new_scanner.go
View file

@ -7,6 +7,7 @@ import (
"io/fs"
"os"
"path/filepath"
"strings"
"testing/fstest"
"unicode/utf8"
@ -143,7 +144,6 @@ join library on media_file.library_id = library.id`, string(os.PathSeparator)))
// Then create an in-memory filesystem with all paths
var path string
var lib model.Library
var f *model.Folder
fsys := fstest.MapFS{}
for rows.Next() {
@ -152,9 +152,9 @@ join library on media_file.library_id = library.id`, string(os.PathSeparator)))
return err
}
// BFR Windows!!
path = strings.TrimPrefix(path, filepath.Clean(lib.Path))
path = strings.TrimPrefix(path, string(os.PathSeparator))
path = filepath.Clean(path)
path, _ = filepath.Rel("/", path)
fsys[path] = &fstest.MapFile{Mode: fs.ModeDir}
}
if err = rows.Err(); err != nil {
@ -164,19 +164,18 @@ join library on media_file.library_id = library.id`, string(os.PathSeparator)))
return nil
}
// Finally, walk the in-mem filesystem and insert all folders into the DB.
stmt, err := tx.PrepareContext(ctx, "insert into folder (id, library_id, path, name, parent_id) values (?, ?, ?, ?, ?)")
if err != nil {
return err
}
root, _ := filepath.Rel("/", lib.Path)
err = fs.WalkDir(fsys, root, func(path string, d fs.DirEntry, err error) error {
// 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
}
if d.IsDir() {
path, _ = filepath.Rel(root, path)
f = model.NewFolder(lib, path)
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)
@ -190,7 +189,7 @@ join library on media_file.library_id = library.id`, string(os.PathSeparator)))
libPathLen := utf8.RuneCountInString(lib.Path)
_, err = tx.ExecContext(ctx, fmt.Sprintf(`
update media_file set path = substr(path,%d);`, libPathLen+2))
update media_file set path = replace(substr(path, %d), '\', '/');`, libPathLen+2))
if err != nil {
return fmt.Errorf("error updating media_file path: %w", err)
}