mirror of
https://github.com/Sonarr/Sonarr.git
synced 2024-12-16 11:37:58 +02:00
Merge pull request #151 from Sonarr/sonarr-url
update usages of nzbdrone.com to sonarr.tv
This commit is contained in:
Keivan Beigi
commit
de33b84eef
@ -8,7 +8,7 @@ Setup guides, FAQ, the more information we have on the wiki the better.
|
||||
## Development ##
|
||||
|
||||
### Tools required ###
|
||||
- Visual Studio 2012
|
||||
- Visual Studio 2013
|
||||
- HTML/Javascript editor of choice (Sublime Text/Webstorm/etc)
|
||||
- npm (node package manager)
|
||||
- git
|
||||
@ -22,7 +22,7 @@ Setup guides, FAQ, the more information we have on the wiki the better.
|
||||
5. Compile in Visual Studio
|
||||
|
||||
### Contributing Code ###
|
||||
- If you're adding a new, already requested feature, please comment on [Trello](http://trello.nzbdrone.com "Trello") so work is not duplicated (If you want to add something not already on there, please talk to us first)
|
||||
- If you're adding a new, already requested feature, please comment on [Trello](https://trello.sonarr.tv "Trello") so work is not duplicated (If you want to add something not already on there, please talk to us first)
|
||||
- Rebase from NzbDrone's develop branch, don't merge
|
||||
- Make meaningful commits, or squash them
|
||||
- Feel free to make a pull request before work is complete, this will let us see where its at and make comments/suggest improvements
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
|
||||
#define AppName "NzbDrone"
|
||||
#define AppPublisher "NzbDrone"
|
||||
#define AppURL "http://www.nzbdrone.com/"
|
||||
#define ForumsURL "http://forums.nzbdrone.com/"
|
||||
#define AppURL "https://sonarr.tv/"
|
||||
#define ForumsURL "https://forums.sonarr.tv/"
|
||||
#define AppExeName "NzbDrone.exe"
|
||||
#define BuildNumber "2.0"
|
||||
#define BuildNumber GetEnv('BUILD_NUMBER')
|
||||
|
||||
@ -9,7 +9,7 @@ public interface IDroneServicesRequestBuilder
|
||||
|
||||
public class DroneServicesHttpRequestBuilder : HttpRequestBuilder, IDroneServicesRequestBuilder
|
||||
{
|
||||
private const string ROOT_URL = "http://services.nzbdrone.com/v1/";
|
||||
private const string ROOT_URL = "http://services.sonarr.tv/v1/";
|
||||
|
||||
public DroneServicesHttpRequestBuilder()
|
||||
: base(ROOT_URL)
|
||||
|
||||
@ -175,12 +175,11 @@
|
||||
<Compile Include="RateGate.cs" />
|
||||
<Compile Include="Reflection\ReflectionExtensions.cs" />
|
||||
<Compile Include="Extensions\ResourceExtensions.cs" />
|
||||
<Compile Include="Security\IgnoreCertErrorPolicy.cs" />
|
||||
<Compile Include="Security\X509CertificateValidationPolicy.cs" />
|
||||
<Compile Include="Serializer\IntConverter.cs" />
|
||||
<Compile Include="Serializer\Json.cs" />
|
||||
<Compile Include="ServiceFactory.cs" />
|
||||
<Compile Include="ServiceProvider.cs" />
|
||||
<Compile Include="Services.cs" />
|
||||
<Compile Include="Extensions\StringExtensions.cs" />
|
||||
<Compile Include="TinyIoC.cs" />
|
||||
<Compile Include="TPL\LimitedConcurrencyLevelTaskScheduler.cs" />
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("www.nzbdrone.com")]
|
||||
[assembly: AssemblyCompany("sonarr.tv")]
|
||||
[assembly: AssemblyProduct("NzbDrone")]
|
||||
[assembly: AssemblyCopyright("GNU General Public v3")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
using System.Net;
|
||||
using System.Net.Security;
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
using NzbDrone.Common.Extensions;
|
||||
|
||||
namespace NzbDrone.Common.Security
|
||||
{
|
||||
public static class IgnoreCertErrorPolicy
|
||||
{
|
||||
public static void Register()
|
||||
{
|
||||
ServicePointManager.ServerCertificateValidationCallback = ValidationCallback;
|
||||
}
|
||||
|
||||
private static bool ValidationCallback(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslpolicyerrors)
|
||||
{
|
||||
var request = sender as HttpWebRequest;
|
||||
|
||||
if (request != null &&
|
||||
request.Address.OriginalString.ContainsIgnoreCase("nzbdrone.com") &&
|
||||
sslpolicyerrors != SslPolicyErrors.None)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
using System.Net;
|
||||
using System.Net.Security;
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
using NLog;
|
||||
using NzbDrone.Common.Instrumentation;
|
||||
|
||||
namespace NzbDrone.Common.Security
|
||||
{
|
||||
public static class X509CertificateValidationPolicy
|
||||
{
|
||||
private static readonly Logger Logger = NzbDroneLogger.GetLogger();
|
||||
|
||||
public static void Register()
|
||||
{
|
||||
ServicePointManager.ServerCertificateValidationCallback = ShouldByPassValidationError;
|
||||
}
|
||||
|
||||
private static bool ShouldByPassValidationError(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslpolicyerrors)
|
||||
{
|
||||
var request = sender as HttpWebRequest;
|
||||
|
||||
if (request == null)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
if (sslpolicyerrors == SslPolicyErrors.None)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
Logger.Error("Request for {0} failed certificated validation. {1}", request.Address, sslpolicyerrors);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
using System;
|
||||
|
||||
namespace NzbDrone.Common
|
||||
{
|
||||
public class Services
|
||||
{
|
||||
public static String RootUrl
|
||||
{
|
||||
get
|
||||
{
|
||||
return "http://services.nzbdrone.com";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -88,7 +88,7 @@ public void ToBestDateTime_Before_Yesterday()
|
||||
public void ParentUriString_should_return_self_if_already_parent()
|
||||
{
|
||||
|
||||
var url = "http://www.nzbdrone.com";
|
||||
var url = "http://www.sonarr.tv";
|
||||
var uri = new Uri(url);
|
||||
|
||||
|
||||
@ -102,70 +102,70 @@ public void ParentUriString_should_return_self_if_already_parent()
|
||||
public void ParentUriString_should_return_parent_url_when_path_is_passed()
|
||||
{
|
||||
|
||||
var url = "http://www.nzbdrone.com/test/";
|
||||
var url = "http://www.sonarr.tv/test/";
|
||||
var uri = new Uri(url);
|
||||
|
||||
|
||||
var result = uri.ParentUriString();
|
||||
|
||||
//Resolve
|
||||
result.Should().Be("http://www.nzbdrone.com");
|
||||
result.Should().Be("http://www.sonarr.tv");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ParentUriString_should_return_parent_url_when_multiple_paths_are_passed()
|
||||
{
|
||||
|
||||
var url = "http://www.nzbdrone.com/test/test2";
|
||||
var url = "http://www.sonarr.tv/test/test2";
|
||||
var uri = new Uri(url);
|
||||
|
||||
|
||||
var result = uri.ParentUriString();
|
||||
|
||||
//Resolve
|
||||
result.Should().Be("http://www.nzbdrone.com");
|
||||
result.Should().Be("http://www.sonarr.tv");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ParentUriString_should_return_parent_url_when_url_with_query_string_is_passed()
|
||||
{
|
||||
|
||||
var url = "http://www.nzbdrone.com/test.aspx?test=10";
|
||||
var url = "http://www.sonarr.tv/test.aspx?test=10";
|
||||
var uri = new Uri(url);
|
||||
|
||||
|
||||
var result = uri.ParentUriString();
|
||||
|
||||
//Resolve
|
||||
result.Should().Be("http://www.nzbdrone.com");
|
||||
result.Should().Be("http://www.sonarr.tv");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ParentUriString_should_return_parent_url_when_url_with_path_and_query_strings_is_passed()
|
||||
{
|
||||
|
||||
var url = "http://www.nzbdrone.com/tester/test.aspx?test=10";
|
||||
var url = "http://www.sonarr.tv/tester/test.aspx?test=10";
|
||||
var uri = new Uri(url);
|
||||
|
||||
|
||||
var result = uri.ParentUriString();
|
||||
|
||||
//Resolve
|
||||
result.Should().Be("http://www.nzbdrone.com");
|
||||
result.Should().Be("http://www.sonarr.tv");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ParentUriString_should_return_parent_url_when_url_with_query_strings_is_passed()
|
||||
{
|
||||
|
||||
var url = "http://www.nzbdrone.com/test.aspx?test=10&test2=5";
|
||||
var url = "http://www.sonarr.tv/test.aspx?test=10&test2=5";
|
||||
var uri = new Uri(url);
|
||||
|
||||
|
||||
var result = uri.ParentUriString();
|
||||
|
||||
//Resolve
|
||||
result.Should().Be("http://www.nzbdrone.com");
|
||||
result.Should().Be("http://www.sonarr.tv");
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
||||
@ -332,7 +332,7 @@ private XDocument LoadConfigFile()
|
||||
|
||||
catch (XmlException ex)
|
||||
{
|
||||
throw new InvalidConfigFileException(_configFile + " is invalid, please see the http://wiki.nzbdrone.com for steps to resolve this issue.", ex);
|
||||
throw new InvalidConfigFileException(_configFile + " is invalid, please see the http://wiki.sonarr.tv for steps to resolve this issue.", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ public static void Start(StartupContext startupContext, IUserAlert userAlert, Ac
|
||||
try
|
||||
{
|
||||
GlobalExceptionHandlers.Register();
|
||||
IgnoreCertErrorPolicy.Register();
|
||||
X509CertificateValidationPolicy.Register();
|
||||
|
||||
Logger.Info("Starting NzbDrone - {0} - Version {1}", Assembly.GetCallingAssembly().Location, Assembly.GetExecutingAssembly().GetName().Version);
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ public OwinHostController(
|
||||
|
||||
public void StartServer()
|
||||
{
|
||||
IgnoreCertErrorPolicy.Register();
|
||||
X509CertificateValidationPolicy.Register();
|
||||
|
||||
if (OsInfo.IsWindows)
|
||||
{
|
||||
|
||||
@ -36,7 +36,7 @@ public static void Main(string[] args)
|
||||
|
||||
Console.WriteLine("Starting NzbDrone Update Client");
|
||||
|
||||
IgnoreCertErrorPolicy.Register();
|
||||
X509CertificateValidationPolicy.Register();
|
||||
|
||||
GlobalExceptionHandlers.Register();
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user