diff --git a/src/screen_search.c b/src/screen_search.c
index 3deaf09b6c427810e810baf3f8d8047e60ce52ba..2dd911d09b3a8cc3c9cccb5518c62176889845a8 100644 (file)
--- a/src/screen_search.c
+++ b/src/screen_search.c
}
static struct filelist *
-search_simple_query(struct mpdclient *c, G_GNUC_UNUSED int exact_match,
+search_simple_query(struct mpd_connection *connection, bool exact_match,
int table, gchar *local_pattern)
{
- struct filelist *list, *list2;
+ struct filelist *list;
gchar *filter_utf8 = locale_to_utf8(local_pattern);
if (table == SEARCH_ARTIST_TITLE) {
- list = mpdclient_filelist_search(c, FALSE, MPD_TAG_ARTIST,
- filter_utf8);
- if (list == NULL)
- list = filelist_new();
-
- list2 = mpdclient_filelist_search(c, FALSE, MPD_TAG_TITLE,
- filter_utf8);
- if (list2 != NULL) {
- filelist_move(list, list2);
- filelist_free(list2);
- }
+ mpd_command_list_begin(connection, false);
+
+ mpd_search_db_songs(connection, exact_match);
+ mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
+ MPD_TAG_ARTIST, filter_utf8);
+ mpd_search_commit(connection);
+
+ mpd_search_db_songs(connection, exact_match);
+ mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
+ MPD_TAG_TITLE, filter_utf8);
+ mpd_search_commit(connection);
+
+ mpd_command_list_end(connection);
+
+ list = filelist_new_recv(connection);
- filelist_sort_all(list, compare_filelistentry_format);
+ if (list != NULL)
+ filelist_sort_all(list, compare_filelistentry_format);
+ } else if (table == SEARCH_URI) {
+ mpd_search_db_songs(connection, exact_match);
+ mpd_search_add_uri_constraint(connection, MPD_OPERATOR_DEFAULT,
+ filter_utf8);
+ mpd_search_commit(connection);
+
+ list = filelist_new_recv(connection);
} else {
- list = mpdclient_filelist_search(c, FALSE, table, filter_utf8);
- if (list == NULL)
- list = filelist_new();
+ mpd_search_db_songs(connection, exact_match);
+ mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
+ table, filter_utf8);
+ mpd_search_commit(connection);
+
+ list = filelist_new_recv(connection);
}
g_free(filter_utf8);
*-----------------------------------------------------------------------
*/
static struct filelist *
-search_advanced_query(char *query, struct mpdclient *c)
+search_advanced_query(struct mpd_connection *connection, char *query)
{
int i,j;
char **strv;
int table[10];
char *arg[10];
struct filelist *fl = NULL;
- struct mpd_entity *entity;
advanced_search_mode = FALSE;
if (strchr(query, ':') == NULL)
*-----------------------------------------------------------------------
*/
/** stupid - but this is just a test...... (fulhack) */
- mpd_search_db_songs(c->connection, false);
+ mpd_search_db_songs(connection, false);
for (i = 0; i < 10 && arg[i] != NULL; i++) {
if (table[i] == SEARCH_URI)
- mpd_search_add_uri_constraint(c->connection,
+ mpd_search_add_uri_constraint(connection,
MPD_OPERATOR_DEFAULT,
arg[i]);
else
- mpd_search_add_tag_constraint(c->connection,
+ mpd_search_add_tag_constraint(connection,
MPD_OPERATOR_DEFAULT,
table[i], arg[i]);
}
- mpd_search_commit(c->connection);
-
- fl = filelist_new();
-
- while ((entity = mpd_recv_entity(c->connection)) != NULL)
- filelist_append(fl, entity);
-
- if (!mpd_response_finish(c->connection)) {
+ mpd_search_commit(connection);
+ fl = filelist_new_recv(connection);
+ if (!mpd_response_finish(connection)) {
filelist_free(fl);
fl = NULL;
-
- mpdclient_handle_error(c);
}
for (i = 0; arg[i] != NULL; ++i)
{
struct filelist *fl;
- fl = search_advanced_query(query, c);
- if (!advanced_search_mode && browser.filelist == NULL)
- return search_simple_query(c, FALSE,
- mode[options.search_mode].table,
- query);
+ fl = search_advanced_query(c->connection, query);
+ if (fl != NULL)
+ return fl;
+
+ if (mpd_connection_get_error(c->connection) != MPD_ERROR_SUCCESS) {
+ mpdclient_handle_error(c);
+ return NULL;
+ }
+ fl = search_simple_query(c->connection, FALSE,
+ mode[options.search_mode].table,
+ query);
+ if (fl == NULL)
+ mpdclient_handle_error(c);
return fl;
}