From 400943b74b55303c4e720c941869b643ec7b2d0c Mon Sep 17 00:00:00 2001
From: Fabio Manganiello <blacklight86@gmail.com>
Date: Sun, 15 Apr 2018 10:03:34 +0200
Subject: [PATCH] Cleaner management of MPD search filters on the frontend

---
 platypush/backend/http/static/js/music.mpd.js | 55 +++++--------------
 1 file changed, 14 insertions(+), 41 deletions(-)

diff --git a/platypush/backend/http/static/js/music.mpd.js b/platypush/backend/http/static/js/music.mpd.js
index 6f646a325..3608c6a47 100644
--- a/platypush/backend/http/static/js/music.mpd.js
+++ b/platypush/backend/http/static/js/music.mpd.js
@@ -649,39 +649,10 @@ $(document).ready(function() {
                 return obj;
             }, {});
 
-            var args = {};
-            var searchFilters = {};
-
-            if ('any' in searchData) {
-                args = {
-                    filter: ['any', searchData.any]
-                };
-
-                searchFilters.any = searchData.any;
-            } else {
-                if ('title' in searchData) {
-                    args = {
-                        filter: ['title', searchData.title]
-                    };
-
-                    searchFilters.title = searchData.title;
-                }
-
-                if ('album' in searchData) {
-                    args = {
-                        filter: ['album', searchData.album]
-                    };
-
-                    searchFilters.album = searchData.album;
-                }
-
-                if ('albumartist' in searchData) {
-                    args = {
-                        filter: ['albumartist', searchData.albumartist]
-                    };
-
-                    searchFilters.albumartist = searchData.albumartist;
-                }
+            var filter = [];
+            for (var searchItem of Object.keys(searchData)) {
+                filter.push(searchItem);
+                filter.push(searchData[searchItem]);
             }
 
             $(this).find('input').prop('disabled', true);
@@ -690,7 +661,9 @@ $(document).ready(function() {
                 {
                     type: 'request',
                     action: 'music.mpd.search',
-                    args: args
+                    args: {
+                        filter: filter
+                    }
                 },
 
                 onSuccess = function(response) {
@@ -699,20 +672,20 @@ $(document).ready(function() {
                         return false;
                     }
 
-                    if (Object.keys(searchFilters).length > 1) {
+                    if (Object.keys(searchData).length > 1) {
                         results = results.filter(function(item) {
                             return (
-                                ('title' in searchFilters
+                                ('title' in searchData
                                     ? (item.title || '').toLowerCase().indexOf(
-                                        searchFilters.title.toLowerCase()) >= 0
+                                        searchData.title.toLowerCase()) >= 0
                                     : true) &&
-                                ('album' in searchFilters
+                                ('album' in searchData
                                     ? (item.album || '').toLowerCase().indexOf(
-                                        searchFilters.album.toLowerCase()) >= 0
+                                        searchData.album.toLowerCase()) >= 0
                                     : true) &&
-                                ('albumartist' in searchFilters
+                                ('albumartist' in searchData
                                     ? (item.artist || '').toLowerCase().indexOf(
-                                        searchFilters.albumartist.toLowerCase()) >= 0
+                                        searchData.albumartist.toLowerCase()) >= 0
                                     : true)
                             );
                         });