aboutsummaryrefslogtreecommitdiffstats
path: root/src/db
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-09-10 18:48:10 +0200
committerMax Kellermann <max@duempel.org>2011-09-13 21:47:00 +0200
commita94d4be466ea3a48389361b483f72df45834f7d2 (patch)
tree734076ad49d963a00648f58dee4cde111dc0364a /src/db
parentb7d2d4cfe8b88174a7b1f41840ddc0b23dbd6a75 (diff)
downloadmpd-a94d4be466ea3a48389361b483f72df45834f7d2.tar.gz
mpd-a94d4be466ea3a48389361b483f72df45834f7d2.tar.xz
mpd-a94d4be466ea3a48389361b483f72df45834f7d2.zip
db_plugin: add method visit()
Diffstat (limited to 'src/db')
-rw-r--r--src/db/simple_db_plugin.c41
1 files changed, 41 insertions, 0 deletions
diff --git a/src/db/simple_db_plugin.c b/src/db/simple_db_plugin.c
index 8218635fc..e359b5e65 100644
--- a/src/db/simple_db_plugin.c
+++ b/src/db/simple_db_plugin.c
@@ -21,6 +21,8 @@
#include "simple_db_plugin.h"
#include "db_internal.h"
#include "db_error.h"
+#include "db_selection.h"
+#include "db_visitor.h"
#include "db_save.h"
#include "conf.h"
#include "glib_compat.h"
@@ -48,6 +50,17 @@ simple_db_quark(void)
return g_quark_from_static_string("simple_db");
}
+G_GNUC_PURE
+static const struct directory *
+simple_db_lookup_directory(const struct simple_db *db, const char *uri)
+{
+ assert(db != NULL);
+ assert(db->root != NULL);
+ assert(uri != NULL);
+
+ return directory_lookup_directory(db->root, uri);
+}
+
static struct db *
simple_db_init(const struct config_param *param, GError **error_r)
{
@@ -230,6 +243,33 @@ simple_db_get_song(struct db *_db, const char *uri, GError **error_r)
return song;
}
+static bool
+simple_db_visit(struct db *_db, const struct db_selection *selection,
+ const struct db_visitor *visitor, void *ctx,
+ GError **error_r)
+{
+ const struct simple_db *db = (const struct simple_db *)_db;
+ const struct directory *directory =
+ simple_db_lookup_directory(db, selection->uri);
+ if (directory == NULL) {
+ struct song *song;
+ if (visitor->song != NULL &&
+ (song = simple_db_get_song(_db, selection->uri, NULL)) != NULL)
+ return visitor->song(song, ctx, error_r);
+
+ g_set_error(error_r, db_quark(), DB_NOT_FOUND,
+ "No such directory");
+ return false;
+ }
+
+ if (selection->recursive && visitor->directory != NULL &&
+ !visitor->directory(directory, ctx, error_r))
+ return false;
+
+ return directory_walk(directory, selection->recursive,
+ visitor, ctx, error_r);
+}
+
const struct db_plugin simple_db_plugin = {
.name = "simple",
.init = simple_db_init,
@@ -237,6 +277,7 @@ const struct db_plugin simple_db_plugin = {
.open = simple_db_open,
.close = simple_db_close,
.get_song = simple_db_get_song,
+ .visit = simple_db_visit,
};
struct directory *