From d8c9225d09e7aee5e544008a8585afd04b1bc398 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Thu, 18 Nov 2021 22:23:54 -0600
Subject: [PATCH] Fixed: (Cardigann) Use correct encoding for search requests

Fixes #496
---
 src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs  | 1 +
 .../Definitions/Cardigann/CardigannRequestGenerator.cs         | 3 +++
 src/NzbDrone.Core/Indexers/HttpIndexerBase.cs                  | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs
index f2759f848..23bbc1dd2 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs
@@ -124,6 +124,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
                 Name = definition.Name,
                 Language = definition.Language,
                 Description = definition.Description,
+                Encoding = Encoding.GetEncoding(definition.Encoding),
                 Implementation = GetType().Name,
                 IndexerUrls = definition.Links.ToArray(),
                 Settings = new CardigannSettings { DefinitionFile = definition.File },
diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs
index 9352bca44..5e5526492 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
 using System.Net;
+using System.Text;
 using System.Threading.Tasks;
 using AngleSharp.Html.Dom;
 using AngleSharp.Html.Parser;
@@ -1080,6 +1081,8 @@ namespace NzbDrone.Core.Indexers.Cardigann
 
                 var request = new CardigannRequest(requestbuilder.Build(), variables, searchPath);
 
+                request.HttpRequest.Encoding = Encoding.GetEncoding(_definition.Encoding);
+
                 yield return request;
             }
         }
diff --git a/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs b/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs
index 377acd25e..c07af6852 100644
--- a/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs
+++ b/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs
@@ -377,7 +377,7 @@ namespace NzbDrone.Core.Indexers
             }
 
             request.HttpRequest.SuppressHttpError = true;
-            request.HttpRequest.Encoding = Encoding;
+            request.HttpRequest.Encoding = request.HttpRequest.Encoding ?? Encoding;
 
             var response = await _httpClient.ExecuteProxiedAsync(request.HttpRequest, Definition);