From 38af8edd59ef1ca8f91246c299eea7403e3eee12 Mon Sep 17 00:00:00 2001 From: James White Date: Mon, 21 Aug 2017 20:48:45 +0100 Subject: [PATCH] Fixed: Adjust Sonarr references to Radarr (#1977) --- src/NzbDrone.Common/Disk/DiskProviderBase.cs | 8 ++++---- .../Http/Dispatchers/ManagedHttpDispatcher.cs | 2 +- src/NzbDrone.Common/Http/HttpProvider.cs | 8 ++++---- .../QBittorrentTests/QBittorrentFixture.cs | 6 +++--- .../DownloadClientTests/UTorrentTests/UTorrentFixture.cs | 2 +- .../Clients/DownloadStation/DownloadStationSettings.cs | 4 ++-- .../Clients/DownloadStation/TorrentDownloadStation.cs | 4 ++-- .../Clients/DownloadStation/UsenetDownloadStation.cs | 4 ++-- .../Indexers/Newznab/NewznabCapabilitiesProvider.cs | 6 +++--- src/NzbDrone.Core/Notifications/Growl/GrowlService.cs | 4 ++-- .../Notifications/MediaBrowser/MediaBrowserService.cs | 6 +++--- src/NzbDrone.Core/Rest/RestClientFactory.cs | 4 ++-- src/NzbDrone.Core/Validation/RuleBuilderExtensions.cs | 6 +++--- src/NzbDrone.Integration.Test/HttpLogFixture.cs | 2 +- 14 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/NzbDrone.Common/Disk/DiskProviderBase.cs b/src/NzbDrone.Common/Disk/DiskProviderBase.cs index 4b56168c3..cedd0f348 100644 --- a/src/NzbDrone.Common/Disk/DiskProviderBase.cs +++ b/src/NzbDrone.Common/Disk/DiskProviderBase.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -108,7 +108,7 @@ public bool FileExists(string path, StringComparison stringComparison) } } } - + public bool CanUseGDIPlus() { try @@ -129,7 +129,7 @@ public bool IsValidGDIPlusImage(string filename) { return true; } - + try { using (var bmp = new Bitmap(filename)) @@ -150,7 +150,7 @@ public bool FolderWritable(string path) try { - var testPath = Path.Combine(path, "sonarr_write_test.txt"); + var testPath = Path.Combine(path, "radarr_write_test.txt"); var testContent = string.Format("This file was created to verify if '{0}' is writable. It should've been automatically deleted. Feel free to delete it.", path); File.WriteAllText(testPath, testContent); File.Delete(testPath); diff --git a/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs b/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs index 6fdef87c1..e7713a607 100644 --- a/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs +++ b/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs @@ -136,7 +136,7 @@ protected virtual void AddRequestHeaders(HttpWebRequest webRequest, HttpHeader h webRequest.TransferEncoding = header.Value; break; case "User-Agent": - throw new NotSupportedException("User-Agent other than Sonarr not allowed."); + throw new NotSupportedException("User-Agent other than Radarr not allowed."); case "Proxy-Connection": throw new NotImplementedException(); default: diff --git a/src/NzbDrone.Common/Http/HttpProvider.cs b/src/NzbDrone.Common/Http/HttpProvider.cs index e09fbf1c6..35b63abaa 100644 --- a/src/NzbDrone.Common/Http/HttpProvider.cs +++ b/src/NzbDrone.Common/Http/HttpProvider.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Net; using NLog; using NzbDrone.Common.EnvironmentInfo; @@ -24,7 +24,7 @@ public class HttpProvider : IHttpProvider public HttpProvider(Logger logger) { _logger = logger; - _userAgent = string.Format("Sonarr {0}", BuildInfo.Version); + _userAgent = string.Format("Radarr {0}", BuildInfo.Version); ServicePointManager.Expect100Continue = false; } @@ -58,6 +58,6 @@ private string DownloadString(string url, ICredentials identity) } } - + } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs index 4e14da6b6..afef62690 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 @@ protected void GivenRedirectToMagnet() protected void GivenRedirectToTorrent() { var httpHeader = new HttpHeader(); - httpHeader["Location"] = "http://test.sonarr.tv/not-a-real-torrent.torrent"; + httpHeader["Location"] = "http://test.radarr.video/not-a-real-torrent.torrent"; Mocker.GetMock() .Setup(s => s.Get(It.Is(h => h.Url.FullUri == _downloadUrl))) @@ -405,7 +405,7 @@ public void should_not_be_read_only_if_max_ratio_reached_and_paused() [Test] public void should_get_category_from_the_category_if_set() { - const string category = "tv-sonarr"; + const string category = "movies-radarr"; GivenMaxRatio(1.0f); var torrent = new QBittorrentTorrent @@ -430,7 +430,7 @@ public void should_get_category_from_the_category_if_set() [Test] public void should_get_category_from_the_label_if_the_category_is_not_available() { - const string category = "tv-sonarr"; + const string category = "movies-radarr"; GivenMaxRatio(1.0f); var torrent = new QBittorrentTorrent diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs index 184334bdc..8b0196347 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 @@ protected void GivenRedirectToMagnet() protected void GivenRedirectToTorrent() { var httpHeader = new HttpHeader(); - httpHeader["Location"] = "http://test.sonarr.tv/not-a-real-torrent.torrent"; + httpHeader["Location"] = "http://test.radarr.video/not-a-real-torrent.torrent"; Mocker.GetMock() .Setup(s => s.Get(It.Is(h => h.Url.ToString() == _downloadUrl))) diff --git a/src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStationSettings.cs b/src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStationSettings.cs index a1e12d899..11ff9d7a7 100644 --- a/src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStationSettings.cs +++ b/src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStationSettings.cs @@ -1,4 +1,4 @@ -using System.Text.RegularExpressions; +using System.Text.RegularExpressions; using FluentValidation; using NzbDrone.Common.Extensions; using NzbDrone.Core.Annotations; @@ -42,7 +42,7 @@ public class DownloadStationSettings : IProviderConfig [FieldDefinition(3, Label = "Password", Type = FieldType.Password)] public string Password { get; set; } - [FieldDefinition(4, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Sonarr avoids conflicts with unrelated downloads, but it's optional. Creates a [category] subdirectory in the output directory.")] + [FieldDefinition(4, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated downloads, but it's optional. Creates a [category] subdirectory in the output directory.")] public string TvCategory { get; set; } [FieldDefinition(5, Label = "Directory", Type = FieldType.Textbox, HelpText = "Optional shared folder to put downloads into, leave blank to use the default Download Station location")] diff --git a/src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs b/src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs index 06b33f8c5..4d954c7d4 100644 --- a/src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs +++ b/src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -345,7 +345,7 @@ protected ValidationFailure TestConnection() _logger.Error(ex, ex.Message); return new NzbDroneValidationFailure("Username", "Authentication failure") { - DetailedDescription = $"Please verify your username and password. Also verify if the host running Sonarr isn't blocked from accessing {Name} by WhiteList limitations in the {Name} configuration." + DetailedDescription = $"Please verify your username and password. Also verify if the host running Radarr isn't blocked from accessing {Name} by WhiteList limitations in the {Name} configuration." }; } catch (WebException ex) diff --git a/src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs b/src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs index 7682dfacf..df5d3cf22 100644 --- a/src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs +++ b/src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Net; @@ -259,7 +259,7 @@ protected ValidationFailure TestConnection() _logger.Error(ex, ex.Message); return new NzbDroneValidationFailure("Username", "Authentication failure") { - DetailedDescription = $"Please verify your username and password. Also verify if the host running Sonarr isn't blocked from accessing {Name} by WhiteList limitations in the {Name} configuration." + DetailedDescription = $"Please verify your username and password. Also verify if the host running Radarr isn't blocked from accessing {Name} by WhiteList limitations in the {Name} configuration." }; } catch (WebException ex) diff --git a/src/NzbDrone.Core/Indexers/Newznab/NewznabCapabilitiesProvider.cs b/src/NzbDrone.Core/Indexers/Newznab/NewznabCapabilitiesProvider.cs index da6fe0038..29cc47461 100644 --- a/src/NzbDrone.Core/Indexers/Newznab/NewznabCapabilitiesProvider.cs +++ b/src/NzbDrone.Core/Indexers/Newznab/NewznabCapabilitiesProvider.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Net; using System.Xml; @@ -59,7 +59,7 @@ private NewznabCapabilities FetchCapabilities(NewznabSettings indexerSettings) } catch (Exception ex) { - _logger.Debug(ex, "Failed to get newznab api capabilities from {0}", indexerSettings.BaseUrl); + _logger.Debug(ex, "Failed to get Newznab API capabilities from {0}", indexerSettings.BaseUrl); throw; } @@ -74,7 +74,7 @@ private NewznabCapabilities FetchCapabilities(NewznabSettings indexerSettings) } catch (Exception ex) { - _logger.Error(ex, "Failed to determine newznab api capabilities for {0}, using the defaults instead till Sonarr restarts.", indexerSettings.BaseUrl); + _logger.Error(ex, "Failed to determine newznab api capabilities for {0}, using the defaults instead till Radarr restarts.", indexerSettings.BaseUrl); } return capabilities; diff --git a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs index 551f74e87..dbb5dec04 100644 --- a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs +++ b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs @@ -1,4 +1,4 @@ -using FluentValidation.Results; +using FluentValidation.Results; using Growl.Connector; using Growl.CoreLibrary; using NzbDrone.Common.Extensions; @@ -102,7 +102,7 @@ public void SendNotification(string title, string message, string notificationTy private void Register(string host, int port, string password) { - _logger.Debug("Registering Sonarr with Growl host: {0}:{1}", host, port); + _logger.Debug("Registering Radarr with Growl host: {0}:{1}", host, port); var growlConnector = GetGrowlConnector(host, port, password); diff --git a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserService.cs b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserService.cs index 9c76145cd..950cceb8e 100644 --- a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserService.cs +++ b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserService.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Net; using FluentValidation.Results; using NLog; @@ -49,13 +49,13 @@ public ValidationFailure Test(MediaBrowserSettings settings) { _logger.Debug("Testing connection to MediaBrowser: {0}", settings.Address); - Notify(settings, "Test from Sonarr", "Success! MediaBrowser has been successfully configured!"); + Notify(settings, "Test from Radarr", "Success! MediaBrowser has been successfully configured!"); } catch (RestException ex) { if (ex.Response.StatusCode == HttpStatusCode.Unauthorized) { - return new ValidationFailure("ApiKey", "API Key is incorrect"); + return new ValidationFailure("ApiKey", "API key is incorrect"); } } catch (Exception ex) diff --git a/src/NzbDrone.Core/Rest/RestClientFactory.cs b/src/NzbDrone.Core/Rest/RestClientFactory.cs index 0c92590f6..545c00258 100644 --- a/src/NzbDrone.Core/Rest/RestClientFactory.cs +++ b/src/NzbDrone.Core/Rest/RestClientFactory.cs @@ -1,4 +1,4 @@ -using RestSharp; +using RestSharp; using NzbDrone.Common.EnvironmentInfo; namespace NzbDrone.Core.Rest @@ -9,7 +9,7 @@ public static RestClient BuildClient(string baseUrl) { var restClient = new RestClient(baseUrl); - restClient.UserAgent = string.Format("Sonarr/{0} (RestSharp/{1}; {2}/{3})", + restClient.UserAgent = string.Format("Radarr/{0} (RestSharp/{1}; {2}/{3})", BuildInfo.Version, restClient.GetType().Assembly.GetName().Version, OsInfo.Os, OsInfo.Version.ToString(2)); diff --git a/src/NzbDrone.Core/Validation/RuleBuilderExtensions.cs b/src/NzbDrone.Core/Validation/RuleBuilderExtensions.cs index df1d8056b..f1a7b4af5 100644 --- a/src/NzbDrone.Core/Validation/RuleBuilderExtensions.cs +++ b/src/NzbDrone.Core/Validation/RuleBuilderExtensions.cs @@ -1,4 +1,4 @@ -using System.Text.RegularExpressions; +using System.Text.RegularExpressions; using FluentValidation; using FluentValidation.Validators; using NzbDrone.Core.Parser; @@ -36,7 +36,7 @@ public static IRuleBuilderOptions ValidRootUrl(this IRuleBuilder ValidUrlBase(this IRuleBuilder ruleBuilder) { - return ruleBuilder.SetValidator(new RegularExpressionValidator(@"^(?!\/?https?://[-_a-z0-9.]+)", RegexOptions.IgnoreCase)).WithMessage("Must be a valid URL path (ie: '/sonarr')"); + return ruleBuilder.SetValidator(new RegularExpressionValidator(@"^(?!\/?https?://[-_a-z0-9.]+)", RegexOptions.IgnoreCase)).WithMessage("Must be a valid URL path (ie: '/radarr')"); } public static IRuleBuilderOptions ValidPort(this IRuleBuilder ruleBuilder) @@ -68,4 +68,4 @@ public static IRuleBuilderOptions AsWarning(this IRuleBuilde return ruleBuilder.WithState(v => NzbDroneValidationState.Warning); } } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Integration.Test/HttpLogFixture.cs b/src/NzbDrone.Integration.Test/HttpLogFixture.cs index dfa2d722f..afbc8fcdf 100644 --- a/src/NzbDrone.Integration.Test/HttpLogFixture.cs +++ b/src/NzbDrone.Integration.Test/HttpLogFixture.cs @@ -15,7 +15,7 @@ public void should_log_on_error() config.LogLevel = "Trace"; HostConfig.Put(config); - var logFile = Path.Combine(_runner.AppData, "logs", "sonarr.trace.txt"); + var logFile = Path.Combine(_runner.AppData, "logs", "radarr.trace.txt"); var logLines = File.ReadAllLines(logFile); var result = Series.InvalidPost(new Api.Series.SeriesResource());