From ae706a51a64669b28d6d0a66bfb00ba22a76174c Mon Sep 17 00:00:00 2001
From: jcorporation <mail@jcgames.de>
Date: Thu, 22 Nov 2018 23:23:53 +0000
Subject: [PATCH] Feat: add featAdvsearch, depends on mpd >= 0.21.0 and
 libmpdclient >= 2.17.0

---
 src/mpd_client.c | 15 ++++++++++++---
 src/mpd_client.h |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/mpd_client.c b/src/mpd_client.c
index 7a73424..889f964 100644
--- a/src/mpd_client.c
+++ b/src/mpd_client.c
@@ -752,6 +752,7 @@ void mympd_mpd_features() {
     mpd.feat_sticker = false;
     mpd.feat_playlists = false;
     mpd.feat_tags = false;
+    mpd.feat_advsearch = false;
 
     mpd_send_allowed_commands(mpd.conn);
     while ((pair = mpd_recv_command_pair(mpd.conn)) != NULL) {
@@ -824,6 +825,13 @@ void mympd_mpd_features() {
     free(taglist);
     free(searchtaglist);
     free(browsetaglist);
+    
+    if (LIBMPDCLIENT_CHECK_VERSION(2, 17, 0) && mpd_connection_cmp_server_version(mpd.conn, 0, 21, 0) >= 0) {
+        mpd.feat_advsearch = true;
+        printf("Enabling advanced search\n");
+    } 
+    else 
+        printf("Disabling advanced search, depends on mpd >= 0.21.0 and libmpdclient >= 2.17.0\n");
 }
 
 void mympd_idle(struct mg_mgr *s, int timeout) {
@@ -1412,9 +1420,9 @@ int mympd_put_settings(char *buffer) {
     len = json_printf(&out, "{type: settings, data: {"
         "repeat: %d, single: %d, crossfade: %d, consume: %d, random: %d, "
         "mixrampdb: %f, mixrampdelay: %f, mpdhost: %Q, mpdport: %d, passwort_set: %B, featSyscmds: %B, featPlaylists: %B, featTags: %B, featLibrary: %B, "
-        "featLocalplayer: %B, streamport: %d, streamurl: %Q, featCoverimage: %B, coverimagename: %Q, featStickers: %B, mixramp: %B, featSmartpls: %B, maxElementsPerPage: %d, "
-        "replaygain: %Q, notificationWeb: %B, notificationPage: %B, jukeboxMode: %d, jukeboxPlaylist: %Q, jukeboxQueueLength: %d, "
-        "tags: [", 
+        "featAdvsearch: %B, featLocalplayer: %B, streamport: %d, streamurl: %Q, featCoverimage: %B, coverimagename: %Q, featStickers: %B, mixramp: %B, "
+        "featSmartpls: %B, maxElementsPerPage: %d, replaygain: %Q, notificationWeb: %B, notificationPage: %B, jukeboxMode: %d, jukeboxPlaylist: %Q, "
+        "jukeboxQueueLength: %d, tags: [", 
         mpd_status_get_repeat(status),
         mpd_status_get_single(status),
         mpd_status_get_crossfade(status),
@@ -1429,6 +1437,7 @@ int mympd_put_settings(char *buffer) {
         mpd.feat_playlists,
         mpd.feat_tags,
         mpd.feat_library,
+        mpd.feat_advsearch,
         config.localplayer,
         config.streamport,
         config.streamurl,
diff --git a/src/mpd_client.h b/src/mpd_client.h
index 01c46d2..425ab7c 100644
--- a/src/mpd_client.h
+++ b/src/mpd_client.h
@@ -167,6 +167,7 @@ struct t_mpd {
     bool feat_playlists;
     bool feat_tags;
     bool feat_library;
+    bool feat_advsearch;
 } mpd;
 
 struct list mpd_tags;