From 49b84f92293e2cfc7966dc0f8b50b24c52061b9d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 8 Oct 2011 14:33:41 +0200 Subject: db_print: print absolute URI of playlist entries The protocol mandates that playlist URIs are absolute (i.e. full URI relative to the music directory, not relative to the parent directory). This adds the parameter "directory" to the "playlist" visitor method. --- src/db_print.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'src/db_print.c') diff --git a/src/db_print.c b/src/db_print.c index f341ca4e8..067d1c60f 100644 --- a/src/db_print.c +++ b/src/db_print.c @@ -73,21 +73,35 @@ print_visitor_song_info(struct song *song, void *data, return true; } +static void +print_playlist_in_directory(struct client *client, + const struct directory *directory, + const char *name_utf8) +{ + if (directory_is_root(directory)) + client_printf(client, "playlist: %s\n", name_utf8); + else + client_printf(client, "playlist: %s/%s\n", + directory_get_path(directory), name_utf8); +} + static bool -print_visitor_playlist(const struct playlist_metadata *playlist, void *ctx, +print_visitor_playlist(const struct playlist_metadata *playlist, + const struct directory *directory, void *ctx, G_GNUC_UNUSED GError **error_r) { struct client *client = ctx; - client_printf(client, "playlist: %s\n", playlist->name); + print_playlist_in_directory(client, directory, playlist->name); return true; } static bool print_visitor_playlist_info(const struct playlist_metadata *playlist, + const struct directory *directory, void *ctx, G_GNUC_UNUSED GError **error_r) { struct client *client = ctx; - client_printf(client, "playlist: %s\n", playlist->name); + print_playlist_in_directory(client, directory, playlist->name); #ifndef G_OS_WIN32 struct tm tm; -- cgit v1.2.3