From 6551998e067c06eb4edd78f5ccede58c098bb142 Mon Sep 17 00:00:00 2001
From: "gabis@precog.co" <gabis@precog.co>
Date: Fri, 24 Jul 2020 18:35:11 +0300
Subject: [PATCH 1/5] Add feature: optionally load only configured indexers.

---
 src/Jackett.Common/Content/custom.js          |  3 +
 src/Jackett.Common/Content/index.html         |  4 +
 .../Models/Config/ServerConfig.cs             |  4 +-
 src/Jackett.Common/Models/DTO/ServerConfig.cs |  4 +
 .../Services/IndexerConfigurationService.cs   | 19 ++++-
 .../Services/IndexerManagerService.cs         | 77 +++++++++++++++----
 .../IIndexerConfigurationService.cs           |  2 +
 .../ServerConfigurationController.cs          |  2 +
 8 files changed, 99 insertions(+), 16 deletions(-)

diff --git a/src/Jackett.Common/Content/custom.js b/src/Jackett.Common/Content/custom.js
index b4290a2b2ebe8..7e24ff39ea57e 100644
--- a/src/Jackett.Common/Content/custom.js
+++ b/src/Jackett.Common/Content/custom.js
@@ -99,6 +99,7 @@ function loadJackettSettings() {
         $("#jackett-allowupdate").attr('checked', data.updatedisabled);
         $("#jackett-prerelease").attr('checked', data.prerelease);
         $("#jackett-logging").attr('checked', data.logging);
+        $("#jackett-loadonlyconfiguredindexers").attr('checked', data.loadonlyconfiguredindexers);
         $("#jackett-omdbkey").val(data.omdbkey);
         $("#jackett-omdburl").val(data.omdburl);
         var password = data.password;
@@ -1212,6 +1213,7 @@ function bindUIButtons() {
         var jackett_update = $("#jackett-allowupdate").is(':checked');
         var jackett_prerelease = $("#jackett-prerelease").is(':checked');
         var jackett_logging = $("#jackett-logging").is(':checked');
+        var jackett_loadonlyconfiguredindexers = $("#jackett-loadonlyconfiguredindexers").is(':checked');
         var jackett_omdb_key = $("#jackett-omdbkey").val();
         var jackett_omdb_url = $("#jackett-omdburl").val();
 
@@ -1228,6 +1230,7 @@ function bindUIButtons() {
             prerelease: jackett_prerelease,
             blackholedir: $("#jackett-savedir").val(),
             logging: jackett_logging,
+            loadonlyconfiguredindexers:jackett_loadonlyconfiguredindexers,
             basepathoverride: jackett_basepathoverride,
             omdbkey: jackett_omdb_key,
             omdburl: jackett_omdb_url,
diff --git a/src/Jackett.Common/Content/index.html b/src/Jackett.Common/Content/index.html
index b2ed5dab1c046..afdbfb6dbade6 100644
--- a/src/Jackett.Common/Content/index.html
+++ b/src/Jackett.Common/Content/index.html
@@ -196,6 +196,10 @@ <h3>Jackett Configuration</h3>
             <span class="input-header">OMDB API Url: </span>
             <input id="jackett-omdburl" class="form-control input-right" type="text" value="" placeholder="Blank for default">
         </div>
+      <div class="input-area">
+        <span class="input-header">Load only configured indexers (conserve memory, requires restart): </span>
+        <input id="jackett-loadonlyconfiguredindexers" class="form-control input-right" type="checkbox" />
+      </div>
         <hr />
         <div id="footer">
             <a href="https://github.com/Jackett/Jackett" target="_blank" title="Jackett on GitHub">Jackett</a> Version <span id="app-version"></span>
diff --git a/src/Jackett.Common/Models/Config/ServerConfig.cs b/src/Jackett.Common/Models/Config/ServerConfig.cs
index 31c71f145f989..1f7b9d510722f 100644
--- a/src/Jackett.Common/Models/Config/ServerConfig.cs
+++ b/src/Jackett.Common/Models/Config/ServerConfig.cs
@@ -30,7 +30,7 @@ public ServerConfig(RuntimeSettings runtimeSettings)
         public string OmdbApiUrl { get; set; }
 
         /// <summary>
-        /// Ignore as we don't really want to be saving settings specified in the command line. 
+        /// Ignore as we don't really want to be saving settings specified in the command line.
         /// This is a bit of a hack, but in future it might not be all that bad to be able to override config values using settings that were provided at runtime. (and save them if required)
         /// </summary>
         [JsonIgnore]
@@ -44,6 +44,8 @@ public ServerConfig(RuntimeSettings runtimeSettings)
 
         public bool ProxyIsAnonymous => string.IsNullOrWhiteSpace(ProxyUsername) || string.IsNullOrWhiteSpace(ProxyPassword);
 
+        public bool LoadOnlyConfiguredIndexers { get; set; }
+
         public string GetProxyAuthString() =>
             !ProxyIsAnonymous
                 ? $"{ProxyUsername}:{ProxyPassword}"
diff --git a/src/Jackett.Common/Models/DTO/ServerConfig.cs b/src/Jackett.Common/Models/DTO/ServerConfig.cs
index 2141d71278921..80e95bc099b8e 100644
--- a/src/Jackett.Common/Models/DTO/ServerConfig.cs
+++ b/src/Jackett.Common/Models/DTO/ServerConfig.cs
@@ -36,6 +36,9 @@ public class ServerConfig
         [DataMember]
         public bool can_run_netcore { get; set; }
 
+        [DataMember]
+        public bool loadonlyconfiguredindexers { get; set; }
+
         [DataMember]
         public ProxyType proxy_type { get; set; }
         [DataMember]
@@ -65,6 +68,7 @@ public ServerConfig(IEnumerable<string> notices, Models.Config.ServerConfig conf
             omdburl = config.OmdbApiUrl;
             app_version = version;
             can_run_netcore = canRunNetCore;
+            loadonlyconfiguredindexers = config.LoadOnlyConfiguredIndexers;
 
             proxy_type = config.ProxyType;
             proxy_url = config.ProxyUrl;
diff --git a/src/Jackett.Common/Services/IndexerConfigurationService.cs b/src/Jackett.Common/Services/IndexerConfigurationService.cs
index 9f0d2efcdbcfc..371dac5e2a43f 100644
--- a/src/Jackett.Common/Services/IndexerConfigurationService.cs
+++ b/src/Jackett.Common/Services/IndexerConfigurationService.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using Jackett.Common.Indexers;
 using Jackett.Common.Services.Interfaces;
 using Newtonsoft.Json.Linq;
@@ -10,6 +12,7 @@ namespace Jackett.Common.Services
 
     public class IndexerConfigurationService : IIndexerConfigurationService
     {
+        private const string ConfigFileSuffix = ".json";
 
         //public override void LoadFromSavedConfiguration(JToken jsonConfig)
         //{
@@ -141,8 +144,22 @@ public void Save(IIndexer indexer, JToken obj)
             }
         }
 
+        public IEnumerable<string> FindConfiguredIndexerIds()
+        {
+            var directoryInfo = new DirectoryInfo(configService.GetIndexerConfigDir());
+
+            if (!directoryInfo.Exists)
+            {
+                return new List<string>();
+            }
+
+            var fileNames = directoryInfo
+                            .GetFiles().Select(file => file.Name).Where(fileName => fileName.EndsWith(ConfigFileSuffix)).ToList();
+            return fileNames.Select(file => file.Split('.')[0]).ToList();
+        }
+
         public string GetIndexerConfigFilePath(string indexerId)
-            => Path.Combine(configService.GetIndexerConfigDir(), indexerId + ".json");
+            => Path.Combine(configService.GetIndexerConfigDir(), indexerId + ConfigFileSuffix);
 
         private readonly IConfigurationService configService;
         private readonly Logger logger;
diff --git a/src/Jackett.Common/Services/IndexerManagerService.cs b/src/Jackett.Common/Services/IndexerManagerService.cs
index 11b3cca38395c..b23ecedcc34b7 100644
--- a/src/Jackett.Common/Services/IndexerManagerService.cs
+++ b/src/Jackett.Common/Services/IndexerManagerService.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using AngleSharp.Text;
 using Jackett.Common.Indexers;
 using Jackett.Common.Indexers.Meta;
 using Jackett.Common.Models;
@@ -63,11 +64,52 @@ public IndexerManagerService(IIndexerConfigurationService config, IProtectionSer
         public void InitIndexers(IEnumerable<string> path)
         {
             MigrateRenamedIndexers();
-            InitIndexers();
-            InitCardigannIndexers(path);
+            InitIndexers(GetIndexersToLoad());
+            InitCardigannIndexers(GetRelevantIndexedDefinitionFiles(new HashSet<string>(path)));
             InitAggregateIndexer();
         }
 
+        private ISet<string> GetIndexersToLoad()
+        {
+            if (serverConfig.LoadOnlyConfiguredIndexers)
+            {
+                return new HashSet<string>(configService.FindConfiguredIndexerIds());
+            }
+
+            return null;
+        }
+
+        private bool GetIndexerShouldBeLoaded(string indexerId, ISet<string> configuredIndexers)
+        {
+            if (!serverConfig.LoadOnlyConfiguredIndexers)
+            {
+                return true;
+            }
+
+            return configuredIndexers != null && configuredIndexers.Contains(indexerId);
+        }
+
+        private IEnumerable<FileInfo> GetRelevantIndexedDefinitionFiles(ISet<string> path)
+        {
+            logger.Info("Loading Cardigann definitions from: " + string.Join(", ", path));
+            if (!serverConfig.LoadOnlyConfiguredIndexers)
+            {
+                logger.Info("Loading all Indexer definitions");
+                return GetIndexerDefinitionFiles(path);
+            }
+
+            logger.Info("Loading only configured Indexer definitions");
+            var configuredIndexers = configService.FindConfiguredIndexerIds();
+            return GetIndexerDefinitionFiles(path, new HashSet<string>(configuredIndexers));
+        }
+
+        private IEnumerable<FileInfo> GetIndexerDefinitionFiles(IEnumerable<string> path,
+                                                                ISet<string> configuredIndexers)
+        {
+            return GetIndexerDefinitionFiles(path)
+                   .Where(file => configuredIndexers.Contains(file.Name.SplitWithTrimming('.')[0])).ToList();
+        }
+
         private void MigrateRenamedIndexers()
         {
             foreach (var oldId in renamedIndexers.Keys)
@@ -95,7 +137,7 @@ private void MigrateRenamedIndexers()
             }
         }
 
-        private void InitIndexers()
+        private void InitIndexers(ISet<string> configuredIndexers)
         {
             logger.Info("Using HTTP Client: " + webClient.GetType().Name);
 
@@ -115,28 +157,30 @@ private void InitIndexers()
 
                     var arguments = new object[] { configService, indexerWebClientInstance, logger, protectionService };
                     var indexer = (IIndexer)constructor.Invoke(arguments);
-                    return indexer;
+
+                    if (GetIndexerShouldBeLoaded(indexer.Id, configuredIndexers))
+                    {
+                        return indexer;
+                    }
+
+                    return null;
                 }
                 else
                 {
                     logger.Error("Cannot instantiate " + type.Name);
                 }
                 return null;
-            });
+            }).Where(indexer => indexer != null);
 
             foreach (var idx in ixs)
             {
-                if (idx == null)
-                    continue;
                 indexers.Add(idx.Id, idx);
                 configService.Load(idx);
             }
         }
 
