From a236a439cc84035a70c3f43fd926d39b9d8caaf7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 13 Sep 2011 21:24:22 +0200 Subject: db_print: move code to function db_selection_print() Use it in handle_lsinfo(), and eliminate some duplicate code. --- src/db_print.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'src/db_print.c') diff --git a/src/db_print.c b/src/db_print.c index 8f9bd5b97..f341ca4e8 100644 --- a/src/db_print.c +++ b/src/db_print.c @@ -19,6 +19,7 @@ #include "config.h" #include "db_print.h" +#include "db_selection.h" #include "db_visitor.h" #include "locate.h" #include "directory.h" @@ -119,6 +120,14 @@ static const struct db_visitor print_info_visitor = { .playlist = print_visitor_playlist_info, }; +bool +db_selection_print(struct client *client, const struct db_selection *selection, + bool full, GError **error_r) +{ + return db_visit(selection, full ? &print_info_visitor : &print_visitor, + client, error_r); +} + struct search_data { struct client *client; const struct locate_item_list *criteria; @@ -233,14 +242,18 @@ searchStatsForSongsIn(struct client *client, const char *name, bool printAllIn(struct client *client, const char *uri_utf8, GError **error_r) { - return db_walk(uri_utf8, &print_visitor, client, error_r); + struct db_selection selection; + db_selection_init(&selection, uri_utf8, true); + return db_selection_print(client, &selection, false, error_r); } bool printInfoForAllIn(struct client *client, const char *uri_utf8, GError **error_r) { - return db_walk(uri_utf8, &print_info_visitor, client, error_r); + struct db_selection selection; + db_selection_init(&selection, uri_utf8, true); + return db_selection_print(client, &selection, true, error_r); } static ListCommandItem * -- cgit v1.2.3