From 0a956a3fdd558063e7458c8b3b9b796d0a87900b Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Tue, 5 Sep 2017 21:13:43 +1200
Subject: [PATCH] Testing percentage indicator

---
 src/js/components/Notifications.js   |  5 ++++-
 src/js/services/mopidy/middleware.js | 16 ++++++++++------
 src/js/services/mopidy/reducer.js    |  1 -
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/js/components/Notifications.js b/src/js/components/Notifications.js
index 5152b99c..920fe540 100755
--- a/src/js/components/Notifications.js
+++ b/src/js/components/Notifications.js
@@ -39,12 +39,15 @@ export default class Notifications extends React.Component{
 	}
 
 	renderProcess(process){
+
+		var progress = ((process.data.total - process.data.remaining) / process.data.total * 100).toFixed()
+
 		switch (process.status){
 			case 'running':
 				return(
 					<div className="process notification" key={process.key}>
 						<div className="loader"></div>
-						{process.message}
+						{process.message} {progress ? progress+'%' : null}
 						<FontAwesome name="close" className="close-button" onClick={e => {this.props.uiActions.cancelProcess(process.key)}} />
 					</div>
 				)
diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js
index 61f6fa1a..275206dc 100755
--- a/src/js/services/mopidy/middleware.js
+++ b/src/js/services/mopidy/middleware.js
@@ -503,6 +503,7 @@ const MopidyMiddleware = (function(){
                         query: action.query,
                         limit: action.limit,
                         total: uri_schemes_total,
+                        remaining: uri_schemes.length,
                         uri_scheme: uri_scheme,
                         uri_schemes: uri_schemes
                     }
@@ -524,16 +525,19 @@ const MopidyMiddleware = (function(){
                     return
                 }
 
-                // Update UI for this round
-                store.dispatch(uiActions.updateProcess(
-                    'MOPIDY_GET_SEARCH_RESULTS_PROCESSOR',
-                    'Searching '+action.data.uri_scheme.replace(':','')
-                ))
-
                 // Construct our next batch's task
                 var next_uri_schemes = Object.assign([], action.data.uri_schemes)
                 var next_uri_scheme = next_uri_schemes.shift()
 
+                // Update UI for this round
+                store.dispatch(uiActions.updateProcess(
+                    'MOPIDY_GET_SEARCH_RESULTS_PROCESSOR',
+                    'Searching '+action.data.uri_scheme.replace(':',''),
+                    {
+                        remaining: next_uri_schemes.length,
+                    }
+                ))
+
                 switch (action.data.context){
 
                     // Albums
diff --git a/src/js/services/mopidy/reducer.js b/src/js/services/mopidy/reducer.js
index 6dccf99e..5a3bbc98 100755
--- a/src/js/services/mopidy/reducer.js
+++ b/src/js/services/mopidy/reducer.js
@@ -147,7 +147,6 @@ export default function reducer(mopidy = {}, action){
          **/
 
         case 'MOPIDY_CLEAR_SEARCH_RESULTS':
-            console.log(action)
             return Object.assign({}, mopidy, { search_results: {} });
 
         case 'MOPIDY_SEARCH_RESULTS_LOADED':