-        private void InitCardigannIndexers(IEnumerable<string> path)
+        private void InitCardigannIndexers(IEnumerable<FileInfo> files)
         {
-            logger.Info("Loading Cardigann definitions from: " + string.Join(", ", path));
-
             var deserializer = new DeserializerBuilder()
                         .WithNamingConvention(CamelCaseNamingConvention.Instance)
 //                        .IgnoreUnmatchedProperties()
@@ -144,9 +188,6 @@ private void InitCardigannIndexers(IEnumerable<string> path)
 
             try
             {
-                var directoryInfos = path.Select(p => new DirectoryInfo(p));
-                var existingDirectories = directoryInfos.Where(d => d.Exists);
-                var files = existingDirectories.SelectMany(d => d.GetFiles("*.yml"));
                 var definitions = files.Select(file =>
                 {
                     logger.Debug("Loading Cardigann definition " + file.FullName);
@@ -191,7 +232,7 @@ private void InitCardigannIndexers(IEnumerable<string> path)
 
                     indexers.Add(indexer.Id, indexer);
                 }
-                logger.Info("Cardigann definitions loaded: " + string.Join(", ", indexers.Keys));
+                logger.Info("Cardigann definitions loaded ("+indexers.Count+"): " + string.Join(", ", indexers.Keys));
             }
             catch (Exception ex)
             {
@@ -199,6 +240,14 @@ private void InitCardigannIndexers(IEnumerable<string> path)
             }
         }
 
+        private static IEnumerable<FileInfo> GetIndexerDefinitionFiles(IEnumerable<string> path)
+        {
+            var directoryInfos = path.Select(p => new DirectoryInfo(p));
+            var existingDirectories = directoryInfos.Where(d => d.Exists);
+            var files = existingDirectories.SelectMany(d => d.GetFiles("*.yml"));
+            return files;
+        }
+
         public void InitAggregateIndexer()
         {
             var omdbApiKey = serverConfig.OmdbApiKey;
diff --git a/src/Jackett.Common/Services/Interfaces/IIndexerConfigurationService.cs b/src/Jackett.Common/Services/Interfaces/IIndexerConfigurationService.cs
index a4fd486e918dd..41d509a3daff3 100644
--- a/src/Jackett.Common/Services/Interfaces/IIndexerConfigurationService.cs
+++ b/src/Jackett.Common/Services/Interfaces/IIndexerConfigurationService.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Jackett.Common.Indexers;
 using Newtonsoft.Json.Linq;
 
@@ -9,5 +10,6 @@ public interface IIndexerConfigurationService
         void Save(IIndexer indexer, JToken config);
         void Delete(IIndexer indexer);
         string GetIndexerConfigFilePath(string indexerId);
+        IEnumerable<string> FindConfiguredIndexerIds();
     }
 }
