From 3b44964479932d266d8f4f61df828b2bb41ce145 Mon Sep 17 00:00:00 2001 From: Robert Dailey Date: Thu, 29 Dec 2022 13:57:41 -0600 Subject: [PATCH] feat: Add clear separation between instance logs in console output --- src/Recyclarr.Cli/Command/RadarrCommand.cs | 14 ++++++++++++-- src/Recyclarr.Cli/Command/SonarrCommand.cs | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/Recyclarr.Cli/Command/RadarrCommand.cs b/src/Recyclarr.Cli/Command/RadarrCommand.cs index 63935e58..a6cd6375 100644 --- a/src/Recyclarr.Cli/Command/RadarrCommand.cs +++ b/src/Recyclarr.Cli/Command/RadarrCommand.cs @@ -1,6 +1,7 @@ using System.Reactive.Linq; using Autofac; using CliFx.Attributes; +using CliFx.Infrastructure; using JetBrains.Annotations; using Recyclarr.Cli.Config; using Recyclarr.TrashLib.Config.Services; @@ -38,6 +39,7 @@ internal class RadarrCommand : ServiceCommand var lister = container.Resolve(); var log = container.Resolve(); var guideService = container.Resolve(); + var console = container.Resolve(); if (ListCustomFormats) { @@ -60,8 +62,16 @@ internal class RadarrCommand : ServiceCommand builder.RegisterInstance(config).As(); }); - log.Information("Processing {Server} server {Name}", - Name, config.Name ?? FlurlLogging.SanitizeUrl(config.BaseUrl)); + var serverName = Name; + var instanceName = config.Name ?? FlurlLogging.SanitizeUrl(config.BaseUrl); + + await console.Output.WriteLineAsync($@" +=========================================== +Processing {serverName} Server: [{instanceName}] +=========================================== +"); + + log.Debug("Processing {Server} server {Name}", serverName, instanceName); // There's no actual compatibility checks to perform yet. We directly access the RadarrCompatibility class, // as opposed to a IRadarrVersionEnforcement object (like Sonarr does), simply to force the API invocation diff --git a/src/Recyclarr.Cli/Command/SonarrCommand.cs b/src/Recyclarr.Cli/Command/SonarrCommand.cs index 68c9f763..deb0cc91 100644 --- a/src/Recyclarr.Cli/Command/SonarrCommand.cs +++ b/src/Recyclarr.Cli/Command/SonarrCommand.cs @@ -1,6 +1,7 @@ using Autofac; using CliFx.Attributes; using CliFx.Exceptions; +using CliFx.Infrastructure; using JetBrains.Annotations; using Recyclarr.Cli.Config; using Recyclarr.TrashLib.Config.Services; @@ -51,6 +52,7 @@ public class SonarrCommand : ServiceCommand var lister = container.Resolve(); var log = container.Resolve(); var guideService = container.Resolve(); + var console = container.Resolve(); if (ListReleaseProfiles) { @@ -94,8 +96,16 @@ public class SonarrCommand : ServiceCommand builder.RegisterInstance(config).As(); }); - log.Information("Processing {Server} server {Name}", - Name, config.Name ?? FlurlLogging.SanitizeUrl(config.BaseUrl)); + var serverName = Name; + var instanceName = config.Name ?? FlurlLogging.SanitizeUrl(config.BaseUrl); + + await console.Output.WriteLineAsync($@" +=========================================== +Processing {serverName} Server: [{instanceName}] +=========================================== +"); + + log.Debug("Processing {Server} server {Name}", serverName, instanceName); var versionEnforcement = scope.Resolve(); await versionEnforcement.DoVersionEnforcement(config);