From b7a46a9e51f34f4df315b74088e5580bc93a43ca Mon Sep 17 00:00:00 2001 From: TCBWZA Date: Fri, 28 Apr 2017 16:55:18 +0200 Subject: [PATCH 1/2] Update internal URL's to point to lidarr.audio --- src/NzbDrone.Api/Calendar/CalendarFeedModule.cs | 2 +- src/NzbDrone.Common.Test/Http/HttpClientFixture.cs | 2 +- src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs | 4 ++-- src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs | 8 ++++---- src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs | 2 +- .../QBittorrentTests/QBittorrentFixture.cs | 2 +- .../DownloadClientTests/UTorrentTests/UTorrentFixture.cs | 2 +- .../UpdateTests/UpdateServiceFixture.cs | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs b/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs index 4e89eb44d..69a9225e4 100644 --- a/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs +++ b/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs @@ -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" }; diff --git a/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs b/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs index 57ddc3b06..823e5cdd9 100644 --- a/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs +++ b/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs @@ -174,7 +174,7 @@ namespace NzbDrone.Common.Test.Http { var file = GetTempFilePath(); - Assert.Throws(() => Subject.DownloadFile("http://download.Lidarr.tv/wrongpath", file)); + Assert.Throws(() => Subject.DownloadFile("http://download.lidarr.audio/wrongpath", file)); File.Exists(file).Should().BeFalse(); diff --git a/src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs b/src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs index 668535986..322bfbedf 100644 --- a/src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs +++ b/src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs @@ -12,10 +12,10 @@ namespace NzbDrone.Common.Cloud { public LidarrCloudRequestBuilder() { - Services = new HttpRequestBuilder("http://services.Lidarr.tv/v1/") + Services = new HttpRequestBuilder("http://services.lidarr.audio/v1/") .CreateFactory(); - SkyHookTvdb = new HttpRequestBuilder("http://skyhook.Lidarr.tv/v1/tvdb/{route}/{language}/") + SkyHookTvdb = new HttpRequestBuilder("http://skyhook.lidarr.audio/v1/tvdb/{route}/{language}/") .SetSegment("language", "en") .CreateFactory(); } diff --git a/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs b/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs index d0b0f4f47..f808740db 100644 --- a/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs +++ b/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs @@ -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) diff --git a/src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs b/src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs index 0584ef378..872d4d276 100644 --- a/src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs +++ b/src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs @@ -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("")] diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs index af3ed207e..bce7c1748 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs @@ -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() .Setup(s => s.Get(It.Is(h => h.Url.FullUri == _downloadUrl))) diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs index af7bf79a5..104ab6e09 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs @@ -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() .Setup(s => s.Get(It.Is(h => h.Url.ToString() == _downloadUrl))) diff --git a/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs b/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs index 7defc821c..678e8e5a0 100644 --- a/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs +++ b/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs @@ -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") }; } From 7e97f8c42353091d586454a8918f7a69bb4c8cb0 Mon Sep 17 00:00:00 2001 From: TCBWZA Date: Sat, 29 Apr 2017 05:34:32 +0200 Subject: [PATCH 2/2] Break XEM URL as per a request to remove it. --- src/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs b/src/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs index b2c6d6d19..384ff4d94 100644 --- a/src/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs +++ b/src/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs @@ -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;