diff --git a/src/Jackett.Server/Controllers/ServerConfigurationController.cs b/src/Jackett.Server/Controllers/ServerConfigurationController.cs
index afd1b682910ef..981bdc0e79ee9 100644
--- a/src/Jackett.Server/Controllers/ServerConfigurationController.cs
+++ b/src/Jackett.Server/Controllers/ServerConfigurationController.cs
@@ -79,6 +79,7 @@ public IActionResult UpdateConfig([FromBody]Common.Models.DTO.ServerConfig confi
             var updateDisabled = config.updatedisabled;
             var preRelease = config.prerelease;
             var logging = config.logging;
+            var loadOnlyConfiguredIndexers = config.loadonlyconfiguredindexers;
             var basePathOverride = config.basepathoverride;
             if (basePathOverride != null)
             {
@@ -95,6 +96,7 @@ public IActionResult UpdateConfig([FromBody]Common.Models.DTO.ServerConfig confi
                 webHostRestartNeeded = true;
             }
 
+            serverConfig.LoadOnlyConfiguredIndexers = loadOnlyConfiguredIndexers;
             serverConfig.UpdateDisabled = updateDisabled;
             serverConfig.UpdatePrerelease = preRelease;
             serverConfig.BasePathOverride = basePathOverride;

From 10faa07b5ac7261ad34b182d147d1326ffb63e9e Mon Sep 17 00:00:00 2001
From: "gabis@precog.co" <gabis@precog.co>
Date: Sat, 25 Jul 2020 13:24:58 +0300
Subject: [PATCH 2/5] Optional indexer loading:  force the browser cache to
 refresh custom.js

---
 src/Jackett.Common/Content/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Jackett.Common/Content/index.html b/src/Jackett.Common/Content/index.html
index afdbfb6dbade6..d49abb3b1c090 100644
--- a/src/Jackett.Common/Content/index.html
+++ b/src/Jackett.Common/Content/index.html
@@ -695,6 +695,6 @@ <h4>Capabilities</h4>
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20200410"></script>
+    <script type="text/javascript" src="../custom.js?changed=20200725"></script>
 </body>
 </html>

From 01a45f57f9dc7b86c5e20fbeea5148998baf8172 Mon Sep 17 00:00:00 2001
From: "gabis@precog.co" <gabis@precog.co>
Date: Sat, 25 Jul 2020 21:59:28 +0300
Subject: [PATCH 3/5] Feature: optionally load only configured indexers - fix
 loading indexers with case sensitive discrepancies between indexer id and
 indexer definition file name

---
 .../Services/IndexerConfigurationService.cs   | 10 ++++++++--
 .../Services/IndexerManagerService.cs         | 19 ++++++++++++++-----
 src/Jackett.Common/Utils/FilesystemUtil.cs    | 17 +++++++++++++++++
 3 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 src/Jackett.Common/Utils/FilesystemUtil.cs

diff --git a/src/Jackett.Common/Services/IndexerConfigurationService.cs b/src/Jackett.Common/Services/IndexerConfigurationService.cs
index 371dac5e2a43f..b270bd81ae595 100644
--- a/src/Jackett.Common/Services/IndexerConfigurationService.cs
+++ b/src/Jackett.Common/Services/IndexerConfigurationService.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using Jackett.Common.Indexers;
 using Jackett.Common.Services.Interfaces;
+using Jackett.Common.Utils;
 using Newtonsoft.Json.Linq;
 using NLog;
 
@@ -154,8 +155,13 @@ public IEnumerable<string> FindConfiguredIndexerIds()
             }
 
             var fileNames = directoryInfo
-                            .GetFiles().Select(file => file.Name).Where(fileName => fileName.EndsWith(ConfigFileSuffix)).ToList();
-            return fileNames.Select(file => file.Split('.')[0]).ToList();
+                            .GetFiles().Select(file => file.Name)
+                            .Where(fileName => fileName.EndsWith(ConfigFileSuffix))
+                            .ToList();
+
+            return fileNames.Select(FilesystemUtil.getLowercaseFileNameWithoutExtension)
+                            .Where(indexId => indexId != null)
+                            .ToList();
         }
 
         public string GetIndexerConfigFilePath(string indexerId)
