From e733529dc3e0c2fe9fbed86dbee6c295627d44f5 Mon Sep 17 00:00:00 2001 From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Date: Sun, 13 Dec 2020 13:07:12 -0600 Subject: [PATCH] All Wiki links now use the consolidated Servarr wiki --- frontend/src/AddSeries/AddNewSeries/AddNewSeries.js | 2 +- .../Components/FileBrowser/FileBrowserModalContent.js | 2 +- frontend/src/Settings/General/UpdateSettings.js | 4 ++-- frontend/src/Settings/Indexers/Options/IndexerOptions.js | 2 +- frontend/src/System/Status/MoreInfo/MoreInfo.js | 2 +- frontend/src/login.html | 2 +- src/NzbDrone.Api/ProviderModuleBase.cs | 3 +-- src/NzbDrone.Core.Test/HealthCheck/HealthCheckFixture.cs | 9 ++++----- src/NzbDrone.Core/Datastore/DbFactory.cs | 4 ++-- src/NzbDrone.Core/HealthCheck/HealthCheck.cs | 2 +- .../Notifications/CustomScript/CustomScript.cs | 2 +- .../Notifications/Twitter/TwitterSettings.cs | 4 ++-- src/NzbDrone.Core/Notifications/Webhook/Webhook.cs | 2 +- src/Sonarr.Api.V3/ProviderResource.cs | 2 +- 14 files changed, 20 insertions(+), 22 deletions(-) diff --git a/frontend/src/AddSeries/AddNewSeries/AddNewSeries.js b/frontend/src/AddSeries/AddNewSeries/AddNewSeries.js index 71a826ef9..c819ed99a 100644 --- a/frontend/src/AddSeries/AddNewSeries/AddNewSeries.js +++ b/frontend/src/AddSeries/AddNewSeries/AddNewSeries.js @@ -154,7 +154,7 @@ class AddNewSeries extends Component {
Couldn't find any results for '{term}'
You can also search using TVDB ID of a show. eg. tvdb:71663
- + Why can't I find my show?
diff --git a/frontend/src/Components/FileBrowser/FileBrowserModalContent.js b/frontend/src/Components/FileBrowser/FileBrowserModalContent.js index a2efeb746..f77fcbdc1 100644 --- a/frontend/src/Components/FileBrowser/FileBrowserModalContent.js +++ b/frontend/src/Components/FileBrowser/FileBrowserModalContent.js @@ -128,7 +128,7 @@ 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. + Mapped network drives are not available when running as a Windows Service, see the FAQ for more information. } diff --git a/frontend/src/Settings/General/UpdateSettings.js b/frontend/src/Settings/General/UpdateSettings.js index 377845ad2..aa4586a18 100644 --- a/frontend/src/Settings/General/UpdateSettings.js +++ b/frontend/src/Settings/General/UpdateSettings.js @@ -59,7 +59,7 @@ function UpdateSettings(props) { type={inputTypes.AUTO_COMPLETE} name="branch" helpText={usingExternalUpdateMechanism ? 'Branch used by external update mechanism' : 'Branch to use to update Sonarr'} - helpLink="https://github.com/Sonarr/Sonarr/wiki/Release-Branches" + helpLink="https://wiki.servarr.com/Sonarr_Settings#Updates" {...branch} values={branchValues} onChange={onInputChange} @@ -97,7 +97,7 @@ function UpdateSettings(props) { name="updateMechanism" values={updateOptions} helpText="Use Sonarr's built-in updater or a script" - helpLink="https://github.com/Sonarr/Sonarr/wiki/Updating" + helpLink="https://wiki.servarr.com/Sonarr_Settings#Updates" onChange={onInputChange} {...updateMechanism} /> diff --git a/frontend/src/Settings/Indexers/Options/IndexerOptions.js b/frontend/src/Settings/Indexers/Options/IndexerOptions.js index 30e2c39bc..d4f45a6a4 100644 --- a/frontend/src/Settings/Indexers/Options/IndexerOptions.js +++ b/frontend/src/Settings/Indexers/Options/IndexerOptions.js @@ -89,7 +89,7 @@ function IndexerOptions(props) { unit="minutes" helpText="Interval in minutes. Set to zero to disable (this will stop all automatic release grabbing)" helpTextWarning="This will apply to all indexers, please follow the rules set forth by them" - helpLink="https://github.com/Sonarr/Sonarr/wiki/RSS-Sync" + helpLink="https://wiki.servarr.com/Sonarr_FAQ#How_does_Sonarr_find_episodes" onChange={onInputChange} {...settings.rssSyncInterval} /> diff --git a/frontend/src/System/Status/MoreInfo/MoreInfo.js b/frontend/src/System/Status/MoreInfo/MoreInfo.js index 9eda435e0..694353f63 100644 --- a/frontend/src/System/Status/MoreInfo/MoreInfo.js +++ b/frontend/src/System/Status/MoreInfo/MoreInfo.js @@ -21,7 +21,7 @@ class MoreInfo extends Component { Wiki - wiki.sonarr.tv + wiki.servarr.com/Sonarr Forums diff --git a/frontend/src/login.html b/frontend/src/login.html index cf778fb49..c73d6da53 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 e6cebb4d8..2c9a43def 100644 --- a/src/NzbDrone.Api/ProviderModuleBase.cs +++ b/src/NzbDrone.Api/ProviderModuleBase.cs @@ -119,8 +119,7 @@ protected virtual void MapToResource(TProviderResource resource, TProviderDefini resource.Fields = SchemaBuilder.ToSchema(definition.Settings); - resource.InfoLink = string.Format("https://github.com/Sonarr/Sonarr/wiki/Supported-{0}#{1}", - typeof(TProviderResource).Name.Replace("Resource", "s"), + resource.InfoLink = string.Format("https://wiki.servarr.com/Sonarr_Supported_{0}", definition.Implementation.ToLower()); } diff --git a/src/NzbDrone.Core.Test/HealthCheck/HealthCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/HealthCheckFixture.cs index 7eea94951..03f724b32 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/HealthCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/HealthCheckFixture.cs @@ -8,11 +8,10 @@ namespace NzbDrone.Core.Test.HealthCheck [TestFixture] public class HealthCheckFixture : CoreTest { - private const string WikiRoot = "https://github.com/Sonarr/Sonarr/wiki/"; - - [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")] + private const string WikiRoot = "https://wiki.servarr.com/Sonarr"; + [TestCase("I blew up because of some weird user mistake", null, WikiRoot + "Sonarr_System#i_blew_up_because_of_some_weird_user_mistake")] + [TestCase("I blew up because of some weird user mistake", "#my_health_check", WikiRoot + "Sonarr_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/Datastore/DbFactory.cs b/src/NzbDrone.Core/Datastore/DbFactory.cs index dcb168fce..51ab979e3 100644 --- a/src/NzbDrone.Core/Datastore/DbFactory.cs +++ b/src/NzbDrone.Core/Datastore/DbFactory.cs @@ -122,10 +122,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/Sonarr/Sonarr/wiki/FAQ#i-use-sonarr-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/Sonarr_FAQ#I_use_Sonarr_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/Sonarr/Sonarr/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/Sonarr_FAQ#I_am_getting_an_error_Database_disk_image_is_malformed", e, fileName); } } diff --git a/src/NzbDrone.Core/HealthCheck/HealthCheck.cs b/src/NzbDrone.Core/HealthCheck/HealthCheck.cs index 24edb2ed4..c8df4b52b 100644 --- a/src/NzbDrone.Core/HealthCheck/HealthCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/HealthCheck.cs @@ -39,7 +39,7 @@ private static string MakeWikiFragment(string message) private static HttpUri MakeWikiUrl(string fragment) { - return new HttpUri("https://github.com/Sonarr/Sonarr/wiki/Health-checks") + new HttpUri(fragment); + return new HttpUri("https://wiki.servarr.com/Sonarr_System") + new HttpUri(fragment); } } diff --git a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs index e6995794d..32e3e8b34 100644 --- a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs +++ b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs @@ -30,7 +30,7 @@ public CustomScript(IDiskProvider diskProvider, IProcessProvider processProvider public override string Name => "Custom Script"; - public override string Link => "https://github.com/Sonarr/Sonarr/wiki/Custom-Post-Processing-Scripts"; + public override string Link => "https://wiki.servarr.com/Sonarr_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 eac4f9693..0a0400132 100644 --- a/src/NzbDrone.Core/Notifications/Twitter/TwitterSettings.cs +++ b/src/NzbDrone.Core/Notifications/Twitter/TwitterSettings.cs @@ -37,10 +37,10 @@ public TwitterSettings() AuthorizeNotification = "startOAuth"; } - [FieldDefinition(0, Label = "Consumer Key", Privacy = PrivacyLevel.ApiKey, HelpText = "Consumer key from a Twitter application", HelpLink = "https://github.com/Sonarr/Sonarr/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/Sonarr/Sonarr/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 6ae6973d6..bc6226be6 100644 --- 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/Sonarr/Sonarr/wiki/Webhook"; + public override string Link => "https://wiki.servarr.com/Sonarr_Settings#Connections"; public override void OnGrab(GrabMessage message) { diff --git a/src/Sonarr.Api.V3/ProviderResource.cs b/src/Sonarr.Api.V3/ProviderResource.cs index db239cecd..59fd16d9f 100644 --- a/src/Sonarr.Api.V3/ProviderResource.cs +++ b/src/Sonarr.Api.V3/ProviderResource.cs @@ -39,7 +39,7 @@ public virtual TProviderResource ToResource(TProviderDefinition definition) Tags = definition.Tags, Fields = SchemaBuilder.ToSchema(definition.Settings), - InfoLink = string.Format("https://github.com/Sonarr/Sonarr/wiki/Supported-{0}#{1}", + InfoLink = string.Format("https://wiki.servarr.com/Sonarr_Supported_{0}", typeof(TProviderResource).Name.Replace("Resource", "s"), definition.Implementation.ToLower()) };