From bb721272ca1ef4336fcc159563a33794345a185b Mon Sep 17 00:00:00 2001 From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Date: Thu, 12 Nov 2020 16:54:27 -0600 Subject: [PATCH] New: All Wiki links now use the consolidated Servarr wiki --- frontend/src/AddMovie/AddNewMovie/AddNewMovie.js | 2 +- .../Components/FileBrowser/FileBrowserModalContent.js | 4 +++- .../Specifications/AddSpecificationModalContent.js | 2 +- frontend/src/Settings/General/UpdateSettings.js | 4 ++-- .../src/Settings/Indexers/Options/IndexerOptions.js | 4 ++-- .../Notifications/NotificationEventItems.js | 4 ++-- .../src/Store/Selectors/createHealthCheckSelector.js | 5 +++-- frontend/src/System/Status/MoreInfo/MoreInfo.js | 2 +- frontend/src/login.html | 2 +- src/NzbDrone.Api/ProviderModuleBase.cs | 4 ++-- .../HealthCheck/HealthCheckFixture.cs | 10 +++++----- .../Specifications/CustomFormatSpecificationBase.cs | 2 +- .../Specifications/EditionSpecification.cs | 2 +- .../Specifications/ReleaseTitleSpecification.cs | 2 +- src/NzbDrone.Core/Datastore/DbFactory.cs | 4 ++-- src/NzbDrone.Core/HealthCheck/HealthCheck.cs | 6 +++--- .../Indexers/AwesomeHD/AwesomeHDSettings.cs | 2 +- .../Indexers/FileList/FileListSettings.cs | 2 +- src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs | 2 +- .../Indexers/IPTorrents/IPTorrentsSettings.cs | 2 +- src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs | 2 +- .../Indexers/PassThePopcorn/PassThePopcornParser.cs | 2 +- .../Indexers/PassThePopcorn/PassThePopcornSettings.cs | 2 +- src/NzbDrone.Core/Indexers/Rarbg/RarbgSettings.cs | 2 +- .../Indexers/TorrentRss/TorrentRssIndexerSettings.cs | 2 +- src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs | 2 +- src/NzbDrone.Core/Localization/Core/en.json | 5 ++++- .../Notifications/CustomScript/CustomScript.cs | 2 +- .../Notifications/Twitter/TwitterSettings.cs | 4 ++-- src/NzbDrone.Core/Notifications/Webhook/Webhook.cs | 2 +- src/Radarr.Api.V3/ProviderResource.cs | 4 ++-- src/Radarr.Api.V3/swagger.json | 6 +++--- 32 files changed, 54 insertions(+), 48 deletions(-) diff --git a/frontend/src/AddMovie/AddNewMovie/AddNewMovie.js b/frontend/src/AddMovie/AddNewMovie/AddNewMovie.js index 8156dc869..470dd0d3e 100644 --- a/frontend/src/AddMovie/AddNewMovie/AddNewMovie.js +++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovie.js @@ -159,7 +159,7 @@ class AddNewMovie extends Component { {translate('YouCanAlsoSearch')}
- + {translate('CantFindMovie')}
diff --git a/frontend/src/Components/FileBrowser/FileBrowserModalContent.js b/frontend/src/Components/FileBrowser/FileBrowserModalContent.js index 75aae2891..593ad10ec 100644 --- a/frontend/src/Components/FileBrowser/FileBrowserModalContent.js +++ b/frontend/src/Components/FileBrowser/FileBrowserModalContent.js @@ -129,7 +129,9 @@ class FileBrowserModalContent extends Component { className={styles.mappedDrivesWarning} kind={kinds.WARNING} > - Mapped network drives are not available when running as a Windows Service, see the FAQ for more information. + + {translate('MappedDrivesRunningAsService')} + . } diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.js b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.js index 21bd0ddd9..3fb1ac6ce 100644 --- a/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.js +++ b/frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.js @@ -57,7 +57,7 @@ class AddSpecificationModalContent extends Component {
{translate('VisitGithubCustomFormatsAphrodite')} - GitHub + {translate('Wiki')}
diff --git a/frontend/src/Settings/General/UpdateSettings.js b/frontend/src/Settings/General/UpdateSettings.js index 2c62dc4ae..73ee78265 100644 --- a/frontend/src/Settings/General/UpdateSettings.js +++ b/frontend/src/Settings/General/UpdateSettings.js @@ -55,7 +55,7 @@ function UpdateSettings(props) { type={inputTypes.TEXT} name="branch" helpText={usingExternalUpdateMechanism ? translate('BranchUpdateMechanism') : translate('BranchUpdate')} - helpLink="https://github.com/Radarr/Radarr/wiki/Release-Branches" + helpLink="https://wiki.servarr.com/Radarr_Settings#Updates" {...branch} onChange={onInputChange} readOnly={usingExternalUpdateMechanism} @@ -92,7 +92,7 @@ function UpdateSettings(props) { name="updateMechanism" values={updateOptions} helpText={translate('UpdateMechanismHelpText')} - helpLink="https://github.com/Radarr/Radarr/wiki/Updating" + helpLink="https://wiki.servarr.com/Radarr_Settings#Updates" onChange={onInputChange} {...updateMechanism} /> diff --git a/frontend/src/Settings/Indexers/Options/IndexerOptions.js b/frontend/src/Settings/Indexers/Options/IndexerOptions.js index e6139bc14..3e7cce58a 100644 --- a/frontend/src/Settings/Indexers/Options/IndexerOptions.js +++ b/frontend/src/Settings/Indexers/Options/IndexerOptions.js @@ -85,7 +85,7 @@ function IndexerOptions(props) { type={inputTypes.CHECK} name="preferIndexerFlags" helpText={translate('PreferIndexerFlagsHelpText')} - helpLink="https://github.com/Radarr/Radarr/wiki/Indexer-Flags" + helpLink="https://wiki.servarr.com/Definitions#Indexer_Flags" onChange={onInputChange} {...settings.preferIndexerFlags} /> @@ -118,7 +118,7 @@ function IndexerOptions(props) { unit="minutes" helpText={translate('HelpText')} helpTextWarning={translate('RSSSyncIntervalHelpTextWarning')} - helpLink="https://github.com/Radarr/Radarr/wiki/RSS-Sync" + helpLink="https://wiki.servarr.com/Radarr_FAQ#How_does_Radarr_work" onChange={onInputChange} {...settings.rssSyncInterval} /> diff --git a/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js b/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js index ad3f9290a..16c8bc18c 100644 --- a/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js +++ b/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js @@ -35,8 +35,8 @@ function NotificationEventItems(props) { {translate('NotificationTriggers')}
diff --git a/frontend/src/Store/Selectors/createHealthCheckSelector.js b/frontend/src/Store/Selectors/createHealthCheckSelector.js index 1cb74558b..46fbb9b9e 100644 --- a/frontend/src/Store/Selectors/createHealthCheckSelector.js +++ b/frontend/src/Store/Selectors/createHealthCheckSelector.js @@ -1,4 +1,5 @@ import { createSelector } from 'reselect'; +import translate from 'Utilities/String/translate'; function createHealthCheckSelector() { return createSelector( @@ -11,8 +12,8 @@ function createHealthCheckSelector() { items.push({ source: 'UI', type: 'warning', - message: 'Could not connect to SignalR, UI won\'t update', - wikiUrl: 'https://github.com/Radarr/Radarr/wiki/Health-Checks#could-not-connect-to-signalr' + message: translate('CouldNotConnectSignalR'), + wikiUrl: 'https://wiki.servarr.com/Radarr_System#Could_not_connect_to_signalR' }); } diff --git a/frontend/src/System/Status/MoreInfo/MoreInfo.js b/frontend/src/System/Status/MoreInfo/MoreInfo.js index 45429eb29..dab211718 100644 --- a/frontend/src/System/Status/MoreInfo/MoreInfo.js +++ b/frontend/src/System/Status/MoreInfo/MoreInfo.js @@ -27,7 +27,7 @@ class MoreInfo extends Component { Wiki - github.com/Radarr/Radarr/wiki + wiki.servarr.com/Radarr Donations diff --git a/frontend/src/login.html b/frontend/src/login.html index ae68d07cc..c8b099359 100644 --- a/frontend/src/login.html +++ b/frontend/src/login.html @@ -251,7 +251,7 @@ Forgot your password? diff --git a/src/NzbDrone.Api/ProviderModuleBase.cs b/src/NzbDrone.Api/ProviderModuleBase.cs index 4af04ccf4..c57273ff8 100644 --- a/src/NzbDrone.Api/ProviderModuleBase.cs +++ b/src/NzbDrone.Api/ProviderModuleBase.cs @@ -119,8 +119,8 @@ protected virtual void MapToResource(TProviderResource resource, TProviderDefini resource.Fields = SchemaBuilder.ToSchema(definition.Settings); - resource.InfoLink = string.Format("https://github.com/Radarr/Radarr/wiki/Supported-{0}#{1}", - typeof(TProviderResource).Name.Replace("Resource", "s"), + //Radarr_Supported_{0} are custom build redirect pages; if passing a new var, create a new redirect + resource.InfoLink = string.Format("https://wiki.servarr.com/Radarr_Supported_{0}", definition.Implementation.ToLower()); } diff --git a/src/NzbDrone.Core.Test/HealthCheck/HealthCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/HealthCheckFixture.cs index 1055e2244..82e16cbdc 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/HealthCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/HealthCheckFixture.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.HealthCheck; using NzbDrone.Core.Test.Framework; @@ -8,11 +8,11 @@ namespace NzbDrone.Core.Test.HealthCheck [TestFixture] public class HealthCheckFixture : CoreTest { - private const string WikiRoot = "https://github.com/Radarr/Radarr/wiki/"; + private const string WikiRoot = "https://wiki.servarr.com/"; - [TestCase("I blew up because of some weird user mistake", null, WikiRoot + "Health-checks#i-blew-up-because-of-some-weird-user-mistake")] - [TestCase("I blew up because of some weird user mistake", "#my-health-check", WikiRoot + "Health-checks#my-health-check")] - [TestCase("I blew up because of some weird user mistake", "Custom-Page#my-health-check", WikiRoot + "Custom-Page#my-health-check")] + [TestCase("I blew up because of some weird user mistake", null, WikiRoot + "Radarr_System#i_blew_up_because_of_some_weird_user_mistake")] + [TestCase("I blew up because of some weird user mistake", "#my_health_check", WikiRoot + "Radarr_System#my_health_check")] + [TestCase("I blew up because of some weird user mistake", "Custom-Page#my_health_check", WikiRoot + "Custom-Page#my_health_check")] public void should_format_wiki_url(string message, string wikiFragment, string expectedUrl) { var subject = new NzbDrone.Core.HealthCheck.HealthCheck(typeof(HealthCheckBase), HealthCheckResult.Warning, message, wikiFragment); diff --git a/src/NzbDrone.Core/CustomFormats/Specifications/CustomFormatSpecificationBase.cs b/src/NzbDrone.Core/CustomFormats/Specifications/CustomFormatSpecificationBase.cs index 0ecfa514b..8f79b07b3 100644 --- a/src/NzbDrone.Core/CustomFormats/Specifications/CustomFormatSpecificationBase.cs +++ b/src/NzbDrone.Core/CustomFormats/Specifications/CustomFormatSpecificationBase.cs @@ -7,7 +7,7 @@ public abstract class CustomFormatSpecificationBase : ICustomFormatSpecification public abstract int Order { get; } public abstract string ImplementationName { get; } - public virtual string InfoLink => "https://github.com/Radarr/Radarr/wiki/Custom-Formats-Aphrodite"; + public virtual string InfoLink => "https://wiki.servarr.com/Radarr_Settings#Custom_Formats_2"; public string Name { get; set; } public bool Negate { get; set; } diff --git a/src/NzbDrone.Core/CustomFormats/Specifications/EditionSpecification.cs b/src/NzbDrone.Core/CustomFormats/Specifications/EditionSpecification.cs index e9210d30f..71f9fe947 100644 --- a/src/NzbDrone.Core/CustomFormats/Specifications/EditionSpecification.cs +++ b/src/NzbDrone.Core/CustomFormats/Specifications/EditionSpecification.cs @@ -6,7 +6,7 @@ public class EditionSpecification : RegexSpecificationBase { public override int Order => 2; public override string ImplementationName => "Edition"; - public override string InfoLink => "https://github.com/Radarr/Radarr/wiki/Custom-Formats-Aphrodite#edition"; + public override string InfoLink => "https://wiki.servarr.com/Radarr_Settings#Custom_Formats_2"; protected override bool IsSatisfiedByWithoutNegate(ParsedMovieInfo movieInfo) { diff --git a/src/NzbDrone.Core/CustomFormats/Specifications/ReleaseTitleSpecification.cs b/src/NzbDrone.Core/CustomFormats/Specifications/ReleaseTitleSpecification.cs index e8177a97b..81ab09cb5 100644 --- a/src/NzbDrone.Core/CustomFormats/Specifications/ReleaseTitleSpecification.cs +++ b/src/NzbDrone.Core/CustomFormats/Specifications/ReleaseTitleSpecification.cs @@ -8,7 +8,7 @@ public class ReleaseTitleSpecification : RegexSpecificationBase { public override int Order => 1; public override string ImplementationName => "Release Title"; - public override string InfoLink => "https://github.com/Radarr/Radarr/wiki/Custom-Formats-Aphrodite#release-title"; + public override string InfoLink => "https://wiki.servarr.com/Radarr_Settings#Custom_Formats_2"; protected override bool IsSatisfiedByWithoutNegate(ParsedMovieInfo movieInfo) { diff --git a/src/NzbDrone.Core/Datastore/DbFactory.cs b/src/NzbDrone.Core/Datastore/DbFactory.cs index 9f1d2da53..7917767af 100644 --- a/src/NzbDrone.Core/Datastore/DbFactory.cs +++ b/src/NzbDrone.Core/Datastore/DbFactory.cs @@ -120,10 +120,10 @@ private void CreateMain(string connectionString, MigrationContext migrationConte if (OsInfo.IsOsx) { - throw new CorruptDatabaseException("Database file: {0} is corrupt, restore from backup if available. See: https://github.com/Radarr/Radarr/wiki/FAQ#i-use-radarr-on-a-mac-and-it-suddenly-stopped-working-what-happened", e, fileName); + throw new CorruptDatabaseException("Database file: {0} is corrupt, restore from backup if available. See: https://wiki.servarr.com/Radarr_FAQ#I_use_Radarr_on_a_Mac_and_it_suddenly_stopped_working_What_happened", e, fileName); } - throw new CorruptDatabaseException("Database file: {0} is corrupt, restore from backup if available. See: https://github.com/Radarr/Radarr/wiki/FAQ#i-am-getting-an-error-database-disk-image-is-malformed", e, fileName); + throw new CorruptDatabaseException("Database file: {0} is corrupt, restore from backup if available. See: https://wiki.servarr.com/Radarr_FAQ#I_am_getting_an_error_Database_disk_image_is_malformed", e, fileName); } catch (Exception e) { diff --git a/src/NzbDrone.Core/HealthCheck/HealthCheck.cs b/src/NzbDrone.Core/HealthCheck/HealthCheck.cs index c410878be..ba3303e37 100644 --- a/src/NzbDrone.Core/HealthCheck/HealthCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/HealthCheck.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Text.RegularExpressions; using NzbDrone.Common.Http; using NzbDrone.Core.Datastore; @@ -34,12 +34,12 @@ public HealthCheck(Type source, HealthCheckResult type, string message, string w private static string MakeWikiFragment(string message) { - return "#" + CleanFragmentRegex.Replace(message.ToLower(), string.Empty).Replace(' ', '-'); + return "#" + CleanFragmentRegex.Replace(message.ToLower(), string.Empty).Replace(' ', '_'); } private static HttpUri MakeWikiUrl(string fragment) { - return new HttpUri("https://github.com/Radarr/Radarr/wiki/Health-checks") + new HttpUri(fragment); + return new HttpUri("https://wiki.servarr.com/Radarr_System#") + new HttpUri(fragment); } } diff --git a/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs b/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs index 1b7969f7e..fc7af6f94 100644 --- a/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs +++ b/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs @@ -42,7 +42,7 @@ public AwesomeHDSettings() [FieldDefinition(3, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)] public int MinimumSeeders { get; set; } - [FieldDefinition(4, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://github.com/Radarr/Radarr/wiki/Indexer-Flags#1-required-flags", Advanced = true)] + [FieldDefinition(4, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/Definitions#Indexer_Flags", Advanced = true)] public IEnumerable RequiredFlags { get; set; } [FieldDefinition(5)] diff --git a/src/NzbDrone.Core/Indexers/FileList/FileListSettings.cs b/src/NzbDrone.Core/Indexers/FileList/FileListSettings.cs index 9178518b2..ca1ba5453 100644 --- a/src/NzbDrone.Core/Indexers/FileList/FileListSettings.cs +++ b/src/NzbDrone.Core/Indexers/FileList/FileListSettings.cs @@ -57,7 +57,7 @@ public FileListSettings() [FieldDefinition(5, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)] public int MinimumSeeders { get; set; } - [FieldDefinition(6, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://github.com/Radarr/Radarr/wiki/Indexer-Flags#1-required-flags", Advanced = true)] + [FieldDefinition(6, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/Definitions#Indexer_Flags", Advanced = true)] public IEnumerable RequiredFlags { get; set; } [FieldDefinition(7)] diff --git a/src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs b/src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs index 81c32b68d..cbde09778 100644 --- a/src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs +++ b/src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs @@ -58,7 +58,7 @@ public HDBitsSettings() [FieldDefinition(7, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)] public int MinimumSeeders { get; set; } - [FieldDefinition(8, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://github.com/Radarr/Radarr/wiki/Indexer-Flags#1-required-flags", Advanced = true)] + [FieldDefinition(8, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/Definitions#Indexer_Flags", Advanced = true)] public IEnumerable RequiredFlags { get; set; } [FieldDefinition(9)] diff --git a/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrentsSettings.cs b/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrentsSettings.cs index 72b5e0f77..4c9d4e70e 100644 --- a/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrentsSettings.cs +++ b/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrentsSettings.cs @@ -46,7 +46,7 @@ public IPTorrentsSettings() [FieldDefinition(2, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)] public int MinimumSeeders { get; set; } - [FieldDefinition(3, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://github.com/Radarr/Radarr/wiki/Indexer-Flags#1-required-flags", Advanced = true)] + [FieldDefinition(3, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/Definitions#Indexer_Flags", Advanced = true)] public IEnumerable RequiredFlags { get; set; } [FieldDefinition(4)] diff --git a/src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs b/src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs index 751b30431..84f80aa6c 100644 --- a/src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs +++ b/src/NzbDrone.Core/Indexers/Nyaa/NyaaSettings.cs @@ -44,7 +44,7 @@ public NyaaSettings() [FieldDefinition(3, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)] public int MinimumSeeders { get; set; } - [FieldDefinition(4, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://github.com/Radarr/Radarr/wiki/Indexer-Flags#1-required-flags", Advanced = true)] + [FieldDefinition(4, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/Definitions#Indexer_Flags", Advanced = true)] public IEnumerable RequiredFlags { get; set; } [FieldDefinition(5)] diff --git a/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornParser.cs b/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornParser.cs index d675d8fd3..ac3e9372e 100644 --- a/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornParser.cs +++ b/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornParser.cs @@ -114,7 +114,7 @@ public IList ParseResponse(IndexerResponse indexerResponse) $"Leechers: {torrent.Leechers}" + $"ReleaseName: {torrent.ReleaseName}" + $"ID: {torrent.Id}" + - "}. Please immediately report this info on https://github.com/Radarr/Radarr/issues/1584."); + "}. Please immediately report this info on https://github.com/Radarr/Radarr/issues/new?assignees=&labels=bug&template=bug_report.md&title=Encountered%20Exception%20Parsing%20%20PTP%20Torrent."); throw; } } diff --git a/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornSettings.cs b/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornSettings.cs index 921b2164a..66163519c 100644 --- a/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornSettings.cs +++ b/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornSettings.cs @@ -49,7 +49,7 @@ public PassThePopcornSettings() [FieldDefinition(5)] public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings(); - [FieldDefinition(6, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://github.com/Radarr/Radarr/wiki/Indexer-Flags#1-required-flags", Advanced = true)] + [FieldDefinition(6, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/Definitions#Indexer_Flags", Advanced = true)] public IEnumerable RequiredFlags { get; set; } public NzbDroneValidationResult Validate() diff --git a/src/NzbDrone.Core/Indexers/Rarbg/RarbgSettings.cs b/src/NzbDrone.Core/Indexers/Rarbg/RarbgSettings.cs index 5bf5fbc34..f7ae26cf9 100644 --- a/src/NzbDrone.Core/Indexers/Rarbg/RarbgSettings.cs +++ b/src/NzbDrone.Core/Indexers/Rarbg/RarbgSettings.cs @@ -48,7 +48,7 @@ public RarbgSettings() [FieldDefinition(4, Type = FieldType.Number, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)] public int MinimumSeeders { get; set; } - [FieldDefinition(5, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://github.com/Radarr/Radarr/wiki/Indexer-Flags#1-required-flags", Advanced = true)] + [FieldDefinition(5, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/Definitions#Indexer_Flags", Advanced = true)] public IEnumerable RequiredFlags { get; set; } [FieldDefinition(6, Type = FieldType.Textbox, Label = "Categories", HelpText = "Comma Separated list, you can retrieve the ID by checking the URL behind the category on the website (i.e. Movie/x264/1080 = 44)", HelpLink = "https://rarbgmirror.org/torrents.php?category=movies", Advanced = true)] diff --git a/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssIndexerSettings.cs b/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssIndexerSettings.cs index d2a8bbeb6..8f30a00a9 100644 --- a/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssIndexerSettings.cs +++ b/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssIndexerSettings.cs @@ -48,7 +48,7 @@ public TorrentRssIndexerSettings() [FieldDefinition(5)] public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings(); - [FieldDefinition(6, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://github.com/Radarr/Radarr/wiki/Indexer-Flags#1-required-flags", Advanced = true)] + [FieldDefinition(6, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/Definitions#Indexer_Flags", Advanced = true)] public IEnumerable RequiredFlags { get; set; } public NzbDroneValidationResult Validate() diff --git a/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs b/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs index 2fd55cd2e..b289f38e5 100644 --- a/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs +++ b/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs @@ -65,7 +65,7 @@ public TorznabSettings() [FieldDefinition(9)] public SeedCriteriaSettings SeedCriteria { get; set; } = new SeedCriteriaSettings(); - [FieldDefinition(10, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://github.com/Radarr/Radarr/wiki/Indexer-Flags#1-required-flags", Advanced = true)] + [FieldDefinition(10, Type = FieldType.TagSelect, SelectOptions = typeof(IndexerFlags), Label = "Required Flags", HelpText = "What indexer flags are required?", HelpLink = "https://wiki.servarr.com/Definitions#Indexer_Flags", Advanced = true)] public IEnumerable RequiredFlags { get; set; } public override NzbDroneValidationResult Validate() diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index c5f85635f..c558fcf92 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -125,6 +125,7 @@ "CopyToClipboard": "Copy to Clipboard", "CopyUsingHardlinksHelpText": "Use Hardlinks when trying to copy files from torrents that are still being seeded", "CopyUsingHardlinksHelpTextWarning": "Occasionally, file locks may prevent renaming files that are being seeded. You may temporarily disable seeding and use Radarr's rename function as a work around.", + "CouldNotConnectSignalR": "Could not connect to SignalR, UI won't update", "CouldNotFindResults": "Couldn't find any results for '{0}'", "CreateEmptyMovieFolders": "Create empty movie folders", "CreateEmptyMovieFoldersHelpText": "Create missing movie folders during disk scan", @@ -387,6 +388,7 @@ "MaintenanceRelease": "Maintenance release", "Manual": "Manual", "ManualImport": "Manual Import", + "MappedDrivesRunningAsService": "Mapped network drives are not available when running as a Windows Service. Please see the FAQ for more information", "MarkAsFailed": "Mark as Failed", "MarkAsFailedMessageText": "Are you sure you want to mark '{0}' as failed?", "MassMovieSearch": "Mass Movie Search", @@ -483,6 +485,7 @@ "NoMinimumForAnyRuntime": "No minimum for any runtime", "NoTagsHaveBeenAddedYet": "No tags have been added yet", "NotAvailable": "Not Available", + "NotifcationTriggersHelpText": "Select which events should trigger this notification", "NotificationTriggers": "Notification Triggers", "NotMonitored": "Not Monitored", "NoUpdatesAreAvailable": "No updates are available", @@ -841,7 +844,7 @@ "Version": "Version", "VideoCodec": "Video Codec", "View": "View", - "VisitGithubCustomFormatsAphrodite": "Visit Github for more details: ", + "VisitGithubCustomFormatsAphrodite": "Visit the wiki for more details: ", "WaitingToImport": "Waiting to Import", "WaitingToProcess": "Waiting to Process", "Wanted": "Wanted", diff --git a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs index 039b31c7d..4b01dd760 100755 --- a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs +++ b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs @@ -29,7 +29,7 @@ public CustomScript(IDiskProvider diskProvider, IProcessProvider processProvider public override string Name => "Custom Script"; - public override string Link => "https://github.com/Radarr/Radarr/wiki/Custom-Post-Processing-Scripts"; + public override string Link => "https://wiki.servarr.com/Radarr_Settings#Connections"; public override ProviderMessage Message => new ProviderMessage("Testing will execute the script with the EventType set to Test, ensure your script handles this correctly", ProviderMessageType.Warning); diff --git a/src/NzbDrone.Core/Notifications/Twitter/TwitterSettings.cs b/src/NzbDrone.Core/Notifications/Twitter/TwitterSettings.cs index 02f32405b..962a69afe 100644 --- a/src/NzbDrone.Core/Notifications/Twitter/TwitterSettings.cs +++ b/src/NzbDrone.Core/Notifications/Twitter/TwitterSettings.cs @@ -38,10 +38,10 @@ public TwitterSettings() AuthorizeNotification = "startOAuth"; } - [FieldDefinition(0, Label = "Consumer Key", Privacy = PrivacyLevel.ApiKey, HelpText = "Consumer key from a Twitter application", HelpLink = "https://github.com/Radarr/Radarr/wiki/Twitter-Notifications")] + [FieldDefinition(0, Label = "Consumer Key", Privacy = PrivacyLevel.ApiKey, HelpText = "Consumer key from a Twitter application", HelpLink = "https://wiki.servarr.com/Useful_Tools#Twitter_Connect")] public string ConsumerKey { get; set; } - [FieldDefinition(1, Label = "Consumer Secret", Privacy = PrivacyLevel.ApiKey, HelpText = "Consumer secret from a Twitter application", HelpLink = "https://github.com/Radarr/Radarr/wiki/Twitter-Notifications")] + [FieldDefinition(1, Label = "Consumer Secret", Privacy = PrivacyLevel.ApiKey, HelpText = "Consumer secret from a Twitter application", HelpLink = "https://wiki.servarr.com/Useful_Tools#Twitter_Connect")] public string ConsumerSecret { get; set; } [FieldDefinition(2, Label = "Access Token", Privacy = PrivacyLevel.ApiKey, Advanced = true)] diff --git a/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs b/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs index db9e862b9..adc6cf925 100755 --- a/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs +++ b/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs @@ -17,7 +17,7 @@ public Webhook(IWebhookProxy proxy) _proxy = proxy; } - public override string Link => "https://github.com/Radarr/Radarr/wiki/Webhook"; + public override string Link => "https://wiki.servarr.com/Radarr_Settings#Connect"; public override void OnGrab(GrabMessage message) { diff --git a/src/Radarr.Api.V3/ProviderResource.cs b/src/Radarr.Api.V3/ProviderResource.cs index 376d8b5ae..8aff55c1d 100644 --- a/src/Radarr.Api.V3/ProviderResource.cs +++ b/src/Radarr.Api.V3/ProviderResource.cs @@ -38,8 +38,8 @@ public virtual TProviderResource ToResource(TProviderDefinition definition) Tags = definition.Tags, Fields = SchemaBuilder.ToSchema(definition.Settings), - InfoLink = string.Format("https://github.com/Radarr/Radarr/wiki/Supported-{0}#{1}", - typeof(TProviderResource).Name.Replace("Resource", "s"), + //Radarr_Supported_{0} are custom build redirect pages; if passing a new var, create a new redirect + InfoLink = string.Format("https://wiki.servarr.com/Radarr_Supported_{0}", definition.Implementation.ToLower()) }; } diff --git a/src/Radarr.Api.V3/swagger.json b/src/Radarr.Api.V3/swagger.json index f1e288928..010f8177b 100644 --- a/src/Radarr.Api.V3/swagger.json +++ b/src/Radarr.Api.V3/swagger.json @@ -742,13 +742,13 @@ "source": "ImportMechanismCheck", "type": "warning", "message": "Enable Completed Download Handling", - "wikiUrl": "https://github.com/Radarr/Radarr/wiki/Health-checks#enable-completed-download-handling" + "wikiUrl": "https://wiki.servarr.com/Radarr_System#Completed.2FFailed_Download_Handling" }, { "source": "DownloadClientCheck", "type": "error", "message": "Unable to communicate with qBittorrent. Failed to connect to qBittorrent, check your settings.", - "wikiUrl": "https://github.com/Radarr/Radarr/wiki/Health-checks#unable-to-communicate-with-download-client" + "wikiUrl": "https://wiki.servarr.com/Radarr_System#Download_Clients" } ] } @@ -1333,7 +1333,7 @@ "implementationName": "IMDb Lists", "implementation": "IMDbListImport", "configContract": "IMDbListSettings", - "infoLink": "https://github.com/Radarr/Radarr/wiki/Supported-ImportLists#imdblistimport", + "infoLink": "https://wiki.servarr.com/Radarr_Settings#Lists", "tags": [ 2 ],