diff --git a/src/Jackett.Common/Services/IndexerManagerService.cs b/src/Jackett.Common/Services/IndexerManagerService.cs
index b23ecedcc34b7..5169fdc0ecba4 100644
--- a/src/Jackett.Common/Services/IndexerManagerService.cs
+++ b/src/Jackett.Common/Services/IndexerManagerService.cs
@@ -3,12 +3,12 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using AngleSharp.Text;
 using Jackett.Common.Indexers;
 using Jackett.Common.Indexers.Meta;
 using Jackett.Common.Models;
 using Jackett.Common.Models.Config;
 using Jackett.Common.Services.Interfaces;
+using Jackett.Common.Utils;
 using Jackett.Common.Utils.Clients;
 using NLog;
 using YamlDotNet.Serialization;
@@ -79,14 +79,14 @@ private ISet<string> GetIndexersToLoad()
             return null;
         }
 
-        private bool GetIndexerShouldBeLoaded(string indexerId, ISet<string> configuredIndexers)
+        private bool GetIndexerShouldBeLoaded(string indexerId, ICollection<string> configuredIndexers)
         {
             if (!serverConfig.LoadOnlyConfiguredIndexers)
             {
                 return true;
             }
 
-            return configuredIndexers != null && configuredIndexers.Contains(indexerId);
+            return configuredIndexers != null && configuredIndexers.Contains(indexerId.ToLower());
         }
 
         private IEnumerable<FileInfo> GetRelevantIndexedDefinitionFiles(ISet<string> path)
