mirror of
https://github.com/navidrome/navidrome.git
synced 2026-07-09 17:18:45 +00:00
2c90685bc2
* fix(scanner): import playlists skipped when no admin existed yet (#5499) On a fresh install the first scan runs before any admin user exists, so the scanner's playlist phase skips all playlists (playlists are owned by the first admin). Nothing re-imported them afterwards because folder selection is gated on updated_at > last_scan_at, which nothing bumps. The playlist phase now: - resolves the admin at phase time (FindFirstAdmin) instead of trusting the context snapshot taken at scan start, so a long admin-less scan still imports playlists in its own phase if an admin was created meanwhile; - records a persisted PlaylistsImportPending flag when no admin exists yet; - when that flag is set, imports ALL playlist folders via a new GetAllWithPlaylists (bypassing the timestamp gate) and clears the flag. Playlists are recovered by the next scan that runs with an admin, with no dependency on scan duration and no changes to the auth/server layers. * fix(scanner): surface datastore errors in playlist import deferral (#5499) Address review feedback: - distinguish model.ErrNotFound (no admin yet -> defer) from real datastore errors when resolving the admin, so DB failures are propagated, not swallowed; - propagate the error if the pending-import flag can't be persisted, so a scan doesn't complete as successful without recording the recovery; - surface read errors when checking the pending flag. Also name the no-admin condition for readability. * fix(scanner): simplify admin existence check in playlist import Signed-off-by: Deluan <deluan@navidrome.org> * fix(scanner): streamline folder access in playlist import logic Signed-off-by: Deluan <deluan@navidrome.org> --------- Signed-off-by: Deluan <deluan@navidrome.org>
99 lines
3 KiB
Go
99 lines
3 KiB
Go
package model
|
|
|
|
import (
|
|
"fmt"
|
|
"iter"
|
|
"os"
|
|
"path"
|
|
"path/filepath"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/navidrome/navidrome/model/id"
|
|
)
|
|
|
|
// Folder represents a folder in the library. Its path is relative to the library root.
|
|
// ALWAYS use NewFolder to create a new instance.
|
|
type Folder struct {
|
|
ID string `structs:"id"`
|
|
LibraryID int `structs:"library_id"`
|
|
LibraryPath string `structs:"-" json:"-" hash:"ignore"`
|
|
Path string `structs:"path"`
|
|
Name string `structs:"name"`
|
|
ParentID string `structs:"parent_id"`
|
|
NumAudioFiles int `structs:"num_audio_files"`
|
|
NumPlaylists int `structs:"num_playlists"`
|
|
ImageFiles []string `structs:"image_files"`
|
|
ImagesUpdatedAt time.Time `structs:"images_updated_at"`
|
|
Hash string `structs:"hash"`
|
|
Missing bool `structs:"missing"`
|
|
UpdateAt time.Time `structs:"updated_at"`
|
|
CreatedAt time.Time `structs:"created_at"`
|
|
}
|
|
|
|
func (f Folder) AbsolutePath() string {
|
|
return filepath.Join(f.LibraryPath, f.Path, f.Name)
|
|
}
|
|
|
|
func (f Folder) String() string {
|
|
return f.AbsolutePath()
|
|
}
|
|
|
|
// FolderID generates a unique ID for a folder in a library.
|
|
// The ID is generated based on the library ID and the folder path relative to the library root.
|
|
// Any leading or trailing slashes are removed from the folder path.
|
|
func FolderID(lib Library, path string) string {
|
|
path = strings.TrimPrefix(path, lib.Path)
|
|
path = strings.TrimPrefix(path, string(os.PathSeparator))
|
|
path = filepath.Clean(path)
|
|
key := fmt.Sprintf("%d:%s", lib.ID, path)
|
|
return id.NewHash(key)
|
|
}
|
|
|
|
func NewFolder(lib Library, folderPath string) *Folder {
|
|
newID := FolderID(lib, folderPath)
|
|
dir, name := path.Split(folderPath)
|
|
dir = path.Clean(dir)
|
|
var parentID string
|
|
if dir == "." && name == "." {
|
|
dir = ""
|
|
parentID = ""
|
|
} else {
|
|
parentID = FolderID(lib, dir)
|
|
}
|
|
return &Folder{
|
|
LibraryID: lib.ID,
|
|
ID: newID,
|
|
Path: dir,
|
|
Name: name,
|
|
ParentID: parentID,
|
|
ImageFiles: []string{},
|
|
UpdateAt: time.Now(),
|
|
CreatedAt: time.Now(),
|
|
}
|
|
}
|
|
|
|
type FolderCursor iter.Seq2[Folder, error]
|
|
|
|
type FolderUpdateInfo struct {
|
|
UpdatedAt time.Time
|
|
Hash string
|
|
}
|
|
|
|
type FolderRepository interface {
|
|
Get(id string) (*Folder, error)
|
|
GetByPath(lib Library, path string) (*Folder, error)
|
|
GetAll(...QueryOptions) ([]Folder, error)
|
|
CountAll(...QueryOptions) (int64, error)
|
|
GetFolderUpdateInfo(lib Library, targetPaths ...string) (map[string]FolderUpdateInfo, error)
|
|
// HasAudioOutsideFolders reports whether any folder in parent's subtree
|
|
// (including parent itself) contains audio files and is not one of the
|
|
// given folder IDs.
|
|
HasAudioOutsideFolders(parent Folder, excludeFolderIDs []string) (bool, error)
|
|
Put(*Folder) error
|
|
MarkMissing(missing bool, ids ...string) error
|
|
GetTouchedWithPlaylists() (FolderCursor, error)
|
|
// GetAllWithPlaylists returns all non-missing folders with playlists, ignoring
|
|
// the scan-timestamp gate used by GetTouchedWithPlaylists.
|
|
GetAllWithPlaylists() (FolderCursor, error)
|
|
}
|