Custom build with patches
Some checks failed
Build Prowlarr Container / build (push) Failing after 4m40s

This commit is contained in:
Romain Lecat
2026-02-16 11:07:30 +01:00
parent b9c76fbdff
commit 583239deb2
3 changed files with 787 additions and 21 deletions

View File

@@ -0,0 +1,663 @@
From f7ad90f98669386f4abfde0345a43e4ce13b1dfa Mon Sep 17 00:00:00 2001
From: Romain Lecat <romain@lecat.pro>
Date: Mon, 16 Feb 2026 10:49:13 +0100
Subject: [PATCH] Fork for AvistaZ family language filter
---
.../Indexers/Definitions/AvistaZ.cs | 26 +-
.../Definitions/Avistaz/AvistazBase.cs | 3 +-
.../Definitions/Avistaz/AvistazSettings.cs | 359 ++++++++++++++++++
.../Definitions/Avistaz/CinemaZSettings.cs | 21 +
.../Definitions/Avistaz/PrivateHDSettings.cs | 21 +
.../Indexers/Definitions/CinemaZ.cs | 42 +-
.../Indexers/Definitions/ExoticaZ.cs | 2 +-
.../Indexers/Definitions/PrivateHD.cs | 42 +-
8 files changed, 511 insertions(+), 5 deletions(-)
create mode 100644 src/NzbDrone.Core/Indexers/Definitions/Avistaz/CinemaZSettings.cs
create mode 100644 src/NzbDrone.Core/Indexers/Definitions/Avistaz/PrivateHDSettings.cs
diff --git a/src/NzbDrone.Core/Indexers/Definitions/AvistaZ.cs b/src/NzbDrone.Core/Indexers/Definitions/AvistaZ.cs
index cc1be98b5..edb0ab464 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/AvistaZ.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/AvistaZ.cs
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using System.Linq;
using NLog;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Configuration;
@@ -8,7 +9,7 @@
namespace NzbDrone.Core.Indexers.Definitions
{
- public class AvistaZ : AvistazBase
+ public class AvistaZ : AvistazBase<AvistaZSettings>
{
public override string Name => "AvistaZ";
public override string[] IndexerUrls => new[] { "https://avistaz.to/" };
@@ -68,6 +69,29 @@ protected override IndexerCapabilities SetCapabilities()
public class AvistaZRequestGenerator : AvistazRequestGenerator
{
+ public new AvistaZSettings Settings
+ {
+ get => (AvistaZSettings)base.Settings;
+ set => base.Settings = value;
+ }
+
+ protected override List<KeyValuePair<string, string>> GetBasicSearchParameters(SearchCriteriaBase searchCriteria, string genre = null)
+ {
+ var parameters = base.GetBasicSearchParameters(searchCriteria, genre);
+
+ foreach (var languageId in Settings.SearchAudioLanguages.Distinct())
+ {
+ parameters.Add("language[]", languageId.ToString());
+ }
+
+ foreach (var languageId in Settings.SearchSubtitleLanguages.Distinct())
+ {
+ parameters.Add("subtitle[]", languageId.ToString());
+ }
+
+ return parameters;
+ }
+
// AvistaZ has episodes without season. eg Running Man E323
protected override string GetEpisodeSearchTerm(TvSearchCriteria searchCriteria)
{
diff --git a/src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazBase.cs b/src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazBase.cs
index b14bac702..1aabd470f 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazBase.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazBase.cs
@@ -12,7 +12,8 @@
namespace NzbDrone.Core.Indexers.Definitions.Avistaz
{
- public abstract class AvistazBase : TorrentIndexerBase<AvistazSettings>
+ public abstract class AvistazBase<TSettings> : TorrentIndexerBase<TSettings>
+ where TSettings : AvistazSettings, new()
{
public override bool SupportsRss => true;
public override bool SupportsSearch => true;
diff --git a/src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazSettings.cs b/src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazSettings.cs
index bb431c47b..3a535df21 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazSettings.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazSettings.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Indexers.Settings;
@@ -44,4 +46,361 @@ public override NzbDroneValidationResult Validate()
return new NzbDroneValidationResult(Validator.Validate(this));
}
}
+
+ public class AvistaZSettings : AvistazSettings
+ {
+ public AvistaZSettings()
+ {
+ SearchAudioLanguages = Array.Empty<int>();
+ SearchSubtitleLanguages = Array.Empty<int>();
+ }
+
+ [FieldDefinition(6, Label = "Search Audio Languages", Type = FieldType.Select, SelectOptions = typeof(AvistaZAudioLanguage), HelpText = "Filter by audio language. The language settings are AND searches, e.g. selecting English audio with Basque and Catalan subtitles will only return results with all three of these.", Advanced = true)]
+ public IEnumerable<int> SearchAudioLanguages { get; set; }
+
+ [FieldDefinition(7, Label = "Search Subtitle Languages", Type = FieldType.Select, SelectOptions = typeof(AvistaZSubtitleLanguage), HelpText = "Filter by subtitle language. The language settings are AND searches, e.g. selecting English audio with Basque and Catalan subtitles will only return results with all three of these.", Advanced = true)]
+ public IEnumerable<int> SearchSubtitleLanguages { get; set; }
+ }
+
+ public enum AvistaZAudioLanguage
+ {
+ [FieldOption(Hint = "Arabic")]
+ Arabic = 7,
+ [FieldOption(Hint = "Assamese")]
+ Assamese = 10,
+ [FieldOption(Hint = "Basque")]
+ Basque = 17,
+ [FieldOption(Hint = "Bengali")]
+ Bengali = 19,
+ [FieldOption(Hint = "Bosnian")]
+ Bosnian = 23,
+ [FieldOption(Hint = "Brazilian Portuguese")]
+ BrazilianPortuguese = 189,
+ [FieldOption(Hint = "Burmese")]
+ Burmese = 26,
+ [FieldOption(Hint = "Cantonese")]
+ Cantonese = 27,
+ [FieldOption(Hint = "Catalan")]
+ Catalan = 28,
+ [FieldOption(Hint = "Central Khmer")]
+ CentralKhmer = 29,
+ [FieldOption(Hint = "Chamorro")]
+ Chamorro = 30,
+ [FieldOption(Hint = "Chinese")]
+ Chinese = 33,
+ [FieldOption(Hint = "Croatian")]
+ Croatian = 39,
+ [FieldOption(Hint = "Czech")]
+ Czech = 40,
+ [FieldOption(Hint = "Danish")]
+ Danish = 41,
+ [FieldOption(Hint = "Dutch")]
+ Dutch = 43,
+ [FieldOption(Hint = "Dzongkha")]
+ Dzongkha = 44,
+ [FieldOption(Hint = "English")]
+ English = 45,
+ [FieldOption(Hint = "Esperanto")]
+ Esperanto = 46,
+ [FieldOption(Hint = "Filipino")]
+ Filipino = 188,
+ [FieldOption(Hint = "Finnish")]
+ Finnish = 51,
+ [FieldOption(Hint = "French")]
+ French = 52,
+ [FieldOption(Hint = "German")]
+ German = 58,
+ [FieldOption(Hint = "Greek")]
+ Greek = 59,
+ [FieldOption(Hint = "Gujarati")]
+ Gujarati = 61,
+ [FieldOption(Hint = "Hausa")]
+ Hausa = 63,
+ [FieldOption(Hint = "Hebrew")]
+ Hebrew = 64,
+ [FieldOption(Hint = "Hindi")]
+ Hindi = 66,
+ [FieldOption(Hint = "Hungarian")]
+ Hungarian = 68,
+ [FieldOption(Hint = "Indonesian")]
+ Indonesian = 72,
+ [FieldOption(Hint = "Inuktitut")]
+ Inuktitut = 75,
+ [FieldOption(Hint = "Italian")]
+ Italian = 78,
+ [FieldOption(Hint = "Japanese")]
+ Japanese = 79,
+ [FieldOption(Hint = "Javanese")]
+ Javanese = 80,
+ [FieldOption(Hint = "Kannada")]
+ Kannada = 82,
+ [FieldOption(Hint = "Kashmiri")]
+ Kashmiri = 84,
+ [FieldOption(Hint = "Kazakh")]
+ Kazakh = 85,
+ [FieldOption(Hint = "Kirghiz")]
+ Kirghiz = 88,
+ [FieldOption(Hint = "Korean")]
+ Korean = 91,
+ [FieldOption(Hint = "Lao")]
+ Lao = 94,
+ [FieldOption(Hint = "Malay")]
+ Malay = 104,
+ [FieldOption(Hint = "Malayalam")]
+ Malayalam = 105,
+ [FieldOption(Hint = "Mandarin")]
+ Mandarin = 107,
+ [FieldOption(Hint = "Marathi")]
+ Marathi = 110,
+ [FieldOption(Hint = "Mongolian")]
+ Mongolian = 112,
+ [FieldOption(Hint = "Nepali")]
+ Nepali = 118,
+ [FieldOption(Hint = "Ojibwa")]
+ Ojibwa = 123,
+ [FieldOption(Hint = "Oriya")]
+ Oriya = 124,
+ [FieldOption(Hint = "Pali")]
+ Pali = 127,
+ [FieldOption(Hint = "Panjabi")]
+ Panjabi = 128,
+ [FieldOption(Hint = "Persian")]
+ Persian = 129,
+ [FieldOption(Hint = "Polish")]
+ Polish = 130,
+ [FieldOption(Hint = "Portuguese")]
+ Portuguese = 131,
+ [FieldOption(Hint = "Quechua")]
+ Quechua = 133,
+ [FieldOption(Hint = "Romanian")]
+ Romanian = 134,
+ [FieldOption(Hint = "Russian")]
+ Russian = 137,
+ [FieldOption(Hint = "Sanskrit")]
+ Sanskrit = 140,
+ [FieldOption(Hint = "Sinhala")]
+ Sinhala = 146,
+ [FieldOption(Hint = "Slovak")]
+ Slovak = 147,
+ [FieldOption(Hint = "Spanish")]
+ Spanish = 151,
+ [FieldOption(Hint = "Swedish")]
+ Swedish = 155,
+ [FieldOption(Hint = "Tagalog")]
+ Tagalog = 156,
+ [FieldOption(Hint = "Tamil")]
+ Tamil = 159,
+ [FieldOption(Hint = "Telugu")]
+ Telugu = 161,
+ [FieldOption(Hint = "Thai")]
+ Thai = 162,
+ [FieldOption(Hint = "Tibetan")]
+ Tibetan = 163,
+ [FieldOption(Hint = "Turkish")]
+ Turkish = 168,
+ [FieldOption(Hint = "Uighur")]
+ Uighur = 171,
+ [FieldOption(Hint = "Ukrainian")]
+ Ukrainian = 172,
+ [FieldOption(Hint = "Urdu")]
+ Urdu = 173,
+ [FieldOption(Hint = "Vietnamese")]
+ Vietnamese = 176,
+ [FieldOption(Hint = "Xhosa")]
+ Xhosa = 182,
+ }
+
+ public enum AvistaZSubtitleLanguage
+ {
+ [FieldOption(Hint = "Abkhazian")]
+ Abkhazian = 1,
+ [FieldOption(Hint = "Afar")]
+ Afar = 2,
+ [FieldOption(Hint = "Afrikaans")]
+ Afrikaans = 3,
+ [FieldOption(Hint = "Albanian")]
+ Albanian = 5,
+ [FieldOption(Hint = "Amharic")]
+ Amharic = 6,
+ [FieldOption(Hint = "Arabic")]
+ Arabic = 7,
+ [FieldOption(Hint = "Basque")]
+ Basque = 17,
+ [FieldOption(Hint = "Belarusian")]
+ Belarusian = 18,
+ [FieldOption(Hint = "Bengali")]
+ Bengali = 19,
+ [FieldOption(Hint = "Norwegian Bokmål")]
+ NorwegianBokmal = 22,
+ [FieldOption(Hint = "Bosnian")]
+ Bosnian = 23,
+ [FieldOption(Hint = "Bulgarian")]
+ Bulgarian = 25,
+ [FieldOption(Hint = "Brazilian Portuguese")]
+ BrazilianPortuguese = 189,
+ [FieldOption(Hint = "Burmese")]
+ Burmese = 26,
+ [FieldOption(Hint = "Cantonese")]
+ Cantonese = 27,
+ [FieldOption(Hint = "Catalan")]
+ Catalan = 28,
+ [FieldOption(Hint = "Central Khmer")]
+ CentralKhmer = 29,
+ [FieldOption(Hint = "Chichewa")]
+ Chichewa = 32,
+ [FieldOption(Hint = "Chinese")]
+ Chinese = 33,
+ [FieldOption(Hint = "Corsican")]
+ Corsican = 37,
+ [FieldOption(Hint = "Croatian")]
+ Croatian = 39,
+ [FieldOption(Hint = "Czech")]
+ Czech = 40,
+ [FieldOption(Hint = "Danish")]
+ Danish = 41,
+ [FieldOption(Hint = "Dutch")]
+ Dutch = 43,
+ [FieldOption(Hint = "English")]
+ English = 45,
+ [FieldOption(Hint = "Esperanto")]
+ Esperanto = 46,
+ [FieldOption(Hint = "Estonian")]
+ Estonian = 47,
+ [FieldOption(Hint = "Fijian")]
+ Fijian = 50,
+ [FieldOption(Hint = "Filipino")]
+ Filipino = 188,
+ [FieldOption(Hint = "Finnish")]
+ Finnish = 51,
+ [FieldOption(Hint = "French")]
+ French = 52,
+ [FieldOption(Hint = "Galician")]
+ Galician = 55,
+ [FieldOption(Hint = "Georgian")]
+ Georgian = 57,
+ [FieldOption(Hint = "German")]
+ German = 58,
+ [FieldOption(Hint = "Greek")]
+ Greek = 59,
+ [FieldOption(Hint = "Gujarati")]
+ Gujarati = 61,
+ [FieldOption(Hint = "Haitian")]
+ Haitian = 62,
+ [FieldOption(Hint = "Hebrew")]
+ Hebrew = 64,
+ [FieldOption(Hint = "Hindi")]
+ Hindi = 66,
+ [FieldOption(Hint = "Hungarian")]
+ Hungarian = 68,
+ [FieldOption(Hint = "Icelandic")]
+ Icelandic = 69,
+ [FieldOption(Hint = "Indonesian")]
+ Indonesian = 72,
+ [FieldOption(Hint = "Irish")]
+ Irish = 77,
+ [FieldOption(Hint = "Italian")]
+ Italian = 78,
+ [FieldOption(Hint = "Japanese")]
+ Japanese = 79,
+ [FieldOption(Hint = "Javanese")]
+ Javanese = 80,
+ [FieldOption(Hint = "Kannada")]
+ Kannada = 82,
+ [FieldOption(Hint = "Kazakh")]
+ Kazakh = 85,
+ [FieldOption(Hint = "Korean")]
+ Korean = 91,
+ [FieldOption(Hint = "Kurdish")]
+ Kurdish = 93,
+ [FieldOption(Hint = "Lao")]
+ Lao = 94,
+ [FieldOption(Hint = "Latin")]
+ Latin = 95,
+ [FieldOption(Hint = "Latvian")]
+ Latvian = 96,
+ [FieldOption(Hint = "Lithuanian")]
+ Lithuanian = 99,
+ [FieldOption(Hint = "Macedonian")]
+ Macedonian = 102,
+ [FieldOption(Hint = "Malagasy")]
+ Malagasy = 103,
+ [FieldOption(Hint = "Malay")]
+ Malay = 104,
+ [FieldOption(Hint = "Malayalam")]
+ Malayalam = 105,
+ [FieldOption(Hint = "Mandarin")]
+ Mandarin = 107,
+ [FieldOption(Hint = "Maori")]
+ Maori = 109,
+ [FieldOption(Hint = "Marathi")]
+ Marathi = 110,
+ [FieldOption(Hint = "Mongolian")]
+ Mongolian = 112,
+ [FieldOption(Hint = "Nepali")]
+ Nepali = 118,
+ [FieldOption(Hint = "Norwegian")]
+ Norwegian = 120,
+ [FieldOption(Hint = "Oriya")]
+ Oriya = 124,
+ [FieldOption(Hint = "Panjabi")]
+ Panjabi = 128,
+ [FieldOption(Hint = "Persian")]
+ Persian = 129,
+ [FieldOption(Hint = "Polish")]
+ Polish = 130,
+ [FieldOption(Hint = "Portuguese")]
+ Portuguese = 131,
+ [FieldOption(Hint = "Romanian")]
+ Romanian = 134,
+ [FieldOption(Hint = "Romansh")]
+ Romansh = 135,
+ [FieldOption(Hint = "Russian")]
+ Russian = 137,
+ [FieldOption(Hint = "Sardinian")]
+ Sardinian = 141,
+ [FieldOption(Hint = "Serbian")]
+ Serbian = 142,
+ [FieldOption(Hint = "Sinhala")]
+ Sinhala = 146,
+ [FieldOption(Hint = "Slovak")]
+ Slovak = 147,
+ [FieldOption(Hint = "Slovenian")]
+ Slovenian = 148,
+ [FieldOption(Hint = "Somali")]
+ Somali = 149,
+ [FieldOption(Hint = "Spanish")]
+ Spanish = 151,
+ [FieldOption(Hint = "Sundanese")]
+ Sundanese = 152,
+ [FieldOption(Hint = "Swahili")]
+ Swahili = 153,
+ [FieldOption(Hint = "Swedish")]
+ Swedish = 155,
+ [FieldOption(Hint = "Tagalog")]
+ Tagalog = 156,
+ [FieldOption(Hint = "Tamil")]
+ Tamil = 159,
+ [FieldOption(Hint = "Telugu")]
+ Telugu = 161,
+ [FieldOption(Hint = "Thai")]
+ Thai = 162,
+ [FieldOption(Hint = "Turkish")]
+ Turkish = 168,
+ [FieldOption(Hint = "Twi")]
+ Twi = 170,
+ [FieldOption(Hint = "Ukrainian")]
+ Ukrainian = 172,
+ [FieldOption(Hint = "Urdu")]
+ Urdu = 173,
+ [FieldOption(Hint = "Venda")]
+ Venda = 175,
+ [FieldOption(Hint = "Vietnamese")]
+ Vietnamese = 176,
+ [FieldOption(Hint = "Volapük")]
+ Volapuk = 177,
+ [FieldOption(Hint = "Welsh")]
+ Welsh = 179,
+ [FieldOption(Hint = "Wolof")]
+ Wolof = 181,
+ }
}
diff --git a/src/NzbDrone.Core/Indexers/Definitions/Avistaz/CinemaZSettings.cs b/src/NzbDrone.Core/Indexers/Definitions/Avistaz/CinemaZSettings.cs
new file mode 100644
index 000000000..fa133a0ed
--- /dev/null
+++ b/src/NzbDrone.Core/Indexers/Definitions/Avistaz/CinemaZSettings.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using NzbDrone.Core.Annotations;
+
+namespace NzbDrone.Core.Indexers.Definitions.Avistaz
+{
+ public class CinemaZSettings : AvistazSettings
+ {
+ public CinemaZSettings()
+ {
+ SearchAudioLanguages = Array.Empty<int>();
+ SearchSubtitleLanguages = Array.Empty<int>();
+ }
+
+ [FieldDefinition(6, Label = "Search Audio Languages", Type = FieldType.Select, SelectOptions = typeof(AvistaZAudioLanguage), HelpText = "Filter by audio language. The language settings are AND searches, e.g. selecting English audio with Basque and Catalan subtitles will only return results with all three of these.", Advanced = true)]
+ public IEnumerable<int> SearchAudioLanguages { get; set; }
+
+ [FieldDefinition(7, Label = "Search Subtitle Languages", Type = FieldType.Select, SelectOptions = typeof(AvistaZSubtitleLanguage), HelpText = "Filter by subtitle language. The language settings are AND searches, e.g. selecting English audio with Basque and Catalan subtitles will only return results with all three of these.", Advanced = true)]
+ public IEnumerable<int> SearchSubtitleLanguages { get; set; }
+ }
+}
diff --git a/src/NzbDrone.Core/Indexers/Definitions/Avistaz/PrivateHDSettings.cs b/src/NzbDrone.Core/Indexers/Definitions/Avistaz/PrivateHDSettings.cs
new file mode 100644
index 000000000..31967b586
--- /dev/null
+++ b/src/NzbDrone.Core/Indexers/Definitions/Avistaz/PrivateHDSettings.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using NzbDrone.Core.Annotations;
+
+namespace NzbDrone.Core.Indexers.Definitions.Avistaz
+{
+ public class PrivateHDSettings : AvistazSettings
+ {
+ public PrivateHDSettings()
+ {
+ SearchAudioLanguages = Array.Empty<int>();
+ SearchSubtitleLanguages = Array.Empty<int>();
+ }
+
+ [FieldDefinition(6, Label = "Search Audio Languages", Type = FieldType.Select, SelectOptions = typeof(AvistaZAudioLanguage), HelpText = "Filter by audio language. The language settings are AND searches, e.g. selecting English audio with Basque and Catalan subtitles will only return results with all three of these.", Advanced = true)]
+ public IEnumerable<int> SearchAudioLanguages { get; set; }
+
+ [FieldDefinition(7, Label = "Search Subtitle Languages", Type = FieldType.Select, SelectOptions = typeof(AvistaZSubtitleLanguage), HelpText = "Filter by subtitle language. The language settings are AND searches, e.g. selecting English audio with Basque and Catalan subtitles will only return results with all three of these.", Advanced = true)]
+ public IEnumerable<int> SearchSubtitleLanguages { get; set; }
+ }
+}
diff --git a/src/NzbDrone.Core/Indexers/Definitions/CinemaZ.cs b/src/NzbDrone.Core/Indexers/Definitions/CinemaZ.cs
index 3f0fdd913..e3318c195 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/CinemaZ.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/CinemaZ.cs
@@ -1,12 +1,14 @@
using System.Collections.Generic;
+using System.Linq;
using NLog;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Indexers.Definitions.Avistaz;
+using NzbDrone.Core.IndexerSearch.Definitions;
using NzbDrone.Core.Messaging.Events;
namespace NzbDrone.Core.Indexers.Definitions
{
- public class CinemaZ : AvistazBase
+ public class CinemaZ : AvistazBase<CinemaZSettings>
{
public override string Name => "CinemaZ";
public override string[] IndexerUrls => new[] { "https://cinemaz.to/" };
@@ -23,6 +25,18 @@ public CinemaZ(IIndexerRepository indexerRepository,
{
}
+ public override IIndexerRequestGenerator GetRequestGenerator()
+ {
+ return new CinemaZRequestGenerator
+ {
+ Settings = Settings,
+ Capabilities = Capabilities,
+ PageSize = PageSize,
+ HttpClient = _httpClient,
+ Logger = _logger
+ };
+ }
+
protected override IndexerCapabilities SetCapabilities()
{
var caps = new IndexerCapabilities
@@ -51,4 +65,30 @@ protected override IndexerCapabilities SetCapabilities()
return caps;
}
}
+
+ public class CinemaZRequestGenerator : AvistazRequestGenerator
+ {
+ public new CinemaZSettings Settings
+ {
+ get => (CinemaZSettings)base.Settings;
+ set => base.Settings = value;
+ }
+
+ protected override List<KeyValuePair<string, string>> GetBasicSearchParameters(SearchCriteriaBase searchCriteria, string genre = null)
+ {
+ var parameters = base.GetBasicSearchParameters(searchCriteria, genre);
+
+ foreach (var languageId in Settings.SearchAudioLanguages.Distinct())
+ {
+ parameters.Add("language[]", languageId.ToString());
+ }
+
+ foreach (var languageId in Settings.SearchSubtitleLanguages.Distinct())
+ {
+ parameters.Add("subtitle[]", languageId.ToString());
+ }
+
+ return parameters;
+ }
+ }
}
diff --git a/src/NzbDrone.Core/Indexers/Definitions/ExoticaZ.cs b/src/NzbDrone.Core/Indexers/Definitions/ExoticaZ.cs
index 954d2442c..41202ab21 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/ExoticaZ.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/ExoticaZ.cs
@@ -7,7 +7,7 @@
namespace NzbDrone.Core.Indexers.Definitions
{
- public class ExoticaZ : AvistazBase
+ public class ExoticaZ : AvistazBase<AvistazSettings>
{
public override string Name => "ExoticaZ";
public override string[] IndexerUrls => new[] { "https://exoticaz.to/" };
diff --git a/src/NzbDrone.Core/Indexers/Definitions/PrivateHD.cs b/src/NzbDrone.Core/Indexers/Definitions/PrivateHD.cs
index 21fc76ede..df33867c1 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/PrivateHD.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/PrivateHD.cs
@@ -1,12 +1,14 @@
using System.Collections.Generic;
+using System.Linq;
using NLog;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Indexers.Definitions.Avistaz;
+using NzbDrone.Core.IndexerSearch.Definitions;
using NzbDrone.Core.Messaging.Events;
namespace NzbDrone.Core.Indexers.Definitions
{
- public class PrivateHD : AvistazBase
+ public class PrivateHD : AvistazBase<PrivateHDSettings>
{
public override string Name => "PrivateHD";
public override string[] IndexerUrls => new[] { "https://privatehd.to/" };
@@ -23,6 +25,18 @@ public PrivateHD(IIndexerRepository indexerRepository,
{
}
+ public override IIndexerRequestGenerator GetRequestGenerator()
+ {
+ return new PrivateHDRequestGenerator
+ {
+ Settings = Settings,
+ Capabilities = Capabilities,
+ PageSize = PageSize,
+ HttpClient = _httpClient,
+ Logger = _logger
+ };
+ }
+
protected override IndexerCapabilities SetCapabilities()
{
var caps = new IndexerCapabilities
@@ -51,4 +65,30 @@ protected override IndexerCapabilities SetCapabilities()
return caps;
}
}
+
+ public class PrivateHDRequestGenerator : AvistazRequestGenerator
+ {
+ public new PrivateHDSettings Settings
+ {
+ get => (PrivateHDSettings)base.Settings;
+ set => base.Settings = value;
+ }
+
+ protected override List<KeyValuePair<string, string>> GetBasicSearchParameters(SearchCriteriaBase searchCriteria, string genre = null)
+ {
+ var parameters = base.GetBasicSearchParameters(searchCriteria, genre);
+
+ foreach (var languageId in Settings.SearchAudioLanguages.Distinct())
+ {
+ parameters.Add("language[]", languageId.ToString());
+ }
+
+ foreach (var languageId in Settings.SearchSubtitleLanguages.Distinct())
+ {
+ parameters.Add("subtitle[]", languageId.ToString());
+ }
+
+ return parameters;
+ }
+ }
}
--
2.50.1