@@ -106,8 +106,17 @@ private IEnumerable<FileInfo> GetRelevantIndexedDefinitionFiles(ISet<string> pat
         private IEnumerable<FileInfo> GetIndexerDefinitionFiles(IEnumerable<string> path,
                                                                 ISet<string> configuredIndexers)
         {
-            return GetIndexerDefinitionFiles(path)
-                   .Where(file => configuredIndexers.Contains(file.Name.SplitWithTrimming('.')[0])).ToList();
+            var indexerDefinitionFiles = GetIndexerDefinitionFiles(path);
+            return indexerDefinitionFiles
+                   .Where(file =>
+                   {
+                       var indexId = FilesystemUtil.getLowercaseFileNameWithoutExtension(file.Name);
+                       if (indexId == null)
+                       {
+                           return false;
+                       }
+                       return configuredIndexers.Contains(indexId);
+                   }).ToList();
         }
 
         private void MigrateRenamedIndexers()
diff --git a/src/Jackett.Common/Utils/FilesystemUtil.cs b/src/Jackett.Common/Utils/FilesystemUtil.cs
new file mode 100644
index 0000000000000..40691a810d038
--- /dev/null
+++ b/src/Jackett.Common/Utils/FilesystemUtil.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace Jackett.Common.Utils
+{
+    public static class FilesystemUtil
+    {
+        public static string getLowercaseFileNameWithoutExtension(string fileName)
+        {
+            var fileParts = fileName.Split(".".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
+            if (fileParts.Length < 2)
+            {
+                return null;
+            }
+            return fileParts[0].ToLower();
+        }
+    }
+}

From 4be7fa0adda5778e129b93f1be3ff1e3fbc8cfba Mon Sep 17 00:00:00 2001
From: "gabis@precog.co" <gabis@precog.co>
Date: Fri, 24 Jul 2020 18:35:11 +0300
Subject: [PATCH 4/5] Add feature: optionally load only configured indexers.

Optional indexer loading:  force the browser cache to refresh custom.js

Feature: optionally load only configured indexers - fix loading indexers with case sensitive discrepancies between indexer id and indexer definition file name
---
 src/Jackett.Common/Content/custom.js          |  3 +
 src/Jackett.Common/Content/index.html         |  6 +-
 .../Models/Config/ServerConfig.cs             |  4 +-
 src/Jackett.Common/Models/DTO/ServerConfig.cs |  4 +
 .../Services/IndexerConfigurationService.cs   | 25 +++++-
 .../Services/IndexerManagerService.cs         | 86 ++++++++++++++++---
 .../IIndexerConfigurationService.cs           |  2 +
 src/Jackett.Common/Utils/FilesystemUtil.cs    | 17 ++++
 .../ServerConfigurationController.cs          |  2 +
 9 files changed, 132 insertions(+), 17 deletions(-)
 create mode 100644 src/Jackett.Common/Utils/FilesystemUtil.cs

diff --git a/src/Jackett.Common/Content/custom.js b/src/Jackett.Common/Content/custom.js
index b4290a2b2ebe8..7e24ff39ea57e 100644
--- a/src/Jackett.Common/Content/custom.js
+++ b/src/Jackett.Common/Content/custom.js
@@ -99,6 +99,7 @@ function loadJackettSettings() {
         $("#jackett-allowupdate").attr('checked', data.updatedisabled);
         $("#jackett-prerelease").attr('checked', data.prerelease);
         $("#jackett-logging").attr('checked', data.logging);
+        $("#jackett-loadonlyconfiguredindexers").attr('checked', data.loadonlyconfiguredindexers);
         $("#jackett-omdbkey").val(data.omdbkey);
         $("#jackett-omdburl").val(data.omdburl);
         var password = data.password;
@@ -1212,6 +1213,7 @@ function bindUIButtons() {
         var jackett_update = $("#jackett-allowupdate").is(':checked');
         var jackett_prerelease = $("#jackett-prerelease").is(':checked');
         var jackett_logging = $("#jackett-logging").is(':checked');
+        var jackett_loadonlyconfiguredindexers = $("#jackett-loadonlyconfiguredindexers").is(':checked');
         var jackett_omdb_key = $("#jackett-omdbkey").val();
         var jackett_omdb_url = $("#jackett-omdburl").val();
 
@@ -1228,6 +1230,7 @@ function bindUIButtons() {
             prerelease: jackett_prerelease,
             blackholedir: $("#jackett-savedir").val(),
             logging: jackett_logging,
+            loadonlyconfiguredindexers:jackett_loadonlyconfiguredindexers,
             basepathoverride: jackett_basepathoverride,
             omdbkey: jackett_omdb_key,
             omdburl: jackett_omdb_url,
diff --git a/src/Jackett.Common/Content/index.html b/src/Jackett.Common/Content/index.html
index b2ed5dab1c046..d49abb3b1c090 100644
--- a/src/Jackett.Common/Content/index.html
+++ b/src/Jackett.Common/Content/index.html
@@ -196,6 +196,10 @@ <h3>Jackett Configuration</h3>
             <span class="input-header">OMDB API Url: </span>
             <input id="jackett-omdburl" class="form-control input-right" type="text" value="" placeholder="Blank for default">
         </div>
+      <div class="input-area">
+        <span class="input-header">Load only configured indexers (conserve memory, requires restart): </span>
+        <input id="jackett-loadonlyconfiguredindexers" class="form-control input-right" type="checkbox" />
+      </div>
         <hr />
         <div id="footer">
             <a href="https://github.com/Jackett/Jackett" target="_blank" title="Jackett on GitHub">Jackett</a> Version <span id="app-version"></span>
@@ -691,6 +695,6 @@ <h4>Capabilities</h4>
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20200410"></script>
+    <script type="text/javascript" src="../custom.js?changed=20200725"></script>
 </body>
 </html>
diff --git a/src/Jackett.Common/Models/Config/ServerConfig.cs b/src/Jackett.Common/Models/Config/ServerConfig.cs
index 31c71f145f989..1f7b9d510722f 100644
--- a/src/Jackett.Common/Models/Config/ServerConfig.cs
+++ b/src/Jackett.Common/Models/Config/ServerConfig.cs
@@ -30,7 +30,7 @@ public ServerConfig(RuntimeSettings runtimeSettings)
         public string OmdbApiUrl { get; set; }
 
         /// <summary>
-        /// Ignore as we don't really want to be saving settings specified in the command line. 
+        /// Ignore as we don't really want to be saving settings specified in the command line.
         /// This is a bit of a hack, but in future it might not be all that bad to be able to override config values using settings that were provided at runtime. (and save them if required)
         /// </summary>
         [JsonIgnore]
@@ -44,6 +44,8 @@ public ServerConfig(RuntimeSettings runtimeSettings)
 
         public bool ProxyIsAnonymous => string.IsNullOrWhiteSpace(ProxyUsername) || string.IsNullOrWhiteSpace(ProxyPassword);
 
+        public bool LoadOnlyConfiguredIndexers { get; set; }
+
         public string GetProxyAuthString() =>
             !ProxyIsAnonymous
                 ? $"{ProxyUsername}:{ProxyPassword}"
diff --git a/src/Jackett.Common/Models/DTO/ServerConfig.cs b/src/Jackett.Common/Models/DTO/ServerConfig.cs
index 2141d71278921..80e95bc099b8e 100644
--- a/src/Jackett.Common/Models/DTO/ServerConfig.cs
+++ b/src/Jackett.Common/Models/DTO/ServerConfig.cs
@@ -36,6 +36,9 @@ public class ServerConfig
         [DataMember]
         public bool can_run_netcore { get; set; }
 
+        [DataMember]
+        public bool loadonlyconfiguredindexers { get; set; }
+
         [DataMember]
         public ProxyType proxy_type { get; set; }
         [DataMember]
@@ -65,6 +68,7 @@ public ServerConfig(IEnumerable<string> notices, Models.Config.ServerConfig conf
             omdburl = config.OmdbApiUrl;
             app_version = version;
             can_run_netcore = canRunNetCore;
+            loadonlyconfiguredindexers = config.LoadOnlyConfiguredIndexers;
 
             proxy_type = config.ProxyType;
             proxy_url = config.ProxyUrl;
diff --git a/src/Jackett.Common/Services/IndexerConfigurationService.cs b/src/Jackett.Common/Services/IndexerConfigurationService.cs
index 9f0d2efcdbcfc..b270bd81ae595 100644
--- a/src/Jackett.Common/Services/IndexerConfigurationService.cs
+++ b/src/Jackett.Common/Services/IndexerConfigurationService.cs
@@ -1,7 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using Jackett.Common.Indexers;
 using Jackett.Common.Services.Interfaces;
+using Jackett.Common.Utils;
 using Newtonsoft.Json.Linq;
 using NLog;
 
@@ -10,6 +13,7 @@ namespace Jackett.Common.Services
 
     public class IndexerConfigurationService : IIndexerConfigurationService
     {
+        private const string ConfigFileSuffix = ".json";
 
         //public override void LoadFromSavedConfiguration(JToken jsonConfig)
         //{
@@ -141,8 +145,27 @@ public void Save(IIndexer indexer, JToken obj)
             }
         }
 
+        public IEnumerable<string> FindConfiguredIndexerIds()
+        {
+            var directoryInfo = new DirectoryInfo(configService.GetIndexerConfigDir());
+
+            if (!directoryInfo.Exists)
+            {
+                return new List<string>();
+            }
+
+            var fileNames = directoryInfo
+                            .GetFiles().Select(file => file.Name)
+                            .Where(fileName => fileName.EndsWith(ConfigFileSuffix))
+                            .ToList();
+
+            return fileNames.Select(FilesystemUtil.getLowercaseFileNameWithoutExtension)
+                            .Where(indexId => indexId != null)
+                            .ToList();
+        }
+
         public string GetIndexerConfigFilePath(string indexerId)
-            => Path.Combine(configService.GetIndexerConfigDir(), indexerId + ".json");
+            => Path.Combine(configService.GetIndexerConfigDir(), indexerId + ConfigFileSuffix);
 
         private readonly IConfigurationService configService;
         private readonly Logger logger;
diff --git a/src/Jackett.Common/Services/IndexerManagerService.cs b/src/Jackett.Common/Services/IndexerManagerService.cs
index 11b3cca38395c..5169fdc0ecba4 100644
--- a/src/Jackett.Common/Services/IndexerManagerService.cs
+++ b/src/Jackett.Common/Services/IndexerManagerService.cs
@@ -8,6 +8,7 @@
 using Jackett.Common.Models;
 using Jackett.Common.Models.Config;
 using Jackett.Common.Services.Interfaces;
+using Jackett.Common.Utils;
 using Jackett.Common.Utils.Clients;
 using NLog;
 using YamlDotNet.Serialization;
@@ -63,11 +64,61 @@ public IndexerManagerService(IIndexerConfigurationService config, IProtectionSer
         public void InitIndexers(IEnumerable<string> path)
         {
             MigrateRenamedIndexers();
-            InitIndexers();
-            InitCardigannIndexers(path);
+            InitIndexers(GetIndexersToLoad());
+            InitCardigannIndexers(GetRelevantIndexedDefinitionFiles(new HashSet<string>(path)));
             InitAggregateIndexer();
         }
 
+        private ISet<string> GetIndexersToLoad()
+        {
+            if (serverConfig.LoadOnlyConfiguredIndexers)
+            {
+                return new HashSet<string>(configService.FindConfiguredIndexerIds());
+            }
+
+            return null;
+        }
+
+        private bool GetIndexerShouldBeLoaded(string indexerId, ICollection<string> configuredIndexers)
+        {
+            if (!serverConfig.LoadOnlyConfiguredIndexers)
+            {
+                return true;
+            }
+
+            return configuredIndexers != null && configuredIndexers.Contains(indexerId.ToLower());
+        }
+
+        private IEnumerable<FileInfo> GetRelevantIndexedDefinitionFiles(ISet<string> path)
+        {
+            logger.Info("Loading Cardigann definitions from: " + string.Join(", ", path));
+            if (!serverConfig.LoadOnlyConfiguredIndexers)
+            {
+                logger.Info("Loading all Indexer definitions");
+                return GetIndexerDefinitionFiles(path);
+            }
+
+            logger.Info("Loading only configured Indexer definitions");
+            var configuredIndexers = configService.FindConfiguredIndexerIds();
+            return GetIndexerDefinitionFiles(path, new HashSet<string>(configuredIndexers));
+        }
+
+        private IEnumerable<FileInfo> GetIndexerDefinitionFiles(IEnumerable<string> path,
+                                                                ISet<string> configuredIndexers)
+        {
+            var indexerDefinitionFiles = GetIndexerDefinitionFiles(path);
+            return indexerDefinitionFiles
+                   .Where(file =>
+                   {
+                       var indexId = FilesystemUtil.getLowercaseFileNameWithoutExtension(file.Name);
+                       if (indexId == null)
+                       {
+                           return false;
+                       }
+                       return configuredIndexers.Contains(indexId);
+                   }).ToList();
+        }
+
         private void MigrateRenamedIndexers()
         {
             foreach (var oldId in renamedIndexers.Keys)
@@ -95,7 +146,7 @@ private void MigrateRenamedIndexers()
             }
         }
 
-        private void InitIndexers()
+        private void InitIndexers(ISet<string> configuredIndexers)
         {
             logger.Info("Using HTTP Client: " + webClient.GetType().Name);
 
@@ -115,28 +166,30 @@ private void InitIndexers()
 
                     var arguments = new object[] { configService, indexerWebClientInstance, logger, protectionService };
                     var indexer = (IIndexer)constructor.Invoke(arguments);
-                    return indexer;
+
+                    if (GetIndexerShouldBeLoaded(indexer.Id, configuredIndexers))
+                    {
+                        return indexer;
+                    }
+
+                    return null;
                 }
                 else
                 {
                     logger.Error("Cannot instantiate " + type.Name);
                 }
                 return null;
-            });
+            }).Where(indexer => indexer != null);
 
             foreach (var idx in ixs)
             {
-                if (idx == null)
-                    continue;
                 indexers.Add(idx.Id, idx);
                 configService.Load(idx);
             }
         }
 
