New: (Cardigann) - Cardigann v4 Support for Genre, Year, and TraktID

Prowlarr · Feb 5, 2022 · 7e0f88a · garfield69 · Feb 5, 2022 · Qstick
1 parent 88c6cbf
commit 7e0f88a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/src/NzbDrone.Core/IndexerSearch/NewznabResults.cs b/src/NzbDrone.Core/IndexerSearch/NewznabResults.cs
@@ -91,10 +91,12 @@ public string ToXml(DownloadProtocol protocol)
                             r.IndexerFlags == null ? null : from f in r.IndexerFlags select GetNabElement("tag", f.Name, protocol),
                             r.Languages == null ? null : from c in r.Languages select GetNabElement("language", c.Id, protocol),
                             r.Subs == null ? null : from c in r.Subs select GetNabElement("subs", c.Id, protocol),
+                            r.Genres == null ? null : GetNabElement("genre", string.Join(", ", r.Genres), protocol),
                             GetNabElement("rageid", r.TvRageId, protocol),
                             GetNabElement("tvdbid", r.TvdbId, protocol),
                             GetNabElement("imdb", r.ImdbId.ToString("D7"), protocol),
                             GetNabElement("tmdbid", r.TmdbId, protocol),
+                            GetNabElement("traktid", r.TraktId, protocol),
                             GetNabElement("seeders", t.Seeders, protocol),
                             GetNabElement("files", r.Files, protocol),
                             GetNabElement("grabs", r.Grabs, protocol),

diff --git a/src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs b/src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs
@@ -28,7 +28,7 @@ public class IndexerDefinitionUpdateService : IIndexerDefinitionUpdateService, I
         /* Update Service will fall back if version # does not exist for an indexer  per Ta */
 
         private const string DEFINITION_BRANCH = "master";
-        private const int DEFINITION_VERSION = 3;
+        private const int DEFINITION_VERSION = 4;
 
         //Used when moving yml to C#
         private readonly List<string> _defintionBlocklist = new List<string>()

diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs
@@ -561,6 +561,13 @@ private string ParseFields(string value, string fieldName, TorrentInfo release,
                     release.TvRageId = (int)ParseUtil.CoerceLong(rageID);
                     value = release.TvRageId.ToString();
                     break;
+                case "traktid":
+                    var traktIDRegEx = new Regex(@"(\d+)", RegexOptions.Compiled);
+                    var traktIDMatch = traktIDRegEx.Match(value);
+                    var traktID = traktIDMatch.Groups[1].Value;
+                    release.TvRageId = (int)ParseUtil.CoerceLong(traktID);
+                    value = release.TvRageId.ToString();
+                    break;
                 case "tvdbid":
                     var tvdbIdRegEx = new Regex(@"(\d+)", RegexOptions.Compiled);
                     var tvdbIdMatch = tvdbIdRegEx.Match(value);
@@ -577,6 +584,14 @@ private string ParseFields(string value, string fieldName, TorrentInfo release,
 
                     value = release.PosterUrl;
                     break;
+                case "genre":
+                    release.Genres = release.Genres.Union(value.Split(',')).ToList();
+                    value = release.Genres.ToString();
+                    break;
+                case "year":
+                    release.Year = ParseUtil.CoerceInt(value);
+                    value = release.Year.ToString();
+                    break;
                 case "author":
                     release.Author = value;
                     break;

diff --git a/src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs b/src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs
@@ -32,6 +32,8 @@ public ReleaseInfo()
         public int TvRageId { get; set; }
         public int ImdbId { get; set; }
         public int TmdbId { get; set; }
+        public int TraktId { get; set; }
+        public int Year { get; set; }
         public string Author { get; set; }
         public string BookTitle { get; set; }
         public string Artist { get; set; }
@@ -45,6 +47,7 @@ public ReleaseInfo()
         public string Container { get; set; }
         public string Codec { get; set; }
         public string Resolution { get; set; }
+        public ICollection<string> Genres { get; set; }
         public ICollection<Language> Languages { get; set; }
         public ICollection<Language> Subs { get; set; }
         public ICollection<IndexerCategory> Categories { get; set; }