From 971e159fa49d44854d47770b3b787517c329cad2 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Sat, 21 Mar 2015 12:05:06 +0100 Subject: [PATCH] Replaced a couple more NzbDrone with Sonarr. Left a couple that implied process name. --- src/NzbDrone.Common/ConsoleService.cs | 2 +- src/NzbDrone.Console/ConsoleApp.cs | 2 +- .../TransmissionTests/TransmissionFixture.cs | 8 ++++---- src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs | 2 +- src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs | 6 +++--- .../Download/Clients/TorrentBlackhole/TorrentBlackhole.cs | 4 ++-- .../Download/Clients/Transmission/Transmission.cs | 2 +- .../Download/Clients/UsenetBlackhole/UsenetBlackhole.cs | 4 ++-- src/NzbDrone.Core/Download/TorrentClientBase.cs | 4 ++-- src/NzbDrone.Host/Bootstrap.cs | 2 +- src/NzbDrone.Host/SingleInstancePolicy.cs | 6 +++--- src/NzbDrone.Update/UpdateApp.cs | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/NzbDrone.Common/ConsoleService.cs b/src/NzbDrone.Common/ConsoleService.cs index 9a4caad90..b30febb6b 100644 --- a/src/NzbDrone.Common/ConsoleService.cs +++ b/src/NzbDrone.Common/ConsoleService.cs @@ -26,7 +26,7 @@ namespace NzbDrone.Common Console.WriteLine(" Commands:"); Console.WriteLine(" /{0} Install the application as a Windows Service ({1}).", StartupContext.INSTALL_SERVICE, ServiceProvider.NZBDRONE_SERVICE_NAME); Console.WriteLine(" /{0} Uninstall already installed Windows Service ({1}).", StartupContext.UNINSTALL_SERVICE, ServiceProvider.NZBDRONE_SERVICE_NAME); - Console.WriteLine(" /{0} Don't open NzbDrone in a browser", StartupContext.NO_BROWSER); + Console.WriteLine(" /{0} Don't open Sonarr in a browser", StartupContext.NO_BROWSER); Console.WriteLine(" Run application in console mode."); } diff --git a/src/NzbDrone.Console/ConsoleApp.cs b/src/NzbDrone.Console/ConsoleApp.cs index 143c52c01..87b90165a 100644 --- a/src/NzbDrone.Console/ConsoleApp.cs +++ b/src/NzbDrone.Console/ConsoleApp.cs @@ -23,7 +23,7 @@ namespace NzbDrone.Console { System.Console.WriteLine(""); System.Console.WriteLine(""); - Logger.Fatal(exception.Message + ". This can happen if another instance of NzbDrone is already running or another application is using the port assinged to NzbDrone (default: 8989)"); + Logger.Fatal(exception.Message + ". This can happen if another instance of Sonarr is already running or another application is using the port assinged to NzbDrone (default: 8989)"); System.Console.WriteLine("Press any key to exit..."); System.Console.ReadLine(); Environment.Exit(1); diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs index 3ffd7d547..be99f741f 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs @@ -102,7 +102,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests protected void GivenTvCategory() { - _settings.TvCategory = "nzbdrone"; + _settings.TvCategory = "sonarr"; } protected void GivenFailedDownload() @@ -228,7 +228,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests id.Should().NotBeNullOrEmpty(); Mocker.GetMock() - .Verify(v => v.AddTorrentFromData(It.IsAny(), @"C:/Downloads/Finished/transmission/nzbdrone", It.IsAny()), Times.Once()); + .Verify(v => v.AddTorrentFromData(It.IsAny(), @"C:/Downloads/Finished/transmission/sonarr", It.IsAny()), Times.Once()); } [Test] @@ -246,7 +246,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests id.Should().NotBeNullOrEmpty(); Mocker.GetMock() - .Verify(v => v.AddTorrentFromData(It.IsAny(), @"C:/Downloads/Finished/transmission/nzbdrone", It.IsAny()), Times.Once()); + .Verify(v => v.AddTorrentFromData(It.IsAny(), @"C:/Downloads/Finished/transmission/sonarr", It.IsAny()), Times.Once()); } [TestCase("magnet:?xt=urn:btih:ZPBPA2P6ROZPKRHK44D5OW6NHXU5Z6KR&tr=udp", "CBC2F069FE8BB2F544EAE707D75BCD3DE9DCF951")] @@ -327,7 +327,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests { GivenTvCategory(); - _downloading.DownloadDir = @"C:/Downloads/Finished/transmission/nzbdrone"; + _downloading.DownloadDir = @"C:/Downloads/Finished/transmission/sonarr"; GivenTorrents(new List { diff --git a/src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs b/src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs index d7a0698b4..32091cbcd 100644 --- a/src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs +++ b/src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs @@ -260,7 +260,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge { return new NzbDroneValidationFailure("TvCategory", "Configuration of label failed") { - DetailedDescription = "NzbDrone as unable to add the label to Deluge." + DetailedDescription = "Sonarr as unable to add the label to Deluge." }; } } diff --git a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs index 18ee6243e..6135866fd 100644 --- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs +++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs @@ -297,7 +297,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd return new NzbDroneValidationFailure("", "Disable 'Check before download' option in Sabnbzd") { InfoLink = String.Format("http://{0}:{1}/sabnzbd/config/switches/", Settings.Host, Settings.Port), - DetailedDescription = "Using Check before download affects NzbDrone ability to track new downloads. Also Sabnzbd recommends 'Abort jobs that cannot be completed' instead since it's more effective." + DetailedDescription = "Using Check before download affects Sonarr ability to track new downloads. Also Sabnzbd recommends 'Abort jobs that cannot be completed' instead since it's more effective." }; } @@ -316,7 +316,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd return new NzbDroneValidationFailure("TvCategory", "Enable Job folders") { InfoLink = String.Format("http://{0}:{1}/sabnzbd/config/categories/", Settings.Host, Settings.Port), - DetailedDescription = "NzbDrone prefers each download to have a separate folder. With * appended to the Folder/Path Sabnzbd will not create these job folders. Go to Sabnzbd to fix it." + DetailedDescription = "Sonarr prefers each download to have a separate folder. With * appended to the Folder/Path Sabnzbd will not create these job folders. Go to Sabnzbd to fix it." }; } } @@ -341,7 +341,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd return new NzbDroneValidationFailure("TvCategory", "Disable TV Sorting") { InfoLink = String.Format("http://{0}:{1}/sabnzbd/config/sorting/", Settings.Host, Settings.Port), - DetailedDescription = "You must disable Sabnzbd TV Sorting for the category NzbDrone uses to prevent import issues. Go to Sabnzbd to fix it." + DetailedDescription = "You must disable Sabnzbd TV Sorting for the category Sonarr uses to prevent import issues. Go to Sabnzbd to fix it." }; } } diff --git a/src/NzbDrone.Core/Download/Clients/TorrentBlackhole/TorrentBlackhole.cs b/src/NzbDrone.Core/Download/Clients/TorrentBlackhole/TorrentBlackhole.cs index fbb21c09d..ee3ade6f7 100644 --- a/src/NzbDrone.Core/Download/Clients/TorrentBlackhole/TorrentBlackhole.cs +++ b/src/NzbDrone.Core/Download/Clients/TorrentBlackhole/TorrentBlackhole.cs @@ -67,7 +67,7 @@ namespace NzbDrone.Core.Download.Clients.TorrentBlackhole { DownloadClient = Definition.Name, DownloadId = Definition.Name + "_" + Path.GetFileName(folder) + "_" + _diskProvider.FolderGetCreationTime(folder).Ticks, - Category = "nzbdrone", + Category = "sonarr", Title = title, TotalSize = files.Select(_diskProvider.GetFileSize).Sum(), @@ -97,7 +97,7 @@ namespace NzbDrone.Core.Download.Clients.TorrentBlackhole { DownloadClient = Definition.Name, DownloadId = Definition.Name + "_" + Path.GetFileName(videoFile) + "_" + _diskProvider.FileGetLastWrite(videoFile).Ticks, - Category = "nzbdrone", + Category = "sonarr", Title = title, TotalSize = _diskProvider.GetFileSize(videoFile), diff --git a/src/NzbDrone.Core/Download/Clients/Transmission/Transmission.cs b/src/NzbDrone.Core/Download/Clients/Transmission/Transmission.cs index 6dd8526ea..fad8ef2d4 100644 --- a/src/NzbDrone.Core/Download/Clients/Transmission/Transmission.cs +++ b/src/NzbDrone.Core/Download/Clients/Transmission/Transmission.cs @@ -192,7 +192,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission _logger.ErrorException(ex.Message, ex); return new NzbDroneValidationFailure("Username", "Authentication failure") { - DetailedDescription = "Please verify your username and password. Also verify if the host running NzbDrone isn't blocked from accessing Transmission by WhiteList limitations in the Transmission configuration." + DetailedDescription = "Please verify your username and password. Also verify if the host running Sonarr isn't blocked from accessing Transmission by WhiteList limitations in the Transmission configuration." }; } catch (WebException ex) diff --git a/src/NzbDrone.Core/Download/Clients/UsenetBlackhole/UsenetBlackhole.cs b/src/NzbDrone.Core/Download/Clients/UsenetBlackhole/UsenetBlackhole.cs index 218785b2f..9a9c049de 100644 --- a/src/NzbDrone.Core/Download/Clients/UsenetBlackhole/UsenetBlackhole.cs +++ b/src/NzbDrone.Core/Download/Clients/UsenetBlackhole/UsenetBlackhole.cs @@ -60,7 +60,7 @@ namespace NzbDrone.Core.Download.Clients.UsenetBlackhole { DownloadClient = Definition.Name, DownloadId = Definition.Name + "_" + Path.GetFileName(folder) + "_" + _diskProvider.FolderGetCreationTime(folder).Ticks, - Category = "nzbdrone", + Category = "sonarr", Title = title, TotalSize = files.Select(_diskProvider.GetFileSize).Sum(), @@ -90,7 +90,7 @@ namespace NzbDrone.Core.Download.Clients.UsenetBlackhole { DownloadClient = Definition.Name, DownloadId = Definition.Name + "_" + Path.GetFileName(videoFile) + "_" + _diskProvider.FileGetLastWrite(videoFile).Ticks, - Category = "nzbdrone", + Category = "sonarr", Title = title, TotalSize = _diskProvider.GetFileSize(videoFile), diff --git a/src/NzbDrone.Core/Download/TorrentClientBase.cs b/src/NzbDrone.Core/Download/TorrentClientBase.cs index bdce27d91..d4c2a7bc3 100644 --- a/src/NzbDrone.Core/Download/TorrentClientBase.cs +++ b/src/NzbDrone.Core/Download/TorrentClientBase.cs @@ -142,7 +142,7 @@ namespace NzbDrone.Core.Download if (hash != actualHash) { _logger.Warn( - "{0} did not return the expected InfoHash for '{1}', NzbDrone could potentially lose track of the download in progress.", + "{0} did not return the expected InfoHash for '{1}', Sonarr could potentially lose track of the download in progress.", Definition.Implementation, remoteEpisode.Release.DownloadUrl); } @@ -174,7 +174,7 @@ namespace NzbDrone.Core.Download if (hash != actualHash) { _logger.Warn( - "{0} did not return the expected InfoHash for '{1}', NzbDrone could potentially lose track of the download in progress.", + "{0} did not return the expected InfoHash for '{1}', Sonarr could potentially lose track of the download in progress.", Definition.Implementation, remoteEpisode.Release.DownloadUrl); } diff --git a/src/NzbDrone.Host/Bootstrap.cs b/src/NzbDrone.Host/Bootstrap.cs index 26acc8407..066b38d60 100644 --- a/src/NzbDrone.Host/Bootstrap.cs +++ b/src/NzbDrone.Host/Bootstrap.cs @@ -22,7 +22,7 @@ namespace NzbDrone.Host { X509CertificateValidationPolicy.Register(); - Logger.Info("Starting NzbDrone - {0} - Version {1}", Assembly.GetCallingAssembly().Location, Assembly.GetExecutingAssembly().GetName().Version); + Logger.Info("Starting Sonarr - {0} - Version {1}", Assembly.GetCallingAssembly().Location, Assembly.GetExecutingAssembly().GetName().Version); if (!PlatformValidation.IsValidate(userAlert)) { diff --git a/src/NzbDrone.Host/SingleInstancePolicy.cs b/src/NzbDrone.Host/SingleInstancePolicy.cs index 4e8d44790..2f9f84ed2 100644 --- a/src/NzbDrone.Host/SingleInstancePolicy.cs +++ b/src/NzbDrone.Host/SingleInstancePolicy.cs @@ -31,7 +31,7 @@ namespace NzbDrone.Host { if (IsAlreadyRunning()) { - _logger.Warn("Another instance of NzbDrone is already running."); + _logger.Warn("Another instance of Sonarr is already running."); _browserService.LaunchWebUI(); throw new TerminateApplicationException("Another instance is already running"); } @@ -64,14 +64,14 @@ namespace NzbDrone.Host if (otherProcesses.Any()) { - _logger.Info("{0} instance(s) of NzbDrone are running", otherProcesses.Count); + _logger.Info("{0} instance(s) of Sonarr are running", otherProcesses.Count); } return otherProcesses; } catch (Exception ex) { - _logger.WarnException("Failed to check for multiple instances of NzbDrone.", ex); + _logger.WarnException("Failed to check for multiple instances of Sonarr.", ex); return new List(); } } diff --git a/src/NzbDrone.Update/UpdateApp.cs b/src/NzbDrone.Update/UpdateApp.cs index be5bf22f4..40ff7b88f 100644 --- a/src/NzbDrone.Update/UpdateApp.cs +++ b/src/NzbDrone.Update/UpdateApp.cs @@ -33,13 +33,13 @@ namespace NzbDrone.Update var startupArgument = new StartupContext(args); NzbDroneLogger.Register(startupArgument, true, true); - Logger.Info("Starting NzbDrone Update Client"); + Logger.Info("Starting Sonarr Update Client"); X509CertificateValidationPolicy.Register(); _container = UpdateContainerBuilder.Build(startupArgument); - Logger.Info("Updating NzbDrone to version {0}", BuildInfo.Version); + Logger.Info("Updating Sonarr to version {0}", BuildInfo.Version); _container.Resolve().Start(args); Logger.Info("Update compleded successfully");