search ignore accent chars

2 files changed, 14 insertions, 3 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
index 1628ccc32..1771bbdb2 100644
--- a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
+++ b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.IO;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Resolvers;
@@ -114,7 +115,12 @@ namespace MediaBrowser.Server.Implementations.Library
                 }
                 
                 // Ignore samples
-                if (filename.IndexOf(".sample.", StringComparison.OrdinalIgnoreCase) != -1)
+                var sampleFilename = " " + filename.Replace(".", " ", StringComparison.OrdinalIgnoreCase)
+                    .Replace("-", " ", StringComparison.OrdinalIgnoreCase)
+                    .Replace("_", " ", StringComparison.OrdinalIgnoreCase)
+                    .Replace("!", " ", StringComparison.OrdinalIgnoreCase);
+
+                if (sampleFilename.IndexOf(" sample ", StringComparison.OrdinalIgnoreCase) != -1)
                 {
                     return true;
                 }
diff --git a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
index 071031b25..1c92f6c4a 100644
--- a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
+++ b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
@@ -97,6 +98,8 @@ namespace MediaBrowser.Server.Implementations.Library
                 throw new ArgumentNullException("searchTerm");
             }
 
+            searchTerm = searchTerm.RemoveDiacritics();
+            
             var terms = GetWords(searchTerm);
 
             var hints = new List<Tuple<BaseItem, string, int>>();
@@ -318,6 +321,8 @@ namespace MediaBrowser.Server.Implementations.Library
                 throw new ArgumentNullException("input");
             }
 
+            input = input.RemoveDiacritics();
+
             if (string.Equals(input, searchInput, StringComparison.OrdinalIgnoreCase))
             {
                 return new Tuple<string, int>(searchInput, 0);