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

Misc indexer fixes

Browse Source
This commit is contained in:
Qstick
2021-02-21 16:59:21 -05:00
parent 3ef2e0b384
commit 08d5505b11
4 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs
View File

@@ -60,6 +60,14 @@ namespace NzbDrone.Core.Indexers.Cardigann
private IndexerDefinition GetDefinition(CardigannMetaDefinition definition) private IndexerDefinition GetDefinition(CardigannMetaDefinition definition)
{ {
var defaultSettings = new List<SettingsField>
{
new SettingsField { Name = "username", Label = "Username", Type = "text" },
new SettingsField { Name = "password", Label = "Password", Type = "password" }
};
var settings = definition.Settings ?? defaultSettings;
return new IndexerDefinition return new IndexerDefinition
{ {
Enable = true, Enable = true,
@@ -71,7 +79,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
SupportsRss = SupportsRss, SupportsRss = SupportsRss,
SupportsSearch = SupportsSearch, SupportsSearch = SupportsSearch,
Capabilities = new IndexerCapabilities(), Capabilities = new IndexerCapabilities(),
ExtraFields = definition.Settings ExtraFields = settings
}; };
} }

10
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs
View File

@@ -216,7 +216,15 @@ namespace NzbDrone.Core.Indexers.Cardigann
_logger.Debug("Populating config vars"); _logger.Debug("Populating config vars");
foreach (var setting in _definition.Settings) var defaultSettings = new List<SettingsField>
{
new SettingsField { Name = "username", Label = "Username", Type = "text" },
new SettingsField { Name = "password", Label = "Password", Type = "password" }
};
var settings = _definition.Settings ?? defaultSettings;
foreach (var setting in settings)
{ {
var name = ".Config." + setting.Name; var name = ".Config." + setting.Name;
var value = _settings.ExtraFieldData.GetValueOrDefault(setting.Name, setting.Default); var value = _settings.ExtraFieldData.GetValueOrDefault(setting.Name, setting.Default);

4
src/NzbDrone.Core/Indexers/Definitions/DigitalCore.cs
View File

@@ -294,10 +294,10 @@ namespace NzbDrone.Core.Indexers.Definitions
Passphrase = ""; Passphrase = "";
} }
[FieldDefinition(1, Label = "UID", Advanced = true, HelpText = "Uid from login cookie")] [FieldDefinition(1, Label = "UID", HelpText = "Uid from login cookie")]
public string UId { get; set; } public string UId { get; set; }
[FieldDefinition(2, Label = "Passphrase", Advanced = true, HelpText = "Pass from login cookie")] [FieldDefinition(2, Label = "Passphrase", HelpText = "Pass from login cookie")]
public string Passphrase { get; set; } public string Passphrase { get; set; }
public NzbDroneValidationResult Validate() public NzbDroneValidationResult Validate()

6
src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornParser.cs
View File

@@ -85,6 +85,8 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
flags |= IndexerFlags.G_Scene; flags |= IndexerFlags.G_Scene;
} }
var free = !(torrent.FreeleechType is null);
// Only add approved torrents // Only add approved torrents
try try
{ {
@@ -103,6 +105,10 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
Approved = torrent.Checked, Approved = torrent.Checked,
ImdbId = result.ImdbId.IsNotNullOrWhiteSpace() ? int.Parse(result.ImdbId) : 0, ImdbId = result.ImdbId.IsNotNullOrWhiteSpace() ? int.Parse(result.ImdbId) : 0,
IndexerFlags = flags, IndexerFlags = flags,
MinimumRatio = 1,
MinimumSeedTime = 345600,
DownloadVolumeFactor = free ? 0 : 1,
UploadVolumeFactor = 1,
Category = new List<IndexerCategory> { NewznabStandardCategory.Movies } Category = new List<IndexerCategory> { NewznabStandardCategory.Movies }
}); });
} }