New: Readarr 0.1

This commit is contained in:
ta264
2020-05-06 21:14:11 +01:00
parent 476f2d6047
commit 08496c82af
911 changed files with 14837 additions and 24442 deletions
@@ -17,17 +17,14 @@ import styles from './SelectAlbumModalContent.css';
const columns = [
{
name: 'title',
label: 'Album Title',
isVisible: true
},
{
name: 'albumType',
label: 'Album Type',
label: 'Book Title',
isSortable: true,
isVisible: true
},
{
name: 'releaseDate',
label: 'Release Date',
isSortable: true,
isVisible: true
},
{
@@ -74,7 +71,7 @@ class SelectAlbumModalContent extends Component {
return (
<ModalContent onModalClose={onModalClose}>
<ModalHeader>
Manual Import - Select Album
Manual Import - Select Book
</ModalHeader>
<ModalBody
@@ -87,7 +84,7 @@ class SelectAlbumModalContent extends Component {
}
<TextInput
className={styles.filterInput}
placeholder="Filter album"
placeholder="Filter book"
name="filter"
value={filter}
autoFocus={true}
@@ -37,10 +37,10 @@ class SelectAlbumModalContentConnector extends Component {
componentDidMount() {
const {
artistId
authorId
} = this.props;
this.props.fetchInteractiveImportAlbums({ artistId });
this.props.fetchInteractiveImportAlbums({ authorId });
}
componentWillUnmount() {
@@ -56,8 +56,8 @@ class SelectAlbumModalContentConnector extends Component {
this.props.setInteractiveImportAlbumsSort({ sortKey, sortDirection });
}
onAlbumSelect = (albumId) => {
const album = _.find(this.props.items, { id: albumId });
onAlbumSelect = (bookId) => {
const album = _.find(this.props.items, { id: bookId });
const ids = this.props.ids;
@@ -83,6 +83,7 @@ class SelectAlbumModalContentConnector extends Component {
return (
<SelectAlbumModalContent
{...this.props}
onSortPress={this.onSortPress}
onAlbumSelect={this.onAlbumSelect}
/>
);
@@ -91,7 +92,7 @@ class SelectAlbumModalContentConnector extends Component {
SelectAlbumModalContentConnector.propTypes = {
ids: PropTypes.arrayOf(PropTypes.number).isRequired,
artistId: PropTypes.number.isRequired,
authorId: PropTypes.number.isRequired,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
fetchInteractiveImportAlbums: PropTypes.func.isRequired,
setInteractiveImportAlbumsSort: PropTypes.func.isRequired,
@@ -1,37 +0,0 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import Modal from 'Components/Modal/Modal';
import SelectAlbumReleaseModalContentConnector from './SelectAlbumReleaseModalContentConnector';
class SelectAlbumReleaseModal extends Component {
//
// Render
render() {
const {
isOpen,
onModalClose,
...otherProps
} = this.props;
return (
<Modal
isOpen={isOpen}
onModalClose={onModalClose}
>
<SelectAlbumReleaseModalContentConnector
{...otherProps}
onModalClose={onModalClose}
/>
</Modal>
);
}
}
SelectAlbumReleaseModal.propTypes = {
isOpen: PropTypes.bool.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default SelectAlbumReleaseModal;
@@ -1,18 +0,0 @@
.modalBody {
composes: modalBody from '~Components/Modal/ModalBody.css';
display: flex;
flex: 1 1 auto;
flex-direction: column;
}
.filterInput {
composes: input from '~Components/Form/TextInput.css';
flex: 0 0 auto;
margin-bottom: 20px;
}
.scroller {
flex: 1 1 auto;
}
@@ -1,93 +0,0 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import Button from 'Components/Link/Button';
import { scrollDirections } from 'Helpers/Props';
import ModalContent from 'Components/Modal/ModalContent';
import ModalHeader from 'Components/Modal/ModalHeader';
import ModalBody from 'Components/Modal/ModalBody';
import ModalFooter from 'Components/Modal/ModalFooter';
import Table from 'Components/Table/Table';
import TableBody from 'Components/Table/TableBody';
import SelectAlbumReleaseRow from './SelectAlbumReleaseRow';
import Alert from 'Components/Alert';
import styles from './SelectAlbumReleaseModalContent.css';
const columns = [
{
name: 'album',
label: 'Album',
isVisible: true
},
{
name: 'release',
label: 'Album Release',
isVisible: true
}
];
class SelectAlbumReleaseModalContent extends Component {
//
// Render
render() {
const {
albums,
onAlbumReleaseSelect,
onModalClose,
...otherProps
} = this.props;
return (
<ModalContent onModalClose={onModalClose}>
<ModalHeader>
Manual Import - Select Album Release
</ModalHeader>
<ModalBody
className={styles.modalBody}
scrollDirection={scrollDirections.NONE}
>
<Alert>
Overrriding a release here will <b>disable automatic release selection</b> for that album in future.
</Alert>
<Table
columns={columns}
{...otherProps}
>
<TableBody>
{
albums.map((item) => {
return (
<SelectAlbumReleaseRow
key={item.album.id}
matchedReleaseId={item.matchedReleaseId}
columns={columns}
onAlbumReleaseSelect={onAlbumReleaseSelect}
{...item.album}
/>
);
})
}
</TableBody>
</Table>
</ModalBody>
<ModalFooter>
<Button onPress={onModalClose}>
Cancel
</Button>
</ModalFooter>
</ModalContent>
);
}
}
SelectAlbumReleaseModalContent.propTypes = {
albums: PropTypes.arrayOf(PropTypes.object).isRequired,
onAlbumReleaseSelect: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default SelectAlbumReleaseModalContent;
@@ -1,67 +0,0 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import {
updateInteractiveImportItem,
saveInteractiveImportItem
} from 'Store/Actions/interactiveImportActions';
import SelectAlbumReleaseModalContent from './SelectAlbumReleaseModalContent';
function createMapStateToProps() {
return {};
}
const mapDispatchToProps = {
updateInteractiveImportItem,
saveInteractiveImportItem
};
class SelectAlbumReleaseModalContentConnector extends Component {
//
// Listeners
// onSortPress = (sortKey, sortDirection) => {
// this.props.setInteractiveImportAlbumsSort({ sortKey, sortDirection });
// }
onAlbumReleaseSelect = (albumId, albumReleaseId) => {
const ids = this.props.importIdsByAlbum[albumId];
ids.forEach((id) => {
this.props.updateInteractiveImportItem({
id,
albumReleaseId,
disableReleaseSwitching: true,
tracks: [],
rejections: []
});
});
this.props.saveInteractiveImportItem({ id: ids });
this.props.onModalClose(true);
}
//
// Render
render() {
return (
<SelectAlbumReleaseModalContent
{...this.props}
onAlbumReleaseSelect={this.onAlbumReleaseSelect}
/>
);
}
}
SelectAlbumReleaseModalContentConnector.propTypes = {
importIdsByAlbum: PropTypes.object.isRequired,
albums: PropTypes.arrayOf(PropTypes.object).isRequired,
updateInteractiveImportItem: PropTypes.func.isRequired,
saveInteractiveImportItem: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default connect(createMapStateToProps, mapDispatchToProps)(SelectAlbumReleaseModalContentConnector);
@@ -1,3 +0,0 @@
.albumRow {
cursor: pointer;
}
@@ -1,96 +0,0 @@
import _ from 'lodash';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { inputTypes } from 'Helpers/Props';
import TableRow from 'Components/Table/TableRow';
import TableRowCell from 'Components/Table/Cells/TableRowCell';
import FormInputGroup from 'Components/Form/FormInputGroup';
import titleCase from 'Utilities/String/titleCase';
class SelectAlbumReleaseRow extends Component {
//
// Listeners
onInputChange = ({ name, value }) => {
this.props.onAlbumReleaseSelect(parseInt(name), parseInt(value));
}
//
// Render
render() {
const {
id,
matchedReleaseId,
title,
disambiguation,
releases,
columns
} = this.props;
const extendedTitle = disambiguation ? `${title} (${disambiguation})` : title;
return (
<TableRow>
{
columns.map((column) => {
const {
name,
isVisible
} = column;
if (!isVisible) {
return null;
}
if (name === 'album') {
return (
<TableRowCell key={name}>
{extendedTitle}
</TableRowCell>
);
}
if (name === 'release') {
return (
<TableRowCell key={name}>
<FormInputGroup
type={inputTypes.SELECT}
name={id.toString()}
values={_.map(releases, (r) => ({
key: r.id,
value: `${r.title}` +
`${r.disambiguation ? ' (' : ''}${titleCase(r.disambiguation)}${r.disambiguation ? ')' : ''}` +
`, ${r.mediumCount} med, ${r.trackCount} tracks` +
`${r.country.length > 0 ? ', ' : ''}${r.country}` +
`${r.format ? ', [' : ''}${r.format}${r.format ? ']' : ''}` +
`${r.monitored ? ', Monitored' : ''}`
}))}
value={matchedReleaseId}
onChange={this.onInputChange}
/>
</TableRowCell>
);
}
return null;
})
}
</TableRow>
);
}
}
SelectAlbumReleaseRow.propTypes = {
id: PropTypes.number.isRequired,
matchedReleaseId: PropTypes.number.isRequired,
title: PropTypes.string.isRequired,
disambiguation: PropTypes.string.isRequired,
releases: PropTypes.arrayOf(PropTypes.object).isRequired,
onAlbumReleaseSelect: PropTypes.func.isRequired,
columns: PropTypes.arrayOf(PropTypes.object).isRequired
};
export default SelectAlbumReleaseRow;
@@ -38,8 +38,8 @@ class SelectArtistModalContentConnector extends Component {
//
// Listeners
onArtistSelect = (artistId) => {
const artist = _.find(this.props.items, { id: artistId });
onArtistSelect = (authorId) => {
const artist = _.find(this.props.items, { id: authorId });
const ids = this.props.ids;
@@ -93,7 +93,7 @@ class ConfirmImportModalContent extends Component {
</Alert>
{ _.chain(items)
.groupBy('albumId')
.groupBy('bookId')
.mapValues((value, key) => formatAlbumFiles(value, _.find(albums, (a) => a.id === parseInt(key))))
.values()
.value() }
@@ -30,7 +30,7 @@ class ConfirmImportModalContentConnector extends Component {
albums
} = this.props;
this.props.fetchInteractiveImportTrackFiles({ albumId: albums.map((x) => x.id) });
this.props.fetchInteractiveImportTrackFiles({ bookId: albums.map((x) => x.id) });
}
componentWillUnmount() {
@@ -23,7 +23,6 @@ import TableBody from 'Components/Table/TableBody';
import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal';
import SelectArtistModal from 'InteractiveImport/Artist/SelectArtistModal';
import SelectAlbumModal from 'InteractiveImport/Album/SelectAlbumModal';
import SelectAlbumReleaseModal from 'InteractiveImport/AlbumRelease/SelectAlbumReleaseModal';
import ConfirmImportModal from 'InteractiveImport/Confirmation/ConfirmImportModal';
import InteractiveImportRow from './InteractiveImportRow';
import styles from './InteractiveImportModalContent.css';
@@ -43,12 +42,7 @@ const columns = [
},
{
name: 'album',
label: 'Album',
isVisible: true
},
{
name: 'tracks',
label: 'Track(s)',
label: 'Book',
isVisible: true
},
{
@@ -85,7 +79,6 @@ const importModeOptions = [
const SELECT = 'select';
const ARTIST = 'artist';
const ALBUM = 'album';
const ALBUM_RELEASE = 'albumRelease';
const QUALITY = 'quality';
const replaceExistingFilesOptions = {
@@ -110,7 +103,6 @@ class InteractiveImportModalContent extends Component {
selectModalOpen: null,
albumsImported: [],
isConfirmImportModalOpen: false,
showClearTracks: false,
inconsistentAlbumReleases: false
};
}
@@ -118,15 +110,10 @@ class InteractiveImportModalContent extends Component {
componentDidUpdate(prevProps) {
const selectedIds = this.getSelectedIds();
const selectedItems = _.filter(this.props.items, (x) => _.includes(selectedIds, x.id));
const selectionHasTracks = _.some(selectedItems, (x) => x.tracks.length);
if (this.state.showClearTracks !== selectionHasTracks) {
this.setState({ showClearTracks: selectionHasTracks });
}
const inconsistent = _(selectedItems)
.map((x) => ({ albumId: x.album ? x.album.id : 0, releaseId: x.albumReleaseId }))
.groupBy('albumId')
.map((x) => ({ bookId: x.album ? x.album.id : 0, releaseId: x.albumReleaseId }))
.groupBy('bookId')
.mapValues((album) => _(album).groupBy((x) => x.releaseId).values().value().length)
.values()
.some((x) => x !== undefined && x > 1);
@@ -224,7 +211,6 @@ class InteractiveImportModalContent extends Component {
selectedIds.forEach((id) => {
this.props.updateInteractiveImportItem({
id,
tracks: [],
rejections: []
});
});
@@ -277,7 +263,6 @@ class InteractiveImportModalContent extends Component {
selectModalOpen,
albumsImported,
isConfirmImportModalOpen,
showClearTracks,
inconsistentAlbumReleases
} = this.state;
@@ -288,7 +273,6 @@ class InteractiveImportModalContent extends Component {
const bulkSelectOptions = [
{ key: SELECT, value: 'Select...', disabled: true },
{ key: ALBUM, value: 'Select Album' },
{ key: ALBUM_RELEASE, value: 'Select Album Release' },
{ key: QUALITY, value: 'Select Quality' }
];
@@ -450,24 +434,6 @@ class InteractiveImportModalContent extends Component {
isDisabled={!selectedIds.length}
onChange={this.onSelectModalSelect}
/>
{
showClearTracks ? (
<Button
onPress={this.onClearTrackMappingPress}
isDisabled={!selectedIds.length}
>
Clear Tracks
</Button>
) : (
<Button
onPress={this.onGetTrackMappingPress}
isDisabled={!selectedIds.length}
>
Map Tracks
</Button>
)
}
</div>
<div className={styles.rightButtons}>
@@ -499,14 +465,7 @@ class InteractiveImportModalContent extends Component {
<SelectAlbumModal
isOpen={selectModalOpen === ALBUM}
ids={selectedIds}
artistId={selectedItem && selectedItem.artist && selectedItem.artist.id}
onModalClose={this.onSelectModalClose}
/>
<SelectAlbumReleaseModal
isOpen={selectModalOpen === ALBUM_RELEASE}
importIdsByAlbum={_.chain(items).filter((x) => x.album).groupBy((x) => x.album.id).mapValues((x) => x.map((y) => y.id)).value()}
albums={_.chain(items).filter((x) => x.album).keyBy((x) => x.album.id).mapValues((x) => ({ matchedReleaseId: x.albumReleaseId, album: x.album })).values().value()}
authorId={selectedItem && selectedItem.artist && selectedItem.artist.id}
onModalClose={this.onSelectModalClose}
/>
@@ -124,8 +124,6 @@ class InteractiveImportModalContentConnector extends Component {
const {
artist,
album,
albumReleaseId,
tracks,
quality,
disableReleaseSwitching
} = item;
@@ -140,11 +138,6 @@ class InteractiveImportModalContentConnector extends Component {
return false;
}
if (!tracks || !tracks.length) {
this.setState({ interactiveImportErrorMessage: 'One or more tracks must be chosen for each selected file' });
return false;
}
if (!quality) {
this.setState({ interactiveImportErrorMessage: 'Quality must be chosen for each selected file' });
return false;
@@ -152,10 +145,8 @@ class InteractiveImportModalContentConnector extends Component {
files.push({
path: item.path,
artistId: artist.id,
albumId: album.id,
albumReleaseId,
trackIds: _.map(tracks, 'id'),
authorId: artist.id,
bookId: album.id,
quality,
downloadId: this.props.downloadId,
disableReleaseSwitching
@@ -1,8 +1,7 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import formatBytes from 'Utilities/Number/formatBytes';
import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
import { icons, kinds, tooltipPositions, sortDirections } from 'Helpers/Props';
import { icons, kinds, tooltipPositions } from 'Helpers/Props';
import Icon from 'Components/Icon';
import TableRow from 'Components/Table/TableRow';
import TableRowCell from 'Components/Table/Cells/TableRowCell';
@@ -13,10 +12,8 @@ import Tooltip from 'Components/Tooltip/Tooltip';
import TrackQuality from 'Album/TrackQuality';
import SelectArtistModal from 'InteractiveImport/Artist/SelectArtistModal';
import SelectAlbumModal from 'InteractiveImport/Album/SelectAlbumModal';
import SelectTrackModal from 'InteractiveImport/Track/SelectTrackModal';
import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal';
import InteractiveImportRowCellPlaceholder from './InteractiveImportRowCellPlaceholder';
import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import styles from './InteractiveImportRow.css';
class InteractiveImportRow extends Component {
@@ -30,7 +27,6 @@ class InteractiveImportRow extends Component {
this.state = {
isSelectArtistModalOpen: false,
isSelectAlbumModalOpen: false,
isSelectTrackModalOpen: false,
isSelectQualityModalOpen: false
};
}
@@ -40,14 +36,12 @@ class InteractiveImportRow extends Component {
id,
artist,
album,
tracks,
quality
} = this.props;
if (
artist &&
album != null &&
tracks.length &&
quality
) {
this.props.onSelectedChange({ id, value: true });
@@ -59,7 +53,6 @@ class InteractiveImportRow extends Component {
id,
artist,
album,
tracks,
quality,
isSelected,
onValidRowChange
@@ -68,7 +61,6 @@ class InteractiveImportRow extends Component {
if (
prevProps.artist === artist &&
prevProps.album === album &&
!hasDifferentItems(prevProps.tracks, tracks) &&
prevProps.quality === quality &&
prevProps.isSelected === isSelected
) {
@@ -78,7 +70,6 @@ class InteractiveImportRow extends Component {
const isValid = !!(
artist &&
album &&
tracks.length &&
quality
);
@@ -114,10 +105,6 @@ class InteractiveImportRow extends Component {
this.setState({ isSelectAlbumModalOpen: true });
}
onSelectTrackPress = () => {
this.setState({ isSelectTrackModalOpen: true });
}
onSelectQualityPress = () => {
this.setState({ isSelectQualityModalOpen: true });
}
@@ -132,11 +119,6 @@ class InteractiveImportRow extends Component {
this.selectRowAfterChange(changed);
}
onSelectTrackModalClose = (changed) => {
this.setState({ isSelectTrackModalOpen: false });
this.selectRowAfterChange(changed);
}
onSelectQualityModalClose = (changed) => {
this.setState({ isSelectQualityModalOpen: false });
this.selectRowAfterChange(changed);
@@ -152,22 +134,17 @@ class InteractiveImportRow extends Component {
path,
artist,
album,
albumReleaseId,
tracks,
quality,
size,
rejections,
audioTags,
additionalFile,
isSelected,
isSaving,
onSelectedChange
} = this.props;
const {
isSelectArtistModalOpen,
isSelectAlbumModalOpen,
isSelectTrackModalOpen,
isSelectQualityModalOpen
} = this.state;
@@ -177,15 +154,8 @@ class InteractiveImportRow extends Component {
albumTitle = album.disambiguation ? `${album.title} (${album.disambiguation})` : album.title;
}
const sortedTracks = tracks.sort((a, b) => parseInt(a.absoluteTrackNumber) - parseInt(b.absoluteTrackNumber));
const trackNumbers = sortedTracks.map((track) => `${track.mediumNumber}x${track.trackNumber}`)
.join(', ');
const showArtistPlaceholder = isSelected && !artist;
const showAlbumNumberPlaceholder = isSelected && !!artist && !album;
const showTrackNumbersPlaceholder = !isSaving && isSelected && !!album && !tracks.length;
const showTrackNumbersLoading = isSaving && !tracks.length;
const showQualityPlaceholder = isSelected && !quality;
const pathCellContents = (
@@ -239,19 +209,6 @@ class InteractiveImportRow extends Component {
}
</TableRowCellButton>
<TableRowCellButton
isDisabled={!artist || !album}
title={artist && album ? 'Click to change track' : undefined}
onPress={this.onSelectTrackPress}
>
{
showTrackNumbersLoading && <LoadingIndicator size={20} className={styles.loading} />
}
{
showTrackNumbersPlaceholder ? <InteractiveImportRowCellPlaceholder /> : trackNumbers
}
</TableRowCellButton>
<TableRowCellButton
className={styles.quality}
title="Click to change quality"
@@ -314,24 +271,10 @@ class InteractiveImportRow extends Component {
<SelectAlbumModal
isOpen={isSelectAlbumModalOpen}
ids={[id]}
artistId={artist && artist.id}
authorId={artist && artist.id}
onModalClose={this.onSelectAlbumModalClose}
/>
<SelectTrackModal
isOpen={isSelectTrackModalOpen}
id={id}
artistId={artist && artist.id}
albumId={album && album.id}
albumReleaseId={albumReleaseId}
rejections={rejections}
audioTags={audioTags}
sortKey='mediumNumber'
sortDirection={sortDirections.ASCENDING}
filename={path}
onModalClose={this.onSelectTrackModalClose}
/>
<SelectQualityModal
isOpen={isSelectQualityModalOpen}
ids={[id]}
@@ -352,8 +295,6 @@ InteractiveImportRow.propTypes = {
path: PropTypes.string.isRequired,
artist: PropTypes.object,
album: PropTypes.object,
albumReleaseId: PropTypes.number,
tracks: PropTypes.arrayOf(PropTypes.object).isRequired,
quality: PropTypes.object,
size: PropTypes.number.isRequired,
rejections: PropTypes.arrayOf(PropTypes.object).isRequired,
@@ -365,8 +306,4 @@ InteractiveImportRow.propTypes = {
onValidRowChange: PropTypes.func.isRequired
};
InteractiveImportRow.defaultProps = {
tracks: []
};
export default InteractiveImportRow;
@@ -1,37 +0,0 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import Modal from 'Components/Modal/Modal';
import SelectTrackModalContentConnector from './SelectTrackModalContentConnector';
class SelectTrackModal extends Component {
//
// Render
render() {
const {
isOpen,
onModalClose,
...otherProps
} = this.props;
return (
<Modal
isOpen={isOpen}
onModalClose={onModalClose}
>
<SelectTrackModalContentConnector
{...otherProps}
onModalClose={onModalClose}
/>
</Modal>
);
}
}
SelectTrackModal.propTypes = {
isOpen: PropTypes.bool.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default SelectTrackModal;
@@ -1,236 +0,0 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import _ from 'lodash';
import getErrorMessage from 'Utilities/Object/getErrorMessage';
import getSelectedIds from 'Utilities/Table/getSelectedIds';
import selectAll from 'Utilities/Table/selectAll';
import toggleSelected from 'Utilities/Table/toggleSelected';
import { kinds } from 'Helpers/Props';
import Button from 'Components/Link/Button';
import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import ModalContent from 'Components/Modal/ModalContent';
import ModalHeader from 'Components/Modal/ModalHeader';
import ModalBody from 'Components/Modal/ModalBody';
import ModalFooter from 'Components/Modal/ModalFooter';
import Table from 'Components/Table/Table';
import TableBody from 'Components/Table/TableBody';
import SelectTrackRow from './SelectTrackRow';
import ExpandingFileDetails from 'TrackFile/ExpandingFileDetails';
const columns = [
{
name: 'mediumNumber',
label: 'Medium',
isSortable: true,
isVisible: true
},
{
name: 'trackNumber',
label: '#',
isSortable: true,
isVisible: true
},
{
name: 'title',
label: 'Title',
isVisible: true
},
{
name: 'trackStatus',
label: 'Status',
isVisible: true
}
];
const selectAllBlankColumn = [
{
name: 'dummy',
label: ' ',
isVisible: true
}
];
class SelectTrackModalContent extends Component {
//
// Lifecycle
constructor(props, context) {
super(props, context);
const selectedTracks = _.filter(props.selectedTracksByItem, ['id', props.id])[0].tracks;
const init = _.zipObject(selectedTracks, _.times(selectedTracks.length, _.constant(true)));
this.state = {
allSelected: false,
allUnselected: false,
lastToggled: null,
selectedState: init
};
props.onSortPress( props.sortKey, props.sortDirection );
}
//
// Control
getSelectedIds = () => {
return getSelectedIds(this.state.selectedState);
}
//
// Listeners
onSelectAllChange = ({ value }) => {
this.setState(selectAll(this.state.selectedState, value));
}
onSelectedChange = ({ id, value, shiftKey = false }) => {
this.setState((state) => {
return toggleSelected(state, this.props.items, id, value, shiftKey);
});
}
onTracksSelect = () => {
this.props.onTracksSelect(this.getSelectedIds());
}
//
// Render
render() {
const {
id,
audioTags,
rejections,
isFetching,
isPopulated,
error,
items,
sortKey,
sortDirection,
onSortPress,
onModalClose,
selectedTracksByItem,
filename
} = this.props;
const {
allSelected,
allUnselected,
selectedState
} = this.state;
const errorMessage = getErrorMessage(error, 'Unable to load tracks');
// all tracks selected for other items
const otherSelected = _.map(_.filter(selectedTracksByItem, (item) => {
return item.id !== id;
}), (x) => {
return x.tracks;
}).flat();
// tracks selected for the current file
const currentSelected = _.keys(_.pickBy(selectedState, _.identity)).map(Number);
// only enable selectAll if no other files have any tracks selected.
const selectAllEnabled = otherSelected.length === 0;
return (
<ModalContent onModalClose={onModalClose}>
<ModalHeader>
Manual Import - Select Track(s):
</ModalHeader>
<ModalBody>
{
isFetching &&
<LoadingIndicator />
}
{
error &&
<div>{errorMessage}</div>
}
<ExpandingFileDetails
audioTags={audioTags}
filename={filename}
rejections={rejections}
isExpanded={false}
/>
{
isPopulated && !!items.length &&
<Table
columns={selectAllEnabled ? columns : selectAllBlankColumn.concat(columns)}
selectAll={selectAllEnabled}
allSelected={allSelected}
allUnselected={allUnselected}
sortKey={sortKey}
sortDirection={sortDirection}
onSortPress={onSortPress}
onSelectAllChange={this.onSelectAllChange}
>
<TableBody>
{
items.map((item) => {
return (
<SelectTrackRow
key={item.id}
id={item.id}
mediumNumber={item.mediumNumber}
trackNumber={item.absoluteTrackNumber}
title={item.title}
hasFile={item.hasFile}
importSelected={otherSelected.concat(currentSelected).includes(item.id)}
isDisabled={otherSelected.includes(item.id)}
isSelected={selectedState[item.id]}
onSelectedChange={this.onSelectedChange}
/>
);
})
}
</TableBody>
</Table>
}
{
isPopulated && !items.length &&
'No tracks were found for the selected album'
}
</ModalBody>
<ModalFooter>
<Button onPress={onModalClose}>
Cancel
</Button>
<Button
kind={kinds.SUCCESS}
onPress={this.onTracksSelect}
>
Select Tracks
</Button>
</ModalFooter>
</ModalContent>
);
}
}
SelectTrackModalContent.propTypes = {
id: PropTypes.number.isRequired,
rejections: PropTypes.arrayOf(PropTypes.object).isRequired,
audioTags: PropTypes.object.isRequired,
isFetching: PropTypes.bool.isRequired,
isPopulated: PropTypes.bool.isRequired,
error: PropTypes.object,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
sortKey: PropTypes.string,
sortDirection: PropTypes.string,
onSortPress: PropTypes.func.isRequired,
onTracksSelect: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired,
selectedTracksByItem: PropTypes.arrayOf(PropTypes.object).isRequired,
filename: PropTypes.string.isRequired
};
export default SelectTrackModalContent;
@@ -1,112 +0,0 @@
import _ from 'lodash';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { fetchTracks, setTracksSort, clearTracks } from 'Store/Actions/trackActions';
import { updateInteractiveImportItem } from 'Store/Actions/interactiveImportActions';
import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
import SelectTrackModalContent from './SelectTrackModalContent';
function createMapStateToProps() {
return createSelector(
createClientSideCollectionSelector('tracks'),
createClientSideCollectionSelector('interactiveImport'),
(tracks, interactiveImport) => {
const selectedTracksByItem = _.map(interactiveImport.items, (item) => {
return { id: item.id, tracks: _.map(item.tracks, (track) => {
return track.id;
}) };
});
return {
...tracks,
selectedTracksByItem
};
}
);
}
const mapDispatchToProps = {
fetchTracks,
setTracksSort,
clearTracks,
updateInteractiveImportItem
};
class SelectTrackModalContentConnector extends Component {
//
// Lifecycle
componentDidMount() {
const {
artistId,
albumId,
albumReleaseId
} = this.props;
this.props.fetchTracks({ artistId, albumId, albumReleaseId });
}
componentWillUnmount() {
// This clears the tracks for the queue and hides the queue
// We'll need another place to store tracks for manual import
this.props.clearTracks();
}
//
// Listeners
onSortPress = (sortKey, sortDirection) => {
this.props.setTracksSort({ sortKey, sortDirection });
}
onTracksSelect = (trackIds) => {
const tracks = _.reduce(this.props.items, (acc, item) => {
if (trackIds.indexOf(item.id) > -1) {
acc.push(item);
}
return acc;
}, []);
this.props.updateInteractiveImportItem({
id: this.props.id,
tracks: _.sortBy(tracks, 'trackNumber')
});
this.props.onModalClose(true);
}
//
// Render
render() {
return (
<SelectTrackModalContent
{...this.props}
onSortPress={this.onSortPress}
onTracksSelect={this.onTracksSelect}
/>
);
}
}
SelectTrackModalContentConnector.propTypes = {
id: PropTypes.number.isRequired,
artistId: PropTypes.number.isRequired,
albumId: PropTypes.number.isRequired,
albumReleaseId: PropTypes.number.isRequired,
rejections: PropTypes.arrayOf(PropTypes.object).isRequired,
audioTags: PropTypes.object.isRequired,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
fetchTracks: PropTypes.func.isRequired,
setTracksSort: PropTypes.func.isRequired,
clearTracks: PropTypes.func.isRequired,
updateInteractiveImportItem: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default connect(createMapStateToProps, mapDispatchToProps)(SelectTrackModalContentConnector);
@@ -1,121 +0,0 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import TableRowButton from 'Components/Table/TableRowButton';
import TableRowCell from 'Components/Table/Cells/TableRowCell';
import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
import { icons, kinds, tooltipPositions } from 'Helpers/Props';
import Icon from 'Components/Icon';
import Popover from 'Components/Tooltip/Popover';
class SelectTrackRow extends Component {
//
// Listeners
onPress = () => {
const {
id,
isSelected
} = this.props;
this.props.onSelectedChange({ id, value: !isSelected });
}
//
// Render
render() {
const {
id,
mediumNumber,
trackNumber,
title,
hasFile,
importSelected,
isSelected,
isDisabled,
onSelectedChange
} = this.props;
let iconName = icons.UNKNOWN;
let iconKind = kinds.DEFAULT;
let iconTip = '';
if (hasFile && !importSelected) {
iconName = icons.DOWNLOADED;
iconKind = kinds.DEFAULT;
iconTip = 'Track already in library.';
} else if (!hasFile && !importSelected) {
iconName = icons.UNKNOWN;
iconKind = kinds.DEFAULT;
iconTip = 'Track missing from library and no import selected.';
} else if (importSelected && hasFile) {
iconName = icons.FILEIMPORT;
iconKind = kinds.WARNING;
iconTip = 'Warning: Existing track will be replaced by download.';
} else if (importSelected && !hasFile) {
iconName = icons.FILEIMPORT;
iconKind = kinds.DEFAULT;
iconTip = 'Track missing from library and selected for import.';
}
// isDisabled can only be true if importSelected is true
if (isDisabled) {
iconTip = `${iconTip}\nAnother file is selected to import for this track.`;
}
return (
<TableRowButton
onPress={this.onPress}
isDisabled={isDisabled}
>
<TableSelectCell
id={id}
isSelected={isSelected}
onSelectedChange={onSelectedChange}
isDisabled={isDisabled}
/>
<TableRowCell>
{mediumNumber}
</TableRowCell>
<TableRowCell>
{trackNumber}
</TableRowCell>
<TableRowCell>
{title}
</TableRowCell>
<TableRowCell>
<Popover
anchor={
<Icon
name={iconName}
kind={iconKind}
/>
}
title={'Track status'}
body={iconTip}
position={tooltipPositions.LEFT}
/>
</TableRowCell>
</TableRowButton>
);
}
}
SelectTrackRow.propTypes = {
id: PropTypes.number.isRequired,
mediumNumber: PropTypes.number.isRequired,
trackNumber: PropTypes.number.isRequired,
title: PropTypes.string.isRequired,
hasFile: PropTypes.bool.isRequired,
importSelected: PropTypes.bool.isRequired,
isSelected: PropTypes.bool,
isDisabled: PropTypes.bool,
onSelectedChange: PropTypes.func.isRequired
};
export default SelectTrackRow;