-        private void InitCardigannIndexers(IEnumerable<string> path)
+        private void InitCardigannIndexers(IEnumerable<FileInfo> files)
         {
-            logger.Info("Loading Cardigann definitions from: " + string.Join(", ", path));
-
             var deserializer = new DeserializerBuilder()
                         .WithNamingConvention(CamelCaseNamingConvention.Instance)
 //                        .IgnoreUnmatchedProperties()
@@ -144,9 +197,6 @@ private void InitCardigannIndexers(IEnumerable<string> path)
 
             try
             {
-                var directoryInfos = path.Select(p => new DirectoryInfo(p));
-                var existingDirectories = directoryInfos.Where(d => d.Exists);
-                var files = existingDirectories.SelectMany(d => d.GetFiles("*.yml"));
                 var definitions = files.Select(file =>
                 {
                     logger.Debug("Loading Cardigann definition " + file.FullName);
@@ -191,7 +241,7 @@ private void InitCardigannIndexers(IEnumerable<string> path)
 
                     indexers.Add(indexer.Id, indexer);
                 }
-                logger.Info("Cardigann definitions loaded: " + string.Join(", ", indexers.Keys));
+                logger.Info("Cardigann definitions loaded ("+indexers.Count+"): " + string.Join(", ", indexers.Keys));
             }
             catch (Exception ex)
             {
@@ -199,6 +249,14 @@ private void InitCardigannIndexers(IEnumerable<string> path)
             }
         }
 
+        private static IEnumerable<FileInfo> GetIndexerDefinitionFiles(IEnumerable<string> path)
+        {
+            var directoryInfos = path.Select(p => new DirectoryInfo(p));
+            var existingDirectories = directoryInfos.Where(d => d.Exists);
+            var files = existingDirectories.SelectMany(d => d.GetFiles("*.yml"));
+            return files;
+        }
+
         public void InitAggregateIndexer()
         {
             var omdbApiKey = serverConfig.OmdbApiKey;
diff --git a/src/Jackett.Common/Services/Interfaces/IIndexerConfigurationService.cs b/src/Jackett.Common/Services/Interfaces/IIndexerConfigurationService.cs
index a4fd486e918dd..41d509a3daff3 100644
--- a/src/Jackett.Common/Services/Interfaces/IIndexerConfigurationService.cs
+++ b/src/Jackett.Common/Services/Interfaces/IIndexerConfigurationService.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Jackett.Common.Indexers;
 using Newtonsoft.Json.Linq;
 
@@ -9,5 +10,6 @@ public interface IIndexerConfigurationService
         void Save(IIndexer indexer, JToken config);
         void Delete(IIndexer indexer);
         string GetIndexerConfigFilePath(string indexerId);
+        IEnumerable<string> FindConfiguredIndexerIds();
     }
 }
