New: Newznab/Torznab categories dropdown with indexer provided category names

frontend/src/Components/Form/DeviceInputConnector.js

@@ -2,13 +2,13 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { clearOptions, fetchOptions } from 'Store/Actions/providerOptionActions';
+import { clearOptions, defaultState, fetchOptions } from 'Store/Actions/providerOptionActions';
 import DeviceInput from './DeviceInput';
 
 function createMapStateToProps() {
   return createSelector(
     (state, { value }) => value,
-    (state) => state.providerOptions,
+    (state) => state.providerOptions.devices || defaultState,
     (value, devices) => {
 
       return {
@@ -51,7 +51,7 @@ class DeviceInputConnector extends Component {
   }
 
   componentWillUnmount = () => {
-    this.props.dispatchClearOptions();
+    this.props.dispatchClearOptions({ section: 'devices' });
   }
 
   //
@@ -65,6 +65,7 @@ class DeviceInputConnector extends Component {
     } = this.props;
 
     dispatchFetchOptions({
+      section: 'devices',
       action: 'getDevices',
       provider,
       providerData

frontend/src/Components/Form/EnhancedSelectInput.css

@@ -66,3 +66,8 @@
   border-radius: 4px;
   background-color: $white;
 }
+
+.loading {
+  display: inline-block;
+  margin: 5px -5px 5px 0;
+}

frontend/src/Components/Form/EnhancedSelectInput.js

@@ -5,6 +5,7 @@ import React, { Component } from 'react';
 import { Manager, Popper, Reference } from 'react-popper';
 import Icon from 'Components/Icon';
 import Link from 'Components/Link/Link';
+import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import Measure from 'Components/Measure';
 import Modal from 'Components/Modal/Modal';
 import ModalBody from 'Components/Modal/ModalBody';
@@ -250,6 +251,10 @@ class EnhancedSelectInput extends Component {
       this._addListener();
     }
 
+    if (!this.state.isOpen && this.props.onOpen) {
+      this.props.onOpen();
+    }
+
     this.setState({ isOpen: !this.state.isOpen });
   }
 
@@ -295,6 +300,7 @@ class EnhancedSelectInput extends Component {
       value,
       values,
       isDisabled,
+      isFetching,
       hasError,
       hasWarning,
       valueOptions,
@@ -355,9 +361,21 @@ class EnhancedSelectInput extends Component {
                         styles.dropdownArrowContainer
                       }
                     >
-                      <Icon
+
-                        name={icons.CARET_DOWN}
+                      {
-                      />
+                        isFetching &&
+                          <LoadingIndicator
+                            className={styles.loading}
+                            size={20}
+                          />
+                      }
+
+                      {
+                        !isFetching &&
+                          <Icon
+                            name={icons.CARET_DOWN}
+                          />
+                      }
                     </div>
                   </Link>
                 </Measure>
@@ -483,12 +501,14 @@ EnhancedSelectInput.propTypes = {
   value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.arrayOf(PropTypes.number)]).isRequired,
   values: PropTypes.arrayOf(PropTypes.object).isRequired,
   isDisabled: PropTypes.bool.isRequired,
+  isFetching: PropTypes.bool.isRequired,
   hasError: PropTypes.bool,
   hasWarning: PropTypes.bool,
   valueOptions: PropTypes.object.isRequired,
   selectedValueOptions: PropTypes.object.isRequired,
   selectedValueComponent: PropTypes.oneOfType([PropTypes.string, PropTypes.func]).isRequired,
   optionComponent: PropTypes.elementType,
+  onOpen: PropTypes.func,
   onChange: PropTypes.func.isRequired
 };
 
@@ -496,6 +516,7 @@ EnhancedSelectInput.defaultProps = {
   className: styles.enhancedSelect,
   disabledClassName: styles.isDisabled,
   isDisabled: false,
+  isFetching: false,
   valueOptions: {},
   selectedValueOptions: {},
   selectedValueComponent: HintedSelectInputSelectedValue,

frontend/src/Components/Form/EnhancedSelectInputConnector.js

@@ -0,0 +1,159 @@
+import _ from 'lodash';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { clearOptions, defaultState, fetchOptions } from 'Store/Actions/providerOptionActions';
+import EnhancedSelectInput from './EnhancedSelectInput';
+
+const importantFieldNames = [
+  'baseUrl',
+  'apiPath',
+  'apiKey'
+];
+
+function getProviderDataKey(providerData) {
+  if (!providerData || !providerData.fields) {
+    return null;
+  }
+
+  const fields = providerData.fields
+    .filter((f) => importantFieldNames.includes(f.name))
+    .map((f) => f.value);
+
+  return fields;
+}
+
+function getSelectOptions(items) {
+  if (!items) {
+    return [];
+  }
+
+  return items.map((option) => {
+    return {
+      key: option.value,
+      value: option.name,
+      hint: option.hint,
+      parentKey: option.parentValue
+    };
+  });
+}
+
+function createMapStateToProps() {
+  return createSelector(
+    (state, { selectOptionsProviderAction }) => state.providerOptions[selectOptionsProviderAction] || defaultState,
+    (options) => {
+      if (options) {
+        return {
+          isFetching: options.isFetching,
+          values: getSelectOptions(options.items)
+        };
+      }
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  dispatchFetchOptions: fetchOptions,
+  dispatchClearOptions: clearOptions
+};
+
+class EnhancedSelectInputConnector extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      refetchRequired: false
+    };
+  }
+
+  componentDidMount = () => {
+    this._populate();
+  }
+
+  componentDidUpdate = (prevProps) => {
+    const prevKey = getProviderDataKey(prevProps.providerData);
+    const nextKey = getProviderDataKey(this.props.providerData);
+
+    if (!_.isEqual(prevKey, nextKey)) {
+      this.setState({ refetchRequired: true });
+    }
+  }
+
+  componentWillUnmount = () => {
+    this._cleanup();
+  }
+
+  //
+  // Listeners
+
+  onOpen = () => {
+    if (this.state.refetchRequired) {
+      this._populate();
+    }
+  }
+
+  //
+  // Control
+
+  _populate() {
+    const {
+      provider,
+      providerData,
+      selectOptionsProviderAction,
+      dispatchFetchOptions
+    } = this.props;
+
+    if (selectOptionsProviderAction) {
+      this.setState({ refetchRequired: false });
+      dispatchFetchOptions({
+        section: selectOptionsProviderAction,
+        action: selectOptionsProviderAction,
+        provider,
+        providerData
+      });
+    }
+  }
+
+  _cleanup() {
+    const {
+      selectOptionsProviderAction,
+      dispatchClearOptions
+    } = this.props;
+
+    if (selectOptionsProviderAction) {
+      dispatchClearOptions({ section: selectOptionsProviderAction });
+    }
+  }
+
+  //
+  // Render
+
+  render() {
+    return (
+      <EnhancedSelectInput
+        {...this.props}
+        onOpen={this.onOpen}
+      />
+    );
+  }
+}
+
+EnhancedSelectInputConnector.propTypes = {
+  provider: PropTypes.string.isRequired,
+  providerData: PropTypes.object.isRequired,
+  name: PropTypes.string.isRequired,
+  value: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])).isRequired,
+  values: PropTypes.arrayOf(PropTypes.object).isRequired,
+  selectOptionsProviderAction: PropTypes.string,
+  onChange: PropTypes.func.isRequired,
+  isFetching: PropTypes.bool.isRequired,
+  dispatchFetchOptions: PropTypes.func.isRequired,
+  dispatchClearOptions: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(EnhancedSelectInputConnector);

frontend/src/Components/Form/EnhancedSelectInputOption.css

@@ -13,12 +13,14 @@
 
 .optionCheck {
   composes: container from '~./CheckInput.css';
+
   flex: 0 0 0;
 }
 
 .optionCheckInput {
   composes: input from '~./CheckInput.css';
-  margin-top: 0px;
+
+  margin-top: 0;
 }
 
 .isSelected {

frontend/src/Components/Form/EnhancedSelectInputOption.js

@@ -32,6 +32,7 @@ class EnhancedSelectInputOption extends Component {
     const {
       className,
       id,
+      depth,
       isSelected,
       isDisabled,
       isHidden,
@@ -54,6 +55,11 @@ class EnhancedSelectInputOption extends Component {
         onPress={this.onPress}
       >
 
+        {
+          depth !== 0 &&
+            <div style={{ width: `${depth * 20}px` }} />
+        }
+
         {
           isMultiSelect &&
             <CheckInput
@@ -84,6 +90,7 @@ class EnhancedSelectInputOption extends Component {
 EnhancedSelectInputOption.propTypes = {
   className: PropTypes.string.isRequired,
   id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+  depth: PropTypes.number.isRequired,
   isSelected: PropTypes.bool.isRequired,
   isDisabled: PropTypes.bool.isRequired,
   isHidden: PropTypes.bool.isRequired,
@@ -95,6 +102,7 @@ EnhancedSelectInputOption.propTypes = {
 
 EnhancedSelectInputOption.defaultProps = {
   className: styles.option,
+  depth: 0,
   isDisabled: false,
   isHidden: false,
   isMultiSelect: false

frontend/src/Components/Form/FormInputGroup.js

@@ -8,6 +8,7 @@ import CaptchaInputConnector from './CaptchaInputConnector';
 import CheckInput from './CheckInput';
 import DeviceInputConnector from './DeviceInputConnector';
 import EnhancedSelectInput from './EnhancedSelectInput';
+import EnhancedSelectInputConnector from './EnhancedSelectInputConnector';
 import FormInputHelpText from './FormInputHelpText';
 import IndexerSelectInputConnector from './IndexerSelectInputConnector';
 import KeyValueListInput from './KeyValueListInput';
@@ -79,6 +80,9 @@ function getComponent(type) {
     case inputTypes.SELECT:
       return EnhancedSelectInput;
 
+    case inputTypes.DYNAMIC_SELECT:
+      return EnhancedSelectInputConnector;
+
     case inputTypes.SERIES_TYPE_SELECT:
       return SeriesTypeSelectInput;
 

frontend/src/Components/Form/HintedSelectInputOption.js

@@ -9,6 +9,7 @@ function HintedSelectInputOption(props) {
     id,
     value,
     hint,
+    depth,
     isSelected,
     isDisabled,
     isMultiSelect,
@@ -19,6 +20,7 @@ function HintedSelectInputOption(props) {
   return (
     <EnhancedSelectInputOption
       id={id}
+      depth={depth}
       isSelected={isSelected}
       isDisabled={isDisabled}
       isHidden={isDisabled}
@@ -48,6 +50,7 @@ HintedSelectInputOption.propTypes = {
   id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
   value: PropTypes.string.isRequired,
   hint: PropTypes.node,
+  depth: PropTypes.number,
   isSelected: PropTypes.bool.isRequired,
   isDisabled: PropTypes.bool.isRequired,
   isMultiSelect: PropTypes.bool.isRequired,

frontend/src/Components/Form/ProviderFieldFormGroup.js

@@ -6,7 +6,7 @@ import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import { inputTypes } from 'Helpers/Props';
 
-function getType(type, value) {
+function getType({ type, selectOptionsProviderAction }) {
   switch (type) {
     case 'captcha':
       return inputTypes.CAPTCHA;
@@ -25,6 +25,9 @@ function getType(type, value) {
     case 'filePath':
       return inputTypes.PATH;
     case 'select':
+      if (selectOptionsProviderAction) {
+        return inputTypes.DYNAMIC_SELECT;
+      }
       return inputTypes.SELECT;
     case 'tag':
       return inputTypes.TEXT_TAG;
@@ -87,7 +90,7 @@ function ProviderFieldFormGroup(props) {
       <FormLabel>{label}</FormLabel>
 
       <FormInputGroup
-        type={getType(type, value)}
+        type={getType(props)}
         name={name}
         label={label}
         helpText={helpText}
@@ -107,7 +110,8 @@ function ProviderFieldFormGroup(props) {
 
 const selectOptionsShape = {
   name: PropTypes.string.isRequired,
-  value: PropTypes.number.isRequired
+  value: PropTypes.number.isRequired,
+  hint: PropTypes.string
 };
 
 ProviderFieldFormGroup.propTypes = {
@@ -124,6 +128,7 @@ ProviderFieldFormGroup.propTypes = {
   errors: PropTypes.arrayOf(PropTypes.object).isRequired,
   warnings: PropTypes.arrayOf(PropTypes.object).isRequired,
   selectOptions: PropTypes.arrayOf(PropTypes.shape(selectOptionsShape)),
+  selectOptionsProviderAction: PropTypes.string,
   onChange: PropTypes.func.isRequired
 };
 

frontend/src/Helpers/Props/inputTypes.js

@@ -16,6 +16,7 @@ export const INDEXER_SELECT = 'indexerSelect';
 export const ROOT_FOLDER_SELECT = 'rootFolderSelect';
 export const SELECT = 'select';
 export const SERIES_TYPE_SELECT = 'artistTypeSelect';
+export const DYNAMIC_SELECT = 'dynamicSelect';
 export const TAG = 'tag';
 export const TEXT = 'text';
 export const TEXT_TAG = 'textTag';
@@ -38,6 +39,7 @@ export const all = [
   INDEXER_SELECT,
   ROOT_FOLDER_SELECT,
   SELECT,
+  DYNAMIC_SELECT,
   SERIES_TYPE_SELECT,
   TAG,
   TEXT,

frontend/src/Store/Actions/providerOptionActions.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { createAction } from 'redux-actions';
 import { createThunk, handleThunks } from 'Store/thunks';
 import requestAction from 'Utilities/requestAction';
@@ -10,6 +11,9 @@ import createHandleActions from './Creators/createHandleActions';
 
 export const section = 'providerOptions';
 
+const lastActions = {};
+let lastActionId = 0;
+
 //
 // State
 
@@ -23,8 +27,8 @@ export const defaultState = {
 //
 // Actions Types
 
-export const FETCH_OPTIONS = 'devices/fetchOptions';
+export const FETCH_OPTIONS = 'providers/fetchOptions';
-export const CLEAR_OPTIONS = 'devices/clearOptions';
+export const CLEAR_OPTIONS = 'providers/clearOptions';
 
 //
 // Action Creators
@@ -38,30 +42,55 @@ export const clearOptions = createAction(CLEAR_OPTIONS);
 export const actionHandlers = handleThunks({
 
   [FETCH_OPTIONS]: function(getState, payload, dispatch) {
+    const subsection = `${section}.${payload.section}`;
+
+    if (lastActions[payload.section] && _.isEqual(payload, lastActions[payload.section].payload)) {
+      return;
+    }
+
+    const actionId = ++lastActionId;
+
+    lastActions[payload.section] = {
+      actionId,
+      payload
+    };
+
     dispatch(set({
-      section,
+      section: subsection,
       isFetching: true
     }));
 
     const promise = requestAction(payload);
 
     promise.done((data) => {
-      dispatch(set({
+      if (lastActions[payload.section]) {
-        section,
+        if (lastActions[payload.section].actionId === actionId) {
-        isFetching: false,
+          lastActions[payload.section] = null;
-        isPopulated: true,
+        }
-        error: null,
+
-        items: data.options || []
+        dispatch(set({
-      }));
+          section: subsection,
+          isFetching: false,
+          isPopulated: true,
+          error: null,
+          items: data.options || []
+        }));
+      }
     });
 
     promise.fail((xhr) => {
-      dispatch(set({
+      if (lastActions[payload.section]) {
-        section,
+        if (lastActions[payload.section].actionId === actionId) {
-        isFetching: false,
+          lastActions[payload.section] = null;
-        isPopulated: false,
+        }
-        error: xhr
+
-      }));
+        dispatch(set({
+          section: subsection,
+          isFetching: false,
+          isPopulated: false,
+          error: xhr
+        }));
+      }
     });
   }
 });
@@ -71,8 +100,12 @@ export const actionHandlers = handleThunks({
 
 export const reducers = createHandleActions({
 
-  [CLEAR_OPTIONS]: function(state) {
+  [CLEAR_OPTIONS]: function(state, { payload }) {
-    return updateSectionState(state, section, defaultState);
+    const subsection = `${section}.${payload.section}`;
+
+    lastActions[payload.section] = null;
+
+    return updateSectionState(state, subsection, defaultState);
   }
 
-}, defaultState, section);
+}, {}, section);

src/Lidarr.Api.V1/ProviderModuleBase.cs

@@ -27,7 +27,7 @@ namespace Lidarr.Api.V1
             Get("schema", x => GetTemplates());
             Post("test", x => Test(ReadResourceFromRequest(true)));
             Post("testall", x => TestAll());
-            Post("action/{action}", x => RequestAction(x.action, ReadResourceFromRequest(true)));
+            Post("action/{action}", x => RequestAction(x.action, ReadResourceFromRequest(true, true)));
 
             GetResourceAll = GetAll;
             GetResourceById = GetProviderById;

src/Lidarr.Http/ClientSchema/Field.cs

@@ -14,6 +14,7 @@ namespace Lidarr.Http.ClientSchema
         public string Type { get; set; }
         public bool Advanced { get; set; }
         public List<SelectOption> SelectOptions { get; set; }
+        public string SelectOptionsProviderAction { get; set; }
         public string Section { get; set; }
         public string Hidden { get; set; }
 

src/Lidarr.Http/ClientSchema/SchemaBuilder.cs

@@ -104,7 +104,14 @@ namespace Lidarr.Http.ClientSchema
 
                     if (fieldAttribute.Type == FieldType.Select)
                     {
-                        field.SelectOptions = GetSelectOptions(fieldAttribute.SelectOptions);
+                        if (fieldAttribute.SelectOptionsProviderAction.IsNotNullOrWhiteSpace())
+                        {
+                            field.SelectOptionsProviderAction = fieldAttribute.SelectOptionsProviderAction;
+                        }
+                        else
+                        {
+                            field.SelectOptions = GetSelectOptions(fieldAttribute.SelectOptions);
+                        }
                     }
 
                     if (fieldAttribute.Hidden != HiddenType.Visible)

src/Lidarr.Http/REST/RestModule.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using FluentValidation;
+using FluentValidation.Results;
 using Lidarr.Http.Extensions;
 using Nancy;
 using Nancy.Responses.Negotiation;
@@ -224,7 +225,7 @@ namespace Lidarr.Http.REST
             return Negotiate.WithModel(model).WithStatusCode(statusCode);
         }
 
-        protected TResource ReadResourceFromRequest(bool skipValidate = false)
+        protected TResource ReadResourceFromRequest(bool skipValidate = false, bool skipSharedValidate = false)
         {
             var resource = new TResource();
 
@@ -242,7 +243,12 @@ namespace Lidarr.Http.REST
                 throw new BadRequestException("Request body can't be empty");
             }
 
-            var errors = SharedValidator.Validate(resource).Errors.ToList();
+            var errors = new List<ValidationFailure>();
+
+            if (!skipSharedValidate)
+            {
+                errors.AddRange(SharedValidator.Validate(resource).Errors);
+            }
 
             if (Request.Method.Equals("POST", StringComparison.InvariantCultureIgnoreCase) && !skipValidate && !Request.Url.Path.EndsWith("/test", StringComparison.InvariantCultureIgnoreCase))
             {

src/NzbDrone.Core/Annotations/FieldDefinitionAttribute.cs

@@ -19,6 +19,7 @@ namespace NzbDrone.Core.Annotations
         public FieldType Type { get; set; }
         public bool Advanced { get; set; }
         public Type SelectOptions { get; set; }
+        public string SelectOptionsProviderAction { get; set; }
         public string Section { get; set; }
         public HiddenType Hidden { get; set; }
         public PrivacyLevel Privacy { get; set; }
@@ -38,6 +39,15 @@ namespace NzbDrone.Core.Annotations
         public string Hint { get; set; }
     }
 
+    public class FieldSelectOption
+    {
+        public int Value { get; set; }
+        public string Name { get; set; }
+        public int Order { get; set; }
+        public string Hint { get; set; }
+        public int? ParentValue { get; set; }
+    }
+
     public enum FieldType
     {
         Textbox,

src/NzbDrone.Core/Indexers/HttpIndexerBase.cs

@@ -294,7 +294,14 @@ namespace NzbDrone.Core.Indexers
             {
                 var parser = GetParser();
                 var generator = GetRequestGenerator();
-                var releases = FetchPage(generator.GetRecentRequests().GetAllTiers().First().First(), parser);
+                var firstRequest = generator.GetRecentRequests().GetAllTiers().FirstOrDefault()?.FirstOrDefault();
+
+                if (firstRequest == null)
+                {
+                    return new ValidationFailure(string.Empty, "No rss feed query available. This may be an issue with the indexer or your indexer category settings.");
+                }
+
+                var releases = FetchPage(firstRequest, parser);
 
                 if (releases.Empty())
                 {

src/NzbDrone.Core/Indexers/Newznab/Newznab.cs

@@ -138,5 +138,31 @@ namespace NzbDrone.Core.Indexers.Newznab
                 return new ValidationFailure(string.Empty, "Unable to connect to indexer, check the log for more details");
             }
         }
+
+        public override object RequestAction(string action, IDictionary<string, string> query)
+        {
+            if (action == "newznabCategories")
+            {
+                List<NewznabCategory> categories = null;
+                try
+                {
+                    if (Settings.BaseUrl.IsNotNullOrWhiteSpace() && Settings.ApiPath.IsNotNullOrWhiteSpace())
+                    {
+                        categories = _capabilitiesProvider.GetCapabilities(Settings).Categories;
+                    }
+                }
+                catch
+                {
+                    // Use default categories
+                }
+
+                return new
+                {
+                    options = NewznabCategoryFieldOptionsConverter.GetFieldSelectOptions(categories)
+                };
+            }
+
+            return base.RequestAction(action, query);
+        }
     }
 }

src/NzbDrone.Core/Indexers/Newznab/NewznabCapabilitiesProvider.cs

@@ -48,6 +48,7 @@ namespace NzbDrone.Core.Indexers.Newznab
             }
 
             var request = new HttpRequest(url, HttpAccept.Rss);
+            request.AllowAutoRedirect = true;
 
             HttpResponse response;
 

src/NzbDrone.Core/Indexers/Newznab/NewznabCategoryFieldOptionsConverter.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NzbDrone.Core.Annotations;
+
+namespace NzbDrone.Core.Indexers.Newznab
+{
+    public static class NewznabCategoryFieldOptionsConverter
+    {
+        public static List<FieldSelectOption> GetFieldSelectOptions(List<NewznabCategory> categories)
+        {
+            // Ignore categories not relevant for Lidarr
+            var ignoreCategories = new[] { 0, 1000, 2000, 4000, 5000, 6000, 7000 };
+
+            var result = new List<FieldSelectOption>();
+
+            if (categories == null)
+            {
+                // Fetching categories failed, use default Newznab categories
+                categories = new List<NewznabCategory>();
+                categories.Add(new NewznabCategory
+                {
+                    Id = 3000,
+                    Name = "Music",
+                    Subcategories = new List<NewznabCategory>
+                    {
+                        new NewznabCategory { Id = 3040, Name = "Loseless" },
+                        new NewznabCategory { Id = 3010, Name = "MP3" },
+                        new NewznabCategory { Id = 3050, Name = "Other" },
+                        new NewznabCategory { Id = 3030, Name = "Audiobook" }
+                    }
+                });
+            }
+
+            foreach (var category in categories)
+            {
+                if (ignoreCategories.Contains(category.Id))
+                {
+                    continue;
+                }
+
+                result.Add(new FieldSelectOption
+                {
+                    Value = category.Id,
+                    Name = category.Name,
+                    Hint = $"({category.Id})"
+                });
+
+                if (category.Subcategories != null)
+                {
+                    foreach (var subcat in category.Subcategories)
+                    {
+                        result.Add(new FieldSelectOption
+                        {
+                            Value = subcat.Id,
+                            Name = subcat.Name,
+                            Hint = $"({subcat.Id})",
+                            ParentValue = category.Id
+                        });
+                    }
+                }
+            }
+
+            result.Sort((l, r) => l.Value.CompareTo(r.Value));
+
+            return result;
+        }
+    }
+}

src/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs

@@ -58,7 +58,7 @@ namespace NzbDrone.Core.Indexers.Newznab
         public NewznabSettings()
         {
             ApiPath = "/api";
-            Categories = new[] { 3000, 3010, 3020, 3030, 3040 };
+            Categories = new[] { 3000, 3010, 3030, 3040 };
         }
 
         [FieldDefinition(0, Label = "URL")]
@@ -70,7 +70,7 @@ namespace NzbDrone.Core.Indexers.Newznab
         [FieldDefinition(2, Label = "API Key", Privacy = PrivacyLevel.ApiKey)]
         public string ApiKey { get; set; }
 
-        [FieldDefinition(3, Label = "Categories", HelpText = "Comma Separated list, leave blank to disable standard/daily shows", Advanced = true)]
+        [FieldDefinition(3, Label = "Categories", Type = FieldType.Select, SelectOptionsProviderAction = "newznabCategories", HelpText = "Comma Separated list")]
         public IEnumerable<int> Categories { get; set; }
 
         [FieldDefinition(4, Type = FieldType.Number, Label = "Early Download Limit", HelpText = "Time before release date Lidarr will download from this indexer, empty is no limit", Unit = "days", Advanced = true)]

src/NzbDrone.Core/Indexers/Torznab/Torznab.cs

@@ -106,5 +106,28 @@ namespace NzbDrone.Core.Indexers.Torznab
                 return new ValidationFailure(string.Empty, "Unable to connect to indexer, check the log for more details");
             }
         }
+
+        public override object RequestAction(string action, IDictionary<string, string> query)
+        {
+            if (action == "newznabCategories")
+            {
+                List<NewznabCategory> categories = null;
+                try
+                {
+                    categories = _capabilitiesProvider.GetCapabilities(Settings).Categories;
+                }
+                catch
+                {
+                    // Use default categories
+                }
+
+                return new
+                {
+                    options = NewznabCategoryFieldOptionsConverter.GetFieldSelectOptions(categories)
+                };
+            }
+
+            return base.RequestAction(action, query);
+        }
     }
 }