From 25554ed1004f9e6929d21af22fef64dff56c25ee Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Sat, 6 Jun 2009 08:24:05 +0200
Subject: [PATCH] be more verbose while deleting items in browser

---
 src/browser.cpp | 6 +++++-
 src/ncmpcpp.cpp | 9 ++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/browser.cpp b/src/browser.cpp
index c8bebdc8..ab79a94c 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -20,6 +20,7 @@
 
 #include <dirent.h>
 #include <sys/stat.h>
+#include <cerrno>
 #include <cstring>
 #include <algorithm>
 
@@ -536,7 +537,10 @@ void Browser::ClearDirectory(const std::string &path) const
 		lstat(full_path.c_str(), &file_stat);
 		if (S_ISDIR(file_stat.st_mode))
 			ClearDirectory(full_path);
-		remove(full_path.c_str());
+		if (remove(full_path.c_str()) == 0)
+			ShowMessage("Deleting \"%s\"...", full_path.c_str());
+		else
+			ShowMessage("Couldn't remove \"%s\": %s", full_path.c_str(), strerror(errno));
 	}
 	closedir(dir);
 }
diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index effcae77..9cdff17e 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -584,7 +584,8 @@ int main(int argc, char *argv[])
 					continue;
 				
 				LockStatusbar();
-				Statusbar() << "Delete " << (item.type == itSong ? "file" : "directory") << " \"" << (item.type == itSong ? item.song->GetName() : item.name) << "\" ? [y/n] ";
+				string name = item.type == itSong ? item.song->GetName() : item.name;
+				Statusbar() << "Delete " << (item.type == itSong ? "file" : "directory") << " \"" << name << "\" ? [y/n] ";
 				curs_set(1);
 				int in = 0;
 				do
@@ -595,8 +596,6 @@ int main(int argc, char *argv[])
 				while (in != 'y' && in != 'n');
 				if (in == 'y')
 				{
-					ShowMessage("Deleting...");
-					
 					string path;
 					if (!Config.local_browser)
 						path = Config.mpd_music_dir;
@@ -607,14 +606,14 @@ int main(int argc, char *argv[])
 					
 					if (remove(path.c_str()) == 0)
 					{
-						ShowMessage("%s has been deleted!", item.type == itSong ? "File" : "Directory");
+						ShowMessage("\"%s\" has been successfuly deleted!", name.c_str());
 						if (!Config.local_browser)
 							Mpd->UpdateDirectory(myBrowser->CurrentDir());
 						else
 							myBrowser->GetDirectory(myBrowser->CurrentDir());
 					}
 					else
-						ShowMessage("Deletion failed: %s", strerror(errno));
+						ShowMessage("Couldn't remove \"%s\": %s", name.c_str(), strerror(errno));
 				}
 				else
 					ShowMessage("Aborted!");