From 1268f90f2633d4075c787fa1f25005b585073e50 Mon Sep 17 00:00:00 2001 From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Date: Thu, 17 Dec 2020 16:17:26 -0600 Subject: [PATCH] New: Update all wiki links to point to the Servarr Wiki Fixes: https://github.com/lidarr/Lidarr/issues/1805 https://github.com/lidarr/Lidarr/issues/1803 --- .../Components/FileBrowser/FileBrowserModalContent.js | 2 +- frontend/src/Settings/General/UpdateSettings.js | 4 ++-- .../src/Settings/Indexers/Options/IndexerOptions.js | 2 +- .../Metadata/MetadataProvider/MetadataProvider.js | 4 ++-- .../Notifications/NotificationEventItems.js | 2 +- frontend/src/Settings/Tags/Tags.js | 2 +- .../src/Store/Selectors/createHealthCheckSelector.js | 2 +- frontend/src/System/Status/MoreInfo/MoreInfo.js | 2 +- frontend/src/login.html | 2 +- src/Lidarr.Api.V1/ProviderResource.cs | 3 +-- .../HealthCheck/HealthCheckFixture.cs | 10 +++++----- src/NzbDrone.Core/Datastore/DbFactory.cs | 4 ++-- src/NzbDrone.Core/HealthCheck/HealthCheck.cs | 6 +++--- .../Notifications/CustomScript/CustomScript.cs | 2 +- .../Notifications/Twitter/TwitterSettings.cs | 4 ++-- src/NzbDrone.Core/Notifications/Webhook/Webhook.cs | 2 +- 16 files changed, 26 insertions(+), 27 deletions(-) diff --git a/frontend/src/Components/FileBrowser/FileBrowserModalContent.js b/frontend/src/Components/FileBrowser/FileBrowserModalContent.js index 0df2e5d73..b90339c80 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 8cc94c632..1a8e999ce 100644 --- a/frontend/src/Settings/General/UpdateSettings.js +++ b/frontend/src/Settings/General/UpdateSettings.js @@ -63,7 +63,7 @@ function UpdateSettings(props) { type={inputTypes.TEXT} name="branch" helpText={usingExternalUpdateMechanism ? 'Branch used by external update mechanism' : 'Branch to use to update Lidarr'} - helpLink="https://github.com/Lidarr/Lidarr/wiki/Release-Branches" + helpLink="https://wiki.servarr.com/Lidarr_FAQ#How_do_I_update_my_Lidarr" {...branch} onChange={onInputChange} readOnly={usingExternalUpdateMechanism} @@ -100,7 +100,7 @@ function UpdateSettings(props) { name="updateMechanism" values={updateOptions} helpText="Use Lidarr's built-in updater or a script" - helpLink="https://github.com/Lidarr/Lidarr/wiki/Updating" + helpLink="https://wiki.servarr.com/Lidarr_FAQ#How_do_I_update_my_Lidarr" onChange={onInputChange} {...updateMechanism} /> diff --git a/frontend/src/Settings/Indexers/Options/IndexerOptions.js b/frontend/src/Settings/Indexers/Options/IndexerOptions.js index c0df1bcf6..76a47a427 100644 --- a/frontend/src/Settings/Indexers/Options/IndexerOptions.js +++ b/frontend/src/Settings/Indexers/Options/IndexerOptions.js @@ -88,7 +88,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/Lidarr/Lidarr/wiki/RSS-Sync" + helpLink="https://wiki.servarr.com/Lidarr_FAQ#How_does_Lidarr_work" onChange={onInputChange} {...settings.rssSyncInterval} /> diff --git a/frontend/src/Settings/Metadata/MetadataProvider/MetadataProvider.js b/frontend/src/Settings/Metadata/MetadataProvider/MetadataProvider.js index 423427837..b2c67cc88 100644 --- a/frontend/src/Settings/Metadata/MetadataProvider/MetadataProvider.js +++ b/frontend/src/Settings/Metadata/MetadataProvider/MetadataProvider.js @@ -54,7 +54,7 @@ function MetadataProvider(props) { type={inputTypes.TEXT} name="metadataSource" helpText="Alternative Metadata Source (Leave blank for default)" - helpLink="https://github.com/Lidarr/Lidarr/wiki/Metadata-Source" + helpLink="https://wiki.servarr.com/Lidarr_Settings#Metadata" onChange={onInputChange} {...settings.metadataSource} /> @@ -70,7 +70,7 @@ function MetadataProvider(props) { type={inputTypes.SELECT} name="writeAudioTags" helpTextWarning="Selecting 'All files' will alter existing files when they are imported." - helpLink="https://github.com/Lidarr/Lidarr/wiki/Write-Tags" + helpLink="https://wiki.servarr.com/Lidarr_Settings#Write_Metadata_to_Audio_Files" values={writeAudioTagOptions} onChange={onInputChange} {...settings.writeAudioTags} diff --git a/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js b/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js index 4aba5a27d..b51997fde 100644 --- a/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js +++ b/frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js @@ -39,7 +39,7 @@ function NotificationEventItems(props) {
diff --git a/frontend/src/Settings/Tags/Tags.js b/frontend/src/Settings/Tags/Tags.js index e587de812..523be7b6c 100644 --- a/frontend/src/Settings/Tags/Tags.js +++ b/frontend/src/Settings/Tags/Tags.js @@ -14,7 +14,7 @@ function Tags(props) { if (!items.length) { return ( -
No tags have been added yet. Add tags to link artists with delay profiles, restrictions, or notifications. Click here to find out more about tags in Lidarr.
+
No tags have been added yet. Add tags to link artists with delay profiles, restrictions, or notifications. Click here to find out more about tags in Lidarr.
); } diff --git a/frontend/src/Store/Selectors/createHealthCheckSelector.js b/frontend/src/Store/Selectors/createHealthCheckSelector.js index 682f86288..51689fd74 100644 --- a/frontend/src/Store/Selectors/createHealthCheckSelector.js +++ b/frontend/src/Store/Selectors/createHealthCheckSelector.js @@ -12,7 +12,7 @@ function createHealthCheckSelector() { source: 'UI', type: 'warning', message: 'Could not connect to SignalR, UI won\'t update', - wikiUrl: 'https://github.com/Lidarr/Lidarr/wiki/Health-Checks#could-not-connect-to-signalr' + wikiUrl: 'https://wiki.servarr.com/Lidarr_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 83e7f7069..97c581417 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.lidarr.audio + wiki.lidarr.audio Reddit diff --git a/frontend/src/login.html b/frontend/src/login.html index 2afba6d92..387a554d1 100644 --- a/frontend/src/login.html +++ b/frontend/src/login.html @@ -251,7 +251,7 @@ Forgot your password? diff --git a/src/Lidarr.Api.V1/ProviderResource.cs b/src/Lidarr.Api.V1/ProviderResource.cs index b64d1b031..537962191 100644 --- a/src/Lidarr.Api.V1/ProviderResource.cs +++ b/src/Lidarr.Api.V1/ProviderResource.cs @@ -38,8 +38,7 @@ namespace Lidarr.Api.V1 Tags = definition.Tags, Fields = SchemaBuilder.ToSchema(definition.Settings), - InfoLink = string.Format("https://github.com/Lidarr/Lidarr/wiki/Supported-{0}#{1}", - typeof(TProviderResource).Name.Replace("Resource", "s"), + InfoLink = string.Format("https://wiki.servarr.com/Lidarr_Supported_{0}", definition.Implementation.ToLower()) }; } diff --git a/src/NzbDrone.Core.Test/HealthCheck/HealthCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/HealthCheckFixture.cs index 85e586f5d..2425132b1 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/Lidarr/Lidarr/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 + "Lidarr_System#i_blew_up_because_of_some_weird_user_mistake")] + [TestCase("I blew up because of some weird user mistake", "#my_health_check", WikiRoot + "Lidarr_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 a23b75757..a23d550a1 100644 --- a/src/NzbDrone.Core/Datastore/DbFactory.cs +++ b/src/NzbDrone.Core/Datastore/DbFactory.cs @@ -119,10 +119,10 @@ namespace NzbDrone.Core.Datastore 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/Lidarr_FAQ#I_use_Lidarr_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/Lidarr/Lidarr/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/Lidarr_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 89e0feb80..de42b14fc 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 @@ namespace NzbDrone.Core.HealthCheck 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/Lidarr/Lidarr/wiki/Health-checks") + new HttpUri(fragment); + return new HttpUri("https://wiki.servarr.com/Lidarr_System") + new HttpUri(fragment); } } diff --git a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs index 93ab88195..4ed582295 100644 --- a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs +++ b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs @@ -28,7 +28,7 @@ namespace NzbDrone.Core.Notifications.CustomScript public override string Name => "Custom Script"; - public override string Link => "https://github.com/Lidarr/Lidarr/wiki/Custom-Post-Processing-Scripts"; + public override string Link => "https://wiki.servarr.com/Lidarr_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 2949875cc..962a69afe 100644 --- a/src/NzbDrone.Core/Notifications/Twitter/TwitterSettings.cs +++ b/src/NzbDrone.Core/Notifications/Twitter/TwitterSettings.cs @@ -38,10 +38,10 @@ namespace NzbDrone.Core.Notifications.Twitter AuthorizeNotification = "startOAuth"; } - [FieldDefinition(0, Label = "Consumer Key", Privacy = PrivacyLevel.ApiKey, HelpText = "Consumer key from a Twitter application", HelpLink = "https://github.com/Lidarr/Lidarr/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/Lidarr/Lidarr/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 127f7e153..b2d07a1a3 100644 --- a/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs +++ b/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs @@ -16,7 +16,7 @@ namespace NzbDrone.Core.Notifications.Webhook _proxy = proxy; } - public override string Link => "https://github.com/Lidarr/Lidarr/wiki/Webhook"; + public override string Link => "https://wiki.servarr.com/Lidarr_Settings#Connect"; public override void OnGrab(GrabMessage message) {