Overseerr Custom Categories

darkalfx · Oct 12, 2021 · 4b03415 · 4b03415
1 parent 805d240
commit 4b03415
Show file tree

Hide file tree

Showing 50 changed files with 2,916 additions and 503 deletions.
diff --git a/Requestrr.WebApi/ClientApp/package-lock.json b/Requestrr.WebApi/ClientApp/package-lock.json
diff --git a/Requestrr.WebApi/ClientApp/package.json b/Requestrr.WebApi/ClientApp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Requestrr",
-  "version": "2.0.5",
+  "version": "2.1.0",
   "description": "Requestrr is a server designed to faciliate the request of media through chat applications.",
   "main": "index.js",
   "author": "Darkalfx",

diff --git a/.../components/DownloadClients/Overseerr.jsx → ...ients/Overseerr/Movies/OverseerrMovie.jsx b/.../components/DownloadClients/Overseerr.jsx → ...ients/Overseerr/Movies/OverseerrMovie.jsx
@@ -2,10 +2,11 @@ import React from "react";
 import Loader from 'react-loader-spinner'
 import { connect } from 'react-redux';
 import { Alert } from "reactstrap";
-import { testOverseerrSettings } from "../../store/actions/MovieClientsActions"
-import ValidatedTextbox from "../Inputs/ValidatedTextbox"
-import Textbox from "../Inputs/Textbox"
-import Dropdown from "../Inputs/Dropdown"
+import { testOverseerrMovieSettings } from "../../../../store/actions/OverseerrClientRadarrActions"
+import { setOverseerrMovieConnectionSettings } from "../../../../store/actions/OverseerrClientRadarrActions"
+import ValidatedTextbox from "../../../Inputs/ValidatedTextbox"
+import Dropdown from "../../../Inputs/Dropdown"
+import OverseerrMovieCategoryList from "./OverseerrMovieCategoryList"
 
 import {
   FormGroup,
@@ -14,7 +15,7 @@ import {
   Col
 } from "reactstrap";
 
-class Overseerr extends React.Component {
+class OverseerrMovie extends React.Component {
   constructor(props) {
     super(props);
 
@@ -49,6 +50,10 @@ class Overseerr extends React.Component {
     this.updateStateFromProps(this.props);
   }
 
+  componentDidUpdate(prevProps) {
+    this.onValidate();
+  }
+
   updateStateFromProps = props => {
     this.setState({
       isTestingSettings: false,
@@ -66,7 +71,8 @@ class Overseerr extends React.Component {
       isDefaultApiUserIDValid: true,
       useSSL: props.settings.useSSL,
       apiVersion: props.settings.version,
-    });
+      isValid: false,
+    }, this.onValueChange);
   }
 
   onUseSSLChanged = event => {
@@ -102,7 +108,7 @@ class Overseerr extends React.Component {
         port: this.state.port,
         apiKey: this.state.apiKey,
         useSSL: this.state.useSSL,
-        defaultApiUserID: this.state.defaultApiUserID,
+        DefaultApiUserID: this.state.DefaultApiUserID,
         version: this.state.apiVersion,
       })
         .then(data => {
@@ -132,24 +138,65 @@ class Overseerr extends React.Component {
   }
 
   onValueChange() {
+    this.props.setConnectionSettings({
+      hostname: this.state.hostname,
+      port: this.state.port,
+      apiKey: this.state.apiKey,
+      useSSL: this.state.useSSL,
+      version: this.state.apiVersion,
+    });
+
     this.props.onChange({
       client: this.state.client,
       hostname: this.state.hostname,
       port: this.state.port,
       apiKey: this.state.apiKey,
       defaultApiUserID: this.state.defaultApiUserID,
       useSSL: this.state.useSSL,
-      qualityProfile: this.state.qualityProfile,
-      path: this.state.path,
-      profile: this.state.profile,
       version: this.state.apiVersion,
     });
 
     this.onValidate();
   }
 
   onValidate() {
-    this.props.onValidate(this.state.isApiKeyValid && this.state.isHostnameValid && this.state.isPortValid && this.state.isDefaultApiUserIDValid);
+    let isValid = this.state.isApiKeyValid
+      && this.state.isHostnameValid
+      && this.state.isPortValid
+      && this.state.isDefaultApiUserIDValid
+      && (this.props.settings.categories.length == 0 || (this.props.settings.categories.every(x => this.validateCategory(x)) && this.props.settings.isRadarrServiceSettingsValid));
+
+    if (isValid !== this.state.isValid) {
+      this.setState({ isValid: isValid },
+        () => this.props.onValidate(isValid));
+    }
+  }
+
+  validateCategory(category) {
+    if (!/\S/.test(category.name)) {
+      return false;
+    }
+    else if (/^[\w-]{1,32}$/.test(category.name)) {
+      var names = this.props.settings.categories.map(x => x.name);
+
+      if (new Set(names).size !== names.length) {
+        return false;
+      }
+      else if (this.props.settings.radarrServiceSettings.radarrServices.every(x => x.id !== category.serviceId)) {
+        return false;
+      }
+      else {
+        var radarrService = this.props.settings.radarrServiceSettings.radarrServices.filter(x => x.id === category.serviceId)[0];
+
+        if (radarrService.profiles.length == 0 || radarrService.rootPaths.length == 0) {
+          return false;
+        }
+      }
+    }
+    else {
+      return false;
+    }
+    return true;
   }
 
   render() {
@@ -283,14 +330,21 @@ class Overseerr extends React.Component {
             </Col>
           </Row>
         </div>
-        <hr className="my-4" />
+        <OverseerrMovieCategoryList isSubmitted={this.props.isSubmitted} isSaving={this.props.isSaving} apiVersion={this.state.apiVersion} canConnect={this.state.isHostnameValid && this.state.isPortValid && this.state.isApiKeyValid} />
       </>
     );
   }
 }
 
+const mapPropsToState = state => {
+  return {
+    settings: state.movies.overseerr
+  }
+};
+
 const mapPropsToAction = {
-  testSettings: testOverseerrSettings,
+  testSettings: testOverseerrMovieSettings,
+  setConnectionSettings: setOverseerrMovieConnectionSettings,
 };
 
-export default connect(null, mapPropsToAction)(Overseerr);
+export default connect(mapPropsToState, mapPropsToAction)(OverseerrMovie);