shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

core: fix incomplete label and track support (#13391)

Browse Source
This commit is contained in:
ilike2burnthing
2022-07-22 05:00:55 +01:00
committed by GitHub
parent 5b6c7bfcdb
commit 223fc2550d
5 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Jackett.Common/Definitions/schema.json
View File

@@ -192,7 +192,7 @@
"uniqueItems": true, "uniqueItems": true,
"items": { "items": {
"type": "string", "type": "string",
"enum": ["q", "album", "artist", "label", "year"] "enum": ["q", "album", "artist", "label", "track", "year"]
} }
}, },
"book-search": { "book-search": {
@@ -650,7 +650,7 @@
"^((category|categorydesc)\\|(noappend|append))?$": { "^((category|categorydesc)\\|(noappend|append))?$": {
"$ref": "#/definitions/SelectorBlock" "$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" "$ref": "#/definitions/SelectorBlock"
} }
}, },

6
src/Jackett.Common/Indexers/CardigannIndexer.cs
View File

@@ -2099,6 +2099,12 @@ namespace Jackett.Common.Indexers
case "album": case "album":
release.Album = value; release.Album = value;
break; break;
case "label":
release.Label = value;
break;
case "track":
release.Track = value;
break;
case "poster": case "poster":
if (!string.IsNullOrWhiteSpace(value)) if (!string.IsNullOrWhiteSpace(value))
{ {

4
src/Jackett.Common/Models/ReleaseInfo.cs
View File

@@ -33,6 +33,8 @@ namespace Jackett.Common.Models
public string BookTitle { get; set; } public string BookTitle { get; set; }
public string Artist { get; set; } public string Artist { get; set; }
public string Album { get; set; } public string Album { get; set; }
public string Label { get; set; }
public string Track { get; set; }
public long? Seeders { get; set; } public long? Seeders { get; set; }
public long? Peers { get; set; } public long? Peers { get; set; }
public Uri Poster { get; set; } public Uri Poster { get; set; }
@@ -78,6 +80,8 @@ namespace Jackett.Common.Models
BookTitle = copyFrom.BookTitle; BookTitle = copyFrom.BookTitle;
Artist = copyFrom.Artist; Artist = copyFrom.Artist;
Album = copyFrom.Album; Album = copyFrom.Album;
Label = copyFrom.Label;
Track = copyFrom.Track;
Seeders = copyFrom.Seeders; Seeders = copyFrom.Seeders;
Peers = copyFrom.Peers; Peers = copyFrom.Peers;
Poster = copyFrom.Poster; Poster = copyFrom.Poster;

2
src/Jackett.Common/Models/ResultPage.cs
View File

@@ -108,6 +108,8 @@ namespace Jackett.Common.Models
GetTorznabElement("booktitle", RemoveInvalidXMLChars(r.BookTitle)), GetTorznabElement("booktitle", RemoveInvalidXMLChars(r.BookTitle)),
GetTorznabElement("artist", RemoveInvalidXMLChars(r.Artist)), GetTorznabElement("artist", RemoveInvalidXMLChars(r.Artist)),
GetTorznabElement("album", RemoveInvalidXMLChars(r.Album)), GetTorznabElement("album", RemoveInvalidXMLChars(r.Album)),
GetTorznabElement("label", RemoveInvalidXMLChars(r.Label)),
GetTorznabElement("track", RemoveInvalidXMLChars(r.Track)),
GetTorznabElement("seeders", r.Seeders), GetTorznabElement("seeders", r.Seeders),
GetTorznabElement("peers", r.Peers), GetTorznabElement("peers", r.Peers),
GetTorznabElement("coverurl", r.Poster?.AbsoluteUri), GetTorznabElement("coverurl", r.Poster?.AbsoluteUri),

4
src/Jackett.Common/Models/TorznabCapabilities.cs
View File

@@ -34,6 +34,7 @@ namespace Jackett.Common.Models
Album, Album,
Artist, Artist,
Label, Label,
Track,
Year Year
} }
@@ -77,6 +78,7 @@ namespace Jackett.Common.Models
public bool MusicSearchAlbumAvailable => (MusicSearchParams.Contains(MusicSearchParam.Album)); public bool MusicSearchAlbumAvailable => (MusicSearchParams.Contains(MusicSearchParam.Album));
public bool MusicSearchArtistAvailable => (MusicSearchParams.Contains(MusicSearchParam.Artist)); public bool MusicSearchArtistAvailable => (MusicSearchParams.Contains(MusicSearchParam.Artist));
public bool MusicSearchLabelAvailable => (MusicSearchParams.Contains(MusicSearchParam.Label)); public bool MusicSearchLabelAvailable => (MusicSearchParams.Contains(MusicSearchParam.Label));
public bool MusicSearchTrackAvailable => (MusicSearchParams.Contains(MusicSearchParam.Track));
public bool MusicSearchYearAvailable => (MusicSearchParams.Contains(MusicSearchParam.Year)); public bool MusicSearchYearAvailable => (MusicSearchParams.Contains(MusicSearchParam.Year));
public List<BookSearchParam> BookSearchParams; public List<BookSearchParam> BookSearchParams;
@@ -229,6 +231,8 @@ namespace Jackett.Common.Models
parameters.Add("artist"); parameters.Add("artist");
if (MusicSearchLabelAvailable) if (MusicSearchLabelAvailable)
parameters.Add("label"); parameters.Add("label");
if (MusicSearchTrackAvailable)
parameters.Add("track");
if (MusicSearchYearAvailable) if (MusicSearchYearAvailable)
parameters.Add("year"); parameters.Add("year");
return string.Join(",", parameters); return string.Join(",", parameters);