From f9e2c5b6733784ca82338772547e0da1876bbc1f Mon Sep 17 00:00:00 2001 From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Date: Tue, 2 Aug 2022 08:49:11 -0500 Subject: [PATCH] Fixed: (Cardigann) Genre is optional Fixed: (Cardigann) Expand Genre Validate characters --- .../Indexers/Definitions/Cardigann/CardigannBase.cs | 2 +- .../Indexers/Definitions/Cardigann/CardigannParser.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs index a50858cff..e24d28aa6 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs @@ -28,7 +28,7 @@ namespace NzbDrone.Core.Indexers.Cardigann protected readonly IndexerCapabilitiesCategories _categories = new IndexerCapabilitiesCategories(); protected readonly List _defaultCategories = new List(); - protected readonly string[] OptionalFields = new string[] { "imdb", "imdbid", "tmdbid", "rageid", "tvdbid", "tvmazeid", "traktid", "doubanid", "poster", "banner", "description" }; + protected readonly string[] OptionalFields = new string[] { "imdb", "imdbid", "tmdbid", "rageid", "tvdbid", "tvmazeid", "traktid", "doubanid", "poster", "banner", "description", "genre" }; protected static readonly string[] _SupportedLogicFunctions = { diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs index 6544b624d..2c427c53e 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs @@ -594,7 +594,7 @@ namespace NzbDrone.Core.Indexers.Cardigann value = release.PosterUrl; break; case "genre": - char[] delimiters = { ',', ' ', '/', ')', '(', '.', ';', '[', ']' }; + char[] delimiters = { ',', ' ', '/', ')', '(', '.', ';', '[', ']', '"', '|', ':' }; release.Genres = release.Genres.Union(value.Split(delimiters, System.StringSplitOptions.RemoveEmptyEntries)).ToList(); value = string.Join(", ", release.Genres); break; @@ -655,7 +655,7 @@ namespace NzbDrone.Core.Indexers.Cardigann _logger.Debug(string.Format("CardigannIndexer ({0}): row strdump: {1}", _definition.Id, row.ToString())); break; case "validate": - char[] delimiters = { ',', ' ', '/', ')', '(', '.', ';', '[', ']' }; + char[] delimiters = { ',', ' ', '/', ')', '(', '.', ';', '[', ']', '"', '|', ':' }; var args = (string)filter.Args; var argsList = args.ToLower().Split(delimiters, StringSplitOptions.RemoveEmptyEntries); var validList = argsList.ToList();