New: Set Branch, Update Mech from PackageInfo

frontend/src/Settings/General/GeneralSettings.js

@@ -101,6 +101,7 @@ class GeneralSettings extends Component {
       isWindowsService,
       isDocker,
       mode,
+      packageUpdateMechanism,
       onInputChange,
       onConfirmResetApiKey,
       ...otherProps
@@ -163,6 +164,7 @@ class GeneralSettings extends Component {
                   advancedSettings={advancedSettings}
                   settings={settings}
                   isWindows={isWindows}
+                  packageUpdateMechanism={packageUpdateMechanism}
                   isDocker={isDocker}
                   onInputChange={onInputChange}
                 />
@@ -208,6 +210,7 @@ GeneralSettings.propTypes = {
   isWindowsService: PropTypes.bool.isRequired,
   isDocker: PropTypes.bool.isRequired,
   mode: PropTypes.string.isRequired,
+  packageUpdateMechanism: PropTypes.string.isRequired,
   onInputChange: PropTypes.func.isRequired,
   onConfirmResetApiKey: PropTypes.func.isRequired,
   onConfirmRestart: PropTypes.func.isRequired

frontend/src/Settings/General/GeneralSettingsConnector.js

@@ -28,6 +28,7 @@ function createMapStateToProps() {
         isWindowsService: systemStatus.isWindows && systemStatus.mode === 'service',
         isDocker: systemStatus.isDocker,
         mode: systemStatus.mode,
+        packageUpdateMechanism: systemStatus.packageUpdateMechanism,
         ...sectionSettings
       };
     }

frontend/src/Settings/General/UpdateSettings.js

@@ -1,22 +1,19 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import titleCase from 'Utilities/String/titleCase';
 import { inputTypes, sizes } from 'Helpers/Props';
 import FieldSet from 'Components/FieldSet';
 import FormGroup from 'Components/Form/FormGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import FormInputGroup from 'Components/Form/FormInputGroup';
 
-const branchValues = [
-  'develop',
-  'nightly'
-];
-
 function UpdateSettings(props) {
   const {
     advancedSettings,
     settings,
     isWindows,
     isDocker,
+    packageUpdateMechanism,
     onInputChange
   } = props;
 
@@ -31,10 +28,20 @@ function UpdateSettings(props) {
     return null;
   }
 
-  const updateOptions = [
-    { key: 'builtIn', value: 'Built-In' },
-    { key: 'script', value: 'Script' }
-  ];
+  const usingExternalUpdateMechanism = packageUpdateMechanism !== 'builtIn';
+
+  const updateOptions = [];
+
+  if (usingExternalUpdateMechanism) {
+    updateOptions.push({
+      key: packageUpdateMechanism,
+      value: titleCase(packageUpdateMechanism)
+    });
+  } else {
+    updateOptions.push({ key: 'builtIn', value: 'Built-In' });
+  }
+
+  updateOptions.push({ key: 'script', value: 'Script' });
 
   if (isDocker) {
     return (
@@ -53,13 +60,13 @@ function UpdateSettings(props) {
         <FormLabel>Branch</FormLabel>
 
         <FormInputGroup
-          type={inputTypes.AUTO_COMPLETE}
+          type={inputTypes.TEXT}
           name="branch"
-          helpText="Branch to use to update Lidarr"
+          helpText={usingExternalUpdateMechanism ? 'Branch used by external update mechanism' : 'Branch to use to update Lidarr'}
           helpLink="https://github.com/Lidarr/Lidarr/wiki/Release-Branches"
           {...branch}
-          values={branchValues}
           onChange={onInputChange}
+          readOnly={usingExternalUpdateMechanism}
         />
       </FormGroup>
 
@@ -127,6 +134,7 @@ UpdateSettings.propTypes = {
   settings: PropTypes.object.isRequired,
   isWindows: PropTypes.bool.isRequired,
   isDocker: PropTypes.bool.isRequired,
+  packageUpdateMechanism: PropTypes.string.isRequired,
   onInputChange: PropTypes.func.isRequired
 };
 

frontend/src/System/Status/About/About.js

@@ -15,6 +15,8 @@ class About extends Component {
   render() {
     const {
       version,
+      packageVersion,
+      packageAuthor,
       isNetCore,
       isMono,
       isDocker,
@@ -36,6 +38,14 @@ class About extends Component {
             data={version}
           />
 
+          {
+            packageVersion &&
+              <DescriptionListItem
+                title="Package Version"
+                data={(packageAuthor ? `${packageVersion} by ${packageAuthor}` : packageVersion)}
+              />
+          }
+
           {
             isMono &&
               <DescriptionListItem
@@ -99,6 +109,8 @@ class About extends Component {
 
 About.propTypes = {
   version: PropTypes.string.isRequired,
+  packageVersion: PropTypes.string,
+  packageAuthor: PropTypes.string,
   isNetCore: PropTypes.bool.isRequired,
   isMono: PropTypes.bool.isRequired,
   runtimeVersion: PropTypes.string.isRequired,

frontend/src/System/Updates/Updates.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import PropTypes from 'prop-types';
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import { icons, kinds } from 'Helpers/Props';
 import formatDate from 'Utilities/Date/formatDate';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
@@ -25,6 +25,7 @@ class Updates extends Component {
       error,
       items,
       isInstallingUpdate,
+      updateMechanism,
       isDocker,
       shortDateFormat,
       onInstallLatestPress
@@ -35,6 +36,12 @@ class Updates extends Component {
     const hasUpdateToInstall = hasUpdates && _.some(items, { installable: true, latest: true });
     const noUpdateToInstall = hasUpdates && !hasUpdateToInstall;
 
+    const externalUpdaterMessages = {
+      external: 'Unable to update Lidarr directly, Lidarr is configured to use an external update mechanism',
+      apt: 'Unable to update Lidarr directly, use apt to install the update',
+      docker: 'Unable to update Lidarr directly, update the docker container to receive the update'
+    };
+
     return (
       <PageContent title="Updates">
         <PageContentBodyConnector>
@@ -50,24 +57,29 @@ class Updates extends Component {
 
           {
             hasUpdateToInstall &&
-              <div className={styles.updateAvailable}>
+              <div className={styles.messageContainer}>
                 {
-                  !isDocker &&
-                  <SpinnerButton
-                    className={styles.updateAvailable}
-                    kind={kinds.PRIMARY}
-                    isSpinning={isInstallingUpdate}
-                    onPress={onInstallLatestPress}
-                  >
-                    Install Latest
-                  </SpinnerButton>
-                }
+                  (updateMechanism === 'builtIn' || updateMechanism === 'script') && !isDocker ?
+                    <SpinnerButton
+                      className={styles.updateAvailable}
+                      kind={kinds.PRIMARY}
+                      isSpinning={isInstallingUpdate}
+                      onPress={onInstallLatestPress}
+                    >
+                      Install Latest
+                    </SpinnerButton> :
 
-                {
-                  isDocker &&
-                    <div className={styles.upToDateMessage}>
-                      An update is available.  Please update your Docker image and re-create the container.
-                    </div>
+                    <Fragment>
+                      <Icon
+                        name={icons.WARNING}
+                        kind={kinds.WARNING}
+                        size={30}
+                      />
+
+                      <div className={styles.message}>
+                        {externalUpdaterMessages[updateMechanism] || externalUpdaterMessages.external}
+                      </div>
+                    </Fragment>
                 }
 
                 {
@@ -188,6 +200,7 @@ Updates.propTypes = {
   items: PropTypes.array.isRequired,
   isInstallingUpdate: PropTypes.bool.isRequired,
   isDocker: PropTypes.bool.isRequired,
+  updateMechanism: PropTypes.string,
   shortDateFormat: PropTypes.string.isRequired,
   onInstallLatestPress: PropTypes.func.isRequired
 };