Playlist{Info,Vector}: move to db/

6 files changed, 188 insertions, 3 deletions

diff --git a/src/db/PlaylistInfo.hxx b/src/db/PlaylistInfo.hxx
new file mode 100644
index 000000000..baa6cc361
--- /dev/null
+++ b/src/db/PlaylistInfo.hxx
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+#ifndef MPD_PLAYLIST_INFO_HXX
+#define MPD_PLAYLIST_INFO_HXX
+
+#include "check.h"
+#include "Compiler.h"
+
+#include <string>
+
+#include <sys/time.h>
+
+/**
+ * A directory entry pointing to a playlist file.
+ */
+struct PlaylistInfo {
+	/**
+	 * The UTF-8 encoded name of the playlist file.
+	 */
+	std::string name;
+
+	time_t mtime;
+
+	class CompareName {
+		const char *const name;
+
+	public:
+		constexpr CompareName(const char *_name):name(_name) {}
+
+		gcc_pure
+		bool operator()(const PlaylistInfo &pi) const {
+			return pi.name.compare(name) == 0;
+		}
+	};
+
+	PlaylistInfo() = default;
+
+	template<typename N>
+	PlaylistInfo(N &&_name, time_t _mtime)
+		:name(std::forward<N>(_name)), mtime(_mtime) {}
+
+	PlaylistInfo(const PlaylistInfo &other) = delete;
+	PlaylistInfo(PlaylistInfo &&) = default;
+};
+
+#endif
diff --git a/src/db/PlaylistVector.cxx b/src/db/PlaylistVector.cxx
new file mode 100644
index 000000000..82a3519d9
--- /dev/null
+++ b/src/db/PlaylistVector.cxx
@@ -0,0 +1,66 @@
+/*
+ * 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"
+#include "PlaylistVector.hxx"
+#include "db/DatabaseLock.hxx"
+
+#include <algorithm>
+
+#include <assert.h>
+
+PlaylistVector::iterator
+PlaylistVector::find(const char *name)
+{
+	assert(holding_db_lock());
+	assert(name != nullptr);
+
+	return std::find_if(begin(), end(),
+			    PlaylistInfo::CompareName(name));
+}
+
+bool
+PlaylistVector::UpdateOrInsert(PlaylistInfo &&pi)
+{
+	assert(holding_db_lock());
+
+	auto i = find(pi.name.c_str());
+	if (i != end()) {
+		if (pi.mtime == i->mtime)
+			return false;
+
+		i->mtime = pi.mtime;
+	} else
+		push_back(std::move(pi));
+
+	return true;
+}
+
+bool
+PlaylistVector::erase(const char *name)
+{
+	assert(holding_db_lock());
+
+	auto i = find(name);
+	if (i == end())
+		return false;
+
+	erase(i);
+	return true;
+}
diff --git a/src/db/PlaylistVector.hxx b/src/db/PlaylistVector.hxx
new file mode 100644
index 000000000..8820ead5c
--- /dev/null
+++ b/src/db/PlaylistVector.hxx
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+#ifndef MPD_PLAYLIST_VECTOR_HXX
+#define MPD_PLAYLIST_VECTOR_HXX
+
+#include "PlaylistInfo.hxx"
+#include "Compiler.h"
+
+#include <list>
+
+class PlaylistVector : protected std::list<PlaylistInfo> {
+protected:
+	/**
+	 * Caller must lock the #db_mutex.
+	 */
+	gcc_pure
+	iterator find(const char *name);
+
+public:
+	using std::list<PlaylistInfo>::empty;
+	using std::list<PlaylistInfo>::begin;
+	using std::list<PlaylistInfo>::end;
+	using std::list<PlaylistInfo>::push_back;
+	using std::list<PlaylistInfo>::erase;
+
+	/**
+	 * Caller must lock the #db_mutex.
+	 *
+	 * @return true if the vector or one of its items was modified
+	 */
+	bool UpdateOrInsert(PlaylistInfo &&pi);
+
+	/**
+	 * Caller must lock the #db_mutex.
+	 */
+	bool erase(const char *name);
+};
+
+#endif /* SONGVEC_H */
diff --git a/src/db/plugins/ProxyDatabasePlugin.cxx b/src/db/plugins/ProxyDatabasePlugin.cxx
index daa963c7d..291b1bc1f 100644
--- a/src/db/plugins/ProxyDatabasePlugin.cxx
+++ b/src/db/plugins/ProxyDatabasePlugin.cxx
@@ -23,7 +23,7 @@
 #include "db/DatabaseListener.hxx"
 #include "db/Selection.hxx"
 #include "db/DatabaseError.hxx"
-#include "PlaylistInfo.hxx"
+#include "db/PlaylistInfo.hxx"
 #include "db/LightDirectory.hxx"
 #include "db/LightSong.hxx"
 #include "SongFilter.hxx"
diff --git a/src/db/update/UpdateDatabase.cxx b/src/db/update/UpdateDatabase.cxx
index 8ef0b6d82..72a68de14 100644
--- a/src/db/update/UpdateDatabase.cxx
+++ b/src/db/update/UpdateDatabase.cxx
@@ -20,7 +20,7 @@
 #include "config.h" /* must be first for large file support */
 #include "UpdateDatabase.hxx"
 #include "UpdateRemove.hxx"
-#include "PlaylistVector.hxx"
+#include "db/PlaylistVector.hxx"
 #include "db/Directory.hxx"
 #include "db/Song.hxx"
 #include "db/DatabaseLock.hxx"
diff --git a/src/db/update/UpdateWalk.cxx b/src/db/update/UpdateWalk.cxx
index c5a9936e9..75924a7f7 100644
--- a/src/db/update/UpdateWalk.cxx
+++ b/src/db/update/UpdateWalk.cxx
@@ -28,7 +28,7 @@
 #include "db/DatabaseSimple.hxx"
 #include "db/Directory.hxx"
 #include "db/Song.hxx"
-#include "PlaylistVector.hxx"
+#include "db/PlaylistVector.hxx"
 #include "playlist/PlaylistRegistry.hxx"
 #include "Mapper.hxx"
 #include "ExcludeList.hxx"