Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-09-11 12:02:35 +02:00
Code Issues Releases Wiki Activity

Fixed: Adjust Sonarr references to Radarr (#1977)

Browse Source
This commit is contained in:
James White 2017-08-21 20:48:45 +01:00 committed by Leonardo Galli
parent 685c5daf36
commit 38af8edd59
14 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/NzbDrone.Common/Disk/DiskProviderBase.cs
View File

@ -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);

2
src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs
View File

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

8
src/NzbDrone.Common/Http/HttpProvider.cs
View File

@ -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)
}
}
}
}
}

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

@ -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<IHttpClient>()
.Setup(s => s.Get(It.Is<HttpRequest>(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

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

@ -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<IHttpClient>()
.Setup(s => s.Get(It.Is<HttpRequest>(h => h.Url.ToString() == _downloadUrl)))

4
src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStationSettings.cs
View File

@ -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")]

4
src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs
View File

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

4
src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs
View File

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

6
src/NzbDrone.Core/Indexers/Newznab/NewznabCapabilitiesProvider.cs
View File

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

4
src/NzbDrone.Core/Notifications/Growl/GrowlService.cs
View File

@ -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);

6
src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserService.cs
View File

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

4
src/NzbDrone.Core/Rest/RestClientFactory.cs
View File

@ -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));

6
src/NzbDrone.Core/Validation/RuleBuilderExtensions.cs
View File

@ -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<T, string> ValidRootUrl<T>(this IRuleBuilder<T
public static IRuleBuilderOptions<T, string> ValidUrlBase<T>(this IRuleBuilder<T, string> 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<T, int> ValidPort<T>(this IRuleBuilder<T, int> ruleBuilder)
@ -68,4 +68,4 @@ public static IRuleBuilderOptions<T, TProp> AsWarning<T, TProp>(this IRuleBuilde
return ruleBuilder.WithState(v => NzbDroneValidationState.Warning);
}
}
}
}

2
src/NzbDrone.Integration.Test/HttpLogFixture.cs
View File

@ -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());