Basic support for cardigann definitions

This commit is contained in:
ta264
2020-10-22 21:43:29 +01:00
committed by Qstick
parent 4b66d99029
commit d041b152d6
29 changed files with 2801 additions and 15 deletions

View File

@@ -16,10 +16,11 @@ class AddIndexerItem extends Component {
onIndexerSelect = () => {
const {
implementation
implementation,
name
} = this.props;
this.props.onIndexerSelect({ implementation });
this.props.onIndexerSelect({ implementation, name });
}
//

View File

@@ -67,7 +67,7 @@ class AddIndexerModalContent extends Component {
usenetIndexers.map((indexer) => {
return (
<AddIndexerItem
key={indexer.implementation}
key={indexer.name}
implementation={indexer.implementation}
{...indexer}
onIndexerSelect={onIndexerSelect}
@@ -84,7 +84,7 @@ class AddIndexerModalContent extends Component {
torrentIndexers.map((indexer) => {
return (
<AddIndexerItem
key={indexer.implementation}
key={indexer.name}
implementation={indexer.implementation}
{...indexer}
onIndexerSelect={onIndexerSelect}

View File

@@ -49,7 +49,7 @@ class AddIndexerModalContentConnector extends Component {
// Listeners
onIndexerSelect = ({ implementation, name }) => {
this.props.selectIndexerSchema({ implementation, presetName: name });
this.props.selectIndexerSchema({ implementation, name });
this.props.onModalClose({ indexerSelected: true });
}

View File

@@ -1,3 +1,4 @@
import _ from 'lodash';
import { createAction } from 'redux-actions';
import createFetchHandler from 'Store/Actions/Creators/createFetchHandler';
import createFetchSchemaHandler from 'Store/Actions/Creators/createFetchSchemaHandler';
@@ -9,7 +10,6 @@ import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/
import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
import { createThunk, handleThunks } from 'Store/thunks';
import getSectionState from 'Utilities/State/getSectionState';
import selectProviderSchema from 'Utilities/State/selectProviderSchema';
import updateSectionState from 'Utilities/State/updateSectionState';
import createHandleActions from './Creators/createHandleActions';
@@ -86,6 +86,35 @@ export const setIndexerFieldValue = createAction(SET_INDEXER_FIELD_VALUE, (paylo
//
// Action Handlers
function applySchemaDefaults(selectedSchema, schemaDefaults) {
if (!schemaDefaults) {
return selectedSchema;
} else if (_.isFunction(schemaDefaults)) {
return schemaDefaults(selectedSchema);
}
return Object.assign(selectedSchema, schemaDefaults);
}
function selectSchema(state, payload, schemaDefaults) {
const newState = getSectionState(state, section);
console.log(payload);
const {
implementation,
name
} = payload;
const selectedImplementation = _.find(newState.schema, { implementation, name });
console.log(selectedImplementation);
newState.selectedSchema = applySchemaDefaults(_.cloneDeep(selectedImplementation), schemaDefaults);
return updateSectionState(state, section, newState);
}
export const actionHandlers = handleThunks({
[FETCH_INDEXERS]: createFetchHandler(section, '/indexer'),
[FETCH_INDEXER_SCHEMA]: createFetchSchemaHandler(section, '/indexer/schema'),
@@ -106,7 +135,7 @@ export const reducers = createHandleActions({
[SET_INDEXER_FIELD_VALUE]: createSetProviderFieldValueReducer(section),
[SELECT_INDEXER_SCHEMA]: (state, { payload }) => {
return selectProviderSchema(state, section, payload, (selectedSchema) => {
return selectSchema(state, payload, (selectedSchema) => {
selectedSchema.enableRss = selectedSchema.supportsRss;
selectedSchema.enableAutomaticSearch = selectedSchema.supportsSearch;
selectedSchema.enableInteractiveSearch = selectedSchema.supportsSearch;