Fix search

martpie · May 9, 2016 · 31797ad · 31797ad
1 parent 5f2b3c4
commit 31797ad
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/js/actions/LibraryActions.js b/src/js/actions/LibraryActions.js
@@ -2,7 +2,8 @@ import AppDispatcher from '../dispatcher/AppDispatcher';
 import AppConstants  from '../constants/AppConstants';
 import AppActions    from './AppActions';
 
-import app from '../utils/app';
+import app   from '../utils/app';
+import utils from '../utils/utils';
 
 import mmd      from 'musicmetadata';
 import fs       from 'fs';
@@ -148,11 +149,11 @@ export default {
 
                                         // Formated metas for sorting
                                         metadata.loweredMetas = {
-                                            artist      : metadata.artist.map(meta => meta.toLowerCase()),
-                                            album       : metadata.album.toLowerCase(),
-                                            albumartist : metadata.albumartist.map(meta => meta.toLowerCase()),
-                                            title       : metadata.title.toLowerCase(),
-                                            genre       : metadata.genre.map(meta => meta.toLowerCase())
+                                            artist      : metadata.artist.map(meta => utils.stripAccents(meta.toLowerCase())),
+                                            album       : utils.stripAccents(metadata.album.toLowerCase()),
+                                            albumartist : metadata.albumartist.map(meta => utils.stripAccents(meta.toLowerCase())),
+                                            title       : utils.stripAccents(metadata.title.toLowerCase()),
+                                            genre       : metadata.genre.map(meta => utils.stripAccents(meta.toLowerCase()))
                                         }
 
                                         app.db.find({ path: metadata.path }, function (err, docs) {

diff --git a/src/js/stores/AppStore.js b/src/js/stores/AppStore.js
@@ -166,9 +166,9 @@ AppDispatcher.register(function(payload) {
                 if(search != '' && search != undefined) {
 
                     if(utils.stripAccents(track.loweredMetas.artist.join(', ')).indexOf(search) === -1
-                        && utils.stripAccents(track.album.toLowerCase()).indexOf(search) === -1
-                        && utils.stripAccents(track.loweredMetas.genre.join(', ')).toLowerCase().indexOf(search) === -1
-                        && utils.stripAccents(track.title.toLowerCase().indexOf(search) === -1)) {
+                        && track.loweredMetas.album.indexOf(search) === -1
+                        && track.loweredMetas.genre.join(', ').indexOf(search) === -1
+                        && track.loweredMetas.title.indexOf(search) === -1) {
 
                         continue;
 

diff --git a/src/js/utils/utils.js b/src/js/utils/utils.js
@@ -94,6 +94,8 @@ export default {
      */
     stripAccents(str) {
 
+        console.log(str)
+
         var accents = "ÀÁÂÃÄÅÇÈÉÊËÌÍÎÏÒÓÔÕÖÙÚÛÜÝàáâãäåçèéêëìíîïðòóôõöùúûüýÿñ",
             fixes = "aaaaaaceeeeiiiiooooouuuuyaaaaaaceeeeiiiioooooouuuuyyn",
             reg = new RegExp("(" + accents.split("").join("|") + ")", "g");