diff --git a/src/Jackett.Common/Utils/FilesystemUtil.cs b/src/Jackett.Common/Utils/FilesystemUtil.cs
new file mode 100644
index 0000000000000..40691a810d038
--- /dev/null
+++ b/src/Jackett.Common/Utils/FilesystemUtil.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace Jackett.Common.Utils
+{
+    public static class FilesystemUtil
+    {
+        public static string getLowercaseFileNameWithoutExtension(string fileName)
+        {
+            var fileParts = fileName.Split(".".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
+            if (fileParts.Length < 2)
+            {
+                return null;
+            }
+            return fileParts[0].ToLower();
+        }
+    }
+}
diff --git a/src/Jackett.Server/Controllers/ServerConfigurationController.cs b/src/Jackett.Server/Controllers/ServerConfigurationController.cs
index afd1b682910ef..981bdc0e79ee9 100644
--- a/src/Jackett.Server/Controllers/ServerConfigurationController.cs
+++ b/src/Jackett.Server/Controllers/ServerConfigurationController.cs
@@ -79,6 +79,7 @@ public IActionResult UpdateConfig([FromBody]Common.Models.DTO.ServerConfig confi
             var updateDisabled = config.updatedisabled;
             var preRelease = config.prerelease;
             var logging = config.logging;
+            var loadOnlyConfiguredIndexers = config.loadonlyconfiguredindexers;
             var basePathOverride = config.basepathoverride;
             if (basePathOverride != null)
             {
@@ -95,6 +96,7 @@ public IActionResult UpdateConfig([FromBody]Common.Models.DTO.ServerConfig confi
                 webHostRestartNeeded = true;
             }
 
+            serverConfig.LoadOnlyConfiguredIndexers = loadOnlyConfiguredIndexers;
             serverConfig.UpdateDisabled = updateDisabled;
             serverConfig.UpdatePrerelease = preRelease;
             serverConfig.BasePathOverride = basePathOverride;

From 9f6981a7b83a713a725783b53e158fffa6beb2ec Mon Sep 17 00:00:00 2001
From: "gabis@precog.co" <gabis@precog.co>
Date: Mon, 27 Jul 2020 19:31:14 +0300
Subject: [PATCH 5/5] Feature: Load only configured indexers: fix to load
 indexer according to id in definition file and not according to definition
 file name.

---
 .../Services/IndexerConfigurationService.cs   |  2 +-
 .../Services/IndexerManagerService.cs         | 46 +++++--------------
 src/Jackett.Common/Utils/FilesystemUtil.cs    |  4 +-
 3 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/src/Jackett.Common/Services/IndexerConfigurationService.cs b/src/Jackett.Common/Services/IndexerConfigurationService.cs
index b270bd81ae595..9b8ebcd9a104b 100644
--- a/src/Jackett.Common/Services/IndexerConfigurationService.cs
+++ b/src/Jackett.Common/Services/IndexerConfigurationService.cs
@@ -159,7 +159,7 @@ public IEnumerable<string> FindConfiguredIndexerIds()
                             .Where(fileName => fileName.EndsWith(ConfigFileSuffix))
                             .ToList();
 
-            return fileNames.Select(FilesystemUtil.getLowercaseFileNameWithoutExtension)
+            return fileNames.Select(FilesystemUtil.getFileNameWithoutExtension)
                             .Where(indexId => indexId != null)
                             .ToList();
         }
diff --git a/src/Jackett.Common/Services/IndexerManagerService.cs b/src/Jackett.Common/Services/IndexerManagerService.cs
index 5169fdc0ecba4..ba190a799feb9 100644
--- a/src/Jackett.Common/Services/IndexerManagerService.cs
+++ b/src/Jackett.Common/Services/IndexerManagerService.cs
@@ -64,8 +64,9 @@ public IndexerManagerService(IIndexerConfigurationService config, IProtectionSer
         public void InitIndexers(IEnumerable<string> path)
         {
             MigrateRenamedIndexers();
-            InitIndexers(GetIndexersToLoad());
-            InitCardigannIndexers(GetRelevantIndexedDefinitionFiles(new HashSet<string>(path)));
+            var indexersToLoad = GetIndexersToLoad();
+            InitIndexers(indexersToLoad);
+            InitCardigannIndexers(GetIndexerDefinitionFiles(path), indexersToLoad);
             InitAggregateIndexer();
         }
 
@@ -86,37 +87,7 @@ private bool GetIndexerShouldBeLoaded(string indexerId, ICollection<string> conf
                 return true;
             }
 
-            return configuredIndexers != null && configuredIndexers.Contains(indexerId.ToLower());
-        }
-
-        private IEnumerable<FileInfo> GetRelevantIndexedDefinitionFiles(ISet<string> path)
-        {
-            logger.Info("Loading Cardigann definitions from: " + string.Join(", ", path));
-            if (!serverConfig.LoadOnlyConfiguredIndexers)
-            {
-                logger.Info("Loading all Indexer definitions");
-                return GetIndexerDefinitionFiles(path);
-            }
-
-            logger.Info("Loading only configured Indexer definitions");
-            var configuredIndexers = configService.FindConfiguredIndexerIds();
-            return GetIndexerDefinitionFiles(path, new HashSet<string>(configuredIndexers));
-        }
-
-        private IEnumerable<FileInfo> GetIndexerDefinitionFiles(IEnumerable<string> path,
-                                                                ISet<string> configuredIndexers)
-        {
-            var indexerDefinitionFiles = GetIndexerDefinitionFiles(path);
-            return indexerDefinitionFiles
-                   .Where(file =>
-                   {
-                       var indexId = FilesystemUtil.getLowercaseFileNameWithoutExtension(file.Name);
-                       if (indexId == null)
-                       {
-                           return false;
-                       }
-                       return configuredIndexers.Contains(indexId);
-                   }).ToList();
+            return configuredIndexers != null && configuredIndexers.Contains(indexerId);
         }
 
         private void MigrateRenamedIndexers()
@@ -188,7 +159,7 @@ private void InitIndexers(ISet<string> configuredIndexers)
             }
         }
 
