Skip to content

(fix) History: remove purged tracks, auto-remove empty playlists #13579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daschuer merged 2 commits into from
Aug 18, 2024
Merged

(fix) History: remove purged tracks, auto-remove empty playlists #13579

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0d6aa0
History: remove purged tracks
ronso0 Aug 17, 2024
56cf7c8
History: auto-remove empty playlists after purging tracks
ronso0 Aug 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/library/dao/playlistdao.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,8 +956,8 @@ void PlaylistDAO::removeTracksFromPlaylists(const QList<TrackId>& trackIds, bool
++it) {
if (it.key() == trackId) {
const auto playlistId = it.value();
// keep tracks in history playlists
if (getHiddenType(playlistId) == PlaylistDAO::PLHT_SET_LOG) {
// keep hidden tracks in history playlists, remove purged tracks
if (!purged && getHiddenType(playlistId) == PlaylistDAO::PLHT_SET_LOG) {
continue;
}
removeTracksFromPlaylistByIdInner(playlistId, trackId);
Expand All @@ -967,6 +967,9 @@ void PlaylistDAO::removeTracksFromPlaylists(const QList<TrackId>& trackIds, bool
}
transaction.commit();

// We may now have empty history playlists. Remove them.
deleteAllUnlockedPlaylistsWithFewerTracks(PlaylistDAO::PLHT_SET_LOG, 1);

// update the sidebar
emit playlistContentChanged(playlistIds);
// If this is called by TrackCollection::purgeTracks() it will call
Expand Down