Replaced a couple more NzbDrone with Sonarr. Left a couple that implied process name.

pull/2/head
Taloth Saldono 10 years ago
parent a4deea2333
commit 971e159fa4

@ -26,7 +26,7 @@ namespace NzbDrone.Common
Console.WriteLine(" Commands:"); Console.WriteLine(" Commands:");
Console.WriteLine(" /{0} Install the application as a Windows Service ({1}).", StartupContext.INSTALL_SERVICE, ServiceProvider.NZBDRONE_SERVICE_NAME); 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} 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(" <No Arguments> Run application in console mode."); Console.WriteLine(" <No Arguments> Run application in console mode.");
} }

@ -23,7 +23,7 @@ namespace NzbDrone.Console
{ {
System.Console.WriteLine(""); System.Console.WriteLine("");
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.WriteLine("Press any key to exit...");
System.Console.ReadLine(); System.Console.ReadLine();
Environment.Exit(1); Environment.Exit(1);

@ -102,7 +102,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
protected void GivenTvCategory() protected void GivenTvCategory()
{ {
_settings.TvCategory = "nzbdrone"; _settings.TvCategory = "sonarr";
} }
protected void GivenFailedDownload() protected void GivenFailedDownload()
@ -228,7 +228,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
id.Should().NotBeNullOrEmpty(); id.Should().NotBeNullOrEmpty();
Mocker.GetMock<ITransmissionProxy>() Mocker.GetMock<ITransmissionProxy>()
.Verify(v => v.AddTorrentFromData(It.IsAny<Byte[]>(), @"C:/Downloads/Finished/transmission/nzbdrone", It.IsAny<TransmissionSettings>()), Times.Once()); .Verify(v => v.AddTorrentFromData(It.IsAny<Byte[]>(), @"C:/Downloads/Finished/transmission/sonarr", It.IsAny<TransmissionSettings>()), Times.Once());
} }
[Test] [Test]
@ -246,7 +246,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
id.Should().NotBeNullOrEmpty(); id.Should().NotBeNullOrEmpty();
Mocker.GetMock<ITransmissionProxy>() Mocker.GetMock<ITransmissionProxy>()
.Verify(v => v.AddTorrentFromData(It.IsAny<Byte[]>(), @"C:/Downloads/Finished/transmission/nzbdrone", It.IsAny<TransmissionSettings>()), Times.Once()); .Verify(v => v.AddTorrentFromData(It.IsAny<Byte[]>(), @"C:/Downloads/Finished/transmission/sonarr", It.IsAny<TransmissionSettings>()), Times.Once());
} }
[TestCase("magnet:?xt=urn:btih:ZPBPA2P6ROZPKRHK44D5OW6NHXU5Z6KR&tr=udp", "CBC2F069FE8BB2F544EAE707D75BCD3DE9DCF951")] [TestCase("magnet:?xt=urn:btih:ZPBPA2P6ROZPKRHK44D5OW6NHXU5Z6KR&tr=udp", "CBC2F069FE8BB2F544EAE707D75BCD3DE9DCF951")]
@ -327,7 +327,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
{ {
GivenTvCategory(); GivenTvCategory();
_downloading.DownloadDir = @"C:/Downloads/Finished/transmission/nzbdrone"; _downloading.DownloadDir = @"C:/Downloads/Finished/transmission/sonarr";
GivenTorrents(new List<TransmissionTorrent> GivenTorrents(new List<TransmissionTorrent>
{ {

@ -260,7 +260,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge
{ {
return new NzbDroneValidationFailure("TvCategory", "Configuration of label failed") 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."
}; };
} }
} }

@ -297,7 +297,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
return new NzbDroneValidationFailure("", "Disable 'Check before download' option in Sabnbzd") return new NzbDroneValidationFailure("", "Disable 'Check before download' option in Sabnbzd")
{ {
InfoLink = String.Format("http://{0}:{1}/sabnzbd/config/switches/", Settings.Host, Settings.Port), 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") return new NzbDroneValidationFailure("TvCategory", "Enable Job folders")
{ {
InfoLink = String.Format("http://{0}:{1}/sabnzbd/config/categories/", Settings.Host, Settings.Port), 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") return new NzbDroneValidationFailure("TvCategory", "Disable TV Sorting")
{ {
InfoLink = String.Format("http://{0}:{1}/sabnzbd/config/sorting/", Settings.Host, Settings.Port), 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."
}; };
} }
} }

@ -67,7 +67,7 @@ namespace NzbDrone.Core.Download.Clients.TorrentBlackhole
{ {
DownloadClient = Definition.Name, DownloadClient = Definition.Name,
DownloadId = Definition.Name + "_" + Path.GetFileName(folder) + "_" + _diskProvider.FolderGetCreationTime(folder).Ticks, DownloadId = Definition.Name + "_" + Path.GetFileName(folder) + "_" + _diskProvider.FolderGetCreationTime(folder).Ticks,
Category = "nzbdrone", Category = "sonarr",
Title = title, Title = title,
TotalSize = files.Select(_diskProvider.GetFileSize).Sum(), TotalSize = files.Select(_diskProvider.GetFileSize).Sum(),
@ -97,7 +97,7 @@ namespace NzbDrone.Core.Download.Clients.TorrentBlackhole
{ {
DownloadClient = Definition.Name, DownloadClient = Definition.Name,
DownloadId = Definition.Name + "_" + Path.GetFileName(videoFile) + "_" + _diskProvider.FileGetLastWrite(videoFile).Ticks, DownloadId = Definition.Name + "_" + Path.GetFileName(videoFile) + "_" + _diskProvider.FileGetLastWrite(videoFile).Ticks,
Category = "nzbdrone", Category = "sonarr",
Title = title, Title = title,
TotalSize = _diskProvider.GetFileSize(videoFile), TotalSize = _diskProvider.GetFileSize(videoFile),

@ -192,7 +192,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission
_logger.ErrorException(ex.Message, ex); _logger.ErrorException(ex.Message, ex);
return new NzbDroneValidationFailure("Username", "Authentication failure") 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) catch (WebException ex)

@ -60,7 +60,7 @@ namespace NzbDrone.Core.Download.Clients.UsenetBlackhole
{ {
DownloadClient = Definition.Name, DownloadClient = Definition.Name,
DownloadId = Definition.Name + "_" + Path.GetFileName(folder) + "_" + _diskProvider.FolderGetCreationTime(folder).Ticks, DownloadId = Definition.Name + "_" + Path.GetFileName(folder) + "_" + _diskProvider.FolderGetCreationTime(folder).Ticks,
Category = "nzbdrone", Category = "sonarr",
Title = title, Title = title,
TotalSize = files.Select(_diskProvider.GetFileSize).Sum(), TotalSize = files.Select(_diskProvider.GetFileSize).Sum(),
@ -90,7 +90,7 @@ namespace NzbDrone.Core.Download.Clients.UsenetBlackhole
{ {
DownloadClient = Definition.Name, DownloadClient = Definition.Name,
DownloadId = Definition.Name + "_" + Path.GetFileName(videoFile) + "_" + _diskProvider.FileGetLastWrite(videoFile).Ticks, DownloadId = Definition.Name + "_" + Path.GetFileName(videoFile) + "_" + _diskProvider.FileGetLastWrite(videoFile).Ticks,
Category = "nzbdrone", Category = "sonarr",
Title = title, Title = title,
TotalSize = _diskProvider.GetFileSize(videoFile), TotalSize = _diskProvider.GetFileSize(videoFile),

@ -142,7 +142,7 @@ namespace NzbDrone.Core.Download
if (hash != actualHash) if (hash != actualHash)
{ {
_logger.Warn( _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); Definition.Implementation, remoteEpisode.Release.DownloadUrl);
} }
@ -174,7 +174,7 @@ namespace NzbDrone.Core.Download
if (hash != actualHash) if (hash != actualHash)
{ {
_logger.Warn( _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); Definition.Implementation, remoteEpisode.Release.DownloadUrl);
} }

@ -22,7 +22,7 @@ namespace NzbDrone.Host
{ {
X509CertificateValidationPolicy.Register(); 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)) if (!PlatformValidation.IsValidate(userAlert))
{ {

@ -31,7 +31,7 @@ namespace NzbDrone.Host
{ {
if (IsAlreadyRunning()) if (IsAlreadyRunning())
{ {
_logger.Warn("Another instance of NzbDrone is already running."); _logger.Warn("Another instance of Sonarr is already running.");
_browserService.LaunchWebUI(); _browserService.LaunchWebUI();
throw new TerminateApplicationException("Another instance is already running"); throw new TerminateApplicationException("Another instance is already running");
} }
@ -64,14 +64,14 @@ namespace NzbDrone.Host
if (otherProcesses.Any()) 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; return otherProcesses;
} }
catch (Exception ex) 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<int>(); return new List<int>();
} }
} }

@ -33,13 +33,13 @@ namespace NzbDrone.Update
var startupArgument = new StartupContext(args); var startupArgument = new StartupContext(args);
NzbDroneLogger.Register(startupArgument, true, true); NzbDroneLogger.Register(startupArgument, true, true);
Logger.Info("Starting NzbDrone Update Client"); Logger.Info("Starting Sonarr Update Client");
X509CertificateValidationPolicy.Register(); X509CertificateValidationPolicy.Register();
_container = UpdateContainerBuilder.Build(startupArgument); _container = UpdateContainerBuilder.Build(startupArgument);
Logger.Info("Updating NzbDrone to version {0}", BuildInfo.Version); Logger.Info("Updating Sonarr to version {0}", BuildInfo.Version);
_container.Resolve<UpdateApp>().Start(args); _container.Resolve<UpdateApp>().Start(args);
Logger.Info("Update compleded successfully"); Logger.Info("Update compleded successfully");

Loading…
Cancel
Save