-        private void InitCardigannIndexers(IEnumerable<FileInfo> files)
+        private void InitCardigannIndexers(IEnumerable<FileInfo> files, ISet<string> indexersToLoad)
         {
             var deserializer = new DeserializerBuilder()
                         .WithNamingConvention(CamelCaseNamingConvention.Instance)
@@ -204,7 +175,12 @@ private void InitCardigannIndexers(IEnumerable<FileInfo> files)
                     {
                         var DefinitionString = File.ReadAllText(file.FullName);
                         var definition = deserializer.Deserialize<IndexerDefinition>(DefinitionString);
-                        return definition;
+                        if (GetIndexerShouldBeLoaded(definition.Id, indexersToLoad))
+                        {
+                            return definition;
+                        }
+
+                        return null;
                     }
                     catch (Exception ex)
                     {
diff --git a/src/Jackett.Common/Utils/FilesystemUtil.cs b/src/Jackett.Common/Utils/FilesystemUtil.cs
index 40691a810d038..b91214bae0edb 100644
--- a/src/Jackett.Common/Utils/FilesystemUtil.cs
+++ b/src/Jackett.Common/Utils/FilesystemUtil.cs
@@ -4,14 +4,14 @@ namespace Jackett.Common.Utils
 {
     public static class FilesystemUtil
     {
-        public static string getLowercaseFileNameWithoutExtension(string fileName)
+        public static string getFileNameWithoutExtension(string fileName)
         {
             var fileParts = fileName.Split(".".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
             if (fileParts.Length < 2)
             {
                 return null;
             }
-            return fileParts[0].ToLower();
+            return fileParts[0];
         }
     }
 }