From 306840fa1d7cad434bbd08af15abaae64679a162 Mon Sep 17 00:00:00 2001 From: Govert Buijs Date: Wed, 8 Jun 2016 23:20:27 +0200 Subject: [PATCH] Added crude filtering for browsing db --- htdocs/index.html | 2 +- htdocs/js/mpd.js | 79 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 77 insertions(+), 4 deletions(-) diff --git a/htdocs/index.html b/htdocs/index.html index ed77279..92fa2a3 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -99,7 +99,7 @@ -
+
diff --git a/htdocs/js/mpd.js b/htdocs/js/mpd.js index 6000b79..0e3c09a 100644 --- a/htdocs/js/mpd.js +++ b/htdocs/js/mpd.js @@ -29,6 +29,7 @@ var dirble_selected_cat = ""; var dirble_catid = ""; var dirble_page = 1; var isTouch = Modernizr.touch ? 1 : 0; +var filter = undefined; var app = $.sammy(function() { @@ -36,6 +37,7 @@ var app = $.sammy(function() { current_app = 'queue'; $('#breadcrump').addClass('hide'); + $('#filter').addClass('hide'); $('#salamisandwich').removeClass('hide').find("tr:gt(0)").remove(); $('#dirble_panel').addClass('hide'); socket.send('MPD_API_GET_QUEUE,'+pagination); @@ -63,7 +65,8 @@ var app = $.sammy(function() { browsepath = this.params['splat'][1]; pagination = parseInt(this.params['splat'][0]); current_app = 'browse'; - $('#breadcrump').removeClass('hide').empty().append("
  • root
  • "); + $('#breadcrump').removeClass('hide').empty().append("
  • root
  • "); + $('#filter').removeClass('hide'); $('#salamisandwich').removeClass('hide').find("tr:gt(0)").remove(); $('#dirble_panel').addClass('hide'); socket.send('MPD_API_GET_BROWSE,'+pagination+','+(browsepath ? browsepath : "/")); @@ -178,6 +181,8 @@ $(document).ready(function(){ else if ($.cookie("notification") === "true") $('#btnnotify').addClass("active") + + add_filter(); }); @@ -270,16 +275,31 @@ function webSocketConnect() { for (var item in obj.data) { switch(obj.data[item].type) { case "directory": + var clazz = 'dir'; + if (filter !== undefined) { + var first = obj.data[item].dir[0]; + if (filter === "#" && isNaN(first)) { + clazz += ' hide'; + } else if (filter >= "A" && filter <= "Z" && first.toUpperCase() !== filter) { + clazz += ' hide'; + } else if (filter === "||") { + clazz += ' hide'; + } + } $('#salamisandwich > tbody').append( - "" + + "" + "" + "" + basename(obj.data[item].dir) + "" + "" ); break; case "playlist": + var clazz = 'plist'; + if (filter !== "||") { + clazz += ' hide'; + } $('#salamisandwich > tbody').append( - "" + + "" + "" + "" + basename(obj.data[item].plist) + "" + "" @@ -934,3 +954,56 @@ function dirble_load_stations() { }); }); } + +function set_filter (c) { + filter = c; + + $.each($('#salamisandwich > tbody > tr.dir'), function(i, line) { + var first = $(line).attr('uri')[0]; + + if (filter === undefined) { + $(line).removeClass('hide'); + } + + else if (filter === "#") { + if (!isNaN(first)) { + $(line).removeClass('hide'); + } else { + $(line).addClass('hide'); + } + } + + else if (filter >= "A" && filter <= "Z") { + if (first.toUpperCase() === filter) { + $(line).removeClass('hide'); + } else { + $(line).addClass('hide'); + } + } + + else if (filter === "||") { + $(line).addClass('hide'); + } + }); + + $.each($('#salamisandwich > tbody > tr.plist'), function(i, line) { + if (filter === undefined) { + $(line).removeClass('hide'); + } else if (filter === "||") { + $(line).removeClass('hide'); + } else { + $(line).addClass('hide'); + } + }); +} + +function add_filter () { + $('#filter').append(' #'); + + for (i = 65; i <= 90; i++) { + var c = String.fromCharCode(i); + $('#filter').append(' ' + c + ''); + } + + $('#filter').append(' '); +} -- 2.20.1