parent
3a9182b6a6
commit
f6ae9fd6c5
|
@ -3,6 +3,7 @@ import React, { Component } from 'react';
|
||||||
import Card from 'Components/Card';
|
import Card from 'Components/Card';
|
||||||
import Label from 'Components/Label';
|
import Label from 'Components/Label';
|
||||||
import ConfirmModal from 'Components/Modal/ConfirmModal';
|
import ConfirmModal from 'Components/Modal/ConfirmModal';
|
||||||
|
import TagList from 'Components/TagList';
|
||||||
import { kinds } from 'Helpers/Props';
|
import { kinds } from 'Helpers/Props';
|
||||||
import EditDownloadClientModalConnector from './EditDownloadClientModalConnector';
|
import EditDownloadClientModalConnector from './EditDownloadClientModalConnector';
|
||||||
import styles from './DownloadClient.css';
|
import styles from './DownloadClient.css';
|
||||||
|
@ -55,7 +56,9 @@ class DownloadClient extends Component {
|
||||||
id,
|
id,
|
||||||
name,
|
name,
|
||||||
enable,
|
enable,
|
||||||
priority
|
priority,
|
||||||
|
tags,
|
||||||
|
tagList
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
@ -93,6 +96,11 @@ class DownloadClient extends Component {
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<TagList
|
||||||
|
tags={tags}
|
||||||
|
tagList={tagList}
|
||||||
|
/>
|
||||||
|
|
||||||
<EditDownloadClientModalConnector
|
<EditDownloadClientModalConnector
|
||||||
id={id}
|
id={id}
|
||||||
isOpen={this.state.isEditDownloadClientModalOpen}
|
isOpen={this.state.isEditDownloadClientModalOpen}
|
||||||
|
@ -119,6 +127,8 @@ DownloadClient.propTypes = {
|
||||||
name: PropTypes.string.isRequired,
|
name: PropTypes.string.isRequired,
|
||||||
enable: PropTypes.bool.isRequired,
|
enable: PropTypes.bool.isRequired,
|
||||||
priority: PropTypes.number.isRequired,
|
priority: PropTypes.number.isRequired,
|
||||||
|
tags: PropTypes.arrayOf(PropTypes.number).isRequired,
|
||||||
|
tagList: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||||
onConfirmDeleteDownloadClient: PropTypes.func.isRequired
|
onConfirmDeleteDownloadClient: PropTypes.func.isRequired
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -49,6 +49,7 @@ class DownloadClients extends Component {
|
||||||
const {
|
const {
|
||||||
items,
|
items,
|
||||||
onConfirmDeleteDownloadClient,
|
onConfirmDeleteDownloadClient,
|
||||||
|
tagList,
|
||||||
...otherProps
|
...otherProps
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
|
@ -70,6 +71,7 @@ class DownloadClients extends Component {
|
||||||
<DownloadClient
|
<DownloadClient
|
||||||
key={item.id}
|
key={item.id}
|
||||||
{...item}
|
{...item}
|
||||||
|
tagList={tagList}
|
||||||
onConfirmDeleteDownloadClient={onConfirmDeleteDownloadClient}
|
onConfirmDeleteDownloadClient={onConfirmDeleteDownloadClient}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
@ -108,6 +110,7 @@ DownloadClients.propTypes = {
|
||||||
isFetching: PropTypes.bool.isRequired,
|
isFetching: PropTypes.bool.isRequired,
|
||||||
error: PropTypes.object,
|
error: PropTypes.object,
|
||||||
items: PropTypes.arrayOf(PropTypes.object).isRequired,
|
items: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||||
|
tagList: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||||
onConfirmDeleteDownloadClient: PropTypes.func.isRequired
|
onConfirmDeleteDownloadClient: PropTypes.func.isRequired
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -4,13 +4,20 @@ import { connect } from 'react-redux';
|
||||||
import { createSelector } from 'reselect';
|
import { createSelector } from 'reselect';
|
||||||
import { deleteDownloadClient, fetchDownloadClients } from 'Store/Actions/settingsActions';
|
import { deleteDownloadClient, fetchDownloadClients } from 'Store/Actions/settingsActions';
|
||||||
import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
|
import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
|
||||||
|
import createTagsSelector from 'Store/Selectors/createTagsSelector';
|
||||||
import sortByName from 'Utilities/Array/sortByName';
|
import sortByName from 'Utilities/Array/sortByName';
|
||||||
import DownloadClients from './DownloadClients';
|
import DownloadClients from './DownloadClients';
|
||||||
|
|
||||||
function createMapStateToProps() {
|
function createMapStateToProps() {
|
||||||
return createSelector(
|
return createSelector(
|
||||||
createSortedSectionSelector('settings.downloadClients', sortByName),
|
createSortedSectionSelector('settings.downloadClients', sortByName),
|
||||||
(downloadClients) => downloadClients
|
createTagsSelector(),
|
||||||
|
(downloadClients, tagList) => {
|
||||||
|
return {
|
||||||
|
...downloadClients,
|
||||||
|
tagList
|
||||||
|
};
|
||||||
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -50,6 +50,7 @@ class EditDownloadClientModalContent extends Component {
|
||||||
removeCompletedDownloads,
|
removeCompletedDownloads,
|
||||||
removeFailedDownloads,
|
removeFailedDownloads,
|
||||||
fields,
|
fields,
|
||||||
|
tags,
|
||||||
message
|
message
|
||||||
} = item;
|
} = item;
|
||||||
|
|
||||||
|
@ -137,6 +138,18 @@ class EditDownloadClientModalContent extends Component {
|
||||||
/>
|
/>
|
||||||
</FormGroup>
|
</FormGroup>
|
||||||
|
|
||||||
|
<FormGroup>
|
||||||
|
<FormLabel>Tags</FormLabel>
|
||||||
|
|
||||||
|
<FormInputGroup
|
||||||
|
type={inputTypes.TAG}
|
||||||
|
name="tags"
|
||||||
|
helpText="Only use this download client for series with at least one matching tag. Leave blank to use with all series."
|
||||||
|
{...tags}
|
||||||
|
onChange={onInputChange}
|
||||||
|
/>
|
||||||
|
</FormGroup>
|
||||||
|
|
||||||
<FieldSet
|
<FieldSet
|
||||||
size={sizes.SMALL}
|
size={sizes.SMALL}
|
||||||
legend="Completed Download Handling"
|
legend="Completed Download Handling"
|
||||||
|
|
|
@ -23,6 +23,7 @@ import getErrorMessage from 'Utilities/Object/getErrorMessage';
|
||||||
import getSelectedIds from 'Utilities/Table/getSelectedIds';
|
import getSelectedIds from 'Utilities/Table/getSelectedIds';
|
||||||
import ManageDownloadClientsEditModal from './Edit/ManageDownloadClientsEditModal';
|
import ManageDownloadClientsEditModal from './Edit/ManageDownloadClientsEditModal';
|
||||||
import ManageDownloadClientsModalRow from './ManageDownloadClientsModalRow';
|
import ManageDownloadClientsModalRow from './ManageDownloadClientsModalRow';
|
||||||
|
import TagsModal from './Tags/TagsModal';
|
||||||
import styles from './ManageDownloadClientsModalContent.css';
|
import styles from './ManageDownloadClientsModalContent.css';
|
||||||
|
|
||||||
// TODO: This feels janky to do, but not sure of a better way currently
|
// TODO: This feels janky to do, but not sure of a better way currently
|
||||||
|
@ -67,6 +68,12 @@ const COLUMNS = [
|
||||||
isSortable: true,
|
isSortable: true,
|
||||||
isVisible: true,
|
isVisible: true,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: 'tags',
|
||||||
|
label: 'Tags',
|
||||||
|
isSortable: true,
|
||||||
|
isVisible: true,
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
interface ManageDownloadClientsModalContentProps {
|
interface ManageDownloadClientsModalContentProps {
|
||||||
|
@ -92,6 +99,8 @@ function ManageDownloadClientsModalContent(
|
||||||
|
|
||||||
const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
|
const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
|
||||||
const [isEditModalOpen, setIsEditModalOpen] = useState(false);
|
const [isEditModalOpen, setIsEditModalOpen] = useState(false);
|
||||||
|
const [isTagsModalOpen, setIsTagsModalOpen] = useState(false);
|
||||||
|
const [isSavingTags, setIsSavingTags] = useState(false);
|
||||||
|
|
||||||
const [selectState, setSelectState] = useSelectState();
|
const [selectState, setSelectState] = useSelectState();
|
||||||
|
|
||||||
|
@ -138,6 +147,30 @@ function ManageDownloadClientsModalContent(
|
||||||
[selectedIds, dispatch]
|
[selectedIds, dispatch]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const onTagsPress = useCallback(() => {
|
||||||
|
setIsTagsModalOpen(true);
|
||||||
|
}, [setIsTagsModalOpen]);
|
||||||
|
|
||||||
|
const onTagsModalClose = useCallback(() => {
|
||||||
|
setIsTagsModalOpen(false);
|
||||||
|
}, [setIsTagsModalOpen]);
|
||||||
|
|
||||||
|
const onApplyTagsPress = useCallback(
|
||||||
|
(tags: number[], applyTags: string) => {
|
||||||
|
setIsSavingTags(true);
|
||||||
|
setIsTagsModalOpen(false);
|
||||||
|
|
||||||
|
dispatch(
|
||||||
|
bulkEditDownloadClients({
|
||||||
|
ids: selectedIds,
|
||||||
|
tags,
|
||||||
|
applyTags,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
},
|
||||||
|
[selectedIds, dispatch]
|
||||||
|
);
|
||||||
|
|
||||||
const onSelectAllChange = useCallback(
|
const onSelectAllChange = useCallback(
|
||||||
({ value }: SelectStateInputProps) => {
|
({ value }: SelectStateInputProps) => {
|
||||||
setSelectState({ type: value ? 'selectAll' : 'unselectAll', items });
|
setSelectState({ type: value ? 'selectAll' : 'unselectAll', items });
|
||||||
|
@ -213,6 +246,14 @@ function ManageDownloadClientsModalContent(
|
||||||
>
|
>
|
||||||
Edit
|
Edit
|
||||||
</SpinnerButton>
|
</SpinnerButton>
|
||||||
|
|
||||||
|
<SpinnerButton
|
||||||
|
isSpinning={isSaving && isSavingTags}
|
||||||
|
isDisabled={!anySelected}
|
||||||
|
onPress={onTagsPress}
|
||||||
|
>
|
||||||
|
Set Tags
|
||||||
|
</SpinnerButton>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Button onPress={onModalClose}>Close</Button>
|
<Button onPress={onModalClose}>Close</Button>
|
||||||
|
@ -225,6 +266,13 @@ function ManageDownloadClientsModalContent(
|
||||||
downloadClientIds={selectedIds}
|
downloadClientIds={selectedIds}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<TagsModal
|
||||||
|
isOpen={isTagsModalOpen}
|
||||||
|
ids={selectedIds}
|
||||||
|
onApplyTagsPress={onApplyTagsPress}
|
||||||
|
onModalClose={onTagsModalClose}
|
||||||
|
/>
|
||||||
|
|
||||||
<ConfirmModal
|
<ConfirmModal
|
||||||
isOpen={isDeleteModalOpen}
|
isOpen={isDeleteModalOpen}
|
||||||
kind={kinds.DANGER}
|
kind={kinds.DANGER}
|
||||||
|
|
|
@ -3,6 +3,7 @@ import TableRowCell from 'Components/Table/Cells/TableRowCell';
|
||||||
import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
|
import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
|
||||||
import Column from 'Components/Table/Column';
|
import Column from 'Components/Table/Column';
|
||||||
import TableRow from 'Components/Table/TableRow';
|
import TableRow from 'Components/Table/TableRow';
|
||||||
|
import TagListConnector from 'Components/TagListConnector';
|
||||||
import { SelectStateInputProps } from 'typings/props';
|
import { SelectStateInputProps } from 'typings/props';
|
||||||
import styles from './ManageDownloadClientsModalRow.css';
|
import styles from './ManageDownloadClientsModalRow.css';
|
||||||
|
|
||||||
|
@ -14,6 +15,7 @@ interface ManageDownloadClientsModalRowProps {
|
||||||
removeCompletedDownloads: boolean;
|
removeCompletedDownloads: boolean;
|
||||||
removeFailedDownloads: boolean;
|
removeFailedDownloads: boolean;
|
||||||
implementation: string;
|
implementation: string;
|
||||||
|
tags: number[];
|
||||||
columns: Column[];
|
columns: Column[];
|
||||||
isSelected?: boolean;
|
isSelected?: boolean;
|
||||||
onSelectedChange(result: SelectStateInputProps): void;
|
onSelectedChange(result: SelectStateInputProps): void;
|
||||||
|
@ -31,6 +33,7 @@ function ManageDownloadClientsModalRow(
|
||||||
removeCompletedDownloads,
|
removeCompletedDownloads,
|
||||||
removeFailedDownloads,
|
removeFailedDownloads,
|
||||||
implementation,
|
implementation,
|
||||||
|
tags,
|
||||||
onSelectedChange,
|
onSelectedChange,
|
||||||
} = props;
|
} = props;
|
||||||
|
|
||||||
|
@ -70,6 +73,10 @@ function ManageDownloadClientsModalRow(
|
||||||
<TableRowCell className={styles.removeFailedDownloads}>
|
<TableRowCell className={styles.removeFailedDownloads}>
|
||||||
{removeFailedDownloads ? 'Yes' : 'No'}
|
{removeFailedDownloads ? 'Yes' : 'No'}
|
||||||
</TableRowCell>
|
</TableRowCell>
|
||||||
|
|
||||||
|
<TableRowCell className={styles.tags}>
|
||||||
|
<TagListConnector tags={tags} />
|
||||||
|
</TableRowCell>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,22 @@
|
||||||
|
import React from 'react';
|
||||||
|
import Modal from 'Components/Modal/Modal';
|
||||||
|
import TagsModalContent from './TagsModalContent';
|
||||||
|
|
||||||
|
interface TagsModalProps {
|
||||||
|
isOpen: boolean;
|
||||||
|
ids: number[];
|
||||||
|
onApplyTagsPress: (tags: number[], applyTags: string) => void;
|
||||||
|
onModalClose: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
function TagsModal(props: TagsModalProps) {
|
||||||
|
const { isOpen, onModalClose, ...otherProps } = props;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Modal isOpen={isOpen} onModalClose={onModalClose}>
|
||||||
|
<TagsModalContent {...otherProps} onModalClose={onModalClose} />
|
||||||
|
</Modal>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default TagsModal;
|
|
@ -0,0 +1,12 @@
|
||||||
|
.renameIcon {
|
||||||
|
margin-left: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message {
|
||||||
|
margin-top: 20px;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.result {
|
||||||
|
padding-top: 4px;
|
||||||
|
}
|
9
frontend/src/Settings/DownloadClients/DownloadClients/Manage/Tags/TagsModalContent.css.d.ts
vendored
Normal file
9
frontend/src/Settings/DownloadClients/DownloadClients/Manage/Tags/TagsModalContent.css.d.ts
vendored
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
// This file is automatically generated.
|
||||||
|
// Please do not change this file!
|
||||||
|
interface CssExports {
|
||||||
|
'message': string;
|
||||||
|
'renameIcon': string;
|
||||||
|
'result': string;
|
||||||
|
}
|
||||||
|
export const cssExports: CssExports;
|
||||||
|
export default cssExports;
|
|
@ -0,0 +1,180 @@
|
||||||
|
import { uniq } from 'lodash';
|
||||||
|
import React, { useCallback, useMemo, useState } from 'react';
|
||||||
|
import { useSelector } from 'react-redux';
|
||||||
|
import AppState from 'App/State/AppState';
|
||||||
|
import { DownloadClientAppState } from 'App/State/SettingsAppState';
|
||||||
|
import { Tag } from 'App/State/TagsAppState';
|
||||||
|
import Form from 'Components/Form/Form';
|
||||||
|
import FormGroup from 'Components/Form/FormGroup';
|
||||||
|
import FormInputGroup from 'Components/Form/FormInputGroup';
|
||||||
|
import FormLabel from 'Components/Form/FormLabel';
|
||||||
|
import Label from 'Components/Label';
|
||||||
|
import Button from 'Components/Link/Button';
|
||||||
|
import ModalBody from 'Components/Modal/ModalBody';
|
||||||
|
import ModalContent from 'Components/Modal/ModalContent';
|
||||||
|
import ModalFooter from 'Components/Modal/ModalFooter';
|
||||||
|
import ModalHeader from 'Components/Modal/ModalHeader';
|
||||||
|
import { inputTypes, kinds, sizes } from 'Helpers/Props';
|
||||||
|
import createTagsSelector from 'Store/Selectors/createTagsSelector';
|
||||||
|
import DownloadClient from 'typings/DownloadClient';
|
||||||
|
import styles from './TagsModalContent.css';
|
||||||
|
|
||||||
|
interface TagsModalContentProps {
|
||||||
|
ids: number[];
|
||||||
|
onApplyTagsPress: (tags: number[], applyTags: string) => void;
|
||||||
|
onModalClose: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
function TagsModalContent(props: TagsModalContentProps) {
|
||||||
|
const { ids, onModalClose, onApplyTagsPress } = props;
|
||||||
|
|
||||||
|
const allDownloadClients: DownloadClientAppState = useSelector(
|
||||||
|
(state: AppState) => state.settings.downloadClients
|
||||||
|
);
|
||||||
|
const tagList: Tag[] = useSelector(createTagsSelector());
|
||||||
|
|
||||||
|
const [tags, setTags] = useState<number[]>([]);
|
||||||
|
const [applyTags, setApplyTags] = useState('add');
|
||||||
|
|
||||||
|
const seriesTags = useMemo(() => {
|
||||||
|
const tags = ids.reduce((acc: number[], id) => {
|
||||||
|
const s = allDownloadClients.items.find(
|
||||||
|
(s: DownloadClient) => s.id === id
|
||||||
|
);
|
||||||
|
|
||||||
|
if (s) {
|
||||||
|
acc.push(...s.tags);
|
||||||
|
}
|
||||||
|
|
||||||
|
return acc;
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return uniq(tags);
|
||||||
|
}, [ids, allDownloadClients]);
|
||||||
|
|
||||||
|
const onTagsChange = useCallback(
|
||||||
|
({ value }: { value: number[] }) => {
|
||||||
|
setTags(value);
|
||||||
|
},
|
||||||
|
[setTags]
|
||||||
|
);
|
||||||
|
|
||||||
|
const onApplyTagsChange = useCallback(
|
||||||
|
({ value }: { value: string }) => {
|
||||||
|
setApplyTags(value);
|
||||||
|
},
|
||||||
|
[setApplyTags]
|
||||||
|
);
|
||||||
|
|
||||||
|
const onApplyPress = useCallback(() => {
|
||||||
|
onApplyTagsPress(tags, applyTags);
|
||||||
|
}, [tags, applyTags, onApplyTagsPress]);
|
||||||
|
|
||||||
|
const applyTagsOptions = [
|
||||||
|
{ key: 'add', value: 'Add' },
|
||||||
|
{ key: 'remove', value: 'Remove' },
|
||||||
|
{ key: 'replace', value: 'Replace' },
|
||||||
|
];
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ModalContent onModalClose={onModalClose}>
|
||||||
|
<ModalHeader>Tags</ModalHeader>
|
||||||
|
|
||||||
|
<ModalBody>
|
||||||
|
<Form>
|
||||||
|
<FormGroup>
|
||||||
|
<FormLabel>Tags</FormLabel>
|
||||||
|
|
||||||
|
<FormInputGroup
|
||||||
|
type={inputTypes.TAG}
|
||||||
|
name="tags"
|
||||||
|
value={tags}
|
||||||
|
onChange={onTagsChange}
|
||||||
|
/>
|
||||||
|
</FormGroup>
|
||||||
|
|
||||||
|
<FormGroup>
|
||||||
|
<FormLabel>Apply Tags</FormLabel>
|
||||||
|
|
||||||
|
<FormInputGroup
|
||||||
|
type={inputTypes.SELECT}
|
||||||
|
name="applyTags"
|
||||||
|
value={applyTags}
|
||||||
|
values={applyTagsOptions}
|
||||||
|
helpTexts={[
|
||||||
|
'How to apply tags to the selected download clients(s)',
|
||||||
|
'Add: Add the tags the existing list of tags',
|
||||||
|
'Remove: Remove the entered tags',
|
||||||
|
'Replace: Replace the tags with the entered tags (enter no tags to clear all tags)',
|
||||||
|
]}
|
||||||
|
onChange={onApplyTagsChange}
|
||||||
|
/>
|
||||||
|
</FormGroup>
|
||||||
|
|
||||||
|
<FormGroup>
|
||||||
|
<FormLabel>Result</FormLabel>
|
||||||
|
|
||||||
|
<div className={styles.result}>
|
||||||
|
{seriesTags.map((id) => {
|
||||||
|
const tag = tagList.find((t) => t.id === id);
|
||||||
|
|
||||||
|
if (!tag) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const removeTag =
|
||||||
|
(applyTags === 'remove' && tags.indexOf(id) > -1) ||
|
||||||
|
(applyTags === 'replace' && tags.indexOf(id) === -1);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Label
|
||||||
|
key={tag.id}
|
||||||
|
title={removeTag ? 'Removing tag' : 'Existing tag'}
|
||||||
|
kind={removeTag ? kinds.INVERSE : kinds.INFO}
|
||||||
|
size={sizes.LARGE}
|
||||||
|
>
|
||||||
|
{tag.label}
|
||||||
|
</Label>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
|
||||||
|
{(applyTags === 'add' || applyTags === 'replace') &&
|
||||||
|
tags.map((id) => {
|
||||||
|
const tag = tagList.find((t) => t.id === id);
|
||||||
|
|
||||||
|
if (!tag) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (seriesTags.indexOf(id) > -1) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Label
|
||||||
|
key={tag.id}
|
||||||
|
title={'Adding tag'}
|
||||||
|
kind={kinds.SUCCESS}
|
||||||
|
size={sizes.LARGE}
|
||||||
|
>
|
||||||
|
{tag.label}
|
||||||
|
</Label>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</FormGroup>
|
||||||
|
</Form>
|
||||||
|
</ModalBody>
|
||||||
|
|
||||||
|
<ModalFooter>
|
||||||
|
<Button onPress={onModalClose}>Cancel</Button>
|
||||||
|
|
||||||
|
<Button kind={kinds.PRIMARY} onPress={onApplyPress}>
|
||||||
|
Apply
|
||||||
|
</Button>
|
||||||
|
</ModalFooter>
|
||||||
|
</ModalContent>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default TagsModalContent;
|
|
@ -21,6 +21,7 @@ function TagDetailsModalContent(props) {
|
||||||
notifications,
|
notifications,
|
||||||
releaseProfiles,
|
releaseProfiles,
|
||||||
indexers,
|
indexers,
|
||||||
|
downloadClients,
|
||||||
autoTags,
|
autoTags,
|
||||||
onModalClose,
|
onModalClose,
|
||||||
onDeleteTagPress
|
onDeleteTagPress
|
||||||
|
@ -179,6 +180,22 @@ function TagDetailsModalContent(props) {
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
downloadClients.length ?
|
||||||
|
<FieldSet legend="Download Clients">
|
||||||
|
{
|
||||||
|
downloadClients.map((item) => {
|
||||||
|
return (
|
||||||
|
<div key={item.id}>
|
||||||
|
{item.name}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})
|
||||||
|
}
|
||||||
|
</FieldSet> :
|
||||||
|
null
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
autoTags.length ?
|
autoTags.length ?
|
||||||
<FieldSet legend="Auto Tagging">
|
<FieldSet legend="Auto Tagging">
|
||||||
|
@ -228,6 +245,7 @@ TagDetailsModalContent.propTypes = {
|
||||||
notifications: PropTypes.arrayOf(PropTypes.object).isRequired,
|
notifications: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||||
releaseProfiles: PropTypes.arrayOf(PropTypes.object).isRequired,
|
releaseProfiles: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||||
indexers: PropTypes.arrayOf(PropTypes.object).isRequired,
|
indexers: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||||
|
downloadClients: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||||
autoTags: PropTypes.arrayOf(PropTypes.object).isRequired,
|
autoTags: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||||
onModalClose: PropTypes.func.isRequired,
|
onModalClose: PropTypes.func.isRequired,
|
||||||
onDeleteTagPress: PropTypes.func.isRequired
|
onDeleteTagPress: PropTypes.func.isRequired
|
||||||
|
|
|
@ -77,6 +77,14 @@ function createMatchingIndexersSelector() {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function createMatchingDownloadClientsSelector() {
|
||||||
|
return createSelector(
|
||||||
|
(state, { downloadClientIds }) => downloadClientIds,
|
||||||
|
(state) => state.settings.downloadClients.items,
|
||||||
|
findMatchingItems
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function createMatchingAutoTagsSelector() {
|
function createMatchingAutoTagsSelector() {
|
||||||
return createSelector(
|
return createSelector(
|
||||||
(state, { autoTagIds }) => autoTagIds,
|
(state, { autoTagIds }) => autoTagIds,
|
||||||
|
@ -93,8 +101,9 @@ function createMapStateToProps() {
|
||||||
createMatchingNotificationsSelector(),
|
createMatchingNotificationsSelector(),
|
||||||
createMatchingReleaseProfilesSelector(),
|
createMatchingReleaseProfilesSelector(),
|
||||||
createMatchingIndexersSelector(),
|
createMatchingIndexersSelector(),
|
||||||
|
createMatchingDownloadClientsSelector(),
|
||||||
createMatchingAutoTagsSelector(),
|
createMatchingAutoTagsSelector(),
|
||||||
(series, delayProfiles, importLists, notifications, releaseProfiles, indexers, autoTags) => {
|
(series, delayProfiles, importLists, notifications, releaseProfiles, indexers, downloadClients, autoTags) => {
|
||||||
return {
|
return {
|
||||||
series,
|
series,
|
||||||
delayProfiles,
|
delayProfiles,
|
||||||
|
@ -102,6 +111,7 @@ function createMapStateToProps() {
|
||||||
notifications,
|
notifications,
|
||||||
releaseProfiles,
|
releaseProfiles,
|
||||||
indexers,
|
indexers,
|
||||||
|
downloadClients,
|
||||||
autoTags
|
autoTags
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,6 +58,7 @@ class Tag extends Component {
|
||||||
notificationIds,
|
notificationIds,
|
||||||
restrictionIds,
|
restrictionIds,
|
||||||
indexerIds,
|
indexerIds,
|
||||||
|
downloadClientIds,
|
||||||
autoTagIds,
|
autoTagIds,
|
||||||
seriesIds
|
seriesIds
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
@ -73,6 +74,7 @@ class Tag extends Component {
|
||||||
notificationIds.length ||
|
notificationIds.length ||
|
||||||
restrictionIds.length ||
|
restrictionIds.length ||
|
||||||
indexerIds.length ||
|
indexerIds.length ||
|
||||||
|
downloadClientIds.length ||
|
||||||
autoTagIds.length ||
|
autoTagIds.length ||
|
||||||
seriesIds.length
|
seriesIds.length
|
||||||
);
|
);
|
||||||
|
@ -121,6 +123,11 @@ class Tag extends Component {
|
||||||
count={indexerIds.length}
|
count={indexerIds.length}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<TagInUse
|
||||||
|
label="download client"
|
||||||
|
count={downloadClientIds.length}
|
||||||
|
/>
|
||||||
|
|
||||||
<TagInUse
|
<TagInUse
|
||||||
label="auto tagging"
|
label="auto tagging"
|
||||||
count={autoTagIds.length}
|
count={autoTagIds.length}
|
||||||
|
@ -146,6 +153,7 @@ class Tag extends Component {
|
||||||
notificationIds={notificationIds}
|
notificationIds={notificationIds}
|
||||||
restrictionIds={restrictionIds}
|
restrictionIds={restrictionIds}
|
||||||
indexerIds={indexerIds}
|
indexerIds={indexerIds}
|
||||||
|
downloadClientIds={downloadClientIds}
|
||||||
autoTagIds={autoTagIds}
|
autoTagIds={autoTagIds}
|
||||||
isOpen={isDetailsModalOpen}
|
isOpen={isDetailsModalOpen}
|
||||||
onModalClose={this.onDetailsModalClose}
|
onModalClose={this.onDetailsModalClose}
|
||||||
|
@ -174,6 +182,7 @@ Tag.propTypes = {
|
||||||
notificationIds: PropTypes.arrayOf(PropTypes.number).isRequired,
|
notificationIds: PropTypes.arrayOf(PropTypes.number).isRequired,
|
||||||
restrictionIds: PropTypes.arrayOf(PropTypes.number).isRequired,
|
restrictionIds: PropTypes.arrayOf(PropTypes.number).isRequired,
|
||||||
indexerIds: PropTypes.arrayOf(PropTypes.number).isRequired,
|
indexerIds: PropTypes.arrayOf(PropTypes.number).isRequired,
|
||||||
|
downloadClientIds: PropTypes.arrayOf(PropTypes.number).isRequired,
|
||||||
autoTagIds: PropTypes.arrayOf(PropTypes.number).isRequired,
|
autoTagIds: PropTypes.arrayOf(PropTypes.number).isRequired,
|
||||||
seriesIds: PropTypes.arrayOf(PropTypes.number).isRequired,
|
seriesIds: PropTypes.arrayOf(PropTypes.number).isRequired,
|
||||||
onConfirmDeleteTag: PropTypes.func.isRequired
|
onConfirmDeleteTag: PropTypes.func.isRequired
|
||||||
|
@ -185,6 +194,7 @@ Tag.defaultProps = {
|
||||||
notificationIds: [],
|
notificationIds: [],
|
||||||
restrictionIds: [],
|
restrictionIds: [],
|
||||||
indexerIds: [],
|
indexerIds: [],
|
||||||
|
downloadClientIds: [],
|
||||||
autoTagIds: [],
|
autoTagIds: [],
|
||||||
seriesIds: []
|
seriesIds: []
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
|
||||||
import React, { Component } from 'react';
|
import React, { Component } from 'react';
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import { createSelector } from 'reselect';
|
import { createSelector } from 'reselect';
|
||||||
import { fetchDelayProfiles, fetchImportLists, fetchIndexers, fetchNotifications, fetchReleaseProfiles } from 'Store/Actions/settingsActions';
|
import { fetchDelayProfiles, fetchDownloadClients, fetchImportLists, fetchIndexers, fetchNotifications, fetchReleaseProfiles } from 'Store/Actions/settingsActions';
|
||||||
import { fetchTagDetails } from 'Store/Actions/tagActions';
|
import { fetchTagDetails } from 'Store/Actions/tagActions';
|
||||||
import Tags from './Tags';
|
import Tags from './Tags';
|
||||||
|
|
||||||
|
@ -30,7 +30,8 @@ const mapDispatchToProps = {
|
||||||
dispatchFetchImportLists: fetchImportLists,
|
dispatchFetchImportLists: fetchImportLists,
|
||||||
dispatchFetchNotifications: fetchNotifications,
|
dispatchFetchNotifications: fetchNotifications,
|
||||||
dispatchFetchReleaseProfiles: fetchReleaseProfiles,
|
dispatchFetchReleaseProfiles: fetchReleaseProfiles,
|
||||||
dispatchFetchIndexers: fetchIndexers
|
dispatchFetchIndexers: fetchIndexers,
|
||||||
|
dispatchFetchDownloadClients: fetchDownloadClients
|
||||||
};
|
};
|
||||||
|
|
||||||
class MetadatasConnector extends Component {
|
class MetadatasConnector extends Component {
|
||||||
|
@ -45,7 +46,8 @@ class MetadatasConnector extends Component {
|
||||||
dispatchFetchImportLists,
|
dispatchFetchImportLists,
|
||||||
dispatchFetchNotifications,
|
dispatchFetchNotifications,
|
||||||
dispatchFetchReleaseProfiles,
|
dispatchFetchReleaseProfiles,
|
||||||
dispatchFetchIndexers
|
dispatchFetchIndexers,
|
||||||
|
dispatchFetchDownloadClients
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
dispatchFetchTagDetails();
|
dispatchFetchTagDetails();
|
||||||
|
@ -54,6 +56,7 @@ class MetadatasConnector extends Component {
|
||||||
dispatchFetchNotifications();
|
dispatchFetchNotifications();
|
||||||
dispatchFetchReleaseProfiles();
|
dispatchFetchReleaseProfiles();
|
||||||
dispatchFetchIndexers();
|
dispatchFetchIndexers();
|
||||||
|
dispatchFetchDownloadClients();
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -74,7 +77,8 @@ MetadatasConnector.propTypes = {
|
||||||
dispatchFetchImportLists: PropTypes.func.isRequired,
|
dispatchFetchImportLists: PropTypes.func.isRequired,
|
||||||
dispatchFetchNotifications: PropTypes.func.isRequired,
|
dispatchFetchNotifications: PropTypes.func.isRequired,
|
||||||
dispatchFetchReleaseProfiles: PropTypes.func.isRequired,
|
dispatchFetchReleaseProfiles: PropTypes.func.isRequired,
|
||||||
dispatchFetchIndexers: PropTypes.func.isRequired
|
dispatchFetchIndexers: PropTypes.func.isRequired,
|
||||||
|
dispatchFetchDownloadClients: PropTypes.func.isRequired
|
||||||
};
|
};
|
||||||
|
|
||||||
export default connect(createMapStateToProps, mapDispatchToProps)(MetadatasConnector);
|
export default connect(createMapStateToProps, mapDispatchToProps)(MetadatasConnector);
|
||||||
|
|
|
@ -34,7 +34,7 @@ namespace NzbDrone.Core.Test.Download
|
||||||
.Returns(_blockedProviders);
|
.Returns(_blockedProviders);
|
||||||
}
|
}
|
||||||
|
|
||||||
private Mock<IDownloadClient> WithUsenetClient(int priority = 0)
|
private Mock<IDownloadClient> WithUsenetClient(int priority = 0, HashSet<int> tags = null)
|
||||||
{
|
{
|
||||||
var mock = new Mock<IDownloadClient>(MockBehavior.Default);
|
var mock = new Mock<IDownloadClient>(MockBehavior.Default);
|
||||||
mock.SetupGet(s => s.Definition)
|
mock.SetupGet(s => s.Definition)
|
||||||
|
@ -42,6 +42,7 @@ namespace NzbDrone.Core.Test.Download
|
||||||
.CreateNew()
|
.CreateNew()
|
||||||
.With(v => v.Id = _nextId++)
|
.With(v => v.Id = _nextId++)
|
||||||
.With(v => v.Priority = priority)
|
.With(v => v.Priority = priority)
|
||||||
|
.With(v => v.Tags = tags ?? new HashSet<int>())
|
||||||
.Build());
|
.Build());
|
||||||
|
|
||||||
_downloadClients.Add(mock.Object);
|
_downloadClients.Add(mock.Object);
|
||||||
|
@ -51,7 +52,7 @@ namespace NzbDrone.Core.Test.Download
|
||||||
return mock;
|
return mock;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Mock<IDownloadClient> WithTorrentClient(int priority = 0)
|
private Mock<IDownloadClient> WithTorrentClient(int priority = 0, HashSet<int> tags = null)
|
||||||
{
|
{
|
||||||
var mock = new Mock<IDownloadClient>(MockBehavior.Default);
|
var mock = new Mock<IDownloadClient>(MockBehavior.Default);
|
||||||
mock.SetupGet(s => s.Definition)
|
mock.SetupGet(s => s.Definition)
|
||||||
|
@ -59,6 +60,7 @@ namespace NzbDrone.Core.Test.Download
|
||||||
.CreateNew()
|
.CreateNew()
|
||||||
.With(v => v.Id = _nextId++)
|
.With(v => v.Id = _nextId++)
|
||||||
.With(v => v.Priority = priority)
|
.With(v => v.Priority = priority)
|
||||||
|
.With(v => v.Tags = tags ?? new HashSet<int>())
|
||||||
.Build());
|
.Build());
|
||||||
|
|
||||||
_downloadClients.Add(mock.Object);
|
_downloadClients.Add(mock.Object);
|
||||||
|
@ -148,6 +150,69 @@ namespace NzbDrone.Core.Test.Download
|
||||||
client4.Definition.Id.Should().Be(2);
|
client4.Definition.Id.Should().Be(2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void should_roundrobin_over_clients_with_matching_tags()
|
||||||
|
{
|
||||||
|
var seriesTags = new HashSet<int> { 1 };
|
||||||
|
var clientTags = new HashSet<int> { 1 };
|
||||||
|
|
||||||
|
WithTorrentClient();
|
||||||
|
WithTorrentClient(0, clientTags);
|
||||||
|
WithTorrentClient();
|
||||||
|
WithTorrentClient(0, clientTags);
|
||||||
|
|
||||||
|
var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
|
||||||
|
var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
|
||||||
|
var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
|
||||||
|
var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
|
||||||
|
|
||||||
|
client1.Definition.Id.Should().Be(2);
|
||||||
|
client2.Definition.Id.Should().Be(4);
|
||||||
|
client3.Definition.Id.Should().Be(2);
|
||||||
|
client4.Definition.Id.Should().Be(4);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void should_roundrobin_over_non_tagged_when_no_matching_tags()
|
||||||
|
{
|
||||||
|
var seriesTags = new HashSet<int> { 2 };
|
||||||
|
var clientTags = new HashSet<int> { 1 };
|
||||||
|
|
||||||
|
WithTorrentClient();
|
||||||
|
WithTorrentClient(0, clientTags);
|
||||||
|
WithTorrentClient();
|
||||||
|
WithTorrentClient(0, clientTags);
|
||||||
|
|
||||||
|
var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
|
||||||
|
var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
|
||||||
|
var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
|
||||||
|
var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
|
||||||
|
|
||||||
|
client1.Definition.Id.Should().Be(1);
|
||||||
|
client2.Definition.Id.Should().Be(3);
|
||||||
|
client3.Definition.Id.Should().Be(1);
|
||||||
|
client4.Definition.Id.Should().Be(3);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void should_fail_to_choose_when_clients_have_tags_but_no_match()
|
||||||
|
{
|
||||||
|
var seriesTags = new HashSet<int> { 2 };
|
||||||
|
var clientTags = new HashSet<int> { 1 };
|
||||||
|
|
||||||
|
WithTorrentClient(0, clientTags);
|
||||||
|
WithTorrentClient(0, clientTags);
|
||||||
|
WithTorrentClient(0, clientTags);
|
||||||
|
WithTorrentClient(0, clientTags);
|
||||||
|
|
||||||
|
var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
|
||||||
|
var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
|
||||||
|
var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
|
||||||
|
var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
|
||||||
|
|
||||||
|
Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags).Should().BeNull();
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void should_skip_blocked_torrent_client()
|
public void should_skip_blocked_torrent_client()
|
||||||
{
|
{
|
||||||
|
@ -162,7 +227,6 @@ namespace NzbDrone.Core.Test.Download
|
||||||
var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
|
var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
|
||||||
var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
|
var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
|
||||||
var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
|
var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
|
||||||
var client5 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
|
|
||||||
|
|
||||||
client1.Definition.Id.Should().Be(2);
|
client1.Definition.Id.Should().Be(2);
|
||||||
client2.Definition.Id.Should().Be(4);
|
client2.Definition.Id.Should().Be(4);
|
||||||
|
|
|
@ -32,8 +32,8 @@ namespace NzbDrone.Core.Test.Download
|
||||||
.Returns(_downloadClients);
|
.Returns(_downloadClients);
|
||||||
|
|
||||||
Mocker.GetMock<IProvideDownloadClient>()
|
Mocker.GetMock<IProvideDownloadClient>()
|
||||||
.Setup(v => v.GetDownloadClient(It.IsAny<DownloadProtocol>(), It.IsAny<int>(), It.IsAny<bool>()))
|
.Setup(v => v.GetDownloadClient(It.IsAny<DownloadProtocol>(), It.IsAny<int>(), It.IsAny<bool>(), It.IsAny<HashSet<int>>()))
|
||||||
.Returns<DownloadProtocol, int, bool>((v, i, f) => _downloadClients.FirstOrDefault(d => d.Protocol == v));
|
.Returns<DownloadProtocol, int, bool, HashSet<int>>((v, i, f, t) => _downloadClients.FirstOrDefault(d => d.Protocol == v));
|
||||||
|
|
||||||
var episodes = Builder<Episode>.CreateListOfSize(2)
|
var episodes = Builder<Episode>.CreateListOfSize(2)
|
||||||
.TheFirst(1).With(s => s.Id = 12)
|
.TheFirst(1).With(s => s.Id = 12)
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
using FluentMigrator;
|
||||||
|
using NzbDrone.Core.Datastore.Migration.Framework;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Datastore.Migration
|
||||||
|
{
|
||||||
|
[Migration(191)]
|
||||||
|
public class add_download_client_tags : NzbDroneMigrationBase
|
||||||
|
{
|
||||||
|
protected override void MainDbUpgrade()
|
||||||
|
{
|
||||||
|
Alter.Table("DownloadClients").AddColumn("Tags").AsString().Nullable();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -102,8 +102,7 @@ namespace NzbDrone.Core.Datastore
|
||||||
|
|
||||||
Mapper.Entity<DownloadClientDefinition>("DownloadClients").RegisterModel()
|
Mapper.Entity<DownloadClientDefinition>("DownloadClients").RegisterModel()
|
||||||
.Ignore(x => x.ImplementationName)
|
.Ignore(x => x.ImplementationName)
|
||||||
.Ignore(d => d.Protocol)
|
.Ignore(d => d.Protocol);
|
||||||
.Ignore(d => d.Tags);
|
|
||||||
|
|
||||||
Mapper.Entity<SceneMapping>("SceneMappings").RegisterModel();
|
Mapper.Entity<SceneMapping>("SceneMappings").RegisterModel();
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@ using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Common.Cache;
|
using NzbDrone.Common.Cache;
|
||||||
|
using NzbDrone.Common.Extensions;
|
||||||
using NzbDrone.Core.Download.Clients;
|
using NzbDrone.Core.Download.Clients;
|
||||||
using NzbDrone.Core.Indexers;
|
using NzbDrone.Core.Indexers;
|
||||||
|
|
||||||
|
@ -9,7 +10,7 @@ namespace NzbDrone.Core.Download
|
||||||
{
|
{
|
||||||
public interface IProvideDownloadClient
|
public interface IProvideDownloadClient
|
||||||
{
|
{
|
||||||
IDownloadClient GetDownloadClient(DownloadProtocol downloadProtocol, int indexerId = 0, bool filterBlockedClients = false);
|
IDownloadClient GetDownloadClient(DownloadProtocol downloadProtocol, int indexerId = 0, bool filterBlockedClients = false, HashSet<int> tags = null);
|
||||||
IEnumerable<IDownloadClient> GetDownloadClients(bool filterBlockedClients = false);
|
IEnumerable<IDownloadClient> GetDownloadClients(bool filterBlockedClients = false);
|
||||||
IDownloadClient Get(int id);
|
IDownloadClient Get(int id);
|
||||||
}
|
}
|
||||||
|
@ -35,11 +36,20 @@ namespace NzbDrone.Core.Download
|
||||||
_lastUsedDownloadClient = cacheManager.GetCache<int>(GetType(), "lastDownloadClientId");
|
_lastUsedDownloadClient = cacheManager.GetCache<int>(GetType(), "lastDownloadClientId");
|
||||||
}
|
}
|
||||||
|
|
||||||
public IDownloadClient GetDownloadClient(DownloadProtocol downloadProtocol, int indexerId = 0, bool filterBlockedClients = false)
|
public IDownloadClient GetDownloadClient(DownloadProtocol downloadProtocol, int indexerId = 0, bool filterBlockedClients = false, HashSet<int> tags = null)
|
||||||
{
|
{
|
||||||
var blockedProviders = new HashSet<int>(_downloadClientStatusService.GetBlockedProviders().Select(v => v.ProviderId));
|
var blockedProviders = new HashSet<int>(_downloadClientStatusService.GetBlockedProviders().Select(v => v.ProviderId));
|
||||||
var availableProviders = _downloadClientFactory.GetAvailableProviders().Where(v => v.Protocol == downloadProtocol).ToList();
|
var availableProviders = _downloadClientFactory.GetAvailableProviders().Where(v => v.Protocol == downloadProtocol).ToList();
|
||||||
|
|
||||||
|
if (tags != null)
|
||||||
|
{
|
||||||
|
var matchingTagsClients = availableProviders.Where(i => i.Definition.Tags.Intersect(tags).Any()).ToList();
|
||||||
|
|
||||||
|
availableProviders = matchingTagsClients.Count > 0 ?
|
||||||
|
matchingTagsClients :
|
||||||
|
availableProviders.Where(i => i.Definition.Tags.Empty()).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
if (!availableProviders.Any())
|
if (!availableProviders.Any())
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
|
|
|
@ -53,9 +53,11 @@ namespace NzbDrone.Core.Download
|
||||||
{
|
{
|
||||||
var filterBlockedClients = remoteEpisode.Release.PendingReleaseReason == PendingReleaseReason.DownloadClientUnavailable;
|
var filterBlockedClients = remoteEpisode.Release.PendingReleaseReason == PendingReleaseReason.DownloadClientUnavailable;
|
||||||
|
|
||||||
|
var tags = remoteEpisode.Series?.Tags;
|
||||||
|
|
||||||
var downloadClient = downloadClientId.HasValue
|
var downloadClient = downloadClientId.HasValue
|
||||||
? _downloadClientProvider.Get(downloadClientId.Value)
|
? _downloadClientProvider.Get(downloadClientId.Value)
|
||||||
: _downloadClientProvider.GetDownloadClient(remoteEpisode.Release.DownloadProtocol, remoteEpisode.Release.IndexerId, filterBlockedClients);
|
: _downloadClientProvider.GetDownloadClient(remoteEpisode.Release.DownloadProtocol, remoteEpisode.Release.IndexerId, filterBlockedClients, tags);
|
||||||
|
|
||||||
DownloadReport(remoteEpisode, downloadClient);
|
DownloadReport(remoteEpisode, downloadClient);
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,19 +24,19 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
|
||||||
{
|
{
|
||||||
private readonly Logger _logger;
|
private readonly Logger _logger;
|
||||||
private readonly IMapCoversToLocal _mediaCoverService;
|
private readonly IMapCoversToLocal _mediaCoverService;
|
||||||
private readonly ITagService _tagService;
|
private readonly ITagRepository _tagRepo;
|
||||||
private readonly IDetectXbmcNfo _detectNfo;
|
private readonly IDetectXbmcNfo _detectNfo;
|
||||||
private readonly IDiskProvider _diskProvider;
|
private readonly IDiskProvider _diskProvider;
|
||||||
|
|
||||||
public XbmcMetadata(IDetectXbmcNfo detectNfo,
|
public XbmcMetadata(IDetectXbmcNfo detectNfo,
|
||||||
IDiskProvider diskProvider,
|
IDiskProvider diskProvider,
|
||||||
IMapCoversToLocal mediaCoverService,
|
IMapCoversToLocal mediaCoverService,
|
||||||
ITagService tagService,
|
ITagRepository tagRepo,
|
||||||
Logger logger)
|
Logger logger)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_mediaCoverService = mediaCoverService;
|
_mediaCoverService = mediaCoverService;
|
||||||
_tagService = tagService;
|
_tagRepo = tagRepo;
|
||||||
_diskProvider = diskProvider;
|
_diskProvider = diskProvider;
|
||||||
_detectNfo = detectNfo;
|
_detectNfo = detectNfo;
|
||||||
}
|
}
|
||||||
|
@ -183,7 +183,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
|
||||||
|
|
||||||
if (series.Tags.Any())
|
if (series.Tags.Any())
|
||||||
{
|
{
|
||||||
var tags = _tagService.GetTags(series.Tags);
|
var tags = _tagRepo.Get(series.Tags);
|
||||||
|
|
||||||
foreach (var tag in tags)
|
foreach (var tag in tags)
|
||||||
{
|
{
|
||||||
|
|
|
@ -18,7 +18,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
|
||||||
public void Clean()
|
public void Clean()
|
||||||
{
|
{
|
||||||
using var mapper = _database.OpenConnection();
|
using var mapper = _database.OpenConnection();
|
||||||
var usedTags = new[] { "Series", "Notifications", "DelayProfiles", "ReleaseProfiles", "ImportLists", "Indexers", "AutoTagging" }
|
var usedTags = new[] { "Series", "Notifications", "DelayProfiles", "ReleaseProfiles", "ImportLists", "Indexers", "AutoTagging", "DownloadClients" }
|
||||||
.SelectMany(v => GetUsedTags(v, mapper))
|
.SelectMany(v => GetUsedTags(v, mapper))
|
||||||
.Distinct()
|
.Distinct()
|
||||||
.ToArray();
|
.ToArray();
|
||||||
|
|
|
@ -14,7 +14,15 @@ namespace NzbDrone.Core.Tags
|
||||||
public List<int> ImportListIds { get; set; }
|
public List<int> ImportListIds { get; set; }
|
||||||
public List<int> IndexerIds { get; set; }
|
public List<int> IndexerIds { get; set; }
|
||||||
public List<int> AutoTagIds { get; set; }
|
public List<int> AutoTagIds { get; set; }
|
||||||
|
public List<int> DownloadClientIds { get; set; }
|
||||||
|
|
||||||
public bool InUse => SeriesIds.Any() || NotificationIds.Any() || RestrictionIds.Any() || DelayProfileIds.Any() || ImportListIds.Any() || IndexerIds.Any() || AutoTagIds.Any();
|
public bool InUse => SeriesIds.Any() ||
|
||||||
|
NotificationIds.Any() ||
|
||||||
|
RestrictionIds.Any() ||
|
||||||
|
DelayProfileIds.Any() ||
|
||||||
|
ImportListIds.Any() ||
|
||||||
|
IndexerIds.Any() ||
|
||||||
|
AutoTagIds.Any() ||
|
||||||
|
DownloadClientIds.Any();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@ using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using NzbDrone.Core.AutoTagging;
|
using NzbDrone.Core.AutoTagging;
|
||||||
using NzbDrone.Core.Datastore;
|
using NzbDrone.Core.Datastore;
|
||||||
|
using NzbDrone.Core.Download;
|
||||||
using NzbDrone.Core.ImportLists;
|
using NzbDrone.Core.ImportLists;
|
||||||
using NzbDrone.Core.Indexers;
|
using NzbDrone.Core.Indexers;
|
||||||
using NzbDrone.Core.Messaging.Events;
|
using NzbDrone.Core.Messaging.Events;
|
||||||
|
@ -36,6 +37,7 @@ namespace NzbDrone.Core.Tags
|
||||||
private readonly ISeriesService _seriesService;
|
private readonly ISeriesService _seriesService;
|
||||||
private readonly IIndexerFactory _indexerService;
|
private readonly IIndexerFactory _indexerService;
|
||||||
private readonly IAutoTaggingService _autoTaggingService;
|
private readonly IAutoTaggingService _autoTaggingService;
|
||||||
|
private readonly IDownloadClientFactory _downloadClientFactory;
|
||||||
|
|
||||||
public TagService(ITagRepository repo,
|
public TagService(ITagRepository repo,
|
||||||
IEventAggregator eventAggregator,
|
IEventAggregator eventAggregator,
|
||||||
|
@ -45,7 +47,8 @@ namespace NzbDrone.Core.Tags
|
||||||
IReleaseProfileService releaseProfileService,
|
IReleaseProfileService releaseProfileService,
|
||||||
ISeriesService seriesService,
|
ISeriesService seriesService,
|
||||||
IIndexerFactory indexerService,
|
IIndexerFactory indexerService,
|
||||||
IAutoTaggingService autoTaggingService)
|
IAutoTaggingService autoTaggingService,
|
||||||
|
IDownloadClientFactory downloadClientFactory)
|
||||||
{
|
{
|
||||||
_repo = repo;
|
_repo = repo;
|
||||||
_eventAggregator = eventAggregator;
|
_eventAggregator = eventAggregator;
|
||||||
|
@ -56,6 +59,7 @@ namespace NzbDrone.Core.Tags
|
||||||
_seriesService = seriesService;
|
_seriesService = seriesService;
|
||||||
_indexerService = indexerService;
|
_indexerService = indexerService;
|
||||||
_autoTaggingService = autoTaggingService;
|
_autoTaggingService = autoTaggingService;
|
||||||
|
_downloadClientFactory = downloadClientFactory;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Tag GetTag(int tagId)
|
public Tag GetTag(int tagId)
|
||||||
|
@ -90,6 +94,7 @@ namespace NzbDrone.Core.Tags
|
||||||
var series = _seriesService.AllForTag(tagId);
|
var series = _seriesService.AllForTag(tagId);
|
||||||
var indexers = _indexerService.AllForTag(tagId);
|
var indexers = _indexerService.AllForTag(tagId);
|
||||||
var autoTags = _autoTaggingService.AllForTag(tagId);
|
var autoTags = _autoTaggingService.AllForTag(tagId);
|
||||||
|
var downloadClients = _downloadClientFactory.AllForTag(tagId);
|
||||||
|
|
||||||
return new TagDetails
|
return new TagDetails
|
||||||
{
|
{
|
||||||
|
@ -101,7 +106,8 @@ namespace NzbDrone.Core.Tags
|
||||||
RestrictionIds = restrictions.Select(c => c.Id).ToList(),
|
RestrictionIds = restrictions.Select(c => c.Id).ToList(),
|
||||||
SeriesIds = series.Select(c => c.Id).ToList(),
|
SeriesIds = series.Select(c => c.Id).ToList(),
|
||||||
IndexerIds = indexers.Select(c => c.Id).ToList(),
|
IndexerIds = indexers.Select(c => c.Id).ToList(),
|
||||||
AutoTagIds = autoTags.Select(c => c.Id).ToList()
|
AutoTagIds = autoTags.Select(c => c.Id).ToList(),
|
||||||
|
DownloadClientIds = downloadClients.Select(c => c.Id).ToList()
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -115,6 +121,7 @@ namespace NzbDrone.Core.Tags
|
||||||
var series = _seriesService.GetAllSeriesTags();
|
var series = _seriesService.GetAllSeriesTags();
|
||||||
var indexers = _indexerService.All();
|
var indexers = _indexerService.All();
|
||||||
var autotags = _autoTaggingService.All();
|
var autotags = _autoTaggingService.All();
|
||||||
|
var downloadClients = _downloadClientFactory.All();
|
||||||
|
|
||||||
var details = new List<TagDetails>();
|
var details = new List<TagDetails>();
|
||||||
|
|
||||||
|
@ -131,6 +138,7 @@ namespace NzbDrone.Core.Tags
|
||||||
SeriesIds = series.Where(c => c.Value.Contains(tag.Id)).Select(c => c.Key).ToList(),
|
SeriesIds = series.Where(c => c.Value.Contains(tag.Id)).Select(c => c.Key).ToList(),
|
||||||
IndexerIds = indexers.Where(c => c.Tags.Contains(tag.Id)).Select(c => c.Id).ToList(),
|
IndexerIds = indexers.Where(c => c.Tags.Contains(tag.Id)).Select(c => c.Id).ToList(),
|
||||||
AutoTagIds = autotags.Where(c => c.Tags.Contains(tag.Id)).Select(c => c.Id).ToList(),
|
AutoTagIds = autotags.Where(c => c.Tags.Contains(tag.Id)).Select(c => c.Id).ToList(),
|
||||||
|
DownloadClientIds = downloadClients.Where(c => c.Tags.Contains(tag.Id)).Select(c => c.Id).ToList(),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ namespace Sonarr.Api.V3.Tags
|
||||||
public List<int> NotificationIds { get; set; }
|
public List<int> NotificationIds { get; set; }
|
||||||
public List<int> RestrictionIds { get; set; }
|
public List<int> RestrictionIds { get; set; }
|
||||||
public List<int> IndexerIds { get; set; }
|
public List<int> IndexerIds { get; set; }
|
||||||
|
public List<int> DownloadClientIds { get; set; }
|
||||||
public List<int> AutoTagIds { get; set; }
|
public List<int> AutoTagIds { get; set; }
|
||||||
public List<int> SeriesIds { get; set; }
|
public List<int> SeriesIds { get; set; }
|
||||||
}
|
}
|
||||||
|
@ -35,6 +36,7 @@ namespace Sonarr.Api.V3.Tags
|
||||||
NotificationIds = model.NotificationIds,
|
NotificationIds = model.NotificationIds,
|
||||||
RestrictionIds = model.RestrictionIds,
|
RestrictionIds = model.RestrictionIds,
|
||||||
IndexerIds = model.IndexerIds,
|
IndexerIds = model.IndexerIds,
|
||||||
|
DownloadClientIds = model.DownloadClientIds,
|
||||||
AutoTagIds = model.AutoTagIds,
|
AutoTagIds = model.AutoTagIds,
|
||||||
SeriesIds = model.SeriesIds
|
SeriesIds = model.SeriesIds
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue