Renamed NzbDrone.exe to Radarr.exe.

pull/2/head
Leonardo Galli 8 years ago
parent 2b54f0a7f3
commit 88dacc00f7

@ -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"
$MONO_EXEC "$EXE_PATH"

@ -3,8 +3,9 @@ using Moq;
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
{

@ -263,7 +263,7 @@ namespace NzbDrone.Common.Test
[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]

@ -13,7 +13,7 @@ namespace NzbDrone.Common.Extensions
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;

@ -35,8 +35,8 @@ namespace NzbDrone.Common.Processes
{
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)
{

@ -9,7 +9,7 @@
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NzbDrone.Console</RootNamespace>
<AssemblyName>NzbDrone.Console</AssemblyName>
<AssemblyName>Radarr.Console</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>

@ -59,7 +59,7 @@ namespace NzbDrone.Core.Test.UpdateTests
Mocker.GetMock<IVerifyUpdates>().Setup(c => c.Verify(It.IsAny<UpdatePackage>(), It.IsAny<string>())).Returns(true);
Mocker.GetMock<IProcessProvider>().Setup(c => c.GetCurrentProcess()).Returns(new ProcessInfo { Id = 12 });
Mocker.GetMock<IRuntimeInfo>().Setup(c => c.ExecutingApplication).Returns(@"C:\Test\NzbDrone.exe");
Mocker.GetMock<IRuntimeInfo>().Setup(c => c.ExecutingApplication).Returns(@"C:\Test\Radarr.exe");
Mocker.GetMock<IConfigFileProvider>()
.SetupGet(s => s.UpdateAutomatically)

@ -5,7 +5,7 @@ using NLog;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Core.Configuration;
namespace NzbDrone.Host.AccessControl
namespace Radarr.Host.AccessControl
{
public interface IFirewallAdapter
{

@ -2,7 +2,7 @@
using NLog;
using NzbDrone.Common.Processes;
namespace NzbDrone.Host.AccessControl
namespace Radarr.Host.AccessControl
{
public interface INetshProvider
{

@ -3,7 +3,7 @@ using System.Text.RegularExpressions;
using NLog;
using NzbDrone.Core.Configuration;
namespace NzbDrone.Host.AccessControl
namespace Radarr.Host.AccessControl
{
public interface ISslAdapter
{

@ -1,4 +1,4 @@
namespace NzbDrone.Host.AccessControl
namespace Radarr.Host.AccessControl
{
public class UrlAcl
{

@ -7,7 +7,7 @@ using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Configuration;
namespace NzbDrone.Host.AccessControl
namespace Radarr.Host.AccessControl
{
public interface IUrlAclAdapter
{

@ -1,4 +1,4 @@
namespace NzbDrone.Host
namespace Radarr.Host
{
public enum ApplicationModes
{

@ -5,9 +5,9 @@ using NzbDrone.Common.EnvironmentInfo;
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
{

@ -10,7 +10,7 @@ using NzbDrone.Common.Security;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Instrumentation;
namespace NzbDrone.Host
namespace Radarr.Host
{
public static class Bootstrap
{

@ -4,7 +4,7 @@ using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Processes;
using NzbDrone.Core.Configuration;
namespace NzbDrone.Host
namespace Radarr.Host
{
public interface IBrowserService
{

@ -1,4 +1,4 @@
namespace NzbDrone.Host
namespace Radarr.Host
{
public interface IUserAlert
{

@ -6,7 +6,7 @@ using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Http.Dispatchers;
using NzbDrone.SignalR;
namespace NzbDrone.Host
namespace Radarr.Host
{
public class MainAppContainerBuilder : ContainerBuilderBase
{
@ -14,7 +14,7 @@ namespace NzbDrone.Host
{
var assemblies = new List<string>
{
"NzbDrone.Host",
"Radarr.Host",
"NzbDrone.Common",
"NzbDrone.Core",
"NzbDrone.Api",

@ -8,8 +8,8 @@
<ProjectGuid>{95C11A9E-56ED-456A-8447-2C89C1139266}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NzbDrone.Host</RootNamespace>
<AssemblyName>NzbDrone.Host</AssemblyName>
<RootNamespace>Radarr.Host</RootNamespace>
<AssemblyName>Radarr.Host</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>

@ -1,4 +1,4 @@
namespace NzbDrone.Host.Owin
namespace Radarr.Host.Owin
{
public interface IHostController
{

@ -1,6 +1,6 @@
using Owin;
namespace NzbDrone.Host.Owin.MiddleWare
namespace Radarr.Host.Owin.MiddleWare
{
public interface IOwinMiddleWare
{

@ -2,7 +2,7 @@
using Nancy.Owin;
using Owin;
namespace NzbDrone.Host.Owin.MiddleWare
namespace Radarr.Host.Owin.MiddleWare
{
public class NancyMiddleWare : IOwinMiddleWare
{

@ -4,7 +4,7 @@ using Microsoft.Owin;
using NzbDrone.Common.EnvironmentInfo;
using Owin;
namespace NzbDrone.Host.Owin.MiddleWare
namespace Radarr.Host.Owin.MiddleWare
{
public class NzbDroneVersionMiddleWare : IOwinMiddleWare
{

@ -4,7 +4,7 @@ using NzbDrone.Common.Composition;
using NzbDrone.SignalR;
using Owin;
namespace NzbDrone.Host.Owin.MiddleWare
namespace Radarr.Host.Owin.MiddleWare
{
public class SignalRMiddleWare : IOwinMiddleWare
{

@ -2,7 +2,7 @@
using System.Text;
using NLog;
namespace NzbDrone.Host.Owin
namespace Radarr.Host.Owin
{
public class NlogTextWriter : TextWriter
{

@ -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
{

@ -9,10 +9,10 @@ using Microsoft.Owin.Hosting.Services;
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
{

@ -2,7 +2,7 @@
using Microsoft.Owin.Hosting.Tracing;
using NLog;
namespace NzbDrone.Host.Owin
namespace Radarr.Host.Owin
{
public class OwinTraceOutputFactory : ITraceOutputFactory
{

@ -1,7 +1,7 @@
using System;
using NzbDrone.Common.Exceptions;
namespace NzbDrone.Host.Owin
namespace Radarr.Host.Owin
{
public class PortInUseException : NzbDroneException
{

@ -5,7 +5,7 @@ using NLog;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Instrumentation;
namespace NzbDrone.Host
namespace Radarr.Host
{
public static class PlatformValidation
{

@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
// 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.*")]

@ -1,7 +1,7 @@
using NLog;
using NzbDrone.Common;
namespace NzbDrone.Host
namespace Radarr.Host
{
public class Router
{

@ -4,7 +4,7 @@ using System.Linq;
using NLog;
using NzbDrone.Common.Processes;
namespace NzbDrone.Host
namespace Radarr.Host
{
public interface ISingleInstancePolicy
{
@ -31,9 +31,9 @@ namespace NzbDrone.Host
{
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");
}
}

@ -4,7 +4,7 @@ using NLog.Common;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Processes;
namespace NzbDrone.Host
namespace Radarr.Host
{
public interface IWaitForExit
{

@ -1,6 +1,6 @@
using System;
namespace NzbDrone.Host
namespace Radarr.Host
{
public class TerminateApplicationException : ApplicationException
{

@ -32,16 +32,16 @@ namespace NzbDrone.Test.Common
{
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
{

@ -34,7 +34,7 @@ namespace NzbDrone.Update.Test
[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<IProcessProvider>().Setup(c => c.GetProcessById(12))
.Returns(new ProcessInfo() { StartPath = ProcessPath });

@ -32,7 +32,7 @@ namespace NzbDrone.Update.Test
Subject.Start(AppType.Service, targetFolder);
Mocker.GetMock<IProcessProvider>().Verify(c => c.SpawnNewProcess("c:\\NzbDrone\\NzbDrone.Console.exe", "/" + StartupContext.NO_BROWSER, null), Times.Once());
Mocker.GetMock<IProcessProvider>().Verify(c => c.SpawnNewProcess("c:\\NzbDrone\\Radarr.Console.exe", "/" + StartupContext.NO_BROWSER, null), Times.Once());
ExceptionVerification.ExpectedWarns(1);
}

@ -232,7 +232,7 @@ namespace NzbDrone.Update.Test
.Verify(c => c.Start(It.IsAny<string>()), Times.Never());
Mocker.GetMock<IProcessProvider>()
.Verify(c => c.Start(TARGET_FOLDER + "NzbDrone.exe"), Times.Once());
.Verify(c => c.Start(TARGET_FOLDER + "radarr.exe"), Times.Once());
}

@ -9,7 +9,7 @@
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NzbDrone.Update</RootNamespace>
<AssemblyName>NzbDrone.Update</AssemblyName>
<AssemblyName>Radarr.Update</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>

@ -22,7 +22,7 @@ namespace NzbDrone.Update.UpdateEngine
{
try
{
var targetExecutable = Path.Combine(targetFolder, "NzbDrone.exe");
var targetExecutable = Path.Combine(targetFolder, "Radarr.exe");
if (File.Exists(targetExecutable))
{

@ -62,12 +62,12 @@ namespace NzbDrone.Update.UpdateEngine
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)

@ -1,5 +1,5 @@
using System.Windows.Forms;
using NzbDrone.Host;
using Radarr.Host;
namespace NzbDrone
{

@ -9,7 +9,7 @@
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NzbDrone</RootNamespace>
<AssemblyName>NzbDrone</AssemblyName>
<AssemblyName>Radarr</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>

@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
// 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.*")]

@ -4,7 +4,7 @@ using System.Windows.Forms;
using NLog;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Processes;
using NzbDrone.Host;
using Radarr.Host;
namespace NzbDrone.SysTray
{

@ -3,7 +3,7 @@ using System.Windows.Forms;
using NLog;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Instrumentation;
using NzbDrone.Host;
using Radarr.Host;
using NzbDrone.SysTray;
namespace NzbDrone

@ -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 @@ namespace ServiceInstall
{
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;
}

@ -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 @@ namespace ServiceUninstall
{
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;
}

Loading…
Cancel
Save