diff --git a/osx/Sonarr b/osx/Sonarr index db2a35399b..bb5d9d6bd2 100644 --- a/osx/Sonarr +++ b/osx/Sonarr @@ -4,9 +4,9 @@ DIR=$(cd "$(dirname "$0")"; pwd) #change these values to match your app -EXE_PATH="$DIR/NzbDrone.exe" +EXE_PATH="$DIR/Radarr.exe" APPNAME="Sonarr" - + #set up environment if [[ -x '/opt/local/bin/mono' ]]; then export PATH="/opt/local/bin:$PATH" @@ -29,11 +29,11 @@ export DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:$HOME/lib:/usr/lo #mono version check REQUIRED_MAJOR=3 REQUIRED_MINOR=10 - + VERSION_TITLE="Cannot launch $APPNAME" VERSION_MSG="$APPNAME requires Mono Runtime Environment(MRE) $REQUIRED_MAJOR.$REQUIRED_MINOR or later." DOWNLOAD_URL="http://www.mono-project.com/download/#download-mac" - + MONO_VERSION="$(mono --version | grep 'Mono JIT compiler version ' | cut -f5 -d\ )" # if [[ -o DEBUG ]]; then osascript -e "display dialog \"MONO_VERSION: $MONO_VERSION\""; fi @@ -42,7 +42,7 @@ MONO_VERSION_MAJOR="$(echo $MONO_VERSION | cut -f1 -d.)" MONO_VERSION_MINOR="$(echo $MONO_VERSION | cut -f2 -d.)" if [ -z "$MONO_VERSION" ] \ || [ $MONO_VERSION_MAJOR -lt $REQUIRED_MAJOR ] \ - || [ $MONO_VERSION_MAJOR -eq $REQUIRED_MAJOR -a $MONO_VERSION_MINOR -lt $REQUIRED_MINOR ] + || [ $MONO_VERSION_MAJOR -eq $REQUIRED_MAJOR -a $MONO_VERSION_MINOR -lt $REQUIRED_MINOR ] then osascript \ -e "set question to display dialog \"$VERSION_MSG\" with title \"$VERSION_TITLE\" buttons {\"Cancel\", \"Download...\"} default button 2" \ @@ -51,8 +51,8 @@ then echo "$VERSION_MSG" exit 1 fi - + MONO_EXEC="exec mono --debug" - + #run app using mono -$MONO_EXEC "$EXE_PATH" \ No newline at end of file +$MONO_EXEC "$EXE_PATH" diff --git a/src/NzbDrone.App.Test/NzbDroneProcessServiceFixture.cs b/src/NzbDrone.App.Test/NzbDroneProcessServiceFixture.cs index 1ee1ee522e..dc8eda6383 100644 --- a/src/NzbDrone.App.Test/NzbDroneProcessServiceFixture.cs +++ b/src/NzbDrone.App.Test/NzbDroneProcessServiceFixture.cs @@ -3,8 +3,9 @@ using NUnit.Framework; using NzbDrone.Common.Model; using NzbDrone.Common.Processes; -using NzbDrone.Host; +using Radarr.Host; using NzbDrone.Test.Common; +using Radarr.Host; namespace NzbDrone.App.Test { diff --git a/src/NzbDrone.Common.Test/PathExtensionFixture.cs b/src/NzbDrone.Common.Test/PathExtensionFixture.cs index e3e7fb34aa..95e4aebe7e 100644 --- a/src/NzbDrone.Common.Test/PathExtensionFixture.cs +++ b/src/NzbDrone.Common.Test/PathExtensionFixture.cs @@ -263,7 +263,7 @@ public void GetUpdateClientFolder() [Test] public void GetUpdateClientExePath() { - GetIAppDirectoryInfo().GetUpdateClientExePath().Should().BeEquivalentTo(@"C:\Temp\nzbdrone_update\NzbDrone.Update.exe".AsOsAgnostic()); + GetIAppDirectoryInfo().GetUpdateClientExePath().Should().BeEquivalentTo(@"C:\Temp\nzbdrone_update\Radarr.Update.exe".AsOsAgnostic()); } [Test] diff --git a/src/NzbDrone.Common/Extensions/PathExtensions.cs b/src/NzbDrone.Common/Extensions/PathExtensions.cs index 7e77f9d7eb..893706f3d0 100644 --- a/src/NzbDrone.Common/Extensions/PathExtensions.cs +++ b/src/NzbDrone.Common/Extensions/PathExtensions.cs @@ -13,7 +13,7 @@ public static class PathExtensions private const string NZBDRONE_DB = "nzbdrone.db"; private const string NZBDRONE_LOG_DB = "logs.db"; private const string NLOG_CONFIG_FILE = "nlog.config"; - private const string UPDATE_CLIENT_EXE = "NzbDrone.Update.exe"; + private const string UPDATE_CLIENT_EXE = "Radarr.Update.exe"; private const string BACKUP_FOLDER = "Backups"; private static readonly string UPDATE_SANDBOX_FOLDER_NAME = "nzbdrone_update" + Path.DirectorySeparatorChar; diff --git a/src/NzbDrone.Common/Processes/ProcessProvider.cs b/src/NzbDrone.Common/Processes/ProcessProvider.cs index 57068c840e..50cc89a84b 100644 --- a/src/NzbDrone.Common/Processes/ProcessProvider.cs +++ b/src/NzbDrone.Common/Processes/ProcessProvider.cs @@ -35,8 +35,8 @@ public class ProcessProvider : IProcessProvider { private readonly Logger _logger; - public const string NZB_DRONE_PROCESS_NAME = "NzbDrone"; - public const string NZB_DRONE_CONSOLE_PROCESS_NAME = "NzbDrone.Console"; + public const string NZB_DRONE_PROCESS_NAME = "Radarr"; + public const string NZB_DRONE_CONSOLE_PROCESS_NAME = "Radarr.Console"; public ProcessProvider(Logger logger) { diff --git a/src/NzbDrone.Console/NzbDrone.Console.csproj b/src/NzbDrone.Console/NzbDrone.Console.csproj index 61cc3190ff..a1a04c94fc 100644 --- a/src/NzbDrone.Console/NzbDrone.Console.csproj +++ b/src/NzbDrone.Console/NzbDrone.Console.csproj @@ -9,7 +9,7 @@ Exe Properties NzbDrone.Console - NzbDrone.Console + Radarr.Console v4.0 512 diff --git a/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs b/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs index ef29fe7972..5a7bf569b6 100644 --- a/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs +++ b/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs @@ -59,7 +59,7 @@ public void Setup() Mocker.GetMock().Setup(c => c.Verify(It.IsAny(), It.IsAny())).Returns(true); Mocker.GetMock().Setup(c => c.GetCurrentProcess()).Returns(new ProcessInfo { Id = 12 }); - Mocker.GetMock().Setup(c => c.ExecutingApplication).Returns(@"C:\Test\NzbDrone.exe"); + Mocker.GetMock().Setup(c => c.ExecutingApplication).Returns(@"C:\Test\Radarr.exe"); Mocker.GetMock() .SetupGet(s => s.UpdateAutomatically) diff --git a/src/NzbDrone.Host/AccessControl/FirewallAdapter.cs b/src/NzbDrone.Host/AccessControl/FirewallAdapter.cs index 794e9edff2..9518a6d9e7 100644 --- a/src/NzbDrone.Host/AccessControl/FirewallAdapter.cs +++ b/src/NzbDrone.Host/AccessControl/FirewallAdapter.cs @@ -5,7 +5,7 @@ using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Core.Configuration; -namespace NzbDrone.Host.AccessControl +namespace Radarr.Host.AccessControl { public interface IFirewallAdapter { diff --git a/src/NzbDrone.Host/AccessControl/NetshProvider.cs b/src/NzbDrone.Host/AccessControl/NetshProvider.cs index 88bcd880c5..cca3fc8c5f 100644 --- a/src/NzbDrone.Host/AccessControl/NetshProvider.cs +++ b/src/NzbDrone.Host/AccessControl/NetshProvider.cs @@ -2,7 +2,7 @@ using NLog; using NzbDrone.Common.Processes; -namespace NzbDrone.Host.AccessControl +namespace Radarr.Host.AccessControl { public interface INetshProvider { diff --git a/src/NzbDrone.Host/AccessControl/SslAdapter.cs b/src/NzbDrone.Host/AccessControl/SslAdapter.cs index 12784ba874..ed9c3aa958 100644 --- a/src/NzbDrone.Host/AccessControl/SslAdapter.cs +++ b/src/NzbDrone.Host/AccessControl/SslAdapter.cs @@ -3,7 +3,7 @@ using NLog; using NzbDrone.Core.Configuration; -namespace NzbDrone.Host.AccessControl +namespace Radarr.Host.AccessControl { public interface ISslAdapter { diff --git a/src/NzbDrone.Host/AccessControl/UrlAcl.cs b/src/NzbDrone.Host/AccessControl/UrlAcl.cs index 51af167a6d..8ff7e96024 100644 --- a/src/NzbDrone.Host/AccessControl/UrlAcl.cs +++ b/src/NzbDrone.Host/AccessControl/UrlAcl.cs @@ -1,4 +1,4 @@ -namespace NzbDrone.Host.AccessControl +namespace Radarr.Host.AccessControl { public class UrlAcl { diff --git a/src/NzbDrone.Host/AccessControl/UrlAclAdapter.cs b/src/NzbDrone.Host/AccessControl/UrlAclAdapter.cs index 9493dd2768..7c61f43207 100644 --- a/src/NzbDrone.Host/AccessControl/UrlAclAdapter.cs +++ b/src/NzbDrone.Host/AccessControl/UrlAclAdapter.cs @@ -7,7 +7,7 @@ using NzbDrone.Common.Extensions; using NzbDrone.Core.Configuration; -namespace NzbDrone.Host.AccessControl +namespace Radarr.Host.AccessControl { public interface IUrlAclAdapter { diff --git a/src/NzbDrone.Host/ApplicationModes.cs b/src/NzbDrone.Host/ApplicationModes.cs index aa425948c9..3495d86889 100644 --- a/src/NzbDrone.Host/ApplicationModes.cs +++ b/src/NzbDrone.Host/ApplicationModes.cs @@ -1,4 +1,4 @@ -namespace NzbDrone.Host +namespace Radarr.Host { public enum ApplicationModes { diff --git a/src/NzbDrone.Host/ApplicationServer.cs b/src/NzbDrone.Host/ApplicationServer.cs index fdd3c36830..e7235683b9 100644 --- a/src/NzbDrone.Host/ApplicationServer.cs +++ b/src/NzbDrone.Host/ApplicationServer.cs @@ -5,9 +5,9 @@ using NzbDrone.Core.Configuration; using NzbDrone.Core.Lifecycle; using NzbDrone.Core.Messaging.Events; -using NzbDrone.Host.Owin; +using Radarr.Host.Owin; -namespace NzbDrone.Host +namespace Radarr.Host { public interface INzbDroneServiceFactory { diff --git a/src/NzbDrone.Host/Bootstrap.cs b/src/NzbDrone.Host/Bootstrap.cs index 24a151eebb..ec3e7a32ac 100644 --- a/src/NzbDrone.Host/Bootstrap.cs +++ b/src/NzbDrone.Host/Bootstrap.cs @@ -10,7 +10,7 @@ using NzbDrone.Core.Datastore; using NzbDrone.Core.Instrumentation; -namespace NzbDrone.Host +namespace Radarr.Host { public static class Bootstrap { diff --git a/src/NzbDrone.Host/BrowserService.cs b/src/NzbDrone.Host/BrowserService.cs index 1867421cf0..cf0a3a313c 100644 --- a/src/NzbDrone.Host/BrowserService.cs +++ b/src/NzbDrone.Host/BrowserService.cs @@ -4,7 +4,7 @@ using NzbDrone.Common.Processes; using NzbDrone.Core.Configuration; -namespace NzbDrone.Host +namespace Radarr.Host { public interface IBrowserService { diff --git a/src/NzbDrone.Host/IUserAlert.cs b/src/NzbDrone.Host/IUserAlert.cs index 04db62985a..f0ea05ae48 100644 --- a/src/NzbDrone.Host/IUserAlert.cs +++ b/src/NzbDrone.Host/IUserAlert.cs @@ -1,4 +1,4 @@ -namespace NzbDrone.Host +namespace Radarr.Host { public interface IUserAlert { diff --git a/src/NzbDrone.Host/MainAppContainerBuilder.cs b/src/NzbDrone.Host/MainAppContainerBuilder.cs index ca31bb723e..a82d3d836e 100644 --- a/src/NzbDrone.Host/MainAppContainerBuilder.cs +++ b/src/NzbDrone.Host/MainAppContainerBuilder.cs @@ -6,7 +6,7 @@ using NzbDrone.Common.Http.Dispatchers; using NzbDrone.SignalR; -namespace NzbDrone.Host +namespace Radarr.Host { public class MainAppContainerBuilder : ContainerBuilderBase { @@ -14,7 +14,7 @@ public static IContainer BuildContainer(StartupContext args) { var assemblies = new List { - "NzbDrone.Host", + "Radarr.Host", "NzbDrone.Common", "NzbDrone.Core", "NzbDrone.Api", diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj index fa9b7bf427..187c8284e2 100644 --- a/src/NzbDrone.Host/NzbDrone.Host.csproj +++ b/src/NzbDrone.Host/NzbDrone.Host.csproj @@ -8,8 +8,8 @@ {95C11A9E-56ED-456A-8447-2C89C1139266} Library Properties - NzbDrone.Host - NzbDrone.Host + Radarr.Host + Radarr.Host v4.0 512 diff --git a/src/NzbDrone.Host/Owin/IHostController.cs b/src/NzbDrone.Host/Owin/IHostController.cs index 130b48d4ba..74d534b9d6 100644 --- a/src/NzbDrone.Host/Owin/IHostController.cs +++ b/src/NzbDrone.Host/Owin/IHostController.cs @@ -1,4 +1,4 @@ -namespace NzbDrone.Host.Owin +namespace Radarr.Host.Owin { public interface IHostController { diff --git a/src/NzbDrone.Host/Owin/MiddleWare/IOwinMiddleWare.cs b/src/NzbDrone.Host/Owin/MiddleWare/IOwinMiddleWare.cs index 1b5e8ce5b6..ee33d0df0e 100644 --- a/src/NzbDrone.Host/Owin/MiddleWare/IOwinMiddleWare.cs +++ b/src/NzbDrone.Host/Owin/MiddleWare/IOwinMiddleWare.cs @@ -1,6 +1,6 @@ using Owin; -namespace NzbDrone.Host.Owin.MiddleWare +namespace Radarr.Host.Owin.MiddleWare { public interface IOwinMiddleWare { diff --git a/src/NzbDrone.Host/Owin/MiddleWare/NancyMiddleWare.cs b/src/NzbDrone.Host/Owin/MiddleWare/NancyMiddleWare.cs index 89f6648646..7b826168be 100644 --- a/src/NzbDrone.Host/Owin/MiddleWare/NancyMiddleWare.cs +++ b/src/NzbDrone.Host/Owin/MiddleWare/NancyMiddleWare.cs @@ -2,7 +2,7 @@ using Nancy.Owin; using Owin; -namespace NzbDrone.Host.Owin.MiddleWare +namespace Radarr.Host.Owin.MiddleWare { public class NancyMiddleWare : IOwinMiddleWare { diff --git a/src/NzbDrone.Host/Owin/MiddleWare/NzbDroneVersionMiddleWare.cs b/src/NzbDrone.Host/Owin/MiddleWare/NzbDroneVersionMiddleWare.cs index a74d9b1d3b..a46e357aeb 100644 --- a/src/NzbDrone.Host/Owin/MiddleWare/NzbDroneVersionMiddleWare.cs +++ b/src/NzbDrone.Host/Owin/MiddleWare/NzbDroneVersionMiddleWare.cs @@ -4,7 +4,7 @@ using NzbDrone.Common.EnvironmentInfo; using Owin; -namespace NzbDrone.Host.Owin.MiddleWare +namespace Radarr.Host.Owin.MiddleWare { public class NzbDroneVersionMiddleWare : IOwinMiddleWare { diff --git a/src/NzbDrone.Host/Owin/MiddleWare/SignalRMiddleWare.cs b/src/NzbDrone.Host/Owin/MiddleWare/SignalRMiddleWare.cs index 0df60a326d..fa9fe158a0 100644 --- a/src/NzbDrone.Host/Owin/MiddleWare/SignalRMiddleWare.cs +++ b/src/NzbDrone.Host/Owin/MiddleWare/SignalRMiddleWare.cs @@ -4,7 +4,7 @@ using NzbDrone.SignalR; using Owin; -namespace NzbDrone.Host.Owin.MiddleWare +namespace Radarr.Host.Owin.MiddleWare { public class SignalRMiddleWare : IOwinMiddleWare { diff --git a/src/NzbDrone.Host/Owin/NlogTextWriter.cs b/src/NzbDrone.Host/Owin/NlogTextWriter.cs index 2d04acf1aa..b57e26b929 100644 --- a/src/NzbDrone.Host/Owin/NlogTextWriter.cs +++ b/src/NzbDrone.Host/Owin/NlogTextWriter.cs @@ -2,7 +2,7 @@ using System.Text; using NLog; -namespace NzbDrone.Host.Owin +namespace Radarr.Host.Owin { public class NlogTextWriter : TextWriter { diff --git a/src/NzbDrone.Host/Owin/OwinHostController.cs b/src/NzbDrone.Host/Owin/OwinHostController.cs index 82357c24cd..a2000974b4 100644 --- a/src/NzbDrone.Host/Owin/OwinHostController.cs +++ b/src/NzbDrone.Host/Owin/OwinHostController.cs @@ -1,9 +1,9 @@ using System; using NLog; using NzbDrone.Common.EnvironmentInfo; -using NzbDrone.Host.AccessControl; +using Radarr.Host.AccessControl; -namespace NzbDrone.Host.Owin +namespace Radarr.Host.Owin { public class OwinHostController : IHostController { diff --git a/src/NzbDrone.Host/Owin/OwinServiceProvider.cs b/src/NzbDrone.Host/Owin/OwinServiceProvider.cs index c0676cd247..4dd08a2ea8 100644 --- a/src/NzbDrone.Host/Owin/OwinServiceProvider.cs +++ b/src/NzbDrone.Host/Owin/OwinServiceProvider.cs @@ -9,10 +9,10 @@ using Microsoft.Owin.Hosting.Tracing; using NLog; using NzbDrone.Core.Configuration; -using NzbDrone.Host.Owin.MiddleWare; +using Radarr.Host.Owin.MiddleWare; using Owin; -namespace NzbDrone.Host.Owin +namespace Radarr.Host.Owin { public interface IOwinAppFactory { diff --git a/src/NzbDrone.Host/Owin/OwinTraceOutputFactory.cs b/src/NzbDrone.Host/Owin/OwinTraceOutputFactory.cs index 6dc0e57eec..b195ba9696 100644 --- a/src/NzbDrone.Host/Owin/OwinTraceOutputFactory.cs +++ b/src/NzbDrone.Host/Owin/OwinTraceOutputFactory.cs @@ -2,7 +2,7 @@ using Microsoft.Owin.Hosting.Tracing; using NLog; -namespace NzbDrone.Host.Owin +namespace Radarr.Host.Owin { public class OwinTraceOutputFactory : ITraceOutputFactory { diff --git a/src/NzbDrone.Host/Owin/PortInUseException.cs b/src/NzbDrone.Host/Owin/PortInUseException.cs index 5c6d7a542e..5946bc61a7 100644 --- a/src/NzbDrone.Host/Owin/PortInUseException.cs +++ b/src/NzbDrone.Host/Owin/PortInUseException.cs @@ -1,7 +1,7 @@ using System; using NzbDrone.Common.Exceptions; -namespace NzbDrone.Host.Owin +namespace Radarr.Host.Owin { public class PortInUseException : NzbDroneException { diff --git a/src/NzbDrone.Host/PlatformValidation.cs b/src/NzbDrone.Host/PlatformValidation.cs index a4dce7bc80..2082ee814d 100644 --- a/src/NzbDrone.Host/PlatformValidation.cs +++ b/src/NzbDrone.Host/PlatformValidation.cs @@ -5,7 +5,7 @@ using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.Instrumentation; -namespace NzbDrone.Host +namespace Radarr.Host { public static class PlatformValidation { diff --git a/src/NzbDrone.Host/Properties/AssemblyInfo.cs b/src/NzbDrone.Host/Properties/AssemblyInfo.cs index dd667bbdd0..ea36be1449 100644 --- a/src/NzbDrone.Host/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Host/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.exe")] +[assembly: AssemblyTitle("Radarr.exe")] [assembly: Guid("C2172AF4-F9A6-4D91-BAEE-C2E4EE680613")] [assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.Host/Router.cs b/src/NzbDrone.Host/Router.cs index 72d1c8f671..8009ccb70d 100644 --- a/src/NzbDrone.Host/Router.cs +++ b/src/NzbDrone.Host/Router.cs @@ -1,7 +1,7 @@ using NLog; using NzbDrone.Common; -namespace NzbDrone.Host +namespace Radarr.Host { public class Router { diff --git a/src/NzbDrone.Host/SingleInstancePolicy.cs b/src/NzbDrone.Host/SingleInstancePolicy.cs index 18de28fb11..8aa3a15dd8 100644 --- a/src/NzbDrone.Host/SingleInstancePolicy.cs +++ b/src/NzbDrone.Host/SingleInstancePolicy.cs @@ -4,7 +4,7 @@ using NLog; using NzbDrone.Common.Processes; -namespace NzbDrone.Host +namespace Radarr.Host { public interface ISingleInstancePolicy { @@ -31,9 +31,9 @@ public void PreventStartIfAlreadyRunning() { if (IsAlreadyRunning()) { - _logger.Warn("Another instance of Sonarr or Radarr is already running."); + _logger.Warn("Another instance of Radarr is already running."); _browserService.LaunchWebUI(); - //throw new TerminateApplicationException("Another instance is already running"); TODO: detect only radarr + throw new TerminateApplicationException("Another instance is already running"); } } diff --git a/src/NzbDrone.Host/SpinService.cs b/src/NzbDrone.Host/SpinService.cs index e2c4e6933d..ae35590fdd 100644 --- a/src/NzbDrone.Host/SpinService.cs +++ b/src/NzbDrone.Host/SpinService.cs @@ -4,7 +4,7 @@ using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.Processes; -namespace NzbDrone.Host +namespace Radarr.Host { public interface IWaitForExit { diff --git a/src/NzbDrone.Host/TerminateApplicationException.cs b/src/NzbDrone.Host/TerminateApplicationException.cs index 734fb65d27..0c65345c3e 100644 --- a/src/NzbDrone.Host/TerminateApplicationException.cs +++ b/src/NzbDrone.Host/TerminateApplicationException.cs @@ -1,6 +1,6 @@ using System; -namespace NzbDrone.Host +namespace Radarr.Host { public class TerminateApplicationException : ApplicationException { diff --git a/src/NzbDrone.Test.Common/NzbDroneRunner.cs b/src/NzbDrone.Test.Common/NzbDroneRunner.cs index 87f3f49e9c..d844ea8f79 100644 --- a/src/NzbDrone.Test.Common/NzbDroneRunner.cs +++ b/src/NzbDrone.Test.Common/NzbDroneRunner.cs @@ -32,16 +32,16 @@ public void Start() { AppData = Path.Combine(TestContext.CurrentContext.TestDirectory, "_intg_" + DateTime.Now.Ticks); - var nzbdroneConsoleExe = "NzbDrone.Console.exe"; + var nzbdroneConsoleExe = "Radarr.Console.exe"; if (OsInfo.IsNotWindows) { - nzbdroneConsoleExe = "NzbDrone.exe"; + nzbdroneConsoleExe = "Radarr.exe"; } if (BuildInfo.IsDebug) { - Start(Path.Combine(TestContext.CurrentContext.TestDirectory, "..\\..\\..\\..\\..\\_output\\NzbDrone.Console.exe")); + Start(Path.Combine(TestContext.CurrentContext.TestDirectory, "..\\..\\..\\..\\..\\_output\\Radarr.Console.exe")); } else { diff --git a/src/NzbDrone.Update.Test/ProgramFixture.cs b/src/NzbDrone.Update.Test/ProgramFixture.cs index 5d9b7243a9..fb3ba13388 100644 --- a/src/NzbDrone.Update.Test/ProgramFixture.cs +++ b/src/NzbDrone.Update.Test/ProgramFixture.cs @@ -34,7 +34,7 @@ public void should_throw_if_first_arg_isnt_an_int(string arg1, string arg2) [Test] public void should_call_update_with_correct_path() { - var ProcessPath = @"C:\NzbDrone\nzbdrone.exe".AsOsAgnostic(); + var ProcessPath = @"C:\NzbDrone\radarr.exe".AsOsAgnostic(); Mocker.GetMock().Setup(c => c.GetProcessById(12)) .Returns(new ProcessInfo() { StartPath = ProcessPath }); diff --git a/src/NzbDrone.Update.Test/StartNzbDroneService.cs b/src/NzbDrone.Update.Test/StartNzbDroneService.cs index 4cb97c91dc..d8f8a5dd94 100644 --- a/src/NzbDrone.Update.Test/StartNzbDroneService.cs +++ b/src/NzbDrone.Update.Test/StartNzbDroneService.cs @@ -32,7 +32,7 @@ public void should_start_console_if_app_type_was_service_but_start_failed_becaus Subject.Start(AppType.Service, targetFolder); - Mocker.GetMock().Verify(c => c.SpawnNewProcess("c:\\NzbDrone\\NzbDrone.Console.exe", "/" + StartupContext.NO_BROWSER, null), Times.Once()); + Mocker.GetMock().Verify(c => c.SpawnNewProcess("c:\\NzbDrone\\Radarr.Console.exe", "/" + StartupContext.NO_BROWSER, null), Times.Once()); ExceptionVerification.ExpectedWarns(1); } diff --git a/src/NzbDrone.Update.Test/UpdateProviderStartFixture.cs b/src/NzbDrone.Update.Test/UpdateProviderStartFixture.cs index 6e6456b59c..a5a8529515 100644 --- a/src/NzbDrone.Update.Test/UpdateProviderStartFixture.cs +++ b/src/NzbDrone.Update.Test/UpdateProviderStartFixture.cs @@ -232,7 +232,7 @@ private void VerifyProcessRestart() .Verify(c => c.Start(It.IsAny()), Times.Never()); Mocker.GetMock() - .Verify(c => c.Start(TARGET_FOLDER + "NzbDrone.exe"), Times.Once()); + .Verify(c => c.Start(TARGET_FOLDER + "radarr.exe"), Times.Once()); } diff --git a/src/NzbDrone.Update/NzbDrone.Update.csproj b/src/NzbDrone.Update/NzbDrone.Update.csproj index 2fa4f4bc5c..a6721db7ac 100644 --- a/src/NzbDrone.Update/NzbDrone.Update.csproj +++ b/src/NzbDrone.Update/NzbDrone.Update.csproj @@ -9,7 +9,7 @@ WinExe Properties NzbDrone.Update - NzbDrone.Update + Radarr.Update v4.0 diff --git a/src/NzbDrone.Update/UpdateEngine/DetectExistingVersion.cs b/src/NzbDrone.Update/UpdateEngine/DetectExistingVersion.cs index d27190f172..2494e43bc1 100644 --- a/src/NzbDrone.Update/UpdateEngine/DetectExistingVersion.cs +++ b/src/NzbDrone.Update/UpdateEngine/DetectExistingVersion.cs @@ -22,7 +22,7 @@ public string GetExistingVersion(string targetFolder) { try { - var targetExecutable = Path.Combine(targetFolder, "NzbDrone.exe"); + var targetExecutable = Path.Combine(targetFolder, "Radarr.exe"); if (File.Exists(targetExecutable)) { diff --git a/src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs b/src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs index 0a1bc9147b..470f28a7ad 100644 --- a/src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs +++ b/src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs @@ -62,12 +62,12 @@ private void StartService() private void StartWinform(string installationFolder) { - Start(installationFolder, "NzbDrone.exe"); + Start(installationFolder, "Radarr.exe"); } private void StartConsole(string installationFolder) { - Start(installationFolder, "NzbDrone.Console.exe"); + Start(installationFolder, "Radarr.Console.exe"); } private void Start(string installationFolder, string fileName) diff --git a/src/NzbDrone/MessageBoxUserAlert.cs b/src/NzbDrone/MessageBoxUserAlert.cs index 1b5686864f..da371ccda3 100644 --- a/src/NzbDrone/MessageBoxUserAlert.cs +++ b/src/NzbDrone/MessageBoxUserAlert.cs @@ -1,5 +1,5 @@ using System.Windows.Forms; -using NzbDrone.Host; +using Radarr.Host; namespace NzbDrone { diff --git a/src/NzbDrone/NzbDrone.csproj b/src/NzbDrone/NzbDrone.csproj index d36a0dfc9c..b54e9ea345 100644 --- a/src/NzbDrone/NzbDrone.csproj +++ b/src/NzbDrone/NzbDrone.csproj @@ -9,7 +9,7 @@ WinExe Properties NzbDrone - NzbDrone + Radarr v4.0 512 diff --git a/src/NzbDrone/Properties/AssemblyInfo.cs b/src/NzbDrone/Properties/AssemblyInfo.cs index c1bca68721..3e9037cd6e 100644 --- a/src/NzbDrone/Properties/AssemblyInfo.cs +++ b/src/NzbDrone/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.exe")] +[assembly: AssemblyTitle("Radarr.exe")] [assembly: Guid("67AADCD9-89AA-4D95-8281-3193740E70E5")] [assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone/SysTray/SysTrayApp.cs b/src/NzbDrone/SysTray/SysTrayApp.cs index 5e3359bcbd..5cf523101f 100644 --- a/src/NzbDrone/SysTray/SysTrayApp.cs +++ b/src/NzbDrone/SysTray/SysTrayApp.cs @@ -4,7 +4,7 @@ using NLog; using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.Processes; -using NzbDrone.Host; +using Radarr.Host; namespace NzbDrone.SysTray { diff --git a/src/NzbDrone/WindowsApp.cs b/src/NzbDrone/WindowsApp.cs index b99f3d134d..8cd0fdc6f0 100644 --- a/src/NzbDrone/WindowsApp.cs +++ b/src/NzbDrone/WindowsApp.cs @@ -3,7 +3,7 @@ using NLog; using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.Instrumentation; -using NzbDrone.Host; +using Radarr.Host; using NzbDrone.SysTray; namespace NzbDrone diff --git a/src/ServiceHelpers/ServiceInstall/ServiceHelper.cs b/src/ServiceHelpers/ServiceInstall/ServiceHelper.cs index 78e8811700..5e88809781 100644 --- a/src/ServiceHelpers/ServiceInstall/ServiceHelper.cs +++ b/src/ServiceHelpers/ServiceInstall/ServiceHelper.cs @@ -8,7 +8,7 @@ namespace ServiceInstall { public static class ServiceHelper { - private static string NzbDroneExe => Path.Combine(new FileInfo(Assembly.GetExecutingAssembly().Location).Directory.FullName, "NzbDrone.Console.exe"); + private static string NzbDroneExe => Path.Combine(new FileInfo(Assembly.GetExecutingAssembly().Location).Directory.FullName, "Radarr.Console.exe"); private static bool IsAnAdministrator() { @@ -20,7 +20,7 @@ public static void Run(string arg) { if (!File.Exists(NzbDroneExe)) { - Console.WriteLine("Unable to find NzbDrone.Console.exe in the current directory."); + Console.WriteLine("Unable to find Radarr.Console.exe in the current directory."); return; } diff --git a/src/ServiceHelpers/ServiceUninstall/ServiceHelper.cs b/src/ServiceHelpers/ServiceUninstall/ServiceHelper.cs index e5fedb19e2..1a046b1b3c 100644 --- a/src/ServiceHelpers/ServiceUninstall/ServiceHelper.cs +++ b/src/ServiceHelpers/ServiceUninstall/ServiceHelper.cs @@ -8,7 +8,7 @@ namespace ServiceUninstall { public static class ServiceHelper { - private static string NzbDroneExe => Path.Combine(new FileInfo(Assembly.GetExecutingAssembly().Location).Directory.FullName, "NzbDrone.Console.exe"); + private static string NzbDroneExe => Path.Combine(new FileInfo(Assembly.GetExecutingAssembly().Location).Directory.FullName, "Radarr.Console.exe"); private static bool IsAnAdministrator() { @@ -20,7 +20,7 @@ public static void Run(string arg) { if (!File.Exists(NzbDroneExe)) { - Console.WriteLine("Unable to find NzbDrone.exe in the current directory."); + Console.WriteLine("Unable to find Radarr.exe in the current directory."); return; }