refactor: pull changes from upstream

Radarr · May 5, 2024 · caaa91e · caaa91e
1 parent 46a7dcd
commit caaa91e
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 39 deletions.
diff --git a/src/NzbDrone.Common/Options/LogOptions.cs b/src/NzbDrone.Common/Options/LogOptions.cs
@@ -11,4 +11,5 @@ public class LogOptions
     public string SyslogServer { get; set; }
     public int? SyslogPort { get; set; }
     public string SyslogLevel { get; set; }
+    public bool? DbEnabled { get; set; }
 }
diff --git a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
@@ -55,6 +55,7 @@ public interface IConfigFileProvider : IHandleAsync<ApplicationStartedEvent>,
         string SyslogServer { get; }
         int SyslogPort { get; }
         string SyslogLevel { get; }
+        bool LogDbEnabled { get; }
         string PostgresHost { get; }
         int PostgresPort { get; }
         string PostgresUser { get; }
@@ -229,6 +230,7 @@ public AuthenticationType AuthenticationMethod
         public string PostgresMainDb => _postgresOptions?.MainDb ?? GetValue("PostgresMainDb", "radarr-main", persist: false);
         public string PostgresLogDb => _postgresOptions?.LogDb ?? GetValue("PostgresLogDb", "radarr-log", persist: false);
         public int PostgresPort => (_postgresOptions?.Port ?? 0) != 0 ? _postgresOptions.Port : GetValueInt("PostgresPort", 5432, persist: false);
+        public bool LogDbEnabled => _logOptions.DbEnabled ?? GetValueBoolean("LogDbEnabled", true, persist: false);
         public bool LogSql => _logOptions.Sql ?? GetValueBoolean("LogSql", false, persist: false);
         public int LogRotate => _logOptions.Rotate ?? GetValueInt("LogRotate", 50, persist: false);
         public bool FilterSentryEvents => _logOptions.FilterSentryEvents ?? GetValueBoolean("FilterSentryEvents", true, persist: false);

diff --git a/src/NzbDrone.Core/Datastore/Extensions/CompositionExtensions.cs b/src/NzbDrone.Core/Datastore/Extensions/CompositionExtensions.cs
@@ -8,12 +8,14 @@ public static class CompositionExtensions
         public static IContainer AddDatabase(this IContainer container)
         {
             container.RegisterDelegate<IDbFactory, IMainDatabase>(f => new MainDatabase(f.Create()), Reuse.Singleton);
+
             return container;
         }
 
         public static IContainer AddLogDatabase(this IContainer container)
         {
             container.RegisterDelegate<IDbFactory, ILogDatabase>(f => new LogDatabase(f.Create(MigrationType.Log)), Reuse.Singleton);
+
             return container;
         }
 

diff --git a/src/NzbDrone.Core/Update/History/UpdateHistoryService.cs b/src/NzbDrone.Core/Update/History/UpdateHistoryService.cs
@@ -19,16 +19,16 @@ public class UpdateHistoryService : IUpdateHistoryService, IHandle<ApplicationSt
     {
         private readonly IUpdateHistoryRepository _repository;
         private readonly IEventAggregator _eventAggregator;
-        private readonly Logger _logger;
         private readonly IConfigFileProvider _configFileProvider;
+        private readonly Logger _logger;
         private Version _prevVersion;
 
-        public UpdateHistoryService(IUpdateHistoryRepository repository, IEventAggregator eventAggregator, Logger logger, IConfigFileProvider configFileProvider)
+        public UpdateHistoryService(IUpdateHistoryRepository repository, IEventAggregator eventAggregator, IConfigFileProvider configFileProvider, Logger logger)
         {
             _repository = repository;
             _eventAggregator = eventAggregator;
-            _logger = logger;
             _configFileProvider = configFileProvider;
+            _logger = logger;
         }
 
         public Version PreviouslyInstalled()

diff --git a/src/NzbDrone.Core/Update/RecentUpdateProvider.cs b/src/NzbDrone.Core/Update/RecentUpdateProvider.cs
@@ -29,7 +29,7 @@ public List<UpdatePackage> GetRecentUpdatePackages()
         {
             var branch = _configFileProvider.Branch;
             var version = BuildInfo.Version;
-            var prevVersion = _updateHistoryService.PreviouslyInstalled();
+            var prevVersion = _configFileProvider.LogDbEnabled ? _updateHistoryService.PreviouslyInstalled() : null;
             return _updatePackageProvider.GetRecentUpdates(branch, version, prevVersion);
         }
     }

diff --git a/src/NzbDrone.Host.Test/ContainerFixture.cs b/src/NzbDrone.Host.Test/ContainerFixture.cs
@@ -42,7 +42,6 @@ public void SetUp()
                 .AutoAddServices(Bootstrap.ASSEMBLIES)
                 .AddNzbDroneLogger()
                 .AddDummyDatabase()
-                .AddDummyLogDatabase()
                 .AddStartupContext(args);
 
             // dummy lifetime and broadcaster so tests resolve

diff --git a/src/NzbDrone.Host/Bootstrap.cs b/src/NzbDrone.Host/Bootstrap.cs
@@ -93,6 +93,15 @@ public static void Start(string[] args, Action<IHostBuilder> trayCallback = null
                                     .AddStartupContext(startupContext)
                                     .Resolve<UtilityModeRouter>()
                                     .Route(appMode);
+
+                                if (config.GetValue(nameof(ConfigFileProvider.LogDbEnabled), true))
+                                {
+                                    c.AddLogDatabase();
+                                }
+                                else
+                                {
+                                    c.AddDummyLogDatabase();
+                                }
                             })
                             .ConfigureServices(services =>
                             {
@@ -135,6 +144,7 @@ public static IHostBuilder CreateConsoleHostBuilder(string[] args, StartupContex
             var enableSsl = config.GetValue<bool?>($"Radarr:Server:{nameof(ServerOptions.EnableSsl)}") ?? config.GetValue(nameof(ConfigFileProvider.EnableSsl), false);
             var sslCertPath = config.GetValue<string>($"Radarr:Server:{nameof(ServerOptions.SslCertPath)}") ?? config.GetValue<string>(nameof(ConfigFileProvider.SslCertPath));
             var sslCertPassword = config.GetValue<string>($"Radarr:Server:{nameof(ServerOptions.SslCertPassword)}") ?? config.GetValue<string>(nameof(ConfigFileProvider.SslCertPassword));
+            var logDbEnabled = config.GetValue<bool?>($"Radarr:Log:{nameof(LogOptions.DbEnabled)}") ?? config.GetValue(nameof(ConfigFileProvider.LogDbEnabled), true);
 
             var urls = new List<string> { BuildUrl("http", bindAddress, port) };
 
@@ -152,6 +162,15 @@ public static IHostBuilder CreateConsoleHostBuilder(string[] args, StartupContex
                         .AddNzbDroneLogger()
                         .AddDatabase()
                         .AddStartupContext(context);
+
+                    if (logDbEnabled)
+                    {
+                        c.AddLogDatabase();
+                    }
+                    else
+                    {
+                        c.AddDummyLogDatabase();
+                    }
                 })
                 .ConfigureServices(services =>
                 {

diff --git a/src/NzbDrone.Host/Startup.cs b/src/NzbDrone.Host/Startup.cs
@@ -239,9 +239,13 @@ public void ConfigureServices(IServiceCollection services)
 
             // instantiate the databases to initialize/migrate them
             _ = mainDatabaseFactory.Value;
-            _ = logDatabaseFactory.Value;
 
-            dbTarget.Register();
+            if (configFileProvider.LogDbEnabled)
+            {
+                _ = logDatabaseFactory.Value;
+                dbTarget.Register();
+            }
+
             SchemaBuilder.Initialize(container);
 
             if (OsInfo.IsNotWindows)

diff --git a/src/Radarr.Api.V3/Logs/LogController.cs b/src/Radarr.Api.V3/Logs/LogController.cs
@@ -1,27 +1,33 @@
 using Microsoft.AspNetCore.Mvc;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Instrumentation;
 using Radarr.Http;
 using Radarr.Http.Extensions;
-using Radarr.Http.REST.Filters;
 
 namespace Radarr.Api.V3.Logs
 {
     [V3ApiController]
-    [LogDatabaseDisabledActionFilter]
     public class LogController : Controller
     {
         private readonly ILogService _logService;
+        private readonly IConfigFileProvider _configFileProvider;
 
-        public LogController(ILogService logService)
+        public LogController(ILogService logService, IConfigFileProvider configFileProvider)
         {
             _logService = logService;
+            _configFileProvider = configFileProvider;
         }
 
         [HttpGet]
         [Produces("application/json")]
         public PagingResource<LogResource> GetLogs([FromQuery] PagingRequestResource paging, string level)
         {
+            if (!_configFileProvider.LogDbEnabled)
+            {
+                return new PagingResource<LogResource>();
+            }
+
             var pagingResource = new PagingResource<LogResource>(paging);
             var pageSpec = pagingResource.MapToPagingSpec<LogResource, Log>();
 

diff --git a/src/Radarr.Api.V3/Update/UpdateController.cs b/src/Radarr.Api.V3/Update/UpdateController.cs
@@ -2,24 +2,25 @@
 using System.Linq;
 using Microsoft.AspNetCore.Mvc;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Update;
 using NzbDrone.Core.Update.History;
 using Radarr.Http;
-using Radarr.Http.REST.Filters;
 
 namespace Radarr.Api.V3.Update
 {
     [V3ApiController]
-    [LogDatabaseDisabledActionFilter]
     public class UpdateController : Controller
     {
         private readonly IRecentUpdateProvider _recentUpdateProvider;
         private readonly IUpdateHistoryService _updateHistoryService;
+        private readonly IConfigFileProvider _configFileProvider;
 
-        public UpdateController(IRecentUpdateProvider recentUpdateProvider, IUpdateHistoryService updateHistoryService)
+        public UpdateController(IRecentUpdateProvider recentUpdateProvider, IUpdateHistoryService updateHistoryService, IConfigFileProvider configFileProvider)
         {
             _recentUpdateProvider = recentUpdateProvider;
             _updateHistoryService = updateHistoryService;
+            _configFileProvider = configFileProvider;
         }
 
         [HttpGet]
@@ -46,9 +47,15 @@ public List<UpdateResource> GetRecentUpdates()
                     installed.Installed = true;
                 }
 
-                var installDates = _updateHistoryService.InstalledSince(resources.Last().ReleaseDate)
-                                                        .DistinctBy(v => v.Version)
-                                                        .ToDictionary(v => v.Version);
+                if (!_configFileProvider.LogDbEnabled)
+                {
+                    return resources;
+                }
+
+                var updateHistory = _updateHistoryService.InstalledSince(resources.Last().ReleaseDate);
+                var installDates = updateHistory
+                                                                    .DistinctBy(v => v.Version)
+                                                                    .ToDictionary(v => v.Version);
 
                 foreach (var resource in resources)
                 {

diff --git a/src/Radarr.Http/PagingResource.cs b/src/Radarr.Http/PagingResource.cs
@@ -21,7 +21,7 @@ public class PagingResource<TResource>
         public string SortKey { get; set; }
         public SortDirection SortDirection { get; set; }
         public int TotalRecords { get; set; }
-        public List<TResource> Records { get; set; }
+        public List<TResource> Records { get; set; } = new ();
 
         public PagingResource()
         {

diff --git a/src/Radarr.Http/REST/Filters/LogDatabaseDisabledActionFilterAttribute.cs b/src/Radarr.Http/REST/Filters/LogDatabaseDisabledActionFilterAttribute.cs