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

Don't refresh smart playlists when generating covers

Browse source
This commit is contained in:
Deluan 2023-01-01 20:28:03 -05:00
parent 950cc28e67
commit df0f140f9f
9 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmd/pls.go
View file

@ -39,7 +39,7 @@ func runExporter() {
sqlDB := db.Db()
ds := persistence.New(sqlDB)
ctx := auth.WithAdminUser(context.Background(), ds)
playlist, err := ds.Playlist(ctx).GetWithTracks(playlistID)
playlist, err := ds.Playlist(ctx).GetWithTracks(playlistID, true)
if err != nil && !errors.Is(err, model.ErrNotFound) {
log.Fatal("Error retrieving playlist", "name", playlistID, err)
}
@ -49,7 +49,7 @@ func runExporter() {
log.Fatal("Error retrieving playlist", "name", playlistID, err)
}
if len(playlists) > 0 {
playlist, err = ds.Playlist(ctx).GetWithTracks(playlists[0].ID)
playlist, err = ds.Playlist(ctx).GetWithTracks(playlists[0].ID, true)
if err != nil {
log.Fatal("Error retrieving playlist", "name", playlistID, err)
}

2
core/archiver.go
View file

@ -56,7 +56,7 @@ func (a *archiver) ZipArtist(ctx context.Context, id string, format string, bitr
}
func (a *archiver) ZipPlaylist(ctx context.Context, id string, format string, bitrate int, out io.Writer) error {
pls, err := a.ds.Playlist(ctx).GetWithTracks(id)
pls, err := a.ds.Playlist(ctx).GetWithTracks(id, true)
if err != nil {
log.Error(ctx, "Error loading mediafiles from playlist", "id", id, err)
return err

2
core/artwork/reader_playlist.go
View file

@ -45,7 +45,7 @@ func (a *playlistArtworkReader) LastUpdated() time.Time {
func (a *playlistArtworkReader) Reader(ctx context.Context) (io.ReadCloser, string, error) {
var ff []sourceFunc
pl, err := a.a.ds.Playlist(ctx).GetWithTracks(a.pl.ID)
pl, err := a.a.ds.Playlist(ctx).GetWithTracks(a.pl.ID, false)
if err == nil {
ff = append(ff, a.fromGeneratedTile(ctx, pl.Tracks))
}

2
core/playlists.go
View file

@ -200,7 +200,7 @@ func (s *playlists) Update(ctx context.Context, playlistID string,
var err error
repo := tx.Playlist(ctx)
if needsTrackRefresh {
pls, err = repo.GetWithTracks(playlistID)
pls, err = repo.GetWithTracks(playlistID, true)
pls.RemoveTracks(idxToRemove)
pls.AddTracks(idsToAdd)
} else {

2
model/playlist.go
View file

@ -106,7 +106,7 @@ type PlaylistRepository interface {
Exists(id string) (bool, error)
Put(pls *Playlist) error
Get(id string) (*Playlist, error)
GetWithTracks(id string) (*Playlist, error)
GetWithTracks(id string, refreshSmartPlaylist bool) (*Playlist, error)
GetAll(options ...QueryOptions) (Playlists, error)
FindByPath(path string) (*Playlist, error)
Delete(id string) error

6
persistence/playlist_repository.go
View file

@ -129,12 +129,14 @@ func (r *playlistRepository) Get(id string) (*model.Playlist, error) {
return r.findBy(And{Eq{"playlist.id": id}, r.userFilter()})
}
func (r *playlistRepository) GetWithTracks(id string) (*model.Playlist, error) {
func (r *playlistRepository) GetWithTracks(id string, refreshSmartPlaylist bool) (*model.Playlist, error) {
pls, err := r.Get(id)
if err != nil {
return nil, err
}
r.refreshSmartPlaylist(pls)
if refreshSmartPlaylist {
r.refreshSmartPlaylist(pls)
}
tracks, err := r.loadTracks(Select().From("playlist_tracks"), id)
if err != nil {
log.Error(r.ctx, "Error loading playlist tracks ", "playlist", pls.Name, "id", pls.ID, err)

4
persistence/playlist_repository_test.go
View file

@ -55,7 +55,7 @@ var _ = Describe("PlaylistRepository", func() {
Expect(err).To(MatchError(model.ErrNotFound))
})
It("returns all tracks", func() {
pls, err := repo.GetWithTracks(plsBest.ID)
pls, err := repo.GetWithTracks(plsBest.ID, true)
Expect(err).To(BeNil())
Expect(pls.Name).To(Equal(plsBest.Name))
Expect(pls.Tracks).To(HaveLen(2))
@ -85,7 +85,7 @@ var _ = Describe("PlaylistRepository", func() {
By("adds repeated songs to a playlist and keeps the order")
newPls.AddTracks([]string{"1004"})
Expect(repo.Put(&newPls)).To(BeNil())
saved, _ := repo.GetWithTracks(newPls.ID)
saved, _ := repo.GetWithTracks(newPls.ID, true)
Expect(saved.Tracks).To(HaveLen(3))
Expect(saved.Tracks[0].MediaFileID).To(Equal("1004"))
Expect(saved.Tracks[1].MediaFileID).To(Equal("1003"))

2
server/nativeapi/playlists.go
View file

@ -47,7 +47,7 @@ func handleExportPlaylist(ds model.DataStore) http.HandlerFunc {
ctx := r.Context()
plsRepo := ds.Playlist(ctx)
plsId := chi.URLParam(r, "playlistId")
pls, err := plsRepo.GetWithTracks(plsId)
pls, err := plsRepo.GetWithTracks(plsId, true)
if errors.Is(err, model.ErrNotFound) {
log.Warn(r.Context(), "Playlist not found", "playlistId", plsId)
http.Error(w, "not found", http.StatusNotFound)

2
server/subsonic/playlists.go
View file

@ -38,7 +38,7 @@ func (api *Router) GetPlaylist(r *http.Request) (*responses.Subsonic, error) {
}
func (api *Router) getPlaylist(ctx context.Context, id string) (*responses.Subsonic, error) {
pls, err := api.ds.Playlist(ctx).GetWithTracks(id)
pls, err := api.ds.Playlist(ctx).GetWithTracks(id, true)
if errors.Is(err, model.ErrNotFound) {
log.Error(ctx, err.Error(), "id", id)
return nil, newError(responses.ErrorDataNotFound, "Directory not found")