Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

playlist editor: disallow cropping/clearing filtered playlists

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-08-14 18:54:55 +02:00
parent 77a3c73d9c
commit 2096181eb1
6 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/actions.cpp
View File

@@ -1814,6 +1814,8 @@ void AddSelectedItems::Run()
void CropMainPlaylist::Run()
{
if (myPlaylist->isFiltered())
return;
bool yes = true;
if (Config.ask_before_clearing_main_playlist)
yes = AskYesNoQuestion("Do you really want to crop main playlist?", TraceMpdStatus);
@@ -1848,9 +1850,8 @@ bool CropPlaylist::canBeRun() const
void CropPlaylist::Run()
{
if (myPlaylistEditor->Playlists->Empty())
if (myPlaylistEditor->Playlists->Empty() || myPlaylistEditor->isContentFiltered())
return;
bool yes = true;
if (Config.ask_before_clearing_main_playlist)
yes = AskYesNoQuestion("Do you really want to crop playlist \"" + myPlaylistEditor->Playlists->Current() + "\"?", TraceMpdStatus);
@@ -1909,29 +1910,17 @@ bool ClearPlaylist::canBeRun() const
void ClearPlaylist::Run()
{
if (myPlaylistEditor->Playlists->Empty())
if (myPlaylistEditor->Playlists->Empty() || myPlaylistEditor->isContentFiltered())
return;
// OMGPLZ
bool yes = true;
if (Config.ask_before_clearing_main_playlist)
yes = AskYesNoQuestion("Do you really want to clear playlist \"" + myPlaylistEditor->Playlists->Current() + "\"?", TraceMpdStatus);
if (yes)
{
if (myPlaylistEditor->Content->isFiltered())
{
std::string playlist = locale_to_utf_cpy(myPlaylistEditor->Playlists->Current());
ShowMessage("Deleting filtered items from playlist \"%s\"...", myPlaylistEditor->Playlists->Current().c_str());
Mpd.StartCommandsList();
for (int i = myPlaylistEditor->Content->Size()-1; i >= 0; --i)
Mpd.Delete(playlist, (*myPlaylistEditor->Content)[i].GetPosition());
if (Mpd.CommitCommandsList())
ShowMessage("Filtered items deleted from playlist \"%s\"", myPlaylistEditor->Playlists->Current().c_str());
}
else
{
ShowMessage("Clearing playlist...");
Mpd.ClearPlaylist(locale_to_utf_cpy(myPlaylistEditor->Playlists->Current()));
}
ShowMessage("Clearing playlist \"%s\"...", myPlaylistEditor->Playlists->Current().c_str());
if (Mpd.ClearPlaylist(locale_to_utf_cpy(myPlaylistEditor->Playlists->Current())))
ShowMessage("Playlist \"%s\" cleared", myPlaylistEditor->Playlists->Current().c_str());
}
}