searching for artist name containing single quote fails #109

Author: rbackhouse

AlbumArtScreen.js

@@ -29,6 +29,7 @@ import AlbumArt from './AlbumArt';
 import MPDConnection from './MPDConnection';
 import { StyleManager, bgColor } from './Styles';
 import UPnPManager from './UPnPManager';
+import SeachUtil from './SeachUtil';
 
 class MissingModal extends React.Component {
     state = {
@@ -55,6 +56,7 @@ class MissingModal extends React.Component {
 
     search = (text) => {
         if (text.length > 0) {
+            text = SeachUtil.convert(text);
             let filtered = this.state.fullset.filter((item) => {
                 return item.name.toLowerCase().indexOf(text.toLowerCase()) > -1;
             });

AlbumsScreen.js

@@ -31,6 +31,7 @@ import NewPlaylistModal from './NewPlaylistModal';
 import Config from './Config';
 import { StyleManager } from './Styles';
 import Base64 from './Base64';
+import SeachUtil from './SeachUtil';
 
 export default class AlbumsScreen extends React.Component {
     static navigationOptions = ({ navigation }) => {
@@ -181,6 +182,7 @@ export default class AlbumsScreen extends React.Component {
 
     search = (text) => {
         if (text.length > 0) {
+            text = SeachUtil.convert(text);
             let filtered = this.state.fullset.filter((album) => {
                 return album.name.toLowerCase().indexOf(text.toLowerCase()) > -1;
             });

ArtistsScreen.js

@@ -31,6 +31,7 @@ import AlbumArt from './AlbumArt';
 import Config from './Config';
 import { StyleManager } from './Styles';
 import NewPlaylistModal from './NewPlaylistModal';
+import SeachUtil from './SeachUtil';
 
 class AlbumListItem extends React.PureComponent {
     constructor(props) {
@@ -400,6 +401,7 @@ export default class ArtistsScreen extends React.Component {
 
     search = (text) => {
         if (text.length > 0) {
+            text = SeachUtil.convert(text);
             let filtered = this.state.fullset.filter((artist) => {
                 return artist.name.toLowerCase().indexOf(text.toLowerCase()) > -1;
             });
@@ -411,6 +413,7 @@ export default class ArtistsScreen extends React.Component {
 
     searchGenres = (text) => {
         if (text.length > 0) {
+            text = SeachUtil.convert(text);
             let filtered = this.state.genresFullset.filter((genre) => {
                 return genre.name.toLowerCase().indexOf(text.toLowerCase()) > -1;
             });
@@ -422,6 +425,7 @@ export default class ArtistsScreen extends React.Component {
 
     searchAlbums = (text) => {
         if (text.length > 0) {
+            text = SeachUtil.convert(text);
             let filtered = this.state.albumsFullset.filter((album) => {
                 return album.name.toLowerCase().indexOf(text.toLowerCase()) > -1;
             });

FilesScreen.js

@@ -31,6 +31,7 @@ import Base64 from './Base64';
 import NewPlaylistModal from './NewPlaylistModal';
 import { StyleManager } from './Styles';
 import Config from './Config';
+import SeachUtil from './SeachUtil';
 
 export default class FilesScreen extends React.Component {
     static navigationOptions = ({ navigation }) => {
@@ -255,6 +256,7 @@ export default class FilesScreen extends React.Component {
 
     search = (text) => {
         if (text.length > 0) {
+            text = SeachUtil.convert(text);
             let filtered = this.state.fullset.filter((file) => {
                 if (file.dir) {
                     return file.dir.toLowerCase().indexOf(text.toLowerCase()) > -1;

NewPlaylistModal.js

@@ -19,7 +19,7 @@ import React from 'react';
 import { Text, View, Modal, FlatList, TouchableOpacity, ActivityIndicator, Appearance } from 'react-native';
 import { SearchBar, Input, Button } from "@rneui/themed";
 import Icon from 'react-native-vector-icons/Ionicons';
-import FAIcon from 'react-native-vector-icons/FontAwesome';
+import SeachUtil from './SeachUtil';
 
 import MPDConnection from './MPDConnection';
 import { StyleManager } from './Styles';
@@ -69,6 +69,7 @@ export default class NewPlaylistModal extends React.Component {
 
     search = (text) => {
         if (text.length > 0) {
+            text = SeachUtil.convert(text);
             let filtered = this.state.fullset.filter((playlist) => {
                 return playlist.toLowerCase().indexOf(text.toLowerCase()) > -1;
             });

PlaylistDetails.js

@@ -26,6 +26,7 @@ import { ActionSheetCustom as ActionSheet } from 'react-native-actionsheet';
 
 import MPDConnection from './MPDConnection';
 import { StyleManager } from './Styles';
+import SeachUtil from './SeachUtil';
 
 export default class PlaylistDetails extends React.Component {
     static navigationOptions = ({ navigation }) => {
@@ -94,6 +95,7 @@ export default class PlaylistDetails extends React.Component {
 
     search = (text) => {
         if (text.length > 0) {
+            text = SeachUtil.convert(text);
             let filtered = this.state.fullset.filter((entry) => {
                 return entry.title.toLowerCase().indexOf(text.toLowerCase()) > -1;
             });

PlaylistEditor.js

@@ -26,6 +26,7 @@ import ActionButton from 'react-native-action-button';
 import MPDConnection from './MPDConnection';
 import NewPlaylistModal from './NewPlaylistModal';
 import { StyleManager } from './Styles';
+import SeachUtil from './SeachUtil';
 
 class AddStreamURLModal extends React.Component {
     state = {
@@ -139,6 +140,7 @@ export default class PlaylistEditor extends React.Component {
 
     search = (text) => {
         if (text.length > 0) {
+            text = SeachUtil.convert(text);
             let filtered = this.state.fullset.filter((playlist) => {
                 return playlist.toLowerCase().indexOf(text.toLowerCase()) > -1;
             });

SeachUtil.js

@@ -0,0 +1,28 @@
+/*
+* The MIT License (MIT)
+*
+* Copyright (c) 2023 Richard Backhouse
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+* and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+* DEALINGS IN THE SOFTWARE.
+*/
+
+export default {
+    convert: function(text) {
+        let newtext = text.replace(/./g, (char) => {
+            const charCode = char.charCodeAt(0);
+            if (charCode === 8216 || charCode === 8217) return '\'';            
+            if (charCode === 8220 || charCode === 8221) return '"';
+            return char;
+        });
+        return newtext;
+    }
+}

SongsScreen.js

@@ -32,6 +32,7 @@ import Base64 from './Base64';
 import AlbumArt from './AlbumArt';
 import NewPlaylistModal from './NewPlaylistModal';
 import { StyleManager } from './Styles';
+import SeachUtil from './SeachUtil';
 
 export default class SongsScreen extends React.Component {
     static navigationOptions = ({ navigation }) => {
@@ -150,6 +151,7 @@ export default class SongsScreen extends React.Component {
 
     search = (text) => {
         if (text.length > 0) {
+            text = SeachUtil.convert(text);
             let filtered = this.state.fullset.filter((song) => {
                 return song.title.toLowerCase().indexOf(text.toLowerCase()) > -1;
             });

UPnPBrowseScreen.js

@@ -29,6 +29,7 @@ import { StyleManager } from './Styles';
 import Config from './Config';
 import UPnPManager from './UPnPManager';
 import AudioStreamManager from './AudioStreamManager';
+import SeachUtil from './SeachUtil';
 
 export default class UPnPBrowseScreen extends React.Component {
     static navigationOptions = ({ navigation }) => {
@@ -128,6 +129,7 @@ export default class UPnPBrowseScreen extends React.Component {
 
     search = (text) => {
         if (text.length > 0) {
+            text = SeachUtil.convert(text);
             let filtered = this.state.fullset.filter((item) => {
                 return item.title.toLowerCase().indexOf(text.toLowerCase()) > -1;
             });