Recursively refresh playlist tracks within smart playlist rules #3018
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: reillymc <[email protected]>
reillymc
force-pushed
the
smart-playlist-recursive-track-refresh
branch
from
08b12b8
to
2863c61
Compare
|
Download the artifacts for this pull request: |
deluan
requested changes
Jun 11, 2024
Comment on lines
+292
to
+307
| case Any: | ||
| for _, rules := range rule { | ||
| ids = extractPlaylistIds(rules, ids) | ||
| } | ||
| case All: | ||
| for _, rules := range rule { | ||
| ids = extractPlaylistIds(rules, ids) | ||
| } | ||
| case InPlaylist: | ||
| if id, ok = rule["id"].(string); ok { | ||
| ids = append(ids, id) | ||
| } | ||
| case NotInPlaylist: | ||
| if id, ok = rule["id"].(string); ok { | ||
| ids = append(ids, id) | ||
| } |
There was a problem hiding this comment.
Suggested change
| case Any: | |
| for _, rules := range rule { | |
| ids = extractPlaylistIds(rules, ids) | |
| } | |
| case All: | |
| for _, rules := range rule { | |
| ids = extractPlaylistIds(rules, ids) | |
| } | |
| case InPlaylist: | |
| if id, ok = rule["id"].(string); ok { | |
| ids = append(ids, id) | |
| } | |
| case NotInPlaylist: | |
| if id, ok = rule["id"].(string); ok { | |
| ids = append(ids, id) | |
| } | |
| case Any, All: | |
| for _, rules := range rule { | |
| ids = extractPlaylistIds(rules, ids) | |
| } | |
| case InPlaylist, NotInPlaylist: | |
| if id, ok = rule["id"].(string); ok { | |
| ids = append(ids, id) | |
| } |
| @@ -275,3 +283,29 @@ func inList(m map[string]interface{}, negate bool) (sql string, args []interface | |||
| return "media_file.id IN (" + subQText + ")", subQArgs, nil | |||
| } | |||
| } | |||
|
|
|||
| func extractPlaylistIds(inputRule interface{}, ids []string) []string { | |||
| var id string | |||
There was a problem hiding this comment.
You are never returning the ids slice, you are basically mutating the slice passed. Try to not mutate the param and properly returning the new slice.
| @@ -36,6 +40,10 @@ func (any Any) MarshalJSON() ([]byte, error) { | |||
| return marshalConjunction("any", any) | |||
| } | |||
|
|
|||
| func (any Any) ChildPlaylistIds() (ids []string) { | |||
| return extractPlaylistIds(any, ids) | |||
There was a problem hiding this comment.
And that's why it is working, because you are passing the response as a param to extractPlaylistIds. If we went with this design, extractPlaylistIds wouldn't need to return anything. But I rather not mutate arguments when possible.
| log.Error(r.ctx, "Error loading child playlist", "id", pls.ID, "childId", id, err) | ||
| return false | ||
| } | ||
| r.refreshSmartPlaylist(childPls) |
There was a problem hiding this comment.
I'm not too sure if we want to refresh all children playlists like this, this could have a performance impact. Did you test it with large playlists?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3017
This PR ensure that when a smart playlist is refreshed, the playlists used in its rules also have their tracks refreshed first.
This is my first time diving into the Navidrome codebase and using the Go language, so if there is anything I need to do to improve the code here please let me know and I'll be happy to fix it up!