From 223fc2550d77e715636ce2bde20e062200eb1c23 Mon Sep 17 00:00:00 2001
From: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com>
Date: Fri, 22 Jul 2022 05:00:55 +0100
Subject: [PATCH] core: fix incomplete label and track support (#13391)

---
 src/Jackett.Common/Definitions/schema.json       | 4 ++--
 src/Jackett.Common/Indexers/CardigannIndexer.cs  | 6 ++++++
 src/Jackett.Common/Models/ReleaseInfo.cs         | 4 ++++
 src/Jackett.Common/Models/ResultPage.cs          | 2 ++
 src/Jackett.Common/Models/TorznabCapabilities.cs | 4 ++++
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/Jackett.Common/Definitions/schema.json b/src/Jackett.Common/Definitions/schema.json
index 7cbef4d57..e2647aec3 100644
--- a/src/Jackett.Common/Definitions/schema.json
+++ b/src/Jackett.Common/Definitions/schema.json
@@ -192,7 +192,7 @@
                     "uniqueItems": true,
                     "items": {
                         "type": "string",
-                        "enum": ["q", "album", "artist", "label", "year"]
+                        "enum": ["q", "album", "artist", "label", "track", "year"]
                     }
                 },
                 "book-search": {
@@ -650,7 +650,7 @@
                 "^((category|categorydesc)\\|(noappend|append))?$": {
                     "$ref": "#/definitions/SelectorBlock"
                 },
-                "^(download|magnet|infohash|details|comments|title|description|category|categorydesc|size|leechers|seeders|date|files|grabs|downloadvolumefactor|uploadvolumefactor|minimumratio|minimumseedtime|imdb|imdbid|tmdbid|rageid|tvdbid|tvmazeid|traktid|doubanid|poster|genre|year|author|booktitle|artist|album)(_([A-Za-z0-9_])*)?$": {
+                "^(download|magnet|infohash|details|comments|title|description|category|categorydesc|size|leechers|seeders|date|files|grabs|downloadvolumefactor|uploadvolumefactor|minimumratio|minimumseedtime|imdb|imdbid|tmdbid|rageid|tvdbid|tvmazeid|traktid|doubanid|poster|genre|year|author|booktitle|album|artist|label|track)(_([A-Za-z0-9_])*)?$": {
                     "$ref": "#/definitions/SelectorBlock"
                 }
             },
diff --git a/src/Jackett.Common/Indexers/CardigannIndexer.cs b/src/Jackett.Common/Indexers/CardigannIndexer.cs
index e8d1e226b..b6bf47cd4 100644
--- a/src/Jackett.Common/Indexers/CardigannIndexer.cs
+++ b/src/Jackett.Common/Indexers/CardigannIndexer.cs
@@ -2099,6 +2099,12 @@ namespace Jackett.Common.Indexers
                 case "album":
                     release.Album = value;
                     break;
+                case "label":
+                    release.Label = value;
+                    break;
+                case "track":
+                    release.Track = value;
+                    break;
                 case "poster":
                     if (!string.IsNullOrWhiteSpace(value))
                     {
diff --git a/src/Jackett.Common/Models/ReleaseInfo.cs b/src/Jackett.Common/Models/ReleaseInfo.cs
index 82b637f40..4e9ca0c5a 100644
--- a/src/Jackett.Common/Models/ReleaseInfo.cs
+++ b/src/Jackett.Common/Models/ReleaseInfo.cs
@@ -33,6 +33,8 @@ namespace Jackett.Common.Models
         public string BookTitle { get; set; }
         public string Artist { get; set; }
         public string Album { get; set; }
+        public string Label { get; set; }
+        public string Track { get; set; }
         public long? Seeders { get; set; }
         public long? Peers { get; set; }
         public Uri Poster { get; set; }
@@ -78,6 +80,8 @@ namespace Jackett.Common.Models
             BookTitle = copyFrom.BookTitle;
             Artist = copyFrom.Artist;
             Album = copyFrom.Album;
+            Label = copyFrom.Label;
+            Track = copyFrom.Track;
             Seeders = copyFrom.Seeders;
             Peers = copyFrom.Peers;
             Poster = copyFrom.Poster;
diff --git a/src/Jackett.Common/Models/ResultPage.cs b/src/Jackett.Common/Models/ResultPage.cs
index d546a9cce..7ef48a55e 100644
--- a/src/Jackett.Common/Models/ResultPage.cs
+++ b/src/Jackett.Common/Models/ResultPage.cs
@@ -108,6 +108,8 @@ namespace Jackett.Common.Models
                             GetTorznabElement("booktitle", RemoveInvalidXMLChars(r.BookTitle)),
                             GetTorznabElement("artist", RemoveInvalidXMLChars(r.Artist)),
                             GetTorznabElement("album", RemoveInvalidXMLChars(r.Album)),
+                            GetTorznabElement("label", RemoveInvalidXMLChars(r.Label)),
+                            GetTorznabElement("track", RemoveInvalidXMLChars(r.Track)),
                             GetTorznabElement("seeders", r.Seeders),
                             GetTorznabElement("peers", r.Peers),
                             GetTorznabElement("coverurl", r.Poster?.AbsoluteUri),
diff --git a/src/Jackett.Common/Models/TorznabCapabilities.cs b/src/Jackett.Common/Models/TorznabCapabilities.cs
index 14dd42e13..4ed168768 100644
--- a/src/Jackett.Common/Models/TorznabCapabilities.cs
+++ b/src/Jackett.Common/Models/TorznabCapabilities.cs
@@ -34,6 +34,7 @@ namespace Jackett.Common.Models
         Album,
         Artist,
         Label,
+        Track,
         Year
     }
 
@@ -77,6 +78,7 @@ namespace Jackett.Common.Models
         public bool MusicSearchAlbumAvailable => (MusicSearchParams.Contains(MusicSearchParam.Album));
         public bool MusicSearchArtistAvailable => (MusicSearchParams.Contains(MusicSearchParam.Artist));
         public bool MusicSearchLabelAvailable => (MusicSearchParams.Contains(MusicSearchParam.Label));
+        public bool MusicSearchTrackAvailable => (MusicSearchParams.Contains(MusicSearchParam.Track));
         public bool MusicSearchYearAvailable => (MusicSearchParams.Contains(MusicSearchParam.Year));
 
         public List<BookSearchParam> BookSearchParams;
@@ -229,6 +231,8 @@ namespace Jackett.Common.Models
                 parameters.Add("artist");
             if (MusicSearchLabelAvailable)
                 parameters.Add("label");
+            if (MusicSearchTrackAvailable)
+                parameters.Add("track");
             if (MusicSearchYearAvailable)
                 parameters.Add("year");
             return string.Join(",", parameters);