1 files changed, 119 insertions, 0 deletions
diff --git a/src/db/update/Editor.cxx b/src/db/update/Editor.cxx
new file mode 100644
index 000000000..4136ccdad
--- /dev/null
+++ b/src/db/update/Editor.cxx
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h" /* must be first for large file support */
+#include "Editor.hxx"
+#include "Remove.hxx"
+#include "db/PlaylistVector.hxx"
+#include "db/DatabaseLock.hxx"
+#include "db/plugins/simple/Directory.hxx"
+#include "db/plugins/simple/Song.hxx"
+
+#include <assert.h>
+#include <stddef.h>
+
+void
+DatabaseEditor::DeleteSong(Directory &dir, Song *del)
+{
+	assert(del->parent == &dir);
+
+	/* first, prevent traversers in main task from getting this */
+	dir.RemoveSong(del);
+
+	db_unlock(); /* temporary unlock, because update_remove_song() blocks */
+
+	/* now take it out of the playlist (in the main_task) */
+	remove.Remove(del);
+
+	/* finally, all possible references gone, free it */
+	del->Free();
+
+	db_lock();
+}
+
+void
+DatabaseEditor::LockDeleteSong(Directory &parent, Song *song)
+{
+	db_lock();
+	DeleteSong(parent, song);
+	db_unlock();
+}
+
+/**
+ * Recursively remove all sub directories and songs from a directory,
+ * leaving an empty directory.
+ *
+ * Caller must lock the #db_mutex.
+ */
+inline void
+DatabaseEditor::ClearDirectory(Directory &directory)
+{
+	directory.ForEachChildSafe([this](Directory &child){
+			DeleteDirectory(&child);
+		});
+
+	directory.ForEachSongSafe([this, &directory](Song &song){
+			assert(song.parent == &directory);
+			DeleteSong(directory, &song);
+		});
+}
+
+void
+DatabaseEditor::DeleteDirectory(Directory *directory)
+{
+	assert(directory->parent != nullptr);
+
+	ClearDirectory(*directory);
+
+	directory->Delete();
+}
+
+void
+DatabaseEditor::LockDeleteDirectory(Directory *directory)
+{
+	db_lock();
+	DeleteDirectory(directory);
+	db_unlock();
+}
+
+bool
+DatabaseEditor::DeleteNameIn(Directory &parent, const char *name)
+{
+	bool modified = false;
+
+	db_lock();
+	Directory *directory = parent.FindChild(name);
+
+	if (directory != nullptr) {
+		DeleteDirectory(directory);
+		modified = true;
+	}
+
+	Song *song = parent.FindSong(name);
+	if (song != nullptr) {
+		DeleteSong(parent, song);
+		modified = true;
+	}
+
+	parent.playlists.erase(name);
+
+	db_unlock();
+
+	return modified;
+}