open-source-mirrors
/
Lidarr
mirror of https://github.com/Lidarr/Lidarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/database

Browse Source
pull/4/head
Joseph Milazzo 7 years ago committed by GitHub
parent f2a8336b31 7e97f8c423
commit 9a79b590cc
9 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
Unescape View File

@ -91,7 +91,7 @@ namespace NzbDrone.Api.Calendar
{
// This will need to point to the hosted web site
// TODO
ProductId = "-//Lidarr.tv//Lidarr//EN"
ProductId = "-//lidarr.audio//Lidarr//EN"
};

2
src/NzbDrone.Common.Test/Http/HttpClientFixture.cs
Unescape View File

@ -174,7 +174,7 @@ namespace NzbDrone.Common.Test.Http
{
var file = GetTempFilePath();
Assert.Throws<WebException>(() => Subject.DownloadFile("http://download.Lidarr.tv/wrongpath", file));
Assert.Throws<WebException>(() => Subject.DownloadFile("http://download.lidarr.audio/wrongpath", file));
File.Exists(file).Should().BeFalse();

1
src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs
Unescape View File

@ -13,7 +13,6 @@ namespace NzbDrone.Common.Cloud
{
public LidarrCloudRequestBuilder()
{
Services = new HttpRequestBuilder("http://services.lidarr.tv/v1/")
.CreateFactory();

8
src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs
Unescape View File

@ -94,15 +94,15 @@ namespace NzbDrone.Common.Instrumentation
// if (updateClient)
// {
// dsn = RuntimeInfo.IsProduction
// ? "https://b85aa82c65b84b0e99e3b7c281438357:392b5bc007974147a922c5d841c47cf9@sentry.Lidarr.tv/11"
// : "https://6168f0946aba4e60ac23e469ac08eac5:bd59e8454ccc454ea27a90cff1f814ca@sentry.Lidarr.tv/9";
// ? "https://b85aa82c65b84b0e99e3b7c281438357:392b5bc007974147a922c5d841c47cf9@sentry.lidarr.audio/11"
// : "https://6168f0946aba4e60ac23e469ac08eac5:bd59e8454ccc454ea27a90cff1f814ca@sentry.lidarr.audio/9";
// }
// else
// {
// dsn = RuntimeInfo.IsProduction
// ? "https://3e8a38b1a4df4de8b0453a724f5a1139:5a708dd75c724b32ae5128b6a895650f@sentry.Lidarr.tv/8"
// : "https://4ee3580e01d8407c96a7430fbc953512:5f2d07227a0b4fde99dea07041a3ff93@sentry.Lidarr.tv/10";
// ? "https://3e8a38b1a4df4de8b0453a724f5a1139:5a708dd75c724b32ae5128b6a895650f@sentry.lidarr.audio/8"
// : "https://4ee3580e01d8407c96a7430fbc953512:5f2d07227a0b4fde99dea07041a3ff93@sentry.lidarr.audio/10";
// }
// var target = new SentryTarget(dsn)

2
src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs
Unescape View File

@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
// Gets updated at build time by TeamCity to branch name
[assembly: AssemblyConfiguration("debug")]
[assembly: AssemblyCompany("lidarr.tv")]
[assembly: AssemblyCompany("lidarr.audio")]
[assembly: AssemblyProduct("NzbDrone")]
[assembly: AssemblyCopyright("GNU General Public v3")]
[assembly: AssemblyTrademark("")]

2
src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs
Unescape View File

@ -54,7 +54,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
protected void GivenRedirectToTorrent()
{
var httpHeader = new HttpHeader();
httpHeader["Location"] = "http://test.Lidarr.tv/not-a-real-torrent.torrent";
httpHeader["Location"] = "http://test.lidarr.audio/not-a-real-torrent.torrent";
Mocker.GetMock<IHttpClient>()
.Setup(s => s.Get(It.Is<HttpRequest>(h => h.Url.FullUri == _downloadUrl)))

2
src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs
Unescape View File

@ -107,7 +107,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
protected void GivenRedirectToTorrent()
{
var httpHeader = new HttpHeader();
httpHeader["Location"] = "http://test.Lidarr.tv/not-a-real-torrent.torrent";
httpHeader["Location"] = "http://test.lidarr.audio/not-a-real-torrent.torrent";
Mocker.GetMock<IHttpClient>()
.Setup(s => s.Get(It.Is<HttpRequest>(h => h.Url.ToString() == _downloadUrl)))

4
src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs
Unescape View File

@ -36,7 +36,7 @@ namespace NzbDrone.Core.Test.UpdateTests
_updatePackage = new UpdatePackage
{
FileName = "NzbDrone.develop.2.0.0.0.tar.gz",
Url = "http://download.Lidarr.tv/v2/develop/mono/NzbDrone.develop.tar.gz",
Url = "http://download.lidarr.audio/v2/develop/mono/NzbDrone.develop.tar.gz",
Version = new Version("2.0.0.0")
};
}
@ -46,7 +46,7 @@ namespace NzbDrone.Core.Test.UpdateTests
_updatePackage = new UpdatePackage
{
FileName = "NzbDrone.develop.2.0.0.0.zip",
Url = "http://download.Lidarr.tv/v2/develop/windows/NzbDrone.develop.zip",
Url = "http://download.lidarr.audio/v2/develop/windows/NzbDrone.develop.zip",
Version = new Version("2.0.0.0")
};
}

2
src/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs
Unescape View File

@ -18,7 +18,7 @@ namespace NzbDrone.Core.DataAugmentation.Xem
public class XemProxy : IXemProxy
{
private const string ROOT_URL = "http://thexem.de/map/";
private const string ROOT_URL = "http://thexem.de.broken/map/";
private readonly Logger _logger;
private readonly IHttpClient _httpClient;

Write Preview
Loading…
Cancel
Save