github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-13 00:23:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

New: Renamed Blacklist to Blocklist

Browse source
This commit is contained in:
Robin Dadswell 2021-08-19 22:35:06 +01:00 • committed by Qstick
parent 0d7b6f8a4f
commit 8573065a4e
38 changed files with 360 additions and 332 deletions
Download patch file Download diff file Expand all files Collapse all files

30
frontend/src/Activity/Blacklist/Blacklist.js → frontend/src/Activity/Blocklist/Blocklist.js
View file

@ -18,9 +18,9 @@ import getSelectedIds from 'Utilities/Table/getSelectedIds';
import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState'; import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState';
import selectAll from 'Utilities/Table/selectAll'; import selectAll from 'Utilities/Table/selectAll';
import toggleSelected from 'Utilities/Table/toggleSelected'; import toggleSelected from 'Utilities/Table/toggleSelected';
import BlacklistRowConnector from './BlacklistRowConnector'; import BlocklistRowConnector from './BlocklistRowConnector';
class Blacklist extends Component { class Blocklist extends Component {
// //
// Lifecycle // Lifecycle
@ -102,8 +102,8 @@ class Blacklist extends Component {
columns, columns,
totalRecords, totalRecords,
isRemoving, isRemoving,
isClearingBlacklistExecuting, isClearingBlocklistExecuting,
onClearBlacklistPress, onClearBlocklistPress,
...otherProps ...otherProps
} = this.props; } = this.props;
@ -120,7 +120,7 @@ class Blacklist extends Component {
const selectedIds = this.getSelectedIds(); const selectedIds = this.getSelectedIds();
return ( return (
<PageContent title="Blacklist"> <PageContent title="Blocklist">
<PageToolbar> <PageToolbar>
<PageToolbarSection> <PageToolbarSection>
<PageToolbarButton <PageToolbarButton
@ -134,8 +134,8 @@ class Blacklist extends Component {
<PageToolbarButton <PageToolbarButton
label="Clear" label="Clear"
iconName={icons.CLEAR} iconName={icons.CLEAR}
isSpinning={isClearingBlacklistExecuting} isSpinning={isClearingBlocklistExecuting}
onPress={onClearBlacklistPress} onPress={onClearBlocklistPress}
/> />
</PageToolbarSection> </PageToolbarSection>
@ -160,13 +160,13 @@ class Blacklist extends Component {
{ {
!isAnyFetching && !!error && !isAnyFetching && !!error &&
<div>Unable to load blacklist</div> <div>Unable to load blocklist</div>
} }
{ {
isAllPopulated && !error && !items.length && isAllPopulated && !error && !items.length &&
<div> <div>
No history blacklist No history blocklist
</div> </div>
} }
@ -185,7 +185,7 @@ class Blacklist extends Component {
{ {
items.map((item) => { items.map((item) => {
return ( return (
<BlacklistRowConnector <BlocklistRowConnector
key={item.id} key={item.id}
isSelected={selectedState[item.id] || false} isSelected={selectedState[item.id] || false}
columns={columns} columns={columns}
@ -211,7 +211,7 @@ class Blacklist extends Component {
isOpen={isConfirmRemoveModalOpen} isOpen={isConfirmRemoveModalOpen}
kind={kinds.DANGER} kind={kinds.DANGER}
title="Remove Selected" title="Remove Selected"
message={'Are you sure you want to remove the selected items from the blacklist?'} message={'Are you sure you want to remove the selected items from the blocklist?'}
confirmLabel="Remove Selected" confirmLabel="Remove Selected"
onConfirm={this.onRemoveSelectedConfirmed} onConfirm={this.onRemoveSelectedConfirmed}
onCancel={this.onConfirmRemoveModalClose} onCancel={this.onConfirmRemoveModalClose}
@ -221,7 +221,7 @@ class Blacklist extends Component {
} }
} }
Blacklist.propTypes = { Blocklist.propTypes = {
isArtistFetching: PropTypes.bool.isRequired, isArtistFetching: PropTypes.bool.isRequired,
isArtistPopulated: PropTypes.bool.isRequired, isArtistPopulated: PropTypes.bool.isRequired,
isFetching: PropTypes.bool.isRequired, isFetching: PropTypes.bool.isRequired,
@ -231,9 +231,9 @@ Blacklist.propTypes = {
columns: PropTypes.arrayOf(PropTypes.object).isRequired, columns: PropTypes.arrayOf(PropTypes.object).isRequired,
totalRecords: PropTypes.number, totalRecords: PropTypes.number,
isRemoving: PropTypes.bool.isRequired, isRemoving: PropTypes.bool.isRequired,
isClearingBlacklistExecuting: PropTypes.bool.isRequired, isClearingBlocklistExecuting: PropTypes.bool.isRequired,
onRemoveSelected: PropTypes.func.isRequired, onRemoveSelected: PropTypes.func.isRequired,
onClearBlacklistPress: PropTypes.func.isRequired onClearBlocklistPress: PropTypes.func.isRequired
}; };
export default Blacklist; export default Blocklist;

86
frontend/src/Activity/Blacklist/BlacklistConnector.js → frontend/src/Activity/Blocklist/BlocklistConnector.js
View file

@ -4,34 +4,34 @@ import { connect } from 'react-redux';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import * as commandNames from 'Commands/commandNames'; import * as commandNames from 'Commands/commandNames';
import withCurrentPage from 'Components/withCurrentPage'; import withCurrentPage from 'Components/withCurrentPage';
import * as blacklistActions from 'Store/Actions/blacklistActions'; import * as blocklistActions from 'Store/Actions/blocklistActions';
import { executeCommand } from 'Store/Actions/commandActions'; import { executeCommand } from 'Store/Actions/commandActions';
import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector'; import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator'; import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
import Blacklist from './Blacklist'; import Blocklist from './Blocklist';
function createMapStateToProps() { function createMapStateToProps() {
return createSelector( return createSelector(
(state) => state.blacklist, (state) => state.blocklist,
(state) => state.artist, (state) => state.artist,
createCommandExecutingSelector(commandNames.CLEAR_BLACKLIST), createCommandExecutingSelector(commandNames.CLEAR_BLOCKLIST),
(blacklist, artist, isClearingBlacklistExecuting) => { (blocklist, artist, isClearingBlocklistExecuting) => {
return { return {
isArtistFetching: artist.isFetching, isArtistFetching: artist.isFetching,
isArtistPopulated: artist.isPopulated, isArtistPopulated: artist.isPopulated,
isClearingBlacklistExecuting, isClearingBlocklistExecuting,
...blacklist ...blocklist
}; };
} }
); );
} }
const mapDispatchToProps = { const mapDispatchToProps = {
...blacklistActions, ...blocklistActions,
executeCommand executeCommand
}; };
class BlacklistConnector extends Component { class BlocklistConnector extends Component {
// //
// Lifecycle // Lifecycle
@ -39,27 +39,27 @@ class BlacklistConnector extends Component {
componentDidMount() { componentDidMount() {
const { const {
useCurrentPage, useCurrentPage,
fetchBlacklist, fetchBlocklist,
gotoBlacklistFirstPage gotoBlocklistFirstPage
} = this.props; } = this.props;
registerPagePopulator(this.repopulate); registerPagePopulator(this.repopulate);
if (useCurrentPage) { if (useCurrentPage) {
fetchBlacklist(); fetchBlocklist();
} else { } else {
gotoBlacklistFirstPage(); gotoBlocklistFirstPage();
} }
} }
componentDidUpdate(prevProps) { componentDidUpdate(prevProps) {
if (prevProps.isClearingBlacklistExecuting && !this.props.isClearingBlacklistExecuting) { if (prevProps.isClearingBlocklistExecuting && !this.props.isClearingBlocklistExecuting) {
this.props.gotoBlacklistFirstPage(); this.props.gotoBlocklistFirstPage();
} }
} }
componentWillUnmount() { componentWillUnmount() {
this.props.clearBlacklist(); this.props.clearBlocklist();
unregisterPagePopulator(this.repopulate); unregisterPagePopulator(this.repopulate);
} }
@ -67,49 +67,49 @@ class BlacklistConnector extends Component {
// Control // Control
repopulate = () => { repopulate = () => {
this.props.fetchBlacklist(); this.props.fetchBlocklist();
} }
// //
// Listeners // Listeners
onFirstPagePress = () => { onFirstPagePress = () => {
this.props.gotoBlacklistFirstPage(); this.props.gotoBlocklistFirstPage();
} }
onPreviousPagePress = () => { onPreviousPagePress = () => {
this.props.gotoBlacklistPreviousPage(); this.props.gotoBlocklistPreviousPage();
} }
onNextPagePress = () => { onNextPagePress = () => {
this.props.gotoBlacklistNextPage(); this.props.gotoBlocklistNextPage();
} }
onLastPagePress = () => { onLastPagePress = () => {
this.props.gotoBlacklistLastPage(); this.props.gotoBlocklistLastPage();
} }
onPageSelect = (page) => { onPageSelect = (page) => {
this.props.gotoBlacklistPage({ page }); this.props.gotoBlocklistPage({ page });
} }
onRemoveSelected = (ids) => { onRemoveSelected = (ids) => {
this.props.removeBlacklistItems({ ids }); this.props.removeBlocklistItems({ ids });
} }
onSortPress = (sortKey) => { onSortPress = (sortKey) => {
this.props.setBlacklistSort({ sortKey }); this.props.setBlocklistSort({ sortKey });
} }
onTableOptionChange = (payload) => { onTableOptionChange = (payload) => {
this.props.setBlacklistTableOption(payload); this.props.setBlocklistTableOption(payload);
if (payload.pageSize) { if (payload.pageSize) {
this.props.gotoBlacklistFirstPage(); this.props.gotoBlocklistFirstPage();
} }
} }
onClearBlacklistPress = () => { onClearBlocklistPress = () => {
this.props.executeCommand({ name: commandNames.CLEAR_BLACKLIST }); this.props.executeCommand({ name: commandNames.CLEAR_BLOCKLIST });
} }
// //
@ -117,7 +117,7 @@ class BlacklistConnector extends Component {
render() { render() {
return ( return (
<Blacklist <Blocklist
onFirstPagePress={this.onFirstPagePress} onFirstPagePress={this.onFirstPagePress}
onPreviousPagePress={this.onPreviousPagePress} onPreviousPagePress={this.onPreviousPagePress}
onNextPagePress={this.onNextPagePress} onNextPagePress={this.onNextPagePress}
@ -126,30 +126,30 @@ class BlacklistConnector extends Component {
onRemoveSelected={this.onRemoveSelected} onRemoveSelected={this.onRemoveSelected}
onSortPress={this.onSortPress} onSortPress={this.onSortPress}
onTableOptionChange={this.onTableOptionChange} onTableOptionChange={this.onTableOptionChange}
onClearBlacklistPress={this.onClearBlacklistPress} onClearBlocklistPress={this.onClearBlocklistPress}
{...this.props} {...this.props}
/> />
); );
} }
} }
BlacklistConnector.propTypes = { BlocklistConnector.propTypes = {
useCurrentPage: PropTypes.bool.isRequired, useCurrentPage: PropTypes.bool.isRequired,
isClearingBlacklistExecuting: PropTypes.bool.isRequired, isClearingBlocklistExecuting: PropTypes.bool.isRequired,
items: PropTypes.arrayOf(PropTypes.object).isRequired, items: PropTypes.arrayOf(PropTypes.object).isRequired,
fetchBlacklist: PropTypes.func.isRequired, fetchBlocklist: PropTypes.func.isRequired,
gotoBlacklistFirstPage: PropTypes.func.isRequired, gotoBlocklistFirstPage: PropTypes.func.isRequired,
gotoBlacklistPreviousPage: PropTypes.func.isRequired, gotoBlocklistPreviousPage: PropTypes.func.isRequired,
gotoBlacklistNextPage: PropTypes.func.isRequired, gotoBlocklistNextPage: PropTypes.func.isRequired,
gotoBlacklistLastPage: PropTypes.func.isRequired, gotoBlocklistLastPage: PropTypes.func.isRequired,
gotoBlacklistPage: PropTypes.func.isRequired, gotoBlocklistPage: PropTypes.func.isRequired,
removeBlacklistItems: PropTypes.func.isRequired, removeBlocklistItems: PropTypes.func.isRequired,
setBlacklistSort: PropTypes.func.isRequired, setBlocklistSort: PropTypes.func.isRequired,
setBlacklistTableOption: PropTypes.func.isRequired, setBlocklistTableOption: PropTypes.func.isRequired,
clearBlacklist: PropTypes.func.isRequired, clearBlocklist: PropTypes.func.isRequired,
executeCommand: PropTypes.func.isRequired executeCommand: PropTypes.func.isRequired
}; };
export default withCurrentPage( export default withCurrentPage(
connect(createMapStateToProps, mapDispatchToProps)(BlacklistConnector) connect(createMapStateToProps, mapDispatchToProps)(BlocklistConnector)
); );

6
frontend/src/Activity/Blacklist/BlacklistDetailsModal.js → frontend/src/Activity/Blocklist/BlocklistDetailsModal.js
View file

@ -9,7 +9,7 @@ import ModalContent from 'Components/Modal/ModalContent';
import ModalFooter from 'Components/Modal/ModalFooter'; import ModalFooter from 'Components/Modal/ModalFooter';
import ModalHeader from 'Components/Modal/ModalHeader'; import ModalHeader from 'Components/Modal/ModalHeader';
class BlacklistDetailsModal extends Component { class BlocklistDetailsModal extends Component {
// //
// Render // Render
@ -77,7 +77,7 @@ class BlacklistDetailsModal extends Component {
} }
} }
BlacklistDetailsModal.propTypes = { BlocklistDetailsModal.propTypes = {
isOpen: PropTypes.bool.isRequired, isOpen: PropTypes.bool.isRequired,
sourceTitle: PropTypes.string.isRequired, sourceTitle: PropTypes.string.isRequired,
protocol: PropTypes.string.isRequired, protocol: PropTypes.string.isRequired,
@ -86,4 +86,4 @@ BlacklistDetailsModal.propTypes = {
onModalClose: PropTypes.func.isRequired onModalClose: PropTypes.func.isRequired
}; };
export default BlacklistDetailsModal; export default BlocklistDetailsModal;

0
frontend/src/Activity/Blacklist/BlacklistRow.css → frontend/src/Activity/Blocklist/BlocklistRow.css
View file

14
frontend/src/Activity/Blacklist/BlacklistRow.js → frontend/src/Activity/Blocklist/BlocklistRow.js
View file

@ -8,10 +8,10 @@ import TableRowCell from 'Components/Table/Cells/TableRowCell';
import TableSelectCell from 'Components/Table/Cells/TableSelectCell'; import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
import TableRow from 'Components/Table/TableRow'; import TableRow from 'Components/Table/TableRow';
import { icons, kinds } from 'Helpers/Props'; import { icons, kinds } from 'Helpers/Props';
import BlacklistDetailsModal from './BlacklistDetailsModal'; import BlocklistDetailsModal from './BlocklistDetailsModal';
import styles from './BlacklistRow.css'; import styles from './BlocklistRow.css';
class BlacklistRow extends Component { class BlocklistRow extends Component {
// //
// Lifecycle // Lifecycle
@ -141,7 +141,7 @@ class BlacklistRow extends Component {
/> />
<IconButton <IconButton
title="Remove from blacklist" title="Remove from blocklist"
name={icons.REMOVE} name={icons.REMOVE}
kind={kinds.DANGER} kind={kinds.DANGER}
onPress={onRemovePress} onPress={onRemovePress}
@ -154,7 +154,7 @@ class BlacklistRow extends Component {
}) })
} }
<BlacklistDetailsModal <BlocklistDetailsModal
isOpen={this.state.isDetailsModalOpen} isOpen={this.state.isDetailsModalOpen}
sourceTitle={sourceTitle} sourceTitle={sourceTitle}
protocol={protocol} protocol={protocol}
@ -168,7 +168,7 @@ class BlacklistRow extends Component {
} }
BlacklistRow.propTypes = { BlocklistRow.propTypes = {
id: PropTypes.number.isRequired, id: PropTypes.number.isRequired,
artist: PropTypes.object.isRequired, artist: PropTypes.object.isRequired,
sourceTitle: PropTypes.string.isRequired, sourceTitle: PropTypes.string.isRequired,
@ -183,4 +183,4 @@ BlacklistRow.propTypes = {
onRemovePress: PropTypes.func.isRequired onRemovePress: PropTypes.func.isRequired
}; };
export default BlacklistRow; export default BlocklistRow;

8
frontend/src/Activity/Blacklist/BlacklistRowConnector.js → frontend/src/Activity/Blocklist/BlocklistRowConnector.js
View file

@ -1,8 +1,8 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import { removeBlacklistItem } from 'Store/Actions/blacklistActions'; import { removeBlocklistItem } from 'Store/Actions/blocklistActions';
import createArtistSelector from 'Store/Selectors/createArtistSelector'; import createArtistSelector from 'Store/Selectors/createArtistSelector';
import BlacklistRow from './BlacklistRow'; import BlocklistRow from './BlocklistRow';
function createMapStateToProps() { function createMapStateToProps() {
return createSelector( return createSelector(
@ -18,9 +18,9 @@ function createMapStateToProps() {
function createMapDispatchToProps(dispatch, props) { function createMapDispatchToProps(dispatch, props) {
return { return {
onRemovePress() { onRemovePress() {
dispatch(removeBlacklistItem({ id: props.id })); dispatch(removeBlocklistItem({ id: props.id }));
} }
}; };
} }
export default connect(createMapStateToProps, createMapDispatchToProps)(BlacklistRow); export default connect(createMapStateToProps, createMapDispatchToProps)(BlocklistRow);

4
frontend/src/Activity/Queue/QueueRow.js
View file

@ -42,14 +42,14 @@ class QueueRow extends Component {
this.setState({ isRemoveQueueItemModalOpen: true }); this.setState({ isRemoveQueueItemModalOpen: true });
} }
onRemoveQueueItemModalConfirmed = (blacklist, skipredownload) => { onRemoveQueueItemModalConfirmed = (blocklist, skipredownload) => {
const { const {
onRemoveQueueItemPress, onRemoveQueueItemPress,
onQueueRowModalOpenOrClose onQueueRowModalOpenOrClose
} = this.props; } = this.props;
onQueueRowModalOpenOrClose(false); onQueueRowModalOpenOrClose(false);
onRemoveQueueItemPress(blacklist, skipredownload); onRemoveQueueItemPress(blocklist, skipredownload);
this.setState({ isRemoveQueueItemModalOpen: false }); this.setState({ isRemoveQueueItemModalOpen: false });
} }

20
frontend/src/Activity/Queue/RemoveQueueItemModal.js
View file

@ -21,7 +21,7 @@ class RemoveQueueItemModal extends Component {
this.state = { this.state = {
remove: true, remove: true,
blacklist: false, blocklist: false,
skipredownload: false skipredownload: false
}; };
} }
@ -32,7 +32,7 @@ class RemoveQueueItemModal extends Component {
resetState = function() { resetState = function() {
this.setState({ this.setState({
remove: true, remove: true,
blacklist: false, blocklist: false,
skipredownload: false skipredownload: false
}); });
} }
@ -44,8 +44,8 @@ class RemoveQueueItemModal extends Component {
this.setState({ remove: value }); this.setState({ remove: value });
} }
onBlacklistChange = ({ value }) => { onBlocklistChange = ({ value }) => {
this.setState({ blacklist: value }); this.setState({ blocklist: value });
} }
onSkipReDownloadChange = ({ value }) => { onSkipReDownloadChange = ({ value }) => {
@ -74,7 +74,7 @@ class RemoveQueueItemModal extends Component {
canIgnore canIgnore
} = this.props; } = this.props;
const { remove, blacklist, skipredownload } = this.state; const { remove, blocklist, skipredownload } = this.state;
return ( return (
<Modal <Modal
@ -108,19 +108,19 @@ class RemoveQueueItemModal extends Component {
</FormGroup> </FormGroup>
<FormGroup> <FormGroup>
<FormLabel>Blacklist Release</FormLabel> <FormLabel>Blocklist Release</FormLabel>
<FormInputGroup <FormInputGroup
type={inputTypes.CHECK} type={inputTypes.CHECK}
name="blacklist" name="blocklist"
value={blacklist} value={blocklist}
helpText="Prevents Lidarr from automatically grabbing this release again" helpText="Prevents Lidarr from automatically grabbing this release again"
onChange={this.onBlacklistChange} onChange={this.onBlocklistChange}
/> />
</FormGroup> </FormGroup>
{ {
blacklist && blocklist &&
<FormGroup> <FormGroup>
<FormLabel>Skip Redownload</FormLabel> <FormLabel>Skip Redownload</FormLabel>
<FormInputGroup <FormInputGroup

20
frontend/src/Activity/Queue/RemoveQueueItemsModal.js
View file

@ -22,7 +22,7 @@ class RemoveQueueItemsModal extends Component {
this.state = { this.state = {
remove: true, remove: true,
blacklist: false, blocklist: false,
skipredownload: false skipredownload: false
}; };
} }
@ -33,7 +33,7 @@ class RemoveQueueItemsModal extends Component {
resetState = function() { resetState = function() {
this.setState({ this.setState({
remove: true, remove: true,
blacklist: false, blocklist: false,
skipredownload: false skipredownload: false
}); });
} }
@ -45,8 +45,8 @@ class RemoveQueueItemsModal extends Component {
this.setState({ remove: value }); this.setState({ remove: value });
} }
onBlacklistChange = ({ value }) => { onBlocklistChange = ({ value }) => {
this.setState({ blacklist: value }); this.setState({ blocklist: value });
} }
onSkipReDownloadChange = ({ value }) => { onSkipReDownloadChange = ({ value }) => {
@ -75,7 +75,7 @@ class RemoveQueueItemsModal extends Component {
canIgnore canIgnore
} = this.props; } = this.props;
const { remove, blacklist, skipredownload } = this.state; const { remove, blocklist, skipredownload } = this.state;
return ( return (
<Modal <Modal
@ -110,20 +110,20 @@ class RemoveQueueItemsModal extends Component {
<FormGroup> <FormGroup>
<FormLabel> <FormLabel>
Blacklist Release{selectedCount > 1 ? 's' : ''} Blocklist Release{selectedCount > 1 ? 's' : ''}
</FormLabel> </FormLabel>
<FormInputGroup <FormInputGroup
type={inputTypes.CHECK} type={inputTypes.CHECK}
name="blacklist" name="blocklist"
value={blacklist} value={blocklist}
helpText="Prevents Lidarr from automatically grabbing these files again" helpText="Prevents Lidarr from automatically grabbing these files again"
onChange={this.onBlacklistChange} onChange={this.onBlocklistChange}
/> />
</FormGroup> </FormGroup>
{ {
blacklist && blocklist &&
<FormGroup> <FormGroup>
<FormLabel>Skip Redownload</FormLabel> <FormLabel>Skip Redownload</FormLabel>
<FormInputGroup <FormInputGroup

6
frontend/src/App/AppRoutes.js
View file

@ -1,7 +1,7 @@
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import React from 'react'; import React from 'react';
import { Redirect, Route } from 'react-router-dom'; import { Redirect, Route } from 'react-router-dom';
import BlacklistConnector from 'Activity/Blacklist/BlacklistConnector'; import BlocklistConnector from 'Activity/Blocklist/BlocklistConnector';
import HistoryConnector from 'Activity/History/HistoryConnector'; import HistoryConnector from 'Activity/History/HistoryConnector';
import QueueConnector from 'Activity/Queue/QueueConnector'; import QueueConnector from 'Activity/Queue/QueueConnector';
import AlbumDetailsPageConnector from 'Album/Details/AlbumDetailsPageConnector'; import AlbumDetailsPageConnector from 'Album/Details/AlbumDetailsPageConnector';
@ -124,8 +124,8 @@ function AppRoutes(props) {
/> />
<Route <Route
path="/activity/blacklist" path="/activity/blocklist"
component={BlacklistConnector} component={BlocklistConnector}
/> />
{/* {/*

2
frontend/src/Commands/commandNames.js
View file

@ -1,7 +1,7 @@
export const APPLICATION_UPDATE = 'ApplicationUpdate'; export const APPLICATION_UPDATE = 'ApplicationUpdate';
export const BACKUP = 'Backup'; export const BACKUP = 'Backup';
export const REFRESH_MONITORED_DOWNLOADS = 'RefreshMonitoredDownloads'; export const REFRESH_MONITORED_DOWNLOADS = 'RefreshMonitoredDownloads';
export const CLEAR_BLACKLIST = 'ClearBlacklist'; export const CLEAR_BLOCKLIST = 'ClearBlocklist';
export const CLEAR_LOGS = 'ClearLog'; export const CLEAR_LOGS = 'ClearLog';
export const CUTOFF_UNMET_ALBUM_SEARCH = 'CutoffUnmetAlbumSearch'; export const CUTOFF_UNMET_ALBUM_SEARCH = 'CutoffUnmetAlbumSearch';
export const DELETE_LOG_FILES = 'DeleteLogFiles'; export const DELETE_LOG_FILES = 'DeleteLogFiles';

4
frontend/src/Components/Page/Sidebar/PageSidebar.js
View file

@ -64,8 +64,8 @@ const links = [
to: '/activity/history' to: '/activity/history'
}, },
{ {
title: 'Blacklist', title: 'Blocklist',
to: '/activity/blacklist' to: '/activity/blocklist'
} }
] ]
}, },

4
frontend/src/Store/Actions/Creators/createHandleActions.js
View file

@ -10,7 +10,7 @@ import {
import getSectionState from 'Utilities/State/getSectionState'; import getSectionState from 'Utilities/State/getSectionState';
import updateSectionState from 'Utilities/State/updateSectionState'; import updateSectionState from 'Utilities/State/updateSectionState';
const blacklistedProperties = [ const omittedProperties = [
'section', 'section',
'id' 'id'
]; ];
@ -31,7 +31,7 @@ export default function createHandleActions(handlers, defaultState, section) {
if (section === baseSection) { if (section === baseSection) {
const newState = Object.assign(getSectionState(state, payloadSection), const newState = Object.assign(getSectionState(state, payloadSection),
_.omit(payload, blacklistedProperties)); _.omit(payload, omittedProperties));
return updateSectionState(state, payloadSection, newState); return updateSectionState(state, payloadSection, newState);
} }

84
frontend/src/Store/Actions/blacklistActions.js → frontend/src/Store/Actions/blocklistActions.js
View file

@ -14,7 +14,7 @@ import createSetTableOptionReducer from './Creators/Reducers/createSetTableOptio
// //
// Variables // Variables
export const section = 'blacklist'; export const section = 'blocklist';
// //
// State // State
@ -69,41 +69,41 @@ export const defaultState = {
}; };
export const persistState = [ export const persistState = [
'blacklist.pageSize', 'blocklist.pageSize',
'blacklist.sortKey', 'blocklist.sortKey',
'blacklist.sortDirection', 'blocklist.sortDirection',
'blacklist.columns' 'blocklist.columns'
]; ];
// //
// Action Types // Action Types
export const FETCH_BLACKLIST = 'blacklist/fetchBlacklist'; export const FETCH_BLOCKLIST = 'blocklist/fetchBlocklist';
export const GOTO_FIRST_BLACKLIST_PAGE = 'blacklist/gotoBlacklistFirstPage'; export const GOTO_FIRST_BLOCKLIST_PAGE = 'blocklist/gotoBlocklistFirstPage';
export const GOTO_PREVIOUS_BLACKLIST_PAGE = 'blacklist/gotoBlacklistPreviousPage'; export const GOTO_PREVIOUS_BLOCKLIST_PAGE = 'blocklist/gotoBlocklistPreviousPage';
export const GOTO_NEXT_BLACKLIST_PAGE = 'blacklist/gotoBlacklistNextPage'; export const GOTO_NEXT_BLOCKLIST_PAGE = 'blocklist/gotoBlocklistNextPage';
export const GOTO_LAST_BLACKLIST_PAGE = 'blacklist/gotoBlacklistLastPage'; export const GOTO_LAST_BLOCKLIST_PAGE = 'blocklist/gotoBlocklistLastPage';
export const GOTO_BLACKLIST_PAGE = 'blacklist/gotoBlacklistPage'; export const GOTO_BLOCKLIST_PAGE = 'blocklist/gotoBlocklistPage';
export const SET_BLACKLIST_SORT = 'blacklist/setBlacklistSort'; export const SET_BLOCKLIST_SORT = 'blocklist/setBlocklistSort';
export const SET_BLACKLIST_TABLE_OPTION = 'blacklist/setBlacklistTableOption'; export const SET_BLOCKLIST_TABLE_OPTION = 'blocklist/setBlocklistTableOption';
export const REMOVE_BLACKLIST_ITEM = 'blacklist/removeBlacklistItem'; export const REMOVE_BLOCKLIST_ITEM = 'blocklist/removeBlocklistItem';
export const REMOVE_BLACKLIST_ITEMS = 'blacklist/removeBlacklistItems'; export const REMOVE_BLOCKLIST_ITEMS = 'blocklist/removeBlocklistItems';
export const CLEAR_BLACKLIST = 'blacklist/clearBlacklist'; export const CLEAR_BLOCKLIST = 'blocklist/clearBlocklist';
// //
// Action Creators // Action Creators
export const fetchBlacklist = createThunk(FETCH_BLACKLIST); export const fetchBlocklist = createThunk(FETCH_BLOCKLIST);
export const gotoBlacklistFirstPage = createThunk(GOTO_FIRST_BLACKLIST_PAGE); export const gotoBlocklistFirstPage = createThunk(GOTO_FIRST_BLOCKLIST_PAGE);
export const gotoBlacklistPreviousPage = createThunk(GOTO_PREVIOUS_BLACKLIST_PAGE); export const gotoBlocklistPreviousPage = createThunk(GOTO_PREVIOUS_BLOCKLIST_PAGE);
export const gotoBlacklistNextPage = createThunk(GOTO_NEXT_BLACKLIST_PAGE); export const gotoBlocklistNextPage = createThunk(GOTO_NEXT_BLOCKLIST_PAGE);
export const gotoBlacklistLastPage = createThunk(GOTO_LAST_BLACKLIST_PAGE); export const gotoBlocklistLastPage = createThunk(GOTO_LAST_BLOCKLIST_PAGE);
export const gotoBlacklistPage = createThunk(GOTO_BLACKLIST_PAGE); export const gotoBlocklistPage = createThunk(GOTO_BLOCKLIST_PAGE);
export const setBlacklistSort = createThunk(SET_BLACKLIST_SORT); export const setBlocklistSort = createThunk(SET_BLOCKLIST_SORT);
export const setBlacklistTableOption = createAction(SET_BLACKLIST_TABLE_OPTION); export const setBlocklistTableOption = createAction(SET_BLOCKLIST_TABLE_OPTION);
export const removeBlacklistItem = createThunk(REMOVE_BLACKLIST_ITEM); export const removeBlocklistItem = createThunk(REMOVE_BLOCKLIST_ITEM);
export const removeBlacklistItems = createThunk(REMOVE_BLACKLIST_ITEMS); export const removeBlocklistItems = createThunk(REMOVE_BLOCKLIST_ITEMS);
export const clearBlacklist = createAction(CLEAR_BLACKLIST); export const clearBlocklist = createAction(CLEAR_BLOCKLIST);
// //
// Action Handlers // Action Handlers
@ -111,21 +111,21 @@ export const clearBlacklist = createAction(CLEAR_BLACKLIST);
export const actionHandlers = handleThunks({ export const actionHandlers = handleThunks({
...createServerSideCollectionHandlers( ...createServerSideCollectionHandlers(
section, section,
'/blacklist', '/blocklist',
fetchBlacklist, fetchBlocklist,
{ {
[serverSideCollectionHandlers.FETCH]: FETCH_BLACKLIST, [serverSideCollectionHandlers.FETCH]: FETCH_BLOCKLIST,
[serverSideCollectionHandlers.FIRST_PAGE]: GOTO_FIRST_BLACKLIST_PAGE, [serverSideCollectionHandlers.FIRST_PAGE]: GOTO_FIRST_BLOCKLIST_PAGE,
[serverSideCollectionHandlers.PREVIOUS_PAGE]: GOTO_PREVIOUS_BLACKLIST_PAGE, [serverSideCollectionHandlers.PREVIOUS_PAGE]: GOTO_PREVIOUS_BLOCKLIST_PAGE,
[serverSideCollectionHandlers.NEXT_PAGE]: GOTO_NEXT_BLACKLIST_PAGE, [serverSideCollectionHandlers.NEXT_PAGE]: GOTO_NEXT_BLOCKLIST_PAGE,
[serverSideCollectionHandlers.LAST_PAGE]: GOTO_LAST_BLACKLIST_PAGE, [serverSideCollectionHandlers.LAST_PAGE]: GOTO_LAST_BLOCKLIST_PAGE,
[serverSideCollectionHandlers.EXACT_PAGE]: GOTO_BLACKLIST_PAGE, [serverSideCollectionHandlers.EXACT_PAGE]: GOTO_BLOCKLIST_PAGE,
[serverSideCollectionHandlers.SORT]: SET_BLACKLIST_SORT [serverSideCollectionHandlers.SORT]: SET_BLOCKLIST_SORT
}), }),
[REMOVE_BLACKLIST_ITEM]: createRemoveItemHandler(section, '/blacklist'), [REMOVE_BLOCKLIST_ITEM]: createRemoveItemHandler(section, '/blocklist'),
[REMOVE_BLACKLIST_ITEMS]: function(getState, payload, dispatch) { [REMOVE_BLOCKLIST_ITEMS]: function(getState, payload, dispatch) {
const { const {
ids ids
} = payload; } = payload;
@ -143,7 +143,7 @@ export const actionHandlers = handleThunks({
])); ]));
const promise = createAjaxRequest({ const promise = createAjaxRequest({
url: '/blacklist/bulk', url: '/blocklist/bulk',
method: 'DELETE', method: 'DELETE',
dataType: 'json', dataType: 'json',
contentType: 'application/json', contentType: 'application/json',
@ -152,7 +152,7 @@ export const actionHandlers = handleThunks({
promise.done((data) => { promise.done((data) => {
// Don't use batchActions with thunks // Don't use batchActions with thunks
dispatch(fetchBlacklist()); dispatch(fetchBlocklist());
dispatch(set({ section, isRemoving: false })); dispatch(set({ section, isRemoving: false }));
}); });
@ -178,9 +178,9 @@ export const actionHandlers = handleThunks({
export const reducers = createHandleActions({ export const reducers = createHandleActions({
[SET_BLACKLIST_TABLE_OPTION]: createSetTableOptionReducer(section), [SET_BLOCKLIST_TABLE_OPTION]: createSetTableOptionReducer(section),
[CLEAR_BLACKLIST]: createClearReducer(section, { [CLEAR_BLOCKLIST]: createClearReducer(section, {
isFetching: false, isFetching: false,
isPopulated: false, isPopulated: false,
error: null, error: null,

4
frontend/src/Store/Actions/index.js
View file

@ -6,7 +6,7 @@ import * as artist from './artistActions';
import * as artistEditor from './artistEditorActions'; import * as artistEditor from './artistEditorActions';
import * as artistHistory from './artistHistoryActions'; import * as artistHistory from './artistHistoryActions';
import * as artistIndex from './artistIndexActions'; import * as artistIndex from './artistIndexActions';
import * as blacklist from './blacklistActions'; import * as blocklist from './blocklistActions';
import * as calendar from './calendarActions'; import * as calendar from './calendarActions';
import * as captcha from './captchaActions'; import * as captcha from './captchaActions';
import * as commands from './commandActions'; import * as commands from './commandActions';
@ -30,7 +30,7 @@ import * as wanted from './wantedActions';
export default [ export default [
app, app,
blacklist, blocklist,
captcha, captcha,
calendar, calendar,
commands, commands,

8
frontend/src/Store/Actions/queueActions.js
View file

@ -352,14 +352,14 @@ export const actionHandlers = handleThunks({
const { const {
id, id,
remove, remove,
blacklist, blocklist,
skipredownload skipredownload
} = payload; } = payload;
dispatch(updateItem({ section: paged, id, isRemoving: true })); dispatch(updateItem({ section: paged, id, isRemoving: true }));
const promise = createAjaxRequest({ const promise = createAjaxRequest({
url: `/queue/${id}?removeFromClient=${remove}&blacklist=${blacklist}&skipredownload=${skipredownload}`, url: `/queue/${id}?removeFromClient=${remove}&blocklist=${blocklist}&skipredownload=${skipredownload}`,
method: 'DELETE' method: 'DELETE'
}).request; }).request;
@ -376,7 +376,7 @@ export const actionHandlers = handleThunks({
const { const {
ids, ids,
remove, remove,
blacklist, blocklist,
skipredownload skipredownload
} = payload; } = payload;
@ -393,7 +393,7 @@ export const actionHandlers = handleThunks({
])); ]));
const promise = createAjaxRequest({ const promise = createAjaxRequest({
url: `/queue/bulk?removeFromClient=${remove}&blacklist=${blacklist}&skipredownload=${skipredownload}`, url: `/queue/bulk?removeFromClient=${remove}&blocklist=${blocklist}&skipredownload=${skipredownload}`,
method: 'DELETE', method: 'DELETE',
dataType: 'json', dataType: 'json',
contentType: 'application/json', contentType: 'application/json',

2
frontend/src/Store/Migrators/migrate.js
View file

@ -1,5 +1,7 @@
import migrateAddArtistDefaults from './migrateAddArtistDefaults'; import migrateAddArtistDefaults from './migrateAddArtistDefaults';
import migrateBlacklistToBlocklist from './migrateBlacklistToBlocklist';
export default function migrate(persistedState) { export default function migrate(persistedState) {
migrateAddArtistDefaults(persistedState); migrateAddArtistDefaults(persistedState);
migrateBlacklistToBlocklist(persistedState);
} }

12
frontend/src/Store/Migrators/migrateBlacklistToBlocklist.js Normal file
View file

@ -0,0 +1,12 @@
import _, { get } from 'lodash';
export default function migrateBlacklistToBlocklist(persistedState) {
const blocklist = get(persistedState, 'blacklist');
if (!blocklist) {
return;
}
persistedState.blocklist = blocklist;
_.remove(persistedState, 'blacklist');
}

43
src/Lidarr.Api.V1/Blacklist/BlacklistController.cs
View file

@ -1,43 +0,0 @@
using Lidarr.Http;
using Lidarr.Http.Extensions;
using Lidarr.Http.REST.Attributes;
using Microsoft.AspNetCore.Mvc;
using NzbDrone.Core.Blacklisting;
using NzbDrone.Core.Datastore;
namespace Lidarr.Api.V1.Blacklist
{
[V1ApiController]
public class BlacklistController : Controller
{
private readonly IBlacklistService _blacklistService;
public BlacklistController(IBlacklistService blacklistService)
{
_blacklistService = blacklistService;
}
[HttpGet]
public PagingResource<BlacklistResource> GetBlacklist()
{
var pagingResource = Request.ReadPagingResourceFromRequest<BlacklistResource>();
var pagingSpec = pagingResource.MapToPagingSpec<BlacklistResource, NzbDrone.Core.Blacklisting.Blacklist>("date", SortDirection.Descending);
return pagingSpec.ApplyToPage(_blacklistService.Paged, BlacklistResourceMapper.MapToResource);
}
[RestDeleteById]
public void DeleteBlacklist(int id)
{
_blacklistService.Delete(id);
}
[HttpDelete("bulk")]
public object Remove([FromBody] BlacklistBulkResource resource)
{
_blacklistService.Delete(resource.Ids);
return new object();
}
}
}

4
src/Lidarr.Api.V1/Blacklist/BlacklistBulkResource.cs → src/Lidarr.Api.V1/Blocklist/BlocklistBulkResource.cs
View file

@ -1,8 +1,8 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace Lidarr.Api.V1.Blacklist namespace Lidarr.Api.V1.Blocklist
{ {
public class BlacklistBulkResource public class BlocklistBulkResource
{ {
public List<int> Ids { get; set; } public List<int> Ids { get; set; }
} }

43
src/Lidarr.Api.V1/Blocklist/BlocklistController.cs Normal file
View file

@ -0,0 +1,43 @@
using Lidarr.Http;
using Lidarr.Http.Extensions;
using Lidarr.Http.REST.Attributes;
using Microsoft.AspNetCore.Mvc;
using NzbDrone.Core.Blocklisting;
using NzbDrone.Core.Datastore;
namespace Lidarr.Api.V1.Blocklist
{
[V1ApiController]
public class BlocklistController : Controller
{
private readonly IBlocklistService _blocklistService;
public BlocklistController(IBlocklistService blocklistService)
{
_blocklistService = blocklistService;
}
[HttpGet]
public PagingResource<BlocklistResource> GetBlacklist()
{
var pagingResource = Request.ReadPagingResourceFromRequest<BlocklistResource>();
var pagingSpec = pagingResource.MapToPagingSpec<BlocklistResource, NzbDrone.Core.Blocklisting.Blocklist>("date", SortDirection.Descending);
return pagingSpec.ApplyToPage(_blocklistService.Paged, BlocklistResourceMapper.MapToResource);
}
[RestDeleteById]
public void DeleteBlocklist(int id)
{
_blocklistService.Delete(id);
}
[HttpDelete("bulk")]
public object Remove([FromBody] BlocklistBulkResource resource)
{
_blocklistService.Delete(resource.Ids);
return new object();
}
}
}

10
src/Lidarr.Api.V1/Blacklist/BlacklistResource.cs → src/Lidarr.Api.V1/Blocklist/BlocklistResource.cs
View file

@ -5,9 +5,9 @@ using Lidarr.Http.REST;
using NzbDrone.Core.Indexers; using NzbDrone.Core.Indexers;
using NzbDrone.Core.Qualities; using NzbDrone.Core.Qualities;
namespace Lidarr.Api.V1.Blacklist namespace Lidarr.Api.V1.Blocklist
{ {
public class BlacklistResource : RestResource public class BlocklistResource : RestResource
{ {
public int ArtistId { get; set; } public int ArtistId { get; set; }
public List<int> AlbumIds { get; set; } public List<int> AlbumIds { get; set; }
@ -21,16 +21,16 @@ namespace Lidarr.Api.V1.Blacklist
public ArtistResource Artist { get; set; } public ArtistResource Artist { get; set; }
} }
public static class BlacklistResourceMapper public static class BlocklistResourceMapper
{ {
public static BlacklistResource MapToResource(this NzbDrone.Core.Blacklisting.Blacklist model) public static BlocklistResource MapToResource(this NzbDrone.Core.Blocklisting.Blocklist model)
{ {
if (model == null) if (model == null)
{ {
return null; return null;
} }
return new BlacklistResource return new BlocklistResource
{ {
Id = model.Id, Id = model.Id,

36
src/Lidarr.Api.V1/swagger.json
View file

@ -791,10 +791,10 @@
} }
} }
}, },
"/api/v1/blacklist": { "/api/v1/blocklist": {
"get": { "get": {
"tags": [ "tags": [
"Blacklist" "Blocklist"
], ],
"responses": { "responses": {
"200": { "200": {
@ -802,17 +802,17 @@
"content": { "content": {
"text/plain": { "text/plain": {
"schema": { "schema": {
"$ref": "#/components/schemas/BlacklistResourcePagingResource" "$ref": "#/components/schemas/BlocklistResourcePagingResource"
} }
}, },
"application/json": { "application/json": {
"schema": { "schema": {
"$ref": "#/components/schemas/BlacklistResourcePagingResource" "$ref": "#/components/schemas/BlocklistResourcePagingResource"
} }
}, },
"text/json": { "text/json": {
"schema": { "schema": {
"$ref": "#/components/schemas/BlacklistResourcePagingResource" "$ref": "#/components/schemas/BlocklistResourcePagingResource"
} }
} }
} }
@ -820,10 +820,10 @@
} }
} }
}, },
"/api/v1/blacklist/{id}": { "/api/v1/blocklist/{id}": {
"delete": { "delete": {
"tags": [ "tags": [
"Blacklist" "Blocklist"
], ],
"parameters": [ "parameters": [
{ {
@ -843,26 +843,26 @@
} }
} }
}, },
"/api/v1/blacklist/bulk": { "/api/v1/blocklist/bulk": {
"delete": { "delete": {
"tags": [ "tags": [
"Blacklist" "Blocklist"
], ],
"requestBody": { "requestBody": {
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"$ref": "#/components/schemas/BlacklistBulkResource" "$ref": "#/components/schemas/BlocklistBulkResource"
} }
}, },
"text/json": { "text/json": {
"schema": { "schema": {
"$ref": "#/components/schemas/BlacklistBulkResource" "$ref": "#/components/schemas/BlocklistBulkResource"
} }
}, },
"application/*+json": { "application/*+json": {
"schema": { "schema": {
"$ref": "#/components/schemas/BlacklistBulkResource" "$ref": "#/components/schemas/BlocklistBulkResource"
} }
} }
} }
@ -5905,7 +5905,7 @@
} }
}, },
{ {
"name": "blacklist", "name": "blocklist",
"in": "query", "in": "query",
"schema": { "schema": {
"type": "boolean", "type": "boolean",
@ -5943,7 +5943,7 @@
} }
}, },
{ {
"name": "blacklist", "name": "blocklist",
"in": "query", "in": "query",
"schema": { "schema": {
"type": "boolean", "type": "boolean",
@ -9421,7 +9421,7 @@
], ],
"type": "string" "type": "string"
}, },
"BlacklistBulkResource": { "BlocklistBulkResource": {
"type": "object", "type": "object",
"properties": { "properties": {
"ids": { "ids": {
@ -9435,7 +9435,7 @@
}, },
"additionalProperties": false "additionalProperties": false
}, },
"BlacklistResource": { "BlocklistResource": {
"type": "object", "type": "object",
"properties": { "properties": {
"id": { "id": {
@ -9482,7 +9482,7 @@
}, },
"additionalProperties": false "additionalProperties": false
}, },
"BlacklistResourcePagingResource": { "BlocklistResourcePagingResource": {
"type": "object", "type": "object",
"properties": { "properties": {
"page": { "page": {
@ -9514,7 +9514,7 @@
"records": { "records": {
"type": "array", "type": "array",
"items": { "items": {
"$ref": "#/components/schemas/BlacklistResource" "$ref": "#/components/schemas/BlocklistResource"
}, },
"nullable": true "nullable": true
} }

2
src/NzbDrone.Automation.Test/MainPagesTest.cs
View file

@ -52,7 +52,7 @@ namespace NzbDrone.Automation.Test
_page.Find(By.LinkText("Queue")).Should().NotBeNull(); _page.Find(By.LinkText("Queue")).Should().NotBeNull();
_page.Find(By.LinkText("History")).Should().NotBeNull(); _page.Find(By.LinkText("History")).Should().NotBeNull();
_page.Find(By.LinkText("Blacklist")).Should().NotBeNull(); _page.Find(By.LinkText("Blocklist")).Should().NotBeNull();
} }
[Test] [Test]

22
src/NzbDrone.Core.Test/Blacklisting/BlacklistRepositoryFixture.cs → src/NzbDrone.Core.Test/Blocklisting/BlocklistRepositoryFixture.cs
View file

@ -3,21 +3,21 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using FluentAssertions; using FluentAssertions;
using NUnit.Framework; using NUnit.Framework;
using NzbDrone.Core.Blacklisting; using NzbDrone.Core.Blocklisting;
using NzbDrone.Core.Qualities; using NzbDrone.Core.Qualities;
using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Test.Framework;
namespace NzbDrone.Core.Test.Blacklisting namespace NzbDrone.Core.Test.Blocklisting
{ {
[TestFixture] [TestFixture]
public class BlacklistRepositoryFixture : DbTest<BlacklistRepository, Blacklist> public class BlocklistRepositoryFixture : DbTest<BlocklistRepository, Blocklist>
{ {
private Blacklist _blacklist; private Blocklist _blocklist;
[SetUp] [SetUp]
public void Setup() public void Setup()
{ {
_blacklist = new Blacklist _blocklist = new Blocklist
{ {
ArtistId = 12345, ArtistId = 12345,
AlbumIds = new List<int> { 1 }, AlbumIds = new List<int> { 1 },
@ -30,24 +30,24 @@ namespace NzbDrone.Core.Test.Blacklisting
[Test] [Test]
public void should_be_able_to_write_to_database() public void should_be_able_to_write_to_database()
{ {
Subject.Insert(_blacklist); Subject.Insert(_blocklist);
Subject.All().Should().HaveCount(1); Subject.All().Should().HaveCount(1);
} }
[Test] [Test]
public void should_should_have_album_ids() public void should_should_have_album_ids()
{ {
Subject.Insert(_blacklist); Subject.Insert(_blocklist);
Subject.All().First().AlbumIds.Should().Contain(_blacklist.AlbumIds); Subject.All().First().AlbumIds.Should().Contain(_blocklist.AlbumIds);
} }
[Test] [Test]
public void should_check_for_blacklisted_title_case_insensative() public void should_check_for_blocklisted_title_case_insensative()
{ {
Subject.Insert(_blacklist); Subject.Insert(_blocklist);
Subject.BlacklistedByTitle(_blacklist.ArtistId, _blacklist.SourceTitle.ToUpperInvariant()).Should().HaveCount(1); Subject.BlocklistedByTitle(_blocklist.ArtistId, _blocklist.SourceTitle.ToUpperInvariant()).Should().HaveCount(1);
} }
} }
} }

14
src/NzbDrone.Core.Test/Blacklisting/BlacklistServiceFixture.cs → src/NzbDrone.Core.Test/Blocklisting/BlocklistServiceFixture.cs
View file

@ -2,15 +2,15 @@
using System.Collections.Generic; using System.Collections.Generic;
using Moq; using Moq;
using NUnit.Framework; using NUnit.Framework;
using NzbDrone.Core.Blacklisting; using NzbDrone.Core.Blocklisting;
using NzbDrone.Core.Download; using NzbDrone.Core.Download;
using NzbDrone.Core.Qualities; using NzbDrone.Core.Qualities;
using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Test.Framework;
namespace NzbDrone.Core.Test.Blacklisting namespace NzbDrone.Core.Test.Blocklisting
{ {
[TestFixture] [TestFixture]
public class BlacklistServiceFixture : CoreTest<BlacklistService> public class BlocklistServiceFixture : CoreTest<BlocklistService>
{ {
private DownloadFailedEvent _event; private DownloadFailedEvent _event;
@ -39,8 +39,8 @@ namespace NzbDrone.Core.Test.Blacklisting
{ {
Subject.Handle(_event); Subject.Handle(_event);
Mocker.GetMock<IBlacklistRepository>() Mocker.GetMock<IBlocklistRepository>()
.Verify(v => v.Insert(It.Is<Blacklist>(b => b.AlbumIds == _event.AlbumIds)), Times.Once()); .Verify(v => v.Insert(It.Is<Blocklist>(b => b.AlbumIds == _event.AlbumIds)), Times.Once());
} }
[Test] [Test]
@ -51,8 +51,8 @@ namespace NzbDrone.Core.Test.Blacklisting
_event.Data.Remove("size"); _event.Data.Remove("size");
_event.Data.Remove("protocol"); _event.Data.Remove("protocol");
Mocker.GetMock<IBlacklistRepository>() Mocker.GetMock<IBlocklistRepository>()
.Verify(v => v.Insert(It.Is<Blacklist>(b => b.AlbumIds == _event.AlbumIds)), Times.Once()); .Verify(v => v.Insert(It.Is<Blocklist>(b => b.AlbumIds == _event.AlbumIds)), Times.Once());
} }
} }
} }

16
src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedBlacklistFixture.cs
View file

@ -2,7 +2,7 @@
using FizzWare.NBuilder; using FizzWare.NBuilder;
using FluentAssertions; using FluentAssertions;
using NUnit.Framework; using NUnit.Framework;
using NzbDrone.Core.Blacklisting; using NzbDrone.Core.Blocklisting;
using NzbDrone.Core.Housekeeping.Housekeepers; using NzbDrone.Core.Housekeeping.Housekeepers;
using NzbDrone.Core.Music; using NzbDrone.Core.Music;
using NzbDrone.Core.Qualities; using NzbDrone.Core.Qualities;
@ -11,35 +11,35 @@ using NzbDrone.Core.Test.Framework;
namespace NzbDrone.Core.Test.Housekeeping.Housekeepers namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
{ {
[TestFixture] [TestFixture]
public class CleanupOrphanedBlacklistFixture : DbTest<CleanupOrphanedBlacklist, Blacklist> public class CleanupOrphanedBlocklistFixture : DbTest<CleanupOrphanedBlocklist, Blocklist>
{ {
[Test] [Test]
public void should_delete_orphaned_blacklist_items() public void should_delete_orphaned_blocklist_items()
{ {
var blacklist = Builder<Blacklist>.CreateNew() var blocklist = Builder<Blocklist>.CreateNew()
.With(h => h.AlbumIds = new List<int>()) .With(h => h.AlbumIds = new List<int>())
.With(h => h.Quality = new QualityModel()) .With(h => h.Quality = new QualityModel())
.BuildNew(); .BuildNew();
Db.Insert(blacklist); Db.Insert(blocklist);
Subject.Clean(); Subject.Clean();
AllStoredModels.Should().BeEmpty(); AllStoredModels.Should().BeEmpty();
} }
[Test] [Test]
public void should_not_delete_unorphaned_blacklist_items() public void should_not_delete_unorphaned_blocklist_items()
{ {
var artist = Builder<Artist>.CreateNew().BuildNew(); var artist = Builder<Artist>.CreateNew().BuildNew();
Db.Insert(artist); Db.Insert(artist);
var blacklist = Builder<Blacklist>.CreateNew() var blocklist = Builder<Blocklist>.CreateNew()
.With(h => h.AlbumIds = new List<int>()) .With(h => h.AlbumIds = new List<int>())
.With(h => h.Quality = new QualityModel()) .With(h => h.Quality = new QualityModel())
.With(b => b.ArtistId = artist.Id) .With(b => b.ArtistId = artist.Id)
.BuildNew(); .BuildNew();
Db.Insert(blacklist); Db.Insert(blocklist);
Subject.Clean(); Subject.Clean();
AllStoredModels.Should().HaveCount(1); AllStoredModels.Should().HaveCount(1);

20
src/NzbDrone.Core.Test/MetadataSource/SearchArtistComparerFixture.cs
View file

@ -47,25 +47,25 @@ namespace NzbDrone.Core.Test.MetadataSource
} }
[Test] [Test]
public void should_prefer_blacklist_over_the_blacklist_when_searching_for_blacklist() public void should_prefer_blocklist_over_the_blocklist_when_searching_for_blocklist()
{ {
WithSeries("The Blacklist"); WithSeries("The Blocklist");
WithSeries("Blacklist"); WithSeries("Blocklist");
_artist.Sort(new SearchArtistComparer("blacklist")); _artist.Sort(new SearchArtistComparer("blocklist"));
_artist.First().Name.Should().Be("Blacklist"); _artist.First().Name.Should().Be("Blocklist");
} }
[Test] [Test]
public void should_prefer_the_blacklist_over_blacklist_when_searching_for_the_blacklist() public void should_prefer_the_blocklist_over_blocklist_when_searching_for_the_blocklist()
{ {
WithSeries("Blacklist"); WithSeries("Blocklist");
WithSeries("The Blacklist"); WithSeries("The Blocklist");
_artist.Sort(new SearchArtistComparer("the blacklist")); _artist.Sort(new SearchArtistComparer("the blocklist"));
_artist.First().Name.Should().Be("The Blacklist"); _artist.First().Name.Should().Be("The Blocklist");
} }
} }
} }

4
src/NzbDrone.Core/Blacklisting/Blacklist.cs → src/NzbDrone.Core/Blocklisting/Blocklist.cs
View file

@ -5,9 +5,9 @@ using NzbDrone.Core.Indexers;
using NzbDrone.Core.Music; using NzbDrone.Core.Music;
using NzbDrone.Core.Qualities; using NzbDrone.Core.Qualities;
namespace NzbDrone.Core.Blacklisting namespace NzbDrone.Core.Blocklisting
{ {
public class Blacklist : ModelBase public class Blocklist : ModelBase
{ {
public int ArtistId { get; set; } public int ArtistId { get; set; }
public Artist Artist { get; set; } public Artist Artist { get; set; }

24
src/NzbDrone.Core/Blacklisting/BlacklistRepository.cs → src/NzbDrone.Core/Blocklisting/BlocklistRepository.cs
View file

@ -3,34 +3,34 @@ using NzbDrone.Core.Datastore;
using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Messaging.Events;
using NzbDrone.Core.Music; using NzbDrone.Core.Music;
namespace NzbDrone.Core.Blacklisting namespace NzbDrone.Core.Blocklisting
{ {
public interface IBlacklistRepository : IBasicRepository<Blacklist> public interface IBlocklistRepository : IBasicRepository<Blocklist>
{ {
List<Blacklist> BlacklistedByTitle(int artistId, string sourceTitle); List<Blocklist> BlocklistedByTitle(int artistId, string sourceTitle);
List<Blacklist> BlacklistedByTorrentInfoHash(int artistId, string torrentInfoHash); List<Blocklist> BlocklistedByTorrentInfoHash(int artistId, string torrentInfoHash);
List<Blacklist> BlacklistedByArtists(List<int> artistIds); List<Blocklist> BlocklistedByArtists(List<int> artistIds);
void DeleteForArtists(List<int> artistIds); void DeleteForArtists(List<int> artistIds);
} }
public class BlacklistRepository : BasicRepository<Blacklist>, IBlacklistRepository public class BlocklistRepository : BasicRepository<Blocklist>, IBlocklistRepository
{ {
public BlacklistRepository(IMainDatabase database, IEventAggregator eventAggregator) public BlocklistRepository(IMainDatabase database, IEventAggregator eventAggregator)
: base(database, eventAggregator) : base(database, eventAggregator)
{ {
} }
public List<Blacklist> BlacklistedByTitle(int artistId, string sourceTitle) public List<Blocklist> BlocklistedByTitle(int artistId, string sourceTitle)
{ {
return Query(e => e.ArtistId == artistId && e.SourceTitle.Contains(sourceTitle)); return Query(e => e.ArtistId == artistId && e.SourceTitle.Contains(sourceTitle));
} }
public List<Blacklist> BlacklistedByTorrentInfoHash(int artistId, string torrentInfoHash) public List<Blocklist> BlocklistedByTorrentInfoHash(int artistId, string torrentInfoHash)
{ {
return Query(e => e.ArtistId == artistId && e.TorrentInfoHash.Contains(torrentInfoHash)); return Query(e => e.ArtistId == artistId && e.TorrentInfoHash.Contains(torrentInfoHash));
} }
public List<Blacklist> BlacklistedByArtists(List<int> artistIds) public List<Blocklist> BlocklistedByArtists(List<int> artistIds)
{ {
return Query(x => artistIds.Contains(x.ArtistId)); return Query(x => artistIds.Contains(x.ArtistId));
} }
@ -40,8 +40,8 @@ namespace NzbDrone.Core.Blacklisting
Delete(x => artistIds.Contains(x.ArtistId)); Delete(x => artistIds.Contains(x.ArtistId));
} }
protected override SqlBuilder PagedBuilder() => new SqlBuilder().Join<Blacklist, Artist>((b, m) => b.ArtistId == m.Id); protected override SqlBuilder PagedBuilder() => new SqlBuilder().Join<Blocklist, Artist>((b, m) => b.ArtistId == m.Id);
protected override IEnumerable<Blacklist> PagedQuery(SqlBuilder builder) => _database.QueryJoined<Blacklist, Artist>(builder, (bl, artist) => protected override IEnumerable<Blocklist> PagedQuery(SqlBuilder builder) => _database.QueryJoined<Blocklist, Artist>(builder, (bl, artist) =>
{ {
bl.Artist = artist; bl.Artist = artist;
return bl; return bl;

58
src/NzbDrone.Core/Blacklisting/BlacklistService.cs → src/NzbDrone.Core/Blocklisting/BlocklistService.cs
View file

@ -10,32 +10,32 @@ using NzbDrone.Core.Messaging.Events;
using NzbDrone.Core.Music.Events; using NzbDrone.Core.Music.Events;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.Blacklisting namespace NzbDrone.Core.Blocklisting
{ {
public interface IBlacklistService public interface IBlocklistService
{ {
bool Blacklisted(int artistId, ReleaseInfo release); bool Blocklisted(int artistId, ReleaseInfo release);
PagingSpec<Blacklist> Paged(PagingSpec<Blacklist> pagingSpec); PagingSpec<Blocklist> Paged(PagingSpec<Blocklist> pagingSpec);
void Delete(int id); void Delete(int id);
void Delete(List<int> ids); void Delete(List<int> ids);
} }
public class BlacklistService : IBlacklistService, public class BlocklistService : IBlocklistService,
IExecute<ClearBlacklistCommand>, IExecute<ClearBlocklistCommand>,
IHandle<DownloadFailedEvent>, IHandle<DownloadFailedEvent>,
IHandleAsync<ArtistsDeletedEvent> IHandleAsync<ArtistsDeletedEvent>
{ {
private readonly IBlacklistRepository _blacklistRepository; private readonly IBlocklistRepository _blocklistRepository;
public BlacklistService(IBlacklistRepository blacklistRepository) public BlocklistService(IBlocklistRepository blocklistRepository)
{ {
_blacklistRepository = blacklistRepository; _blocklistRepository = blocklistRepository;
} }
public bool Blacklisted(int artistId, ReleaseInfo release) public bool Blocklisted(int artistId, ReleaseInfo release)
{ {
var blacklistedByTitle = _blacklistRepository.BlacklistedByTitle(artistId, release.Title); var blocklistedByTitle = _blocklistRepository.BlocklistedByTitle(artistId, release.Title);
if (release.DownloadProtocol == DownloadProtocol.Torrent) if (release.DownloadProtocol == DownloadProtocol.Torrent)
{ {
@ -48,35 +48,35 @@ namespace NzbDrone.Core.Blacklisting
if (torrentInfo.InfoHash.IsNullOrWhiteSpace()) if (torrentInfo.InfoHash.IsNullOrWhiteSpace())
{ {
return blacklistedByTitle.Where(b => b.Protocol == DownloadProtocol.Torrent) return blocklistedByTitle.Where(b => b.Protocol == DownloadProtocol.Torrent)
.Any(b => SameTorrent(b, torrentInfo)); .Any(b => SameTorrent(b, torrentInfo));
} }
var blacklistedByTorrentInfohash = _blacklistRepository.BlacklistedByTorrentInfoHash(artistId, torrentInfo.InfoHash); var blocklistedByTorrentInfohash = _blocklistRepository.BlocklistedByTorrentInfoHash(artistId, torrentInfo.InfoHash);
return blacklistedByTorrentInfohash.Any(b => SameTorrent(b, torrentInfo)); return blocklistedByTorrentInfohash.Any(b => SameTorrent(b, torrentInfo));
} }
return blacklistedByTitle.Where(b => b.Protocol == DownloadProtocol.Usenet) return blocklistedByTitle.Where(b => b.Protocol == DownloadProtocol.Usenet)
.Any(b => SameNzb(b, release)); .Any(b => SameNzb(b, release));
} }
public PagingSpec<Blacklist> Paged(PagingSpec<Blacklist> pagingSpec) public PagingSpec<Blocklist> Paged(PagingSpec<Blocklist> pagingSpec)
{ {
return _blacklistRepository.GetPaged(pagingSpec); return _blocklistRepository.GetPaged(pagingSpec);
} }
public void Delete(int id) public void Delete(int id)
{ {
_blacklistRepository.Delete(id); _blocklistRepository.Delete(id);
} }
public void Delete(List<int> ids) public void Delete(List<int> ids)
{ {
_blacklistRepository.DeleteMany(ids); _blocklistRepository.DeleteMany(ids);
} }
private bool SameNzb(Blacklist item, ReleaseInfo release) private bool SameNzb(Blocklist item, ReleaseInfo release)
{ {
if (item.PublishedDate == release.PublishDate) if (item.PublishedDate == release.PublishDate)
{ {
@ -93,7 +93,7 @@ namespace NzbDrone.Core.Blacklisting
return false; return false;
} }
private bool SameTorrent(Blacklist item, TorrentInfo release) private bool SameTorrent(Blocklist item, TorrentInfo release)
{ {
if (release.InfoHash.IsNotNullOrWhiteSpace()) if (release.InfoHash.IsNotNullOrWhiteSpace())
{ {
@ -103,7 +103,7 @@ namespace NzbDrone.Core.Blacklisting
return item.Indexer.Equals(release.Indexer, StringComparison.InvariantCultureIgnoreCase); return item.Indexer.Equals(release.Indexer, StringComparison.InvariantCultureIgnoreCase);
} }
private bool HasSameIndexer(Blacklist item, string indexer) private bool HasSameIndexer(Blocklist item, string indexer)
{ {
if (item.Indexer.IsNullOrWhiteSpace()) if (item.Indexer.IsNullOrWhiteSpace())
{ {
@ -113,7 +113,7 @@ namespace NzbDrone.Core.Blacklisting
return item.Indexer.Equals(indexer, StringComparison.InvariantCultureIgnoreCase); return item.Indexer.Equals(indexer, StringComparison.InvariantCultureIgnoreCase);
} }
private bool HasSamePublishedDate(Blacklist item, DateTime publishedDate) private bool HasSamePublishedDate(Blocklist item, DateTime publishedDate)
{ {
if (!item.PublishedDate.HasValue) if (!item.PublishedDate.HasValue)
{ {
@ -124,7 +124,7 @@ namespace NzbDrone.Core.Blacklisting
item.PublishedDate.Value.AddMinutes(2) >= publishedDate; item.PublishedDate.Value.AddMinutes(2) >= publishedDate;
} }
private bool HasSameSize(Blacklist item, long size) private bool HasSameSize(Blocklist item, long size)
{ {
if (!item.Size.HasValue) if (!item.Size.HasValue)
{ {
@ -136,14 +136,14 @@ namespace NzbDrone.Core.Blacklisting
return difference <= 2.Megabytes(); return difference <= 2.Megabytes();
} }
public void Execute(ClearBlacklistCommand message) public void Execute(ClearBlocklistCommand message)
{ {
_blacklistRepository.Purge(); _blocklistRepository.Purge();
} }
public void Handle(DownloadFailedEvent message) public void Handle(DownloadFailedEvent message)
{ {
var blacklist = new Blacklist var blocklist = new Blocklist
{ {
ArtistId = message.ArtistId, ArtistId = message.ArtistId,
AlbumIds = message.AlbumIds, AlbumIds = message.AlbumIds,
@ -158,12 +158,12 @@ namespace NzbDrone.Core.Blacklisting
TorrentInfoHash = message.Data.GetValueOrDefault("torrentInfoHash") TorrentInfoHash = message.Data.GetValueOrDefault("torrentInfoHash")
}; };
_blacklistRepository.Insert(blacklist); _blocklistRepository.Insert(blocklist);
} }
public void HandleAsync(ArtistsDeletedEvent message) public void HandleAsync(ArtistsDeletedEvent message)
{ {
_blacklistRepository.DeleteForArtists(message.Artists.Select(x => x.Id).ToList()); _blocklistRepository.DeleteForArtists(message.Artists.Select(x => x.Id).ToList());
} }
} }
} }

4
src/NzbDrone.Core/Blacklisting/ClearBlacklistCommand.cs → src/NzbDrone.Core/Blocklisting/ClearBlocklistCommand.cs
View file

@ -1,8 +1,8 @@
using NzbDrone.Core.Messaging.Commands; using NzbDrone.Core.Messaging.Commands;
namespace NzbDrone.Core.Blacklisting namespace NzbDrone.Core.Blocklisting
{ {
public class ClearBlacklistCommand : Command public class ClearBlocklistCommand : Command
{ {
public override bool SendUpdatesToClient => true; public override bool SendUpdatesToClient => true;
} }

14
src/NzbDrone.Core/Datastore/Migration/050_rename_blacklist_to_blocklist.cs Normal file
View file

@ -0,0 +1,14 @@
using FluentMigrator;
using NzbDrone.Core.Datastore.Migration.Framework;
namespace NzbDrone.Core.Datastore.Migration
{
[Migration(050)]
public class rename_blacklist_to_blocklist : NzbDroneMigrationBase
{
protected override void MainDbUpgrade()
{
Rename.Table("Blacklist").To("Blocklist");
}
}
}

4
src/NzbDrone.Core/Datastore/TableMapping.cs
View file

@ -4,7 +4,7 @@ using System.Linq;
using Dapper; using Dapper;
using NzbDrone.Common.Reflection; using NzbDrone.Common.Reflection;
using NzbDrone.Core.Authentication; using NzbDrone.Core.Authentication;
using NzbDrone.Core.Blacklisting; using NzbDrone.Core.Blocklisting;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.CustomFilters; using NzbDrone.Core.CustomFilters;
using NzbDrone.Core.Datastore.Converters; using NzbDrone.Core.Datastore.Converters;
@ -165,7 +165,7 @@ namespace NzbDrone.Core.Datastore
Mapper.Entity<Log>("Logs").RegisterModel(); Mapper.Entity<Log>("Logs").RegisterModel();
Mapper.Entity<NamingConfig>("NamingConfig").RegisterModel(); Mapper.Entity<NamingConfig>("NamingConfig").RegisterModel();
Mapper.Entity<Blacklist>("Blacklist").RegisterModel(); Mapper.Entity<Blocklist>("Blocklist").RegisterModel();
Mapper.Entity<MetadataFile>("MetadataFiles").RegisterModel(); Mapper.Entity<MetadataFile>("MetadataFiles").RegisterModel();
Mapper.Entity<LyricFile>("LyricFiles").RegisterModel(); Mapper.Entity<LyricFile>("LyricFiles").RegisterModel();
Mapper.Entity<OtherExtraFile>("ExtraFiles").RegisterModel(); Mapper.Entity<OtherExtraFile>("ExtraFiles").RegisterModel();

16
src/NzbDrone.Core/DecisionEngine/Specifications/BlacklistSpecification.cs → src/NzbDrone.Core/DecisionEngine/Specifications/BlocklistSpecification.cs
View file

@ -1,18 +1,18 @@
using NLog; using NLog;
using NzbDrone.Core.Blacklisting; using NzbDrone.Core.Blocklisting;
using NzbDrone.Core.IndexerSearch.Definitions; using NzbDrone.Core.IndexerSearch.Definitions;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.DecisionEngine.Specifications namespace NzbDrone.Core.DecisionEngine.Specifications
{ {
public class BlacklistSpecification : IDecisionEngineSpecification public class BlocklistSpecification : IDecisionEngineSpecification
{ {
private readonly IBlacklistService _blacklistService; private readonly IBlocklistService _blocklistService;
private readonly Logger _logger; private readonly Logger _logger;
public BlacklistSpecification(IBlacklistService blacklistService, Logger logger) public BlocklistSpecification(IBlocklistService blocklistService, Logger logger)
{ {
_blacklistService = blacklistService; _blocklistService = blocklistService;
_logger = logger; _logger = logger;
} }
@ -21,10 +21,10 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
public Decision IsSatisfiedBy(RemoteAlbum subject, SearchCriteriaBase searchCriteria) public Decision IsSatisfiedBy(RemoteAlbum subject, SearchCriteriaBase searchCriteria)
{ {
if (_blacklistService.Blacklisted(subject.Artist.Id, subject.Release)) if (_blocklistService.Blocklisted(subject.Artist.Id, subject.Release))
{ {
_logger.Debug("{0} is blacklisted, rejecting.", subject.Release.Title); _logger.Debug("{0} is blocklisted, rejecting.", subject.Release.Title);
return Decision.Reject("Release is blacklisted"); return Decision.Reject("Release is blocklisted");
} }
return Decision.Accept(); return Decision.Accept();

10
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedBlacklist.cs
View file

@ -3,11 +3,11 @@ using NzbDrone.Core.Datastore;
namespace NzbDrone.Core.Housekeeping.Housekeepers namespace NzbDrone.Core.Housekeeping.Housekeepers
{ {
public class CleanupOrphanedBlacklist : IHousekeepingTask public class CleanupOrphanedBlocklist : IHousekeepingTask
{ {
private readonly IMainDatabase _database; private readonly IMainDatabase _database;
public CleanupOrphanedBlacklist(IMainDatabase database) public CleanupOrphanedBlocklist(IMainDatabase database)
{ {
_database = database; _database = database;
} }
@ -16,11 +16,11 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
{ {
using (var mapper = _database.OpenConnection()) using (var mapper = _database.OpenConnection())
{ {
mapper.Execute(@"DELETE FROM Blacklist mapper.Execute(@"DELETE FROM Blocklist
WHERE Id IN ( WHERE Id IN (
SELECT Blacklist.Id FROM Blacklist SELECT Blocklist.Id FROM Blocklist
LEFT OUTER JOIN Artists LEFT OUTER JOIN Artists
ON Blacklist.ArtistId = Artists.Id ON Blocklist.ArtistId = Artists.Id
WHERE Artists.Id IS NULL)"); WHERE Artists.Id IS NULL)");
} }
} }

26
src/NzbDrone.Integration.Test/ApiTests/BlacklistFixture.cs → src/NzbDrone.Integration.Test/ApiTests/BlocklistFixture.cs
View file

@ -1,33 +1,33 @@
using FluentAssertions; using FluentAssertions;
using Lidarr.Api.V1.Artist; using Lidarr.Api.V1.Artist;
using Lidarr.Api.V1.Blacklist; using Lidarr.Api.V1.Blocklist;
using NUnit.Framework; using NUnit.Framework;
namespace NzbDrone.Integration.Test.ApiTests namespace NzbDrone.Integration.Test.ApiTests
{ {
[TestFixture] [TestFixture]
public class BlacklistFixture : IntegrationTest public class BlocklistFixture : IntegrationTest
{ {
private ArtistResource _artist; private ArtistResource _artist;
[Test] [Test]
[Ignore("Adding to blacklist not supported")] [Ignore("Adding to blocklist not supported")]
public void should_be_able_to_add_to_blacklist() public void should_be_able_to_add_to_blocklist()
{ {
_artist = EnsureArtist("8ac6cc32-8ddf-43b1-9ac4-4b04f9053176", "Alien Ant Farm"); _artist = EnsureArtist("8ac6cc32-8ddf-43b1-9ac4-4b04f9053176", "Alien Ant Farm");
Blacklist.Post(new BlacklistResource Blocklist.Post(new BlocklistResource
{ {
ArtistId = _artist.Id, ArtistId = _artist.Id,
SourceTitle = "Blacklist - Album 1 [2015 FLAC]" SourceTitle = "Blocklist - Album 1 [2015 FLAC]"
}); });
} }
[Test] [Test]
[Ignore("Adding to blacklist not supported")] [Ignore("Adding to blocklist not supported")]
public void should_be_able_to_get_all_blacklisted() public void should_be_able_to_get_all_blocklisted()
{ {
var result = Blacklist.GetPaged(0, 1000, "date", "desc"); var result = Blocklist.GetPaged(0, 1000, "date", "desc");
result.Should().NotBeNull(); result.Should().NotBeNull();
result.TotalRecords.Should().Be(1); result.TotalRecords.Should().Be(1);
@ -35,12 +35,12 @@ namespace NzbDrone.Integration.Test.ApiTests
} }
[Test] [Test]
[Ignore("Adding to blacklist not supported")] [Ignore("Adding to blocklist not supported")]
public void should_be_able_to_remove_from_blacklist() public void should_be_able_to_remove_from_blocklist()
{ {
Blacklist.Delete(1); Blocklist.Delete(1);
var result = Blacklist.GetPaged(0, 1000, "date", "desc"); var result = Blocklist.GetPaged(0, 1000, "date", "desc");
result.Should().NotBeNull(); result.Should().NotBeNull();
result.TotalRecords.Should().Be(0); result.TotalRecords.Should().Be(0);

6
src/NzbDrone.Integration.Test/IntegrationTestBase.cs
View file

@ -7,7 +7,7 @@ using System.Threading.Tasks;
using FluentAssertions; using FluentAssertions;
using Lidarr.Api.V1.Albums; using Lidarr.Api.V1.Albums;
using Lidarr.Api.V1.Artist; using Lidarr.Api.V1.Artist;
using Lidarr.Api.V1.Blacklist; using Lidarr.Api.V1.Blocklist;
using Lidarr.Api.V1.Config; using Lidarr.Api.V1.Config;
using Lidarr.Api.V1.DownloadClient; using Lidarr.Api.V1.DownloadClient;
using Lidarr.Api.V1.History; using Lidarr.Api.V1.History;
@ -37,7 +37,7 @@ namespace NzbDrone.Integration.Test
{ {
protected RestClient RestClient { get; private set; } protected RestClient RestClient { get; private set; }
public ClientBase<BlacklistResource> Blacklist; public ClientBase<BlocklistResource> Blocklist;
public CommandClient Commands; public CommandClient Commands;
public ClientBase<TaskResource> Tasks; public ClientBase<TaskResource> Tasks;
public DownloadClientClient DownloadClients; public DownloadClientClient DownloadClients;
@ -103,7 +103,7 @@ namespace NzbDrone.Integration.Test
RestClient.AddDefaultHeader("X-Api-Key", ApiKey); RestClient.AddDefaultHeader("X-Api-Key", ApiKey);
RestClient.UseSystemTextJson(); RestClient.UseSystemTextJson();
Blacklist = new ClientBase<BlacklistResource>(RestClient, ApiKey); Blocklist = new ClientBase<BlocklistResource>(RestClient, ApiKey);
Commands = new CommandClient(RestClient, ApiKey); Commands = new CommandClient(RestClient, ApiKey);
Tasks = new ClientBase<TaskResource>(RestClient, ApiKey, "system/task"); Tasks = new ClientBase<TaskResource>(RestClient, ApiKey, "system/task");
DownloadClients = new DownloadClientClient(RestClient, ApiKey); DownloadClients = new DownloadClientClient(RestClient, ApiKey);