From 56850aa6d9e46ba5c3219613f6036a7ca864f7ef Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Tue, 1 Jun 2021 21:56:35 -0400
Subject: [PATCH] Fixed: Indexer sort is case sensitive

---
 .../Indexer/Index/Menus/IndexerIndexSortMenu.js |  2 +-
 .../Indexer/Index/Table/IndexerIndexHeader.css  |  2 +-
 .../src/Indexer/Index/Table/IndexerIndexRow.css |  2 +-
 .../src/Indexer/Index/Table/IndexerIndexRow.js  |  2 +-
 .../src/Store/Actions/indexerIndexActions.js    |  6 +++---
 src/NzbDrone.Core/Parser/StringUtil.cs          | 17 +++++++++++++++++
 src/Prowlarr.Api.V1/Indexers/IndexerResource.cs |  3 +++
 7 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/frontend/src/Indexer/Index/Menus/IndexerIndexSortMenu.js b/frontend/src/Indexer/Index/Menus/IndexerIndexSortMenu.js
index c922b6147..3afd08e01 100644
--- a/frontend/src/Indexer/Index/Menus/IndexerIndexSortMenu.js
+++ b/frontend/src/Indexer/Index/Menus/IndexerIndexSortMenu.js
@@ -30,7 +30,7 @@ function IndexerIndexSortMenu(props) {
         </SortMenuItem>
 
         <SortMenuItem
-          name="name"
+          name="sortName"
           sortKey={sortKey}
           sortDirection={sortDirection}
           onPress={onSortSelect}
diff --git a/frontend/src/Indexer/Index/Table/IndexerIndexHeader.css b/frontend/src/Indexer/Index/Table/IndexerIndexHeader.css
index ec32c3e4b..78de9be14 100644
--- a/frontend/src/Indexer/Index/Table/IndexerIndexHeader.css
+++ b/frontend/src/Indexer/Index/Table/IndexerIndexHeader.css
@@ -4,7 +4,7 @@
   flex: 0 0 60px;
 }
 
-.name {
+.sortName {
   composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';
 
   flex: 4 0 110px;
diff --git a/frontend/src/Indexer/Index/Table/IndexerIndexRow.css b/frontend/src/Indexer/Index/Table/IndexerIndexRow.css
index f7370054e..985411c04 100644
--- a/frontend/src/Indexer/Index/Table/IndexerIndexRow.css
+++ b/frontend/src/Indexer/Index/Table/IndexerIndexRow.css
@@ -11,7 +11,7 @@
   flex: 0 0 60px;
 }
 
-.name {
+.sortName {
   composes: cell;
 
   flex: 4 0 110px;
diff --git a/frontend/src/Indexer/Index/Table/IndexerIndexRow.js b/frontend/src/Indexer/Index/Table/IndexerIndexRow.js
index fa0ef0e91..e26f110b3 100644
--- a/frontend/src/Indexer/Index/Table/IndexerIndexRow.js
+++ b/frontend/src/Indexer/Index/Table/IndexerIndexRow.js
@@ -136,7 +136,7 @@ class IndexerIndexRow extends Component {
               );
             }
 
-            if (column.name === 'name') {
+            if (column.name === 'sortName') {
               return (
                 <VirtualTableRowCell
                   key={column.name}
diff --git a/frontend/src/Store/Actions/indexerIndexActions.js b/frontend/src/Store/Actions/indexerIndexActions.js
index a9c86ff7a..af2e8af68 100644
--- a/frontend/src/Store/Actions/indexerIndexActions.js
+++ b/frontend/src/Store/Actions/indexerIndexActions.js
@@ -24,9 +24,9 @@ export const defaultState = {
   saveError: null,
   isDeleting: false,
   deleteError: null,
-  sortKey: 'name',
+  sortKey: 'sortName',
   sortDirection: sortDirections.ASCENDING,
-  secondarySortKey: 'name',
+  secondarySortKey: 'sortName',
   secondarySortDirection: sortDirections.ASCENDING,
 
   tableOptions: {
@@ -50,7 +50,7 @@ export const defaultState = {
       isModifiable: false
     },
     {
-      name: 'name',
+      name: 'sortName',
       label: 'Indexer Name',
       isSortable: true,
       isVisible: true,
diff --git a/src/NzbDrone.Core/Parser/StringUtil.cs b/src/NzbDrone.Core/Parser/StringUtil.cs
index 59cd7ec73..634bc4313 100644
--- a/src/NzbDrone.Core/Parser/StringUtil.cs
+++ b/src/NzbDrone.Core/Parser/StringUtil.cs
@@ -15,6 +15,12 @@ namespace NzbDrone.Core.Parser
 {
     public static class StringUtil
     {
+        private static readonly Regex WordDelimiterRegex = new Regex(@"(\s|\.|,|_|-|=|'|\|)+", RegexOptions.Compiled);
+        private static readonly Regex SpecialCharRegex = new Regex(@"(\&|\:|\\|\/)+", RegexOptions.Compiled);
+        private static readonly Regex PunctuationRegex = new Regex(@"[^\w\s]", RegexOptions.Compiled);
+        private static readonly Regex CommonWordRegex = new Regex(@"\b(a|an|the|and|or|of)\b\s?", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+        private static readonly Regex DuplicateSpacesRegex = new Regex(@"\s{2,}", RegexOptions.Compiled);
+
         public static string CleanFileName(string name, bool replace = true)
         {
             string result = name;
@@ -248,5 +254,16 @@ namespace NzbDrone.Core.Parser
                 return key;
             }
         }
+
+        public static string NormalizeTitle(this string title)
+        {
+            title = WordDelimiterRegex.Replace(title, " ");
+            title = PunctuationRegex.Replace(title, string.Empty);
+            title = CommonWordRegex.Replace(title, string.Empty);
+            title = DuplicateSpacesRegex.Replace(title, " ");
+            title = SpecialCharRegex.Replace(title, string.Empty);
+
+            return title.Trim().ToLower();
+        }
     }
 }
diff --git a/src/Prowlarr.Api.V1/Indexers/IndexerResource.cs b/src/Prowlarr.Api.V1/Indexers/IndexerResource.cs
index fd594492e..c6c7ed9e3 100644
--- a/src/Prowlarr.Api.V1/Indexers/IndexerResource.cs
+++ b/src/Prowlarr.Api.V1/Indexers/IndexerResource.cs
@@ -7,6 +7,7 @@ using NzbDrone.Core.Annotations;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Indexers.Cardigann;
 using NzbDrone.Core.IndexerVersions;
+using NzbDrone.Core.Parser;
 using Prowlarr.Http.ClientSchema;
 
 namespace Prowlarr.Api.V1.Indexers
@@ -29,6 +30,7 @@ namespace Prowlarr.Api.V1.Indexers
         public int Priority { get; set; }
         public DateTime Added { get; set; }
         public IndexerStatusResource Status { get; set; }
+        public string SortName { get; set; }
     }
 
     public class IndexerResourceMapper : ProviderResourceMapper<IndexerResource, IndexerDefinition>
@@ -81,6 +83,7 @@ namespace Prowlarr.Api.V1.Indexers
             resource.Privacy = definition.Privacy;
             resource.Priority = definition.Priority;
             resource.Added = definition.Added;
+            resource.SortName = definition.Name.NormalizeTitle();
 
             return resource;
         }