From 08d5505b11a641a427105afbc6f873bcaa5c0265 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Sun, 21 Feb 2021 16:59:21 -0500
Subject: [PATCH] Misc indexer fixes

---
 .../Indexers/Definitions/Cardigann/Cardigann.cs        | 10 +++++++++-
 .../Indexers/Definitions/Cardigann/CardigannBase.cs    | 10 +++++++++-
 src/NzbDrone.Core/Indexers/Definitions/DigitalCore.cs  |  4 ++--
 .../Definitions/PassThePopcorn/PassThePopcornParser.cs |  6 ++++++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs
index 34ab303ab..8cec3017b 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs
@@ -60,6 +60,14 @@ namespace NzbDrone.Core.Indexers.Cardigann
 
         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
             {
                 Enable = true,
@@ -71,7 +79,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
                 SupportsRss = SupportsRss,
                 SupportsSearch = SupportsSearch,
                 Capabilities = new IndexerCapabilities(),
-                ExtraFields = definition.Settings
+                ExtraFields = settings
             };
         }
 
diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs
index 2d51907df..cd924c48e 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs
@@ -216,7 +216,15 @@ namespace NzbDrone.Core.Indexers.Cardigann
 
             _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 value = _settings.ExtraFieldData.GetValueOrDefault(setting.Name, setting.Default);
diff --git a/src/NzbDrone.Core/Indexers/Definitions/DigitalCore.cs b/src/NzbDrone.Core/Indexers/Definitions/DigitalCore.cs
index 5781d003f..e71e49e18 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/DigitalCore.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/DigitalCore.cs
@@ -294,10 +294,10 @@ namespace NzbDrone.Core.Indexers.Definitions
             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; }
 
-        [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 NzbDroneValidationResult Validate()
diff --git a/src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornParser.cs b/src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornParser.cs
index 0f1160d6c..8931c0ded 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornParser.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornParser.cs
@@ -85,6 +85,8 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
                         flags |= IndexerFlags.G_Scene;
                     }
 
+                    var free = !(torrent.FreeleechType is null);
+
                     // Only add approved torrents
                     try
                     {
@@ -103,6 +105,10 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
                             Approved = torrent.Checked,
                             ImdbId = result.ImdbId.IsNotNullOrWhiteSpace() ? int.Parse(result.ImdbId) : 0,
                             IndexerFlags = flags,
+                            MinimumRatio = 1,
+                            MinimumSeedTime = 345600,
+                            DownloadVolumeFactor = free ? 0 : 1,
+                            UploadVolumeFactor = 1,
                             Category = new List<IndexerCategory> { NewznabStandardCategory.Movies }
                         });
                     }