diff --git a/frontend/src/Artist/Details/AlbumRowConnector.js b/frontend/src/Artist/Details/AlbumRowConnector.js
index 6e92fb1d4..f00bd3fce 100644
--- a/frontend/src/Artist/Details/AlbumRowConnector.js
+++ b/frontend/src/Artist/Details/AlbumRowConnector.js
@@ -13,8 +13,7 @@ function createMapStateToProps() {
return {
foreignArtistId: artist.foreignArtistId,
artistMonitored: artist.monitored,
- trackFilePath: trackFile ? trackFile.path : null,
- trackFileRelativePath: trackFile ? trackFile.relativePath : null
+ trackFilePath: trackFile ? trackFile.path : null
};
}
);
diff --git a/frontend/src/Artist/Editor/ArtistEditorConnector.js b/frontend/src/Artist/Editor/ArtistEditorConnector.js
index c0188ee6d..61f276f41 100644
--- a/frontend/src/Artist/Editor/ArtistEditorConnector.js
+++ b/frontend/src/Artist/Editor/ArtistEditorConnector.js
@@ -5,7 +5,7 @@ import { createSelector } from 'reselect';
import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
import { setArtistEditorSort, setArtistEditorFilter, saveArtistEditor } from 'Store/Actions/artistEditorActions';
-import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
+import { fetchRootFolders } from 'Store/Actions/settingsActions';
import { executeCommand } from 'Store/Actions/commandActions';
import * as commandNames from 'Commands/commandNames';
import ArtistEditor from './ArtistEditor';
diff --git a/frontend/src/Artist/Editor/ArtistEditorFooter.js b/frontend/src/Artist/Editor/ArtistEditorFooter.js
index ccf044c53..59bdcd056 100644
--- a/frontend/src/Artist/Editor/ArtistEditorFooter.js
+++ b/frontend/src/Artist/Editor/ArtistEditorFooter.js
@@ -217,6 +217,7 @@ class ArtistEditorFooter extends Component {
name="metadataProfileId"
value={metadataProfileId}
includeNoChange={true}
+ includeNone={true}
isDisabled={!selectedCount}
onChange={this.onInputChange}
/>
diff --git a/frontend/src/Artist/Index/ArtistIndex.js b/frontend/src/Artist/Index/ArtistIndex.js
index 1fa9388b0..e250d61f5 100644
--- a/frontend/src/Artist/Index/ArtistIndex.js
+++ b/frontend/src/Artist/Index/ArtistIndex.js
@@ -217,7 +217,6 @@ class ArtistIndex extends Component {
iconName={icons.REFRESH}
spinningName={icons.REFRESH}
isSpinning={isRefreshingArtist}
- isDisabled={hasNoArtist}
onPress={onRefreshArtistPress}
/>
diff --git a/frontend/src/Artist/NoArtist.js b/frontend/src/Artist/NoArtist.js
index 1db9f41db..76c2336bc 100644
--- a/frontend/src/Artist/NoArtist.js
+++ b/frontend/src/Artist/NoArtist.js
@@ -20,15 +20,15 @@ function NoArtist(props) {
return (
- No artist found, to get started you'll want to add a new artist or album or import some existing ones.
+ No artists found, to get started you'll want to add a new artist or album or add an existing library location (Root Folder) and update.
- Import Existing Artist(s)
+ Add Root Folder
diff --git a/frontend/src/Commands/commandNames.js b/frontend/src/Commands/commandNames.js
index 110f94939..b3ea2f94e 100644
--- a/frontend/src/Commands/commandNames.js
+++ b/frontend/src/Commands/commandNames.js
@@ -14,6 +14,7 @@ export const MOVE_ARTIST = 'MoveArtist';
export const REFRESH_ARTIST = 'RefreshArtist';
export const RENAME_FILES = 'RenameFiles';
export const RENAME_ARTIST = 'RenameArtist';
+export const RESCAN_FOLDERS = 'RescanFolders';
export const RETAG_FILES = 'RetagFiles';
export const RETAG_ARTIST = 'RetagArtist';
export const RESET_API_KEY = 'ResetApiKey';
diff --git a/frontend/src/Components/Form/RootFolderSelectInput.js b/frontend/src/Components/Form/RootFolderSelectInput.js
index 08d88e5f1..e585bd524 100644
--- a/frontend/src/Components/Form/RootFolderSelectInput.js
+++ b/frontend/src/Components/Form/RootFolderSelectInput.js
@@ -1,6 +1,6 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
-import FileBrowserModal from 'Components/FileBrowser/FileBrowserModal';
+import EditRootFolderModalConnector from 'Settings/MediaManagement/RootFolder/EditRootFolderModalConnector';
import EnhancedSelectInput from './EnhancedSelectInput';
import RootFolderSelectInputOption from './RootFolderSelectInputOption';
import RootFolderSelectInputSelectedValue from './RootFolderSelectInputSelectedValue';
@@ -14,8 +14,7 @@ class RootFolderSelectInput extends Component {
super(props, context);
this.state = {
- isAddNewRootFolderModalOpen: false,
- newRootFolderPath: ''
+ isAddNewRootFolderModalOpen: false
};
}
@@ -52,9 +51,7 @@ class RootFolderSelectInput extends Component {
}
onNewRootFolderSelect = ({ value }) => {
- this.setState({ newRootFolderPath: value }, () => {
- this.props.onNewRootFolderSelect(value);
- });
+ this.setState({ newRootFolderPath: value });
}
onAddRootFolderModalClose = () => {
@@ -66,8 +63,7 @@ class RootFolderSelectInput extends Component {
render() {
const {
- includeNoChange,
- onNewRootFolderSelect,
+ value,
...otherProps
} = this.props;
@@ -75,17 +71,16 @@ class RootFolderSelectInput extends Component {
);
@@ -94,16 +89,11 @@ class RootFolderSelectInput extends Component {
RootFolderSelectInput.propTypes = {
name: PropTypes.string.isRequired,
+ value: PropTypes.string,
values: PropTypes.arrayOf(PropTypes.object).isRequired,
isSaving: PropTypes.bool.isRequired,
saveError: PropTypes.object,
- includeNoChange: PropTypes.bool.isRequired,
- onChange: PropTypes.func.isRequired,
- onNewRootFolderSelect: PropTypes.func.isRequired
-};
-
-RootFolderSelectInput.defaultProps = {
- includeNoChange: false
+ onChange: PropTypes.func.isRequired
};
export default RootFolderSelectInput;
diff --git a/frontend/src/Components/Form/RootFolderSelectInputConnector.js b/frontend/src/Components/Form/RootFolderSelectInputConnector.js
index b76501dc1..928ecea28 100644
--- a/frontend/src/Components/Form/RootFolderSelectInputConnector.js
+++ b/frontend/src/Components/Form/RootFolderSelectInputConnector.js
@@ -2,20 +2,20 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
-import { addRootFolder } from 'Store/Actions/rootFolderActions';
import RootFolderSelectInput from './RootFolderSelectInput';
const ADD_NEW_KEY = 'addNew';
function createMapStateToProps() {
return createSelector(
- (state) => state.rootFolders,
+ (state) => state.settings.rootFolders,
(state, { includeNoChange }) => includeNoChange,
(rootFolders, includeNoChange) => {
const values = rootFolders.items.map((rootFolder) => {
return {
key: rootFolder.path,
value: rootFolder.path,
+ name: rootFolder.name,
freeSpace: rootFolder.freeSpace
};
});
@@ -23,7 +23,8 @@ function createMapStateToProps() {
if (includeNoChange) {
values.unshift({
key: 'noChange',
- value: 'No Change',
+ value: '',
+ name: 'No Change',
isDisabled: true
});
}
@@ -32,6 +33,7 @@ function createMapStateToProps() {
values.push({
key: '',
value: '',
+ name: '',
isDisabled: true,
isHidden: true
});
@@ -39,7 +41,8 @@ function createMapStateToProps() {
values.push({
key: ADD_NEW_KEY,
- value: 'Add a new path'
+ value: '',
+ name: 'Add a new path'
});
return {
@@ -51,14 +54,6 @@ function createMapStateToProps() {
);
}
-function createMapDispatchToProps(dispatch, props) {
- return {
- dispatchAddRootFolder(path) {
- dispatch(addRootFolder({ path }));
- }
- };
-}
-
class RootFolderSelectInputConnector extends Component {
//
@@ -95,19 +90,11 @@ class RootFolderSelectInputConnector extends Component {
}
}
- //
- // Listeners
-
- onNewRootFolderSelect = (path) => {
- this.props.dispatchAddRootFolder(path);
- }
-
//
// Render
render() {
const {
- dispatchAddRootFolder,
...otherProps
} = this.props;
@@ -125,12 +112,11 @@ RootFolderSelectInputConnector.propTypes = {
value: PropTypes.string,
values: PropTypes.arrayOf(PropTypes.object).isRequired,
includeNoChange: PropTypes.bool.isRequired,
- onChange: PropTypes.func.isRequired,
- dispatchAddRootFolder: PropTypes.func.isRequired
+ onChange: PropTypes.func.isRequired
};
RootFolderSelectInputConnector.defaultProps = {
includeNoChange: false
};
-export default connect(createMapStateToProps, createMapDispatchToProps)(RootFolderSelectInputConnector);
+export default connect(createMapStateToProps)(RootFolderSelectInputConnector);
diff --git a/frontend/src/Components/Form/RootFolderSelectInputOption.js b/frontend/src/Components/Form/RootFolderSelectInputOption.js
index a4db9cd82..0e4de1c1f 100644
--- a/frontend/src/Components/Form/RootFolderSelectInputOption.js
+++ b/frontend/src/Components/Form/RootFolderSelectInputOption.js
@@ -8,11 +8,14 @@ import styles from './RootFolderSelectInputOption.css';
function RootFolderSelectInputOption(props) {
const {
value,
+ name,
freeSpace,
isMobile,
...otherProps
} = props;
+ const text = value === '' ? name : `${name} [${value}]`;
+
return (
- {value}
+ {text}
{
freeSpace != null &&
@@ -37,6 +40,7 @@ function RootFolderSelectInputOption(props) {
}
RootFolderSelectInputOption.propTypes = {
+ name: PropTypes.string.isRequired,
value: PropTypes.string.isRequired,
freeSpace: PropTypes.number,
isMobile: PropTypes.bool.isRequired
diff --git a/frontend/src/Components/Form/RootFolderSelectInputSelectedValue.js b/frontend/src/Components/Form/RootFolderSelectInputSelectedValue.js
index ffd769254..0af2f61ae 100644
--- a/frontend/src/Components/Form/RootFolderSelectInputSelectedValue.js
+++ b/frontend/src/Components/Form/RootFolderSelectInputSelectedValue.js
@@ -6,19 +6,22 @@ import styles from './RootFolderSelectInputSelectedValue.css';
function RootFolderSelectInputSelectedValue(props) {
const {
+ name,
value,
freeSpace,
includeFreeSpace,
...otherProps
} = props;
+ const text = value === '' ? name : `${name} [${value}]`;
+
return (
- {value}
+ {text}
{
@@ -32,6 +35,7 @@ function RootFolderSelectInputSelectedValue(props) {
}
RootFolderSelectInputSelectedValue.propTypes = {
+ name: PropTypes.string,
value: PropTypes.string,
freeSpace: PropTypes.number,
includeFreeSpace: PropTypes.bool.isRequired
diff --git a/frontend/src/Components/Form/SelectInput.js b/frontend/src/Components/Form/SelectInput.js
index 113d50a09..25899f630 100644
--- a/frontend/src/Components/Form/SelectInput.js
+++ b/frontend/src/Components/Form/SelectInput.js
@@ -75,7 +75,7 @@ SelectInput.propTypes = {
className: PropTypes.string,
disabledClassName: PropTypes.string,
name: PropTypes.string.isRequired,
- value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+ value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
values: PropTypes.arrayOf(PropTypes.object).isRequired,
isDisabled: PropTypes.bool,
hasError: PropTypes.bool,
diff --git a/frontend/src/Components/Page/Sidebar/Messages/Message.js b/frontend/src/Components/Page/Sidebar/Messages/Message.js
index bb7a027fa..f9f95cfa5 100644
--- a/frontend/src/Components/Page/Sidebar/Messages/Message.js
+++ b/frontend/src/Components/Page/Sidebar/Messages/Message.js
@@ -17,6 +17,8 @@ function getIconName(name) {
return icons.SEARCH;
case 'Housekeeping':
return icons.HOUSEKEEPING;
+ case 'RescanFolders':
+ return icons.RESCAN;
case 'RefreshArtist':
return icons.REFRESH;
case 'RssSync':
diff --git a/frontend/src/Components/Page/Sidebar/PageSidebar.js b/frontend/src/Components/Page/Sidebar/PageSidebar.js
index a9e9491b0..cb27587df 100644
--- a/frontend/src/Components/Page/Sidebar/PageSidebar.js
+++ b/frontend/src/Components/Page/Sidebar/PageSidebar.js
@@ -28,10 +28,6 @@ const links = [
title: 'Add New',
to: '/add/search'
},
- {
- title: 'Import',
- to: '/add/import'
- },
{
title: 'Mass Editor',
to: '/artisteditor'
diff --git a/frontend/src/Components/SignalRConnector.js b/frontend/src/Components/SignalRConnector.js
index 2c0fc8f44..31779e9d1 100644
--- a/frontend/src/Components/SignalRConnector.js
+++ b/frontend/src/Components/SignalRConnector.js
@@ -11,7 +11,7 @@ import { update, updateItem, removeItem } from 'Store/Actions/baseActions';
import { fetchArtist } from 'Store/Actions/artistActions';
import { fetchHealth } from 'Store/Actions/systemActions';
import { fetchQueue, fetchQueueDetails } from 'Store/Actions/queueActions';
-import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
+import { fetchRootFolders } from 'Store/Actions/settingsActions';
import { fetchTags, fetchTagDetails } from 'Store/Actions/tagActions';
function getHandlerName(name) {
@@ -275,8 +275,14 @@ class SignalRConnector extends Component {
// No-op for now, we may want this later
}
- handleRootfolder = () => {
- this.props.dispatchFetchRootFolders();
+ handleRootfolder = (body) => {
+ if (body.action === 'updated') {
+ this.props.dispatchUpdateItem({
+ section: 'settings.rootFolders',
+ updateOnly: true,
+ ...body.resource
+ });
+ }
}
handleTag = (body) => {
diff --git a/frontend/src/Helpers/Props/icons.js b/frontend/src/Helpers/Props/icons.js
index 86ea9c58b..6643cbc73 100644
--- a/frontend/src/Helpers/Props/icons.js
+++ b/frontend/src/Helpers/Props/icons.js
@@ -82,6 +82,7 @@ import {
faRocket as fasRocket,
faSave as fasSave,
faSearch as fasSearch,
+ faSearchPlus as fasSearchPlus,
faSignOutAlt as fasSignOutAlt,
faSitemap as fasSitemap,
faSpinner as fasSpinner,
@@ -110,6 +111,7 @@ import {
export const ACTIONS = fasBolt;
export const ACTIVITY = farClock;
export const ADD = fasPlus;
+export const ADD_MISSING_ARTISTS = fasSearchPlus;
export const ALTERNATE_TITLES = farClone;
export const ADVANCED_SETTINGS = fasCog;
export const ARROW_LEFT = fasArrowCircleLeft;
@@ -182,6 +184,7 @@ export const QUICK = fasRocket;
export const REFRESH = fasSync;
export const REMOVE = fasTimes;
export const REORDER = fasBars;
+export const RESCAN = fasFolderOpen;
export const RESTART = fasRedoAlt;
export const RESTORE = fasHistory;
export const RETAG = fasEdit;
diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
index 1edac2b7c..c84fd567d 100644
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
@@ -30,8 +30,8 @@ import styles from './InteractiveImportModalContent.css';
const columns = [
{
- name: 'relativePath',
- label: 'Relative Path',
+ name: 'path',
+ label: 'Path',
isSortable: true,
isVisible: true
},
diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css
index 8510d0649..2a23e6d4d 100644
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css
@@ -1,4 +1,4 @@
-.relativePath {
+.path {
composes: cell from '~Components/Table/Cells/TableRowCell.css';
word-break: break-all;
diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js
index 06c2aed2a..0be12c0eb 100644
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js
@@ -149,7 +149,7 @@ class InteractiveImportRow extends Component {
const {
id,
allowArtistChange,
- relativePath,
+ path,
artist,
album,
albumReleaseId,
@@ -190,7 +190,7 @@ class InteractiveImportRow extends Component {
const pathCellContents = (
- {relativePath}
+ {path}
);
@@ -213,8 +213,8 @@ class InteractiveImportRow extends Component {
/>
{pathCell}
@@ -328,7 +328,7 @@ class InteractiveImportRow extends Component {
audioTags={audioTags}
sortKey='mediumNumber'
sortDirection={sortDirections.ASCENDING}
- filename={relativePath}
+ filename={path}
onModalClose={this.onSelectTrackModalClose}
/>
@@ -349,7 +349,7 @@ class InteractiveImportRow extends Component {
InteractiveImportRow.propTypes = {
id: PropTypes.number.isRequired,
allowArtistChange: PropTypes.bool.isRequired,
- relativePath: PropTypes.string.isRequired,
+ path: PropTypes.string.isRequired,
artist: PropTypes.object,
album: PropTypes.object,
albumReleaseId: PropTypes.number,
diff --git a/frontend/src/Organize/OrganizePreviewModalContent.js b/frontend/src/Organize/OrganizePreviewModalContent.js
index 6f20a9d3c..c263208d4 100644
--- a/frontend/src/Organize/OrganizePreviewModalContent.js
+++ b/frontend/src/Organize/OrganizePreviewModalContent.js
@@ -75,7 +75,6 @@ class OrganizePreviewModalContent extends Component {
error,
items,
trackFormat,
- path,
onModalClose
} = this.props;
@@ -113,13 +112,6 @@ class OrganizePreviewModalContent extends Component {
!isFetching && isPopulated && !!items.length &&
-
- All paths are relative to:
-
- {path}
-
-
-
Naming pattern:
diff --git a/frontend/src/Retag/RetagPreviewModalContent.js b/frontend/src/Retag/RetagPreviewModalContent.js
index 5530d63fb..fb7a39c1b 100644
--- a/frontend/src/Retag/RetagPreviewModalContent.js
+++ b/frontend/src/Retag/RetagPreviewModalContent.js
@@ -74,7 +74,6 @@ class RetagPreviewModalContent extends Component {
isPopulated,
error,
items,
- path,
onModalClose
} = this.props;
@@ -112,12 +111,6 @@ class RetagPreviewModalContent extends Component {
!isFetching && isPopulated && !!items.length &&
-
- All paths are relative to:
-
- {path}
-
-
MusicBrainz identifiers will also be added to the files; these are not shown below.
@@ -130,7 +123,7 @@ class RetagPreviewModalContent extends Component {
-
- {
- isUnavailable ?
-
- {path}
-
-
- Unavailable
-
-
:
-
-
-
-
- {(isUnavailable || isNaN(freeSpace)) ? '-' : formatBytes(freeSpace)}
-
-
-
- {isUnavailable ? '-' : unmappedFolders.length}
-
-
-
-
-
- );
-}
-
-RootFolderRow.propTypes = {
- id: PropTypes.number.isRequired,
- path: PropTypes.string.isRequired,
- accessible: PropTypes.bool.isRequired,
- freeSpace: PropTypes.number,
- unmappedFolders: PropTypes.arrayOf(PropTypes.object).isRequired,
- onDeletePress: PropTypes.func.isRequired
-};
-
-RootFolderRow.defaultProps = {
- unmappedFolders: []
-};
-
-export default RootFolderRow;
diff --git a/frontend/src/RootFolder/RootFolderRowConnector.js b/frontend/src/RootFolder/RootFolderRowConnector.js
deleted file mode 100644
index ab0848e87..000000000
--- a/frontend/src/RootFolder/RootFolderRowConnector.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { connect } from 'react-redux';
-import { deleteRootFolder } from 'Store/Actions/rootFolderActions';
-import RootFolderRow from './RootFolderRow';
-
-function createMapDispatchToProps(dispatch, props) {
- return {
- onDeletePress() {
- dispatch(deleteRootFolder({ id: props.id }));
- }
- };
-}
-
-export default connect(null, createMapDispatchToProps)(RootFolderRow);
diff --git a/frontend/src/RootFolder/RootFolders.js b/frontend/src/RootFolder/RootFolders.js
deleted file mode 100644
index a07209ecc..000000000
--- a/frontend/src/RootFolder/RootFolders.js
+++ /dev/null
@@ -1,81 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import Table from 'Components/Table/Table';
-import TableBody from 'Components/Table/TableBody';
-import RootFolderRowConnector from './RootFolderRowConnector';
-
-const rootFolderColumns = [
- {
- name: 'path',
- label: 'Path',
- isVisible: true
- },
- {
- name: 'freeSpace',
- label: 'Free Space',
- isVisible: true
- },
- {
- name: 'unmappedFolders',
- label: 'Unmapped Folders',
- isVisible: true
- },
- {
- name: 'actions',
- isVisible: true
- }
-];
-
-function RootFolders(props) {
- const {
- isFetching,
- isPopulated,
- error,
- items
- } = props;
-
- if (isFetching && !isPopulated) {
- return (
- Unable to load root folders
- );
- }
-
- return (
-
-
- {
- items.map((rootFolder) => {
- return (
-
-
- );
-}
-
-RootFolders.propTypes = {
- isFetching: PropTypes.bool.isRequired,
- isPopulated: PropTypes.bool.isRequired,
- error: PropTypes.object,
- items: PropTypes.arrayOf(PropTypes.object).isRequired
-};
-
-export default RootFolders;
diff --git a/frontend/src/RootFolder/RootFoldersConnector.js b/frontend/src/RootFolder/RootFoldersConnector.js
deleted file mode 100644
index 39f140bcc..000000000
--- a/frontend/src/RootFolder/RootFoldersConnector.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
-import RootFolders from './RootFolders';
-
-function createMapStateToProps() {
- return createSelector(
- (state) => state.rootFolders,
- (rootFolders) => {
- return rootFolders;
- }
- );
-}
-
-const mapDispatchToProps = {
- dispatchFetchRootFolders: fetchRootFolders
-};
-
-class RootFoldersConnector extends Component {
-
- //
- // Lifecycle
-
- componentDidMount() {
- this.props.dispatchFetchRootFolders();
- }
-
- //
- // Render
-
- render() {
- return (
-
+
-
);
diff --git a/frontend/src/Settings/MediaManagement/RootFolder/AddRootFolder.css b/frontend/src/Settings/MediaManagement/RootFolder/AddRootFolder.css
deleted file mode 100644
index 19b1880be..000000000
--- a/frontend/src/Settings/MediaManagement/RootFolder/AddRootFolder.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.addRootFolderButtonContainer {
- margin-top: 20px;
-}
-
-.importButtonIcon {
- margin-right: 8px;
-}
diff --git a/frontend/src/Settings/MediaManagement/RootFolder/AddRootFolder.js b/frontend/src/Settings/MediaManagement/RootFolder/AddRootFolder.js
deleted file mode 100644
index 3da2a55b9..000000000
--- a/frontend/src/Settings/MediaManagement/RootFolder/AddRootFolder.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { icons, kinds, sizes } from 'Helpers/Props';
-import Button from 'Components/Link/Button';
-import Icon from 'Components/Icon';
-import FileBrowserModal from 'Components/FileBrowser/FileBrowserModal';
-import styles from './AddRootFolder.css';
-
-class AddRootFolder extends Component {
-
- //
- // Lifecycle
-
- constructor(props, context) {
- super(props, context);
-
- this.state = {
- isAddNewRootFolderModalOpen: false
- };
- }
-
- //
- // Lifecycle
-
- onAddNewRootFolderPress = () => {
- this.setState({ isAddNewRootFolderModalOpen: true });
- }
-
- onNewRootFolderSelect = ({ value }) => {
- this.props.onNewRootFolderSelect(value);
- }
-
- onAddRootFolderModalClose = () => {
- this.setState({ isAddNewRootFolderModalOpen: false });
- }
-
- //
- // Render
-
- render() {
- return (
-
-
-
-
-
- );
- }
-}
-
-AddRootFolder.propTypes = {
- onNewRootFolderSelect: PropTypes.func.isRequired
-};
-
-export default AddRootFolder;
diff --git a/frontend/src/Settings/MediaManagement/RootFolder/AddRootFolderConnector.js b/frontend/src/Settings/MediaManagement/RootFolder/AddRootFolderConnector.js
deleted file mode 100644
index cd5f4c50d..000000000
--- a/frontend/src/Settings/MediaManagement/RootFolder/AddRootFolderConnector.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { connect } from 'react-redux';
-import AddRootFolder from './AddRootFolder';
-import { addRootFolder } from 'Store/Actions/rootFolderActions';
-
-function createMapDispatchToProps(dispatch) {
- return {
- onNewRootFolderSelect(path) {
- dispatch(addRootFolder({ path }));
- }
- };
-}
-
-export default connect(null, createMapDispatchToProps)(AddRootFolder);
diff --git a/frontend/src/Settings/MediaManagement/RootFolder/EditRootFolderModal.js b/frontend/src/Settings/MediaManagement/RootFolder/EditRootFolderModal.js
new file mode 100644
index 000000000..6adc8046c
--- /dev/null
+++ b/frontend/src/Settings/MediaManagement/RootFolder/EditRootFolderModal.js
@@ -0,0 +1,25 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Modal from 'Components/Modal/Modal';
+import EditRootFolderModalContentConnector from './EditRootFolderModalContentConnector';
+
+function EditRootFolderModal({ isOpen, onModalClose, ...otherProps }) {
+ return (
+
+
+ );
+}
+
+EditRootFolderModal.propTypes = {
+ isOpen: PropTypes.bool.isRequired,
+ onModalClose: PropTypes.func.isRequired
+};
+
+export default EditRootFolderModal;
diff --git a/frontend/src/Settings/MediaManagement/RootFolder/EditRootFolderModalConnector.js b/frontend/src/Settings/MediaManagement/RootFolder/EditRootFolderModalConnector.js
new file mode 100644
index 000000000..d016df6ce
--- /dev/null
+++ b/frontend/src/Settings/MediaManagement/RootFolder/EditRootFolderModalConnector.js
@@ -0,0 +1,58 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { clearPendingChanges } from 'Store/Actions/baseActions';
+import { cancelSaveRootFolder } from 'Store/Actions/settingsActions';
+import EditRootFolderModal from './EditRootFolderModal';
+
+function createMapDispatchToProps(dispatch, props) {
+ const section = 'settings.rootFolders';
+
+ return {
+ dispatchClearPendingChanges() {
+ dispatch(clearPendingChanges({ section }));
+ },
+
+ dispatchCancelSaveRootFolder() {
+ dispatch(cancelSaveRootFolder({ section }));
+ }
+ };
+}
+
+class EditRootFolderModalConnector extends Component {
+
+ //
+ // Listeners
+
+ onModalClose = () => {
+ this.props.dispatchClearPendingChanges();
+ this.props.dispatchCancelSaveRootFolder();
+ this.props.onModalClose();
+ }
+
+ //
+ // Render
+
+ render() {
+ const {
+ dispatchClearPendingChanges,
+ dispatchCancelSaveRootFolder,
+ ...otherProps
+ } = this.props;
+
+ return (
+
+
+ {id ? 'Edit Root Folder' : 'Add Root Folder'}
+
+
+
+ {
+ isFetching &&
+ Unable to add a new root folder, please try again.
+ }
+
+ {
+ !isFetching && !error &&
+
+ }
+
+
+ {
+ id &&
+
+ Delete
+
+ }
+
+
+ Cancel
+
+
+
+ Save
+
+
+
+ );
+}
+
+EditRootFolderModalContent.propTypes = {
+ advancedSettings: PropTypes.bool.isRequired,
+ isFetching: PropTypes.bool.isRequired,
+ error: PropTypes.object,
+ isSaving: PropTypes.bool.isRequired,
+ saveError: PropTypes.object,
+ item: PropTypes.object.isRequired,
+ showMetadataProfile: PropTypes.bool.isRequired,
+ onInputChange: PropTypes.func.isRequired,
+ onModalClose: PropTypes.func.isRequired,
+ onSavePress: PropTypes.func.isRequired,
+ onDeleteRootFolderPress: PropTypes.func
+};
+
+export default EditRootFolderModalContent;
diff --git a/frontend/src/Settings/MediaManagement/RootFolder/EditRootFolderModalContentConnector.js b/frontend/src/Settings/MediaManagement/RootFolder/EditRootFolderModalContentConnector.js
new file mode 100644
index 000000000..1285d2f7a
--- /dev/null
+++ b/frontend/src/Settings/MediaManagement/RootFolder/EditRootFolderModalContentConnector.js
@@ -0,0 +1,84 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector';
+import { setRootFolderValue, saveRootFolder } from 'Store/Actions/settingsActions';
+import EditRootFolderModalContent from './EditRootFolderModalContent';
+
+function createMapStateToProps() {
+ return createSelector(
+ (state, { id }) => id,
+ (state) => state.settings.advancedSettings,
+ (state) => state.settings.metadataProfiles,
+ (state) => state.settings.rootFolders,
+ createProviderSettingsSelector('rootFolders'),
+ (id, advancedSettings, metadataProfiles, rootFolders, rootFolderSettings) => {
+ return {
+ advancedSettings,
+ showMetadataProfile: metadataProfiles.items.length > 1,
+ ...rootFolderSettings,
+ isFetching: rootFolders.isFetching
+ };
+ }
+ );
+}
+
+const mapDispatchToProps = {
+ setRootFolderValue,
+ saveRootFolder
+};
+
+class EditRootFolderModalContentConnector extends Component {
+
+ //
+ // Lifecycle
+
+ componentDidUpdate(prevProps, prevState) {
+ if (prevProps.isSaving && !this.props.isSaving && !this.props.saveError) {
+ this.props.onModalClose();
+ }
+ }
+
+ //
+ // Listeners
+
+ onInputChange = ({ name, value }) => {
+ this.props.setRootFolderValue({ name, value });
+ }
+
+ onSavePress = () => {
+ this.props.saveRootFolder({ id: this.props.id });
+
+ if (this.props.onRootFolderAdded) {
+ this.props.onRootFolderAdded(this.props.item.path);
+ }
+ }
+
+ //
+ // Render
+
+ render() {
+ return (
+
+
+ {name}
+
+
+
+
+ {path}
+
+
+
+ {qualityProfile.name}
+
+
+
+ {metadataProfile.name}
+
+
+
+
+ );
+ }
+}
+
+RootFolder.propTypes = {
+ id: PropTypes.number.isRequired,
+ name: PropTypes.string.isRequired,
+ path: PropTypes.string.isRequired,
+ qualityProfile: PropTypes.object.isRequired,
+ metadataProfile: PropTypes.object.isRequired,
+ onConfirmDeleteRootFolder: PropTypes.func.isRequired
+};
+
+export default RootFolder;
diff --git a/frontend/src/Settings/MediaManagement/RootFolder/RootFolders.css b/frontend/src/Settings/MediaManagement/RootFolder/RootFolders.css
new file mode 100644
index 000000000..6ecc1572c
--- /dev/null
+++ b/frontend/src/Settings/MediaManagement/RootFolder/RootFolders.css
@@ -0,0 +1,20 @@
+.rootFolders {
+ display: flex;
+ flex-wrap: wrap;
+}
+
+.addRootFolder {
+ composes: rootFolder from '~./RootFolder.css';
+
+ background-color: $cardAlternateBackgroundColor;
+ color: $gray;
+ text-align: center;
+}
+
+.center {
+ display: inline-block;
+ padding: 5px 20px 0;
+ border: 1px solid $borderColor;
+ border-radius: 4px;
+ background-color: $white;
+}
diff --git a/frontend/src/Settings/MediaManagement/RootFolder/RootFolders.js b/frontend/src/Settings/MediaManagement/RootFolder/RootFolders.js
new file mode 100644
index 000000000..366f45e85
--- /dev/null
+++ b/frontend/src/Settings/MediaManagement/RootFolder/RootFolders.js
@@ -0,0 +1,105 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import sortByName from 'Utilities/Array/sortByName';
+import { icons } from 'Helpers/Props';
+import FieldSet from 'Components/FieldSet';
+import Card from 'Components/Card';
+import Icon from 'Components/Icon';
+import PageSectionContent from 'Components/Page/PageSectionContent';
+import RootFolder from './RootFolder';
+import EditRootFolderModalConnector from './EditRootFolderModalConnector';
+import styles from './RootFolders.css';
+
+class RootFolders extends Component {
+
+ //
+ // Lifecycle
+
+ constructor(props, context) {
+ super(props, context);
+
+ this.state = {
+ isAddRootFolderModalOpen: false
+ };
+ }
+
+ //
+ // Listeners
+
+ onAddRootFolderPress = () => {
+ this.setState({ isAddRootFolderModalOpen: true });
+ }
+
+ onAddRootFolderModalClose = () => {
+ this.setState({ isAddRootFolderModalOpen: false });
+ }
+
+ //
+ // Render
+
+ render() {
+ const {
+ items,
+ qualityProfiles,
+ metadataProfiles,
+ onConfirmDeleteRootFolder,
+ ...otherProps
+ } = this.props;
+
+ return (
+
+
+
+ {
+ items.sort(sortByName).map((item) => {
+ const qualityProfile = qualityProfiles.find((profile) => profile.id === item.defaultQualityProfileId);
+ const metadataProfile = metadataProfiles.find((profile) => profile.id === item.defaultMetadataProfileId);
+ return (
+
+ );
+ })
+ }
+
+
+
+
+
+
+
+ );
+ }
+}
+
+RootFolders.propTypes = {
+ isFetching: PropTypes.bool.isRequired,
+ isPopulated: PropTypes.bool.isRequired,
+ error: PropTypes.object,
+ items: PropTypes.arrayOf(PropTypes.object).isRequired,
+ qualityProfiles: PropTypes.arrayOf(PropTypes.object).isRequired,
+ metadataProfiles: PropTypes.arrayOf(PropTypes.object).isRequired,
+ onConfirmDeleteRootFolder: PropTypes.func.isRequired
+};
+
+export default RootFolders;
diff --git a/frontend/src/Settings/MediaManagement/RootFolder/RootFoldersConnector.js b/frontend/src/Settings/MediaManagement/RootFolder/RootFoldersConnector.js
new file mode 100644
index 000000000..af2cf091d
--- /dev/null
+++ b/frontend/src/Settings/MediaManagement/RootFolder/RootFoldersConnector.js
@@ -0,0 +1,62 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { fetchRootFolders, deleteRootFolder } from 'Store/Actions/settingsActions';
+import RootFolders from './RootFolders';
+
+function createMapStateToProps() {
+ return createSelector(
+ (state) => state.settings.rootFolders,
+ (state) => state.settings.qualityProfiles,
+ (state) => state.settings.metadataProfiles,
+ (rootFolders, quality, metadata) => {
+ return {
+ qualityProfiles: quality.items,
+ metadataProfiles: metadata.items,
+ ...rootFolders
+ };
+ }
+ );
+}
+
+const mapDispatchToProps = {
+ dispatchFetchRootFolders: fetchRootFolders,
+ dispatchDeleteRootFolder: deleteRootFolder
+};
+
+class RootFoldersConnector extends Component {
+
+ //
+ // Lifecycle
+
+ componentDidMount() {
+ this.props.dispatchFetchRootFolders();
+ }
+
+ //
+ // Listeners
+
+ onConfirmDeleteRootFolder = (id) => {
+ this.props.dispatchDeleteRootFolder({ id });
+ }
+
+ //
+ // Render
+
+ render() {
+ return (
+
- {relativePath}
+ {path}
@@ -44,7 +44,7 @@ function TrackFileEditorRow(props) {
TrackFileEditorRow.propTypes = {
id: PropTypes.number.isRequired,
trackNumber: PropTypes.string.isRequired,
- relativePath: PropTypes.string.isRequired,
+ path: PropTypes.string.isRequired,
quality: PropTypes.object.isRequired,
isSelected: PropTypes.bool,
onSelectedChange: PropTypes.func.isRequired
diff --git a/frontend/src/UnmappedFiles/UnmappedFilesTable.js b/frontend/src/UnmappedFiles/UnmappedFilesTable.js
index 94822299f..7b2bad819 100644
--- a/frontend/src/UnmappedFiles/UnmappedFilesTable.js
+++ b/frontend/src/UnmappedFiles/UnmappedFilesTable.js
@@ -69,7 +69,8 @@ class UnmappedFilesTable extends Component {
sortDirection,
onTableOptionChange,
onSortPress,
- deleteUnmappedFile,
+ isScanningFolders,
+ onAddMissingArtistsPress,
...otherProps
} = this.props;
@@ -80,6 +81,16 @@ class UnmappedFilesTable extends Component {
return (
+
+
+
{
// trackFiles could pick up mapped entries via signalR so filter again here
@@ -27,6 +32,7 @@ function createMapStateToProps() {
return {
items: unmappedFiles,
...otherProps,
+ isScanningFolders,
isSmallScreen: dimensionsState.isSmallScreen
};
}
@@ -49,6 +55,13 @@ function createMapDispatchToProps(dispatch, props) {
deleteUnmappedFile(id) {
dispatch(deleteTrackFile({ id }));
+ },
+
+ onAddMissingArtistsPress() {
+ dispatch(executeCommand({
+ name: commandNames.RESCAN_FOLDERS,
+ filter: 'matched'
+ }));
}
};
}
diff --git a/src/Lidarr.Api.V1/Albums/AlbumModule.cs b/src/Lidarr.Api.V1/Albums/AlbumModule.cs
index 9fb2d9d70..889d05144 100644
--- a/src/Lidarr.Api.V1/Albums/AlbumModule.cs
+++ b/src/Lidarr.Api.V1/Albums/AlbumModule.cs
@@ -39,7 +39,7 @@ namespace Lidarr.Api.V1.Albums
IMapCoversToLocal coverMapper,
IUpgradableSpecification upgradableSpecification,
IBroadcastSignalRMessage signalRBroadcaster,
- ProfileExistsValidator profileExistsValidator,
+ QualityProfileExistsValidator qualityProfileExistsValidator,
MetadataProfileExistsValidator metadataProfileExistsValidator)
: base(albumService, artistStatisticsService, coverMapper, upgradableSpecification, signalRBroadcaster)
@@ -54,7 +54,7 @@ namespace Lidarr.Api.V1.Albums
Put("/monitor", x => SetAlbumsMonitored());
PostValidator.RuleFor(s => s.ForeignAlbumId).NotEmpty();
- PostValidator.RuleFor(s => s.Artist.QualityProfileId).SetValidator(profileExistsValidator);
+ PostValidator.RuleFor(s => s.Artist.QualityProfileId).SetValidator(qualityProfileExistsValidator);
PostValidator.RuleFor(s => s.Artist.MetadataProfileId).SetValidator(metadataProfileExistsValidator);
PostValidator.RuleFor(s => s.Artist.RootFolderPath).IsValidPath().When(s => s.Artist.Path.IsNullOrWhiteSpace());
PostValidator.RuleFor(s => s.Artist.ForeignArtistId).NotEmpty();
diff --git a/src/Lidarr.Api.V1/Artist/ArtistModule.cs b/src/Lidarr.Api.V1/Artist/ArtistModule.cs
index 830d66262..362f155d0 100644
--- a/src/Lidarr.Api.V1/Artist/ArtistModule.cs
+++ b/src/Lidarr.Api.V1/Artist/ArtistModule.cs
@@ -53,7 +53,7 @@ namespace Lidarr.Api.V1.Artist
ArtistExistsValidator artistExistsValidator,
ArtistAncestorValidator artistAncestorValidator,
SystemFolderValidator systemFolderValidator,
- ProfileExistsValidator profileExistsValidator,
+ QualityProfileExistsValidator qualityProfileExistsValidator,
MetadataProfileExistsValidator metadataProfileExistsValidator)
: base(signalRBroadcaster)
{
@@ -85,7 +85,7 @@ namespace Lidarr.Api.V1.Artist
.SetValidator(systemFolderValidator)
.When(s => !s.Path.IsNullOrWhiteSpace());
- SharedValidator.RuleFor(s => s.QualityProfileId).SetValidator(profileExistsValidator);
+ SharedValidator.RuleFor(s => s.QualityProfileId).SetValidator(qualityProfileExistsValidator);
SharedValidator.RuleFor(s => s.MetadataProfileId).SetValidator(metadataProfileExistsValidator);
PostValidator.RuleFor(s => s.Path).IsValidPath().When(s => s.RootFolderPath.IsNullOrWhiteSpace());
diff --git a/src/Lidarr.Api.V1/FileSystem/FileSystemModule.cs b/src/Lidarr.Api.V1/FileSystem/FileSystemModule.cs
index 67da221d6..58f899324 100644
--- a/src/Lidarr.Api.V1/FileSystem/FileSystemModule.cs
+++ b/src/Lidarr.Api.V1/FileSystem/FileSystemModule.cs
@@ -62,7 +62,6 @@ namespace Lidarr.Api.V1.FileSystem
return _diskScanService.GetAudioFiles(path).Select(f => new
{
Path = f.FullName,
- RelativePath = path.GetRelativePath(f.FullName),
Name = f.Name
});
}
diff --git a/src/Lidarr.Api.V1/ImportLists/ImportListModule.cs b/src/Lidarr.Api.V1/ImportLists/ImportListModule.cs
index 4cb75fbae..8f3b1edb1 100644
--- a/src/Lidarr.Api.V1/ImportLists/ImportListModule.cs
+++ b/src/Lidarr.Api.V1/ImportLists/ImportListModule.cs
@@ -9,7 +9,7 @@ namespace Lidarr.Api.V1.ImportLists
public static readonly ImportListResourceMapper ResourceMapper = new ImportListResourceMapper();
public ImportListModule(ImportListFactory importListFactory,
- ProfileExistsValidator profileExistsValidator,
+ QualityProfileExistsValidator qualityProfileExistsValidator,
MetadataProfileExistsValidator metadataProfileExistsValidator)
: base(importListFactory, "importlist", ResourceMapper)
{
@@ -17,7 +17,7 @@ namespace Lidarr.Api.V1.ImportLists
Http.Validation.RuleBuilderExtensions.ValidId(SharedValidator.RuleFor(s => s.MetadataProfileId));
SharedValidator.RuleFor(c => c.RootFolderPath).IsValidPath();
- SharedValidator.RuleFor(c => c.QualityProfileId).SetValidator(profileExistsValidator);
+ SharedValidator.RuleFor(c => c.QualityProfileId).SetValidator(qualityProfileExistsValidator);
SharedValidator.RuleFor(c => c.MetadataProfileId).SetValidator(metadataProfileExistsValidator);
}
diff --git a/src/Lidarr.Api.V1/ManualImport/ManualImportModule.cs b/src/Lidarr.Api.V1/ManualImport/ManualImportModule.cs
index c9c7017b4..ce8b00680 100644
--- a/src/Lidarr.Api.V1/ManualImport/ManualImportModule.cs
+++ b/src/Lidarr.Api.V1/ManualImport/ManualImportModule.cs
@@ -71,7 +71,6 @@ namespace Lidarr.Api.V1.ManualImport
{
Id = resource.Id,
Path = resource.Path,
- RelativePath = resource.RelativePath,
Name = resource.Name,
Size = resource.Size,
Artist = resource.Artist == null ? null : _artistService.GetArtist(resource.Artist.Id),
diff --git a/src/Lidarr.Api.V1/ManualImport/ManualImportResource.cs b/src/Lidarr.Api.V1/ManualImport/ManualImportResource.cs
index 4d9c2653a..8470ae13b 100644
--- a/src/Lidarr.Api.V1/ManualImport/ManualImportResource.cs
+++ b/src/Lidarr.Api.V1/ManualImport/ManualImportResource.cs
@@ -14,7 +14,6 @@ namespace Lidarr.Api.V1.ManualImport
public class ManualImportResource : RestResource
{
public string Path { get; set; }
- public string RelativePath { get; set; }
public string Name { get; set; }
public long Size { get; set; }
public ArtistResource Artist { get; set; }
@@ -44,7 +43,6 @@ namespace Lidarr.Api.V1.ManualImport
{
Id = model.Id,
Path = model.Path,
- RelativePath = model.RelativePath,
Name = model.Name,
Size = model.Size,
Artist = model.Artist.ToResource(),
diff --git a/src/Lidarr.Api.V1/RootFolders/RootFolderModule.cs b/src/Lidarr.Api.V1/RootFolders/RootFolderModule.cs
index cba25a230..731acf561 100644
--- a/src/Lidarr.Api.V1/RootFolders/RootFolderModule.cs
+++ b/src/Lidarr.Api.V1/RootFolders/RootFolderModule.cs
@@ -1,7 +1,9 @@
using System.Collections.Generic;
using FluentValidation;
using Lidarr.Http;
+using Lidarr.Http.REST;
using NzbDrone.Core.RootFolders;
+using NzbDrone.Core.Validation;
using NzbDrone.Core.Validation.Paths;
using NzbDrone.SignalR;
@@ -18,7 +20,9 @@ namespace Lidarr.Api.V1.RootFolders
MappedNetworkDriveValidator mappedNetworkDriveValidator,
StartupFolderValidator startupFolderValidator,
SystemFolderValidator systemFolderValidator,
- FolderWritableValidator folderWritableValidator)
+ FolderWritableValidator folderWritableValidator,
+ QualityProfileExistsValidator qualityProfileExistsValidator,
+ MetadataProfileExistsValidator metadataProfileExistsValidator)
: base(signalRBroadcaster)
{
_rootFolderService = rootFolderService;
@@ -26,17 +30,29 @@ namespace Lidarr.Api.V1.RootFolders
GetResourceAll = GetRootFolders;
GetResourceById = GetRootFolder;
CreateResource = CreateRootFolder;
+ UpdateResource = UpdateRootFolder;
DeleteResource = DeleteFolder;
SharedValidator.RuleFor(c => c.Path)
- .Cascade(CascadeMode.StopOnFirstFailure)
- .IsValidPath()
- .SetValidator(rootFolderValidator)
- .SetValidator(mappedNetworkDriveValidator)
- .SetValidator(startupFolderValidator)
- .SetValidator(pathExistsValidator)
- .SetValidator(systemFolderValidator)
- .SetValidator(folderWritableValidator);
+ .Cascade(CascadeMode.StopOnFirstFailure)
+ .IsValidPath()
+ .SetValidator(mappedNetworkDriveValidator)
+ .SetValidator(startupFolderValidator)
+ .SetValidator(pathExistsValidator)
+ .SetValidator(systemFolderValidator)
+ .SetValidator(folderWritableValidator);
+
+ PostValidator.RuleFor(c => c.Path)
+ .SetValidator(rootFolderValidator);
+
+ SharedValidator.RuleFor(c => c.Name)
+ .NotEmpty();
+
+ SharedValidator.RuleFor(c => c.DefaultMetadataProfileId)
+ .SetValidator(metadataProfileExistsValidator);
+
+ SharedValidator.RuleFor(c => c.DefaultQualityProfileId)
+ .SetValidator(qualityProfileExistsValidator);
}
private RootFolderResource GetRootFolder(int id)
@@ -51,9 +67,21 @@ namespace Lidarr.Api.V1.RootFolders
return _rootFolderService.Add(model).Id;
}
+ private void UpdateRootFolder(RootFolderResource rootFolderResource)
+ {
+ var model = rootFolderResource.ToModel();
+
+ if (model.Path != rootFolderResource.Path)
+ {
+ throw new BadRequestException("Cannot edit root folder path");
+ }
+
+ _rootFolderService.Update(model);
+ }
+
private List GetRootFolders()
{
- return _rootFolderService.AllWithUnmappedFolders().ToResource();
+ return _rootFolderService.AllWithSpaceStats().ToResource();
}
private void DeleteFolder(int id)
diff --git a/src/Lidarr.Api.V1/RootFolders/RootFolderResource.cs b/src/Lidarr.Api.V1/RootFolders/RootFolderResource.cs
index 2d19ef40e..563eb4c08 100644
--- a/src/Lidarr.Api.V1/RootFolders/RootFolderResource.cs
+++ b/src/Lidarr.Api.V1/RootFolders/RootFolderResource.cs
@@ -1,18 +1,23 @@
using System.Collections.Generic;
using System.Linq;
using Lidarr.Http.REST;
+using NzbDrone.Core.Music;
using NzbDrone.Core.RootFolders;
namespace Lidarr.Api.V1.RootFolders
{
public class RootFolderResource : RestResource
{
+ public string Name { get; set; }
public string Path { get; set; }
+ public int DefaultMetadataProfileId { get; set; }
+ public int DefaultQualityProfileId { get; set; }
+ public MonitorTypes DefaultMonitorOption { get; set; }
+ public HashSet DefaultTags { get; set; }
+
public bool Accessible { get; set; }
public long? FreeSpace { get; set; }
public long? TotalSpace { get; set; }
-
- public List UnmappedFolders { get; set; }
}
public static class RootFolderResourceMapper
@@ -28,11 +33,16 @@ namespace Lidarr.Api.V1.RootFolders
{
Id = model.Id,
+ Name = model.Name,
Path = model.Path,
+ DefaultMetadataProfileId = model.DefaultMetadataProfileId,
+ DefaultQualityProfileId = model.DefaultQualityProfileId,
+ DefaultMonitorOption = model.DefaultMonitorOption,
+ DefaultTags = model.DefaultTags,
+
Accessible = model.Accessible,
FreeSpace = model.FreeSpace,
TotalSpace = model.TotalSpace,
- UnmappedFolders = model.UnmappedFolders
};
}
@@ -46,12 +56,13 @@ namespace Lidarr.Api.V1.RootFolders
return new RootFolder
{
Id = resource.Id,
-
+ Name = resource.Name,
Path = resource.Path,
- //Accessible
- //FreeSpace
- //UnmappedFolders
+ DefaultMetadataProfileId = resource.DefaultMetadataProfileId,
+ DefaultQualityProfileId = resource.DefaultQualityProfileId,
+ DefaultMonitorOption = resource.DefaultMonitorOption,
+ DefaultTags = resource.DefaultTags
};
}
diff --git a/src/Lidarr.Api.V1/TrackFiles/TrackFileResource.cs b/src/Lidarr.Api.V1/TrackFiles/TrackFileResource.cs
index fb3f3523d..a445e3c84 100644
--- a/src/Lidarr.Api.V1/TrackFiles/TrackFileResource.cs
+++ b/src/Lidarr.Api.V1/TrackFiles/TrackFileResource.cs
@@ -13,7 +13,6 @@ namespace Lidarr.Api.V1.TrackFiles
{
public int ArtistId { get; set; }
public int AlbumId { get; set; }
- public string RelativePath { get; set; }
public string Path { get; set; }
public long Size { get; set; }
public DateTime DateAdded { get; set; }
@@ -74,7 +73,6 @@ namespace Lidarr.Api.V1.TrackFiles
ArtistId = artist.Id,
AlbumId = model.AlbumId,
Path = model.Path,
- RelativePath = artist.Path.GetRelativePath(model.Path),
Size = model.Size,
DateAdded = model.DateAdded,
Quality = model.Quality,
diff --git a/src/Lidarr.Api.V1/Tracks/RetagTrackResource.cs b/src/Lidarr.Api.V1/Tracks/RetagTrackResource.cs
index 34766eb7c..353233e82 100644
--- a/src/Lidarr.Api.V1/Tracks/RetagTrackResource.cs
+++ b/src/Lidarr.Api.V1/Tracks/RetagTrackResource.cs
@@ -17,7 +17,7 @@ namespace Lidarr.Api.V1.Tracks
public int AlbumId { get; set; }
public List TrackNumbers { get; set; }
public int TrackFileId { get; set; }
- public string RelativePath { get; set; }
+ public string Path { get; set; }
public List Changes { get; set; }
}
@@ -36,7 +36,7 @@ namespace Lidarr.Api.V1.Tracks
AlbumId = model.AlbumId,
TrackNumbers = model.TrackNumbers.ToList(),
TrackFileId = model.TrackFileId,
- RelativePath = model.RelativePath,
+ Path = model.Path,
Changes = model.Changes.Select(x => new TagDifference
{
Field = x.Key,
diff --git a/src/NzbDrone.Common/Extensions/IEnumerableExtensions.cs b/src/NzbDrone.Common/Extensions/IEnumerableExtensions.cs
index d2bd23467..946669ff2 100644
--- a/src/NzbDrone.Common/Extensions/IEnumerableExtensions.cs
+++ b/src/NzbDrone.Common/Extensions/IEnumerableExtensions.cs
@@ -153,5 +153,15 @@ namespace NzbDrone.Common.Extensions
{
return string.Join(separator, source.Select(predicate));
}
+
+ public static TSource MostCommon(this IEnumerable items)
+ {
+ return items.GroupBy(x => x).OrderByDescending(x => x.Count()).First().Key;
+ }
+
+ public static TResult MostCommon(this IEnumerable items, Func predicate)
+ {
+ return items.Select(predicate).GroupBy(x => x).OrderByDescending(x => x.Count()).First().Key;
+ }
}
}
diff --git a/src/NzbDrone.Core.Test/DiskSpace/DiskSpaceServiceFixture.cs b/src/NzbDrone.Core.Test/DiskSpace/DiskSpaceServiceFixture.cs
index b673d0490..b17b4a4b2 100644
--- a/src/NzbDrone.Core.Test/DiskSpace/DiskSpaceServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/DiskSpace/DiskSpaceServiceFixture.cs
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using System.IO;
using System.Linq;
using FluentAssertions;
using Moq;
@@ -6,6 +7,7 @@ using NUnit.Framework;
using NzbDrone.Common.Disk;
using NzbDrone.Core.DiskSpace;
using NzbDrone.Core.Music;
+using NzbDrone.Core.RootFolders;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;
@@ -14,14 +16,20 @@ namespace NzbDrone.Core.Test.DiskSpace
[TestFixture]
public class DiskSpaceServiceFixture : CoreTest
{
- private string _artistFolder;
- private string _artostFolder2;
+ private RootFolder _rootDir;
+ private string _artistFolder1;
+ private string _artistFolder2;
[SetUp]
public void SetUp()
{
- _artistFolder = @"G:\fasdlfsdf\artist".AsOsAgnostic();
- _artostFolder2 = @"G:\fasdlfsdf\artist2".AsOsAgnostic();
+ _rootDir = new RootFolder { Path = @"G:\fasdlfsdf".AsOsAgnostic() };
+ _artistFolder1 = Path.Combine(_rootDir.Path, "artist1");
+ _artistFolder2 = Path.Combine(_rootDir.Path, "artist2");
+
+ Mocker.GetMock()
+ .Setup(x => x.All())
+ .Returns(new List() { _rootDir });
Mocker.GetMock()
.Setup(v => v.GetMounts())
@@ -59,9 +67,9 @@ namespace NzbDrone.Core.Test.DiskSpace
[Test]
public void should_check_diskspace_for_artist_folders()
{
- GivenArtist(new Artist { Path = _artistFolder });
+ GivenArtist(new Artist { Path = _artistFolder1 });
- GivenExistingFolder(_artistFolder);
+ GivenExistingFolder(_artistFolder1);
var freeSpace = Subject.GetFreeSpace();
@@ -71,10 +79,10 @@ namespace NzbDrone.Core.Test.DiskSpace
[Test]
public void should_check_diskspace_for_same_root_folder_only_once()
{
- GivenArtist(new Artist { Path = _artistFolder }, new Artist { Path = _artostFolder2 });
+ GivenArtist(new Artist { Path = _artistFolder1 }, new Artist { Path = _artistFolder2 });
- GivenExistingFolder(_artistFolder);
- GivenExistingFolder(_artostFolder2);
+ GivenExistingFolder(_artistFolder1);
+ GivenExistingFolder(_artistFolder2);
var freeSpace = Subject.GetFreeSpace();
@@ -84,19 +92,6 @@ namespace NzbDrone.Core.Test.DiskSpace
.Verify(v => v.GetAvailableSpace(It.IsAny()), Times.Once());
}
- [Test]
- public void should_not_check_diskspace_for_missing_artist_folders()
- {
- GivenArtist(new Artist { Path = _artistFolder });
-
- var freeSpace = Subject.GetFreeSpace();
-
- freeSpace.Should().BeEmpty();
-
- Mocker.GetMock()
- .Verify(v => v.GetAvailableSpace(It.IsAny()), Times.Never());
- }
-
[TestCase("/boot")]
[TestCase("/var/lib/rancher")]
[TestCase("/var/lib/rancher/volumes")]
@@ -114,6 +109,10 @@ namespace NzbDrone.Core.Test.DiskSpace
.Setup(v => v.GetMounts())
.Returns(new List { mount.Object });
+ Mocker.GetMock()
+ .Setup(x => x.All())
+ .Returns(new List());
+
var freeSpace = Subject.GetFreeSpace();
freeSpace.Should().BeEmpty();
diff --git a/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs
index 8ecf75845..70fecacbc 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs
@@ -9,7 +9,6 @@ using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Common.Disk;
-using NzbDrone.Core.Configuration;
using NzbDrone.Core.DecisionEngine;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.MediaFiles.TrackImport;
@@ -41,11 +40,15 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
.Build();
Mocker.GetMock()
- .Setup(s => s.GetBestRootFolderPath(It.IsAny()))
- .Returns(_rootFolder);
+ .Setup(s => s.GetBestRootFolder(It.IsAny()))
+ .Returns(new RootFolder { Path = _rootFolder });
+
+ Mocker.GetMock()
+ .Setup(s => s.GetArtists(It.IsAny>()))
+ .Returns(new List());
Mocker.GetMock()
- .Setup(v => v.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), It.IsAny()))
+ .Setup(v => v.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), It.IsAny()))
.Returns(new List>());
Mocker.GetMock()
@@ -57,8 +60,8 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
.Returns(new List());
Mocker.GetMock()
- .Setup(v => v.FilterUnchangedFiles(It.IsAny>(), It.IsAny(), It.IsAny()))
- .Returns((List files, Artist artist, FilterFilesType filter) => files);
+ .Setup(v => v.FilterUnchangedFiles(It.IsAny>(), It.IsAny()))
+ .Returns((List files, FilterFilesType filter) => files);
}
private void GivenRootFolder(params string[] subfolders)
@@ -112,7 +115,7 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
[Test]
public void should_not_scan_if_root_folder_does_not_exist()
{
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
ExceptionVerification.ExpectedWarns(1);
@@ -120,15 +123,18 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
.Verify(v => v.FolderExists(_artist.Path), Times.Never());
Mocker.GetMock()
- .Verify(v => v.Clean(It.IsAny(), It.IsAny>()), Times.Never());
+ .Verify(v => v.Clean(It.IsAny(), It.IsAny>()), Times.Never());
+
+ Mocker.GetMock()
+ .Verify(v => v.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), It.IsAny()), Times.Never());
}
[Test]
- public void should_not_scan_if_artist_root_folder_is_empty()
+ public void should_not_scan_if_root_folder_is_empty()
{
GivenRootFolder();
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
ExceptionVerification.ExpectedWarns(1);
@@ -136,72 +142,23 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
.Verify(v => v.FolderExists(_artist.Path), Times.Never());
Mocker.GetMock()
- .Verify(v => v.Clean(It.IsAny(), It.IsAny>()), Times.Never());
+ .Verify(v => v.Clean(It.IsAny(), It.IsAny>()), Times.Never());
Mocker.GetMock()
- .Verify(v => v.GetImportDecisions(It.IsAny>(), _artist, FilterFilesType.Known, true), Times.Never());
+ .Verify(v => v.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), It.IsAny()), Times.Never());
}
[Test]
- public void should_create_if_artist_folder_does_not_exist_but_create_folder_enabled()
+ public void should_clean_if_folder_does_not_exist()
{
GivenRootFolder(_otherArtistFolder);
- Mocker.GetMock()
- .Setup(s => s.CreateEmptyArtistFolders)
- .Returns(true);
-
- Subject.Scan(_artist);
-
- DiskProvider.FolderExists(_artist.Path).Should().BeTrue();
- }
-
- [Test]
- public void should_not_create_if_artist_folder_does_not_exist_and_create_folder_disabled()
- {
- GivenRootFolder(_otherArtistFolder);
-
- Mocker.GetMock()
- .Setup(s => s.CreateEmptyArtistFolders)
- .Returns(false);
-
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
DiskProvider.FolderExists(_artist.Path).Should().BeFalse();
- }
-
- [Test]
- public void should_clean_but_not_import_if_artist_folder_does_not_exist()
- {
- GivenRootFolder(_otherArtistFolder);
-
- Subject.Scan(_artist);
-
- DiskProvider.FolderExists(_artist.Path).Should().BeFalse();
-
- Mocker.GetMock()
- .Verify(v => v.Clean(It.IsAny(), It.IsAny>()), Times.Once());
-
- Mocker.GetMock()
- .Verify(v => v.GetImportDecisions(It.IsAny>(), _artist, FilterFilesType.Known, true), Times.Never());
- }
-
- [Test]
- public void should_clean_but_not_import_if_artist_folder_does_not_exist_and_create_folder_enabled()
- {
- GivenRootFolder(_otherArtistFolder);
-
- Mocker.GetMock()
- .Setup(s => s.CreateEmptyArtistFolders)
- .Returns(true);
-
- Subject.Scan(_artist);
Mocker.GetMock()
- .Verify(v => v.Clean(It.IsAny(), It.IsAny>()), Times.Once());
-
- Mocker.GetMock()
- .Verify(v => v.GetImportDecisions(It.IsAny>(), _artist, FilterFilesType.Known, true), Times.Never());
+ .Verify(v => v.Clean(It.IsAny(), It.IsAny>()), Times.Once());
}
[Test]
@@ -215,10 +172,10 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
Path.Combine(_artist.Path, "s01e01.flac")
});
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
Mocker.GetMock()
- .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 2), _artist, FilterFilesType.Known, true), Times.Once());
+ .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 2), It.IsAny(), It.IsAny(), It.IsAny()), Times.Once());
}
[Test]
@@ -235,10 +192,10 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
Path.Combine(_artist.Path, "Season 1", "s01e01.flac")
});
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
Mocker.GetMock()
- .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 1), _artist, FilterFilesType.Known, true), Times.Once());
+ .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 1), It.IsAny(), It.IsAny(), It.IsAny()), Times.Once());
}
[Test]
@@ -253,10 +210,10 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
Path.Combine(_artist.Path, "Season 1", "s01e01.flac")
});
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
Mocker.GetMock()
- .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 1), _artist, FilterFilesType.Known, true), Times.Once());
+ .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 1), It.IsAny(), It.IsAny(), It.IsAny()), Times.Once());
}
[Test]
@@ -276,10 +233,10 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
Path.Combine(_artist.Path, "Season 2", "s02e02.flac"),
});
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
Mocker.GetMock()
- .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 4), _artist, FilterFilesType.Known, true), Times.Once());
+ .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 4), It.IsAny(), It.IsAny(), It.IsAny()), Times.Once());
}
[Test]
@@ -292,10 +249,10 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
Path.Combine(_artist.Path, "Album 1", ".t01.mp3")
});
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
Mocker.GetMock()
- .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 1), _artist, FilterFilesType.Known, true), Times.Once());
+ .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 1), It.IsAny(), It.IsAny(), It.IsAny()), Times.Once());
}
[Test]
@@ -311,10 +268,10 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
Path.Combine(_artist.Path, "Season 1", "s01e01.flac")
});
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
Mocker.GetMock()
- .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 1), _artist, FilterFilesType.Known, true), Times.Once());
+ .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 1), It.IsAny(), It.IsAny(), It.IsAny()), Times.Once());
}
[Test]
@@ -331,10 +288,10 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
Path.Combine(_artist.Path, "Season 1", "s01e01.flac")
});
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
Mocker.GetMock()
- .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 1), _artist, FilterFilesType.Known, true), Times.Once());
+ .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 1), It.IsAny(), It.IsAny(), It.IsAny()), Times.Once());
}
[Test]
@@ -348,10 +305,10 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
Path.Combine(_artist.Path, "Season 1", "s01e01.flac")
});
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
Mocker.GetMock()
- .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 1), _artist, FilterFilesType.Known, true), Times.Once());
+ .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 1), It.IsAny(), It.IsAny(), It.IsAny()), Times.Once());
}
[Test]
@@ -365,10 +322,10 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
Path.Combine(_artist.Path, "Season 1", "s01e01.flac")
});
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
Mocker.GetMock()
- .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 1), _artist, FilterFilesType.Known, true), Times.Once());
+ .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 1), It.IsAny(), It.IsAny(), It.IsAny()), Times.Once());
}
[Test]
@@ -384,10 +341,10 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
Path.Combine(_artist.Path, "Season 1", "s01e01.flac")
});
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
Mocker.GetMock()
- .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 2), _artist, FilterFilesType.Known, true), Times.Once());
+ .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 2), It.IsAny(), It.IsAny(), It.IsAny()), Times.Once());
}
[Test]
@@ -402,20 +359,20 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
Path.Combine(_artist.Path, "24 The Status Quo Combustion.flac")
});
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
Mocker.GetMock()
- .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 1), _artist, FilterFilesType.Known, true), Times.Once());
+ .Verify(v => v.GetImportDecisions(It.Is>(l => l.Count == 1), It.IsAny(), It.IsAny(), It.IsAny()), Times.Once());
}
private void GivenRejections()
{
Mocker.GetMock()
- .Setup(x => x.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), It.IsAny()))
- .Returns((List fileList, Artist artist, FilterFilesType filter, bool includeExisting) =>
+ .Setup(x => x.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), It.IsAny()))
+ .Returns((List fileList, IdentificationOverrides idOverrides, ImportDecisionMakerInfo idInfo, ImportDecisionMakerConfig idConfig) =>
fileList.Select(x => new LocalTrack
{
- Artist = artist,
+ Artist = _artist,
Path = x.FullName,
Modified = x.LastWriteTimeUtc,
FileTrackInfo = new ParsedTrackInfo()
@@ -437,7 +394,7 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
GivenKnownFiles(new List());
GivenRejections();
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
Mocker.GetMock()
.Verify(x => x.AddMany(It.Is>(l => l.Select(t => t.Path).SequenceEqual(files))),
@@ -457,7 +414,7 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
GivenKnownFiles(files.GetRange(1, 1));
GivenRejections();
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
Mocker.GetMock()
.Verify(x => x.AddMany(It.Is>(l => l.Select(t => t.Path).SequenceEqual(files.GetRange(0, 1)))),
@@ -477,7 +434,7 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
GivenKnownFiles(files);
GivenRejections();
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
Mocker.GetMock()
.Verify(x => x.AddMany(It.Is>(l => l.Count == 0)),
@@ -501,7 +458,7 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
GivenKnownFiles(files);
GivenRejections();
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
Mocker.GetMock()
.Verify(x => x.Update(It.Is>(l => l.Count == 0)),
@@ -525,7 +482,7 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
GivenKnownFiles(files);
GivenRejections();
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
Mocker.GetMock()
.Verify(x => x.Update(It.Is>(l => l.Count == 2)),
@@ -556,14 +513,14 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
.Build();
Mocker.GetMock()
- .Setup(x => x.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), It.IsAny()))
+ .Setup(x => x.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), It.IsAny()))
.Returns(new List> { new ImportDecision(localTrack, new Rejection("Reject")) });
- Subject.Scan(_artist);
+ Subject.Scan(new List { _artist.Path });
Mocker.GetMock()
.Verify(x => x.Update(It.Is>(
- l => l.Count == 1 &&
+ l => l.Count == 1 &&
l[0].Path == localTrack.Path &&
l[0].Modified == localTrack.Modified &&
l[0].Size == localTrack.Size &&
diff --git a/src/NzbDrone.Core.Test/MediaFiles/DownloadedTracksImportServiceFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/DownloadedTracksImportServiceFixture.cs
index 3b9aaa3d4..887eef837 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/DownloadedTracksImportServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/DownloadedTracksImportServiceFixture.cs
@@ -84,7 +84,7 @@ namespace NzbDrone.Core.Test.MediaFiles
imported.Add(new ImportDecision(localTrack));
Mocker.GetMock()
- .Setup(s => s.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), null))
+ .Setup(v => v.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), It.IsAny()))
.Returns(imported);
Mocker.GetMock()
@@ -130,8 +130,8 @@ namespace NzbDrone.Core.Test.MediaFiles
Subject.ProcessRootFolder(DiskProvider.GetDirectoryInfo(_droneFactory));
Mocker.GetMock()
- .Verify(c => c.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), It.IsAny()),
- Times.Never());
+ .Verify(c => c.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), It.IsAny()),
+ Times.Never());
VerifyNoImport();
}
@@ -181,7 +181,7 @@ namespace NzbDrone.Core.Test.MediaFiles
imported.Add(new ImportDecision(localTrack));
Mocker.GetMock()
- .Setup(s => s.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), null))
+ .Setup(v => v.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), It.IsAny()))
.Returns(imported);
Mocker.GetMock()
@@ -238,7 +238,7 @@ namespace NzbDrone.Core.Test.MediaFiles
imported.Add(new ImportDecision(localTrack));
Mocker.GetMock()
- .Setup(s => s.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny