New: Deprecate Readarr

frontend/src/Settings/Applications/Applications/AddApplicationItem.js

@@ -1,14 +1,18 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Label from 'Components/Label';
 import Button from 'Components/Link/Button';
 import Link from 'Components/Link/Link';
 import Menu from 'Components/Menu/Menu';
 import MenuContent from 'Components/Menu/MenuContent';
-import { sizes } from 'Helpers/Props';
+import { kinds, sizes } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import AddApplicationPresetMenuItem from './AddApplicationPresetMenuItem';
 import styles from './AddApplicationItem.css';
 
+const DEPRECATED_APPLICATIONS = ['Readarr'];
+const OBSOLETE_APPLICATIONS = [];
+
 class AddApplicationItem extends Component {
 
   //
@@ -36,6 +40,8 @@ class AddApplicationItem extends Component {
     } = this.props;
 
     const hasPresets = !!presets && !!presets.length;
+    const isDeprecated = DEPRECATED_APPLICATIONS.includes(implementation);
+    const isObsolete = OBSOLETE_APPLICATIONS.includes(implementation);
 
     return (
       <div
@@ -49,6 +55,24 @@ class AddApplicationItem extends Component {
         <div className={styles.overlay}>
           <div className={styles.name}>
             {implementationName}
+            {
+              isDeprecated &&
+                <Label
+                  kind={kinds.WARNING}
+                  title={translate('DeprecatedApplicationMessage', { applicationName: implementationName })}
+                >
+                  {translate('Deprecated')}
+                </Label>
+            }
+            {
+              isObsolete &&
+                <Label
+                  kind={kinds.DANGER}
+                  title={translate('ObsoleteApplicationMessage', { applicationName: implementationName })}
+                >
+                  {translate('Obsolete')}
+                </Label>
+            }
           </div>
 
           <div className={styles.actions}>

frontend/src/Settings/Applications/Applications/Application.js

@@ -10,6 +10,9 @@ import translate from 'Utilities/String/translate';
 import EditApplicationModalConnector from './EditApplicationModalConnector';
 import styles from './Application.css';
 
+const DEPRECATED_APPLICATIONS = ['Readarr'];
+const OBSOLETE_APPLICATIONS = [];
+
 class Application extends Component {
 
   //
@@ -61,10 +64,13 @@ class Application extends Component {
       syncLevel,
       fields,
       tags,
-      tagList
+      tagList,
+      implementation
     } = this.props;
 
     const applicationUrl = fields.find((field) => field.name === 'baseUrl')?.value;
+    const isDeprecated = DEPRECATED_APPLICATIONS.includes(implementation);
+    const isObsolete = OBSOLETE_APPLICATIONS.includes(implementation);
 
     return (
       <Card
@@ -88,6 +94,26 @@ class Application extends Component {
           }
         </div>
 
+        {
+          isDeprecated &&
+            <Label
+              kind={kinds.WARNING}
+              title={translate('DeprecatedApplicationMessage', { applicationName: implementation })}
+            >
+              {translate('Deprecated')}
+            </Label>
+        }
+
+        {
+          isObsolete &&
+            <Label
+              kind={kinds.DANGER}
+              title={translate('ObsoleteApplicationMessage', { applicationName: implementation })}
+            >
+              {translate('Obsolete')}
+            </Label>
+        }
+
         {
           syncLevel === 'addOnly' &&
             <Label kind={kinds.WARNING}>
@@ -141,6 +167,7 @@ class Application extends Component {
 Application.propTypes = {
   id: PropTypes.number.isRequired,
   name: PropTypes.string.isRequired,
+  implementation: PropTypes.string.isRequired,
   enable: PropTypes.bool.isRequired,
   syncLevel: PropTypes.string.isRequired,
   fields: PropTypes.arrayOf(PropTypes.object).isRequired,

frontend/src/Settings/Applications/Applications/EditApplicationModalContent.js

@@ -39,6 +39,9 @@ const syncLevelOptions = [
   }
 ];
 
+const DEPRECATED_APPLICATIONS = ['Readarr'];
+const OBSOLETE_APPLICATIONS = [];
+
 function EditApplicationModalContent(props) {
   const {
     advancedSettings,
@@ -60,6 +63,7 @@ function EditApplicationModalContent(props) {
 
   const {
     id,
+    implementation,
     implementationName,
     name,
     syncLevel,
@@ -68,6 +72,9 @@ function EditApplicationModalContent(props) {
     message
   } = item;
 
+  const isDeprecated = DEPRECATED_APPLICATIONS.includes(implementation);
+  const isObsolete = OBSOLETE_APPLICATIONS.includes(implementation);
+
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
@@ -90,6 +97,28 @@ function EditApplicationModalContent(props) {
         {
           !isFetching && !error &&
             <Form {...otherProps}>
+              {
+                isDeprecated &&
+                  <Alert
+                    className={styles.message}
+                    kind={kinds.WARNING}
+                  >
+                    <div>{translate('DeprecatedApplicationTitle', { applicationName: implementationName })}</div>
+                    <div>{translate('DeprecatedApplicationMessage', { applicationName: implementationName })}</div>
+                  </Alert>
+              }
+
+              {
+                isObsolete &&
+                  <Alert
+                    className={styles.message}
+                    kind={kinds.DANGER}
+                  >
+                    <div>{translate('ObsoleteApplicationTitle', { applicationName: implementationName })}</div>
+                    <div>{translate('ObsoleteApplicationMessage', { applicationName: implementationName })}</div>
+                  </Alert>
+              }
+
               {
                 !!message &&
                   <Alert

src/NzbDrone.Common/Composition/AssemblyLoader.cs

@@ -14,6 +14,7 @@ namespace NzbDrone.Common.Composition
         static AssemblyLoader()
         {
             AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(ContainerResolveEventHandler);
+            RegisterSQLiteResolver();
         }
 
         public static IList<Assembly> Load(IList<string> assemblyNames)
@@ -22,10 +23,6 @@ namespace NzbDrone.Common.Composition
             toLoad.Add("Prowlarr.Common");
             toLoad.Add(OsInfo.IsWindows ? "Prowlarr.Windows" : "Prowlarr.Mono");
 
-            var toRegisterResolver = new List<string> { "System.Data.SQLite" };
-            toRegisterResolver.AddRange(assemblyNames.Intersect(new[] { "Prowlarr.Core" }));
-            RegisterNativeResolver(toRegisterResolver);
-
             var startupPath = AppDomain.CurrentDomain.BaseDirectory;
 
             return toLoad
@@ -46,46 +43,27 @@ namespace NzbDrone.Common.Composition
             return AssemblyLoadContext.Default.LoadFromAssemblyPath(assemblyPath);
         }
 
-        public static void RegisterNativeResolver(IEnumerable<string> assemblyNames)
+        public static void RegisterSQLiteResolver()
         {
-            foreach (var name in assemblyNames)
+            // This ensures we look for sqlite3 using libsqlite3.so.0 on Linux and not libsqlite3.so which
-            {
+            // is less likely to exist.
-                // This ensures we look for sqlite3 using libsqlite3.so.0 on Linux and not libsqlite3.so which
+            var sqliteAssembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(
-                // is less likely to exist.
+                Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "System.Data.SQLite.dll"));
-                var assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(
-                    Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"{name}.dll"));
 
-                try
+            try
-                {
+            {
-                    NativeLibrary.SetDllImportResolver(assembly, LoadNativeLib);
+                NativeLibrary.SetDllImportResolver(sqliteAssembly, LoadSqliteNativeLib);
-                }
+            }
-                catch (InvalidOperationException)
+            catch (InvalidOperationException)
-                {
+            {
-                    // This can only be set once per assembly
+                // This can only be set once per assembly
-                    // Catch required for NzbDrone.Host tests
+                // Catch required for NzbDrone.Host tests
-                }
             }
         }
 
-        private static IntPtr LoadNativeLib(string libraryName, Assembly assembly, DllImportSearchPath? dllImportSearchPath)
+        private static IntPtr LoadSqliteNativeLib(string libraryName, Assembly assembly, DllImportSearchPath? dllImportSearchPath)
         {
-            ArgumentException.ThrowIfNullOrWhiteSpace(libraryName);
+            var mappedName = OsInfo.IsLinux && libraryName == "sqlite3" ? "libsqlite3.so.0" : libraryName;
-
-            var mappedName = libraryName;
-
-            if (libraryName is "sqlite3" or "e_sqlite3")
-            {
-                if (OsInfo.IsLinux)
-                {
-                    if (NativeLibrary.TryLoad(libraryName, assembly, dllImportSearchPath, out var libHandle))
-                    {
-                        return libHandle;
-                    }
-
-                    mappedName = "libsqlite3.so.0";
-                }
-            }
-
             return NativeLibrary.Load(mappedName, assembly, dllImportSearchPath);
         }
     }

src/NzbDrone.Core/Applications/Lidarr/LidarrV1Proxy.cs

@@ -159,7 +159,7 @@ namespace NzbDrone.Core.Applications.Lidarr
                     case HttpStatusCode.BadRequest:
                         if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
+                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: https://wiki.servarr.com/prowlarr/faq#prowlarr-will-not-sync-x-indexer-to-app");
                             break;
                         }
 

src/NzbDrone.Core/Applications/Radarr/RadarrV3Proxy.cs

@@ -172,7 +172,7 @@ namespace NzbDrone.Core.Applications.Radarr
                     case HttpStatusCode.BadRequest:
                         if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
+                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: https://wiki.servarr.com/prowlarr/faq#prowlarr-will-not-sync-x-indexer-to-app");
                             break;
                         }
 

src/NzbDrone.Core/Applications/Readarr/Readarr.cs

@@ -14,6 +14,7 @@ using NzbDrone.Core.Indexers;
 
 namespace NzbDrone.Core.Applications.Readarr
 {
+    [Obsolete("Readarr is deprecated and will be removed in a future version")]
     public class Readarr : ApplicationBase<ReadarrSettings>
     {
         public override string Name => "Readarr";

src/NzbDrone.Core/Applications/Readarr/ReadarrV1Proxy.cs

@@ -146,7 +146,7 @@ namespace NzbDrone.Core.Applications.Readarr
                     case HttpStatusCode.BadRequest:
                         if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
+                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: https://wiki.servarr.com/prowlarr/faq#prowlarr-will-not-sync-x-indexer-to-app");
                             break;
                         }
 

src/NzbDrone.Core/Applications/Sonarr/SonarrV3Proxy.cs

@@ -159,7 +159,7 @@ namespace NzbDrone.Core.Applications.Sonarr
                     case HttpStatusCode.BadRequest:
                         if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
+                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: https://wiki.servarr.com/prowlarr/faq#prowlarr-will-not-sync-x-indexer-to-app");
                             break;
                         }
 

src/NzbDrone.Core/Applications/Whisparr/WhisparrV3Proxy.cs

@@ -144,7 +144,7 @@ namespace NzbDrone.Core.Applications.Whisparr
                     case HttpStatusCode.BadRequest:
                         if (ex.Response.Content.Contains("Query successful, but no results in the configured categories were returned from your indexer.", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: Prowlarr will not sync X Indexer to App");
+                            _logger.Warn(ex, "No Results in configured categories. See FAQ Entry: https://wiki.servarr.com/prowlarr/faq#prowlarr-will-not-sync-x-indexer-to-app");
                             break;
                         }
 

src/NzbDrone.Core/Localization/Core/en.json

@@ -538,6 +538,12 @@
   "NotificationsTelegramSettingsIncludeAppName": "Include {appName} in Title",
   "NotificationsTelegramSettingsIncludeAppNameHelpText": "Optionally prefix message title with {appName} to differentiate notifications from different applications",
   "OAuthPopupMessage": "Pop-ups are being blocked by your browser",
+  "Obsolete": "Obsolete",
+  "ObsoleteApplicationMessage": "{applicationName} is obsolete and has been removed",
+  "ObsoleteApplicationTitle": "{applicationName} is Obsolete",
+  "Deprecated": "Deprecated",
+  "DeprecatedApplicationMessage": "{applicationName} is deprecated and will be removed in a future version",
+  "DeprecatedApplicationTitle": "{applicationName} is Deprecated",
   "Ok": "Ok",
   "OnApplicationUpdate": "On Application Update",
   "OnApplicationUpdateHelpText": "On Application Update",

src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs

@@ -51,7 +51,7 @@ namespace NzbDrone.Test.Common.AutoMoq
 
             if (behavior != MockBehavior.Default && mock.Behavior == MockBehavior.Default)
             {
-                throw new InvalidOperationException("Unable to change be behaviour of an existing mock.");
+                throw new InvalidOperationException("Unable to change be behaviour of a an existing mock.");
             }
 
             return mock;
@@ -139,7 +139,7 @@ namespace NzbDrone.Test.Common.AutoMoq
 
             LoadPlatformLibrary();
 
-            AssemblyLoader.RegisterNativeResolver(new[] { "System.Data.SQLite", "Prowlarr.Core" });
+            AssemblyLoader.RegisterSQLiteResolver();
         }
 
         private Mock<T> TheRegisteredMockForThisType<T>(Type type)