mirror of
https://github.com/Readarr/Readarr.git
synced 2026-03-29 18:14:28 -04:00
* Cache result of GetAllArtists
* Fixed: Manual import not respecting album import notifications
* Fixed: partial album imports stay in queue, prompting manual import
* Fixed: Allow release if tracks are missing
* Fixed: Be tolerant of missing/extra "The" at start of artist name
* Improve manual import UI
* Omit video tracks from DB entirely
* Revert "faster test packaging in build.sh"
This reverts commit 2723e2a7b8.
-u and -T are not supported on macOS
* Fix tests on linux and macOS
* Actually lint on linux
On linux yarn runs scripts with sh not bash so ** doesn't recursively glob
* Match whole albums
* Option to disable fingerprinting
* Rip out MediaInfo
* Don't split up things that have the same album selected in manual import
* Try to speed up IndentificationService
* More speedups
* Some fixes and increase power of recording id
* Fix NRE when no tags
* Fix NRE when some (but not all) files in a directory have missing tags
* Bump taglib, tidy up tag parsing
* Add a health check
* Remove media info setting
* Tags -> audioTags
* Add some tests where tags are null
* Rename history events
* Add missing method to interface
* Reinstate MediaInfo tags and update info with artist scan
Also adds migration to remove old format media info
* This file no longer exists
* Don't penalise year if missing from tags
* Formatting improvements
* Use correct system newline
* Switch to the netstandard2.0 library to support net 461
* TagLib.File is IDisposable so should be in a using
* Improve filename matching and add tests
* Neater logging of parsed tags
* Fix disk scan tests for new media info update
* Fix quality detection source
* Fix Inexact Artist/Album match
* Add button to clear track mapping
* Fix warning
* Pacify eslint
* Use \ not /
* Fix UI updates
* Fix media covers
Prevent localizing URL propaging back to the metadata object
* Reduce database overhead broadcasting UI updates
* Relax timings a bit to make test pass
* Remove irrelevant tests
* Test framework for identification service
* Fix PreferMissingToBadMatch test case
* Make fingerprinting more robust
* More logging
* Penalize unknown media format and country
* Prefer USA to UK
* Allow Data CD
* Fix exception if fingerprinting fails for all files
* Fix tests
* Fix NRE
* Allow apostrophes and remove accents in filename aggregation
* Address codacy issues
* Cope with old versions of fpcalc and suggest upgrade
* fpcalc health check passes if fingerprinting disabled
* Get the Artist meta with the artist
* Fix the mapper so that lazy loaded lists will be populated on Join
And therefore we can join TrackFiles on Tracks by default and avoid an
extra query
* Rename subtitle -> lyric
* Tidy up MediaInfoFormatter
209 lines
5.3 KiB
JavaScript
209 lines
5.3 KiB
JavaScript
import _ from 'lodash';
|
|
import PropTypes from 'prop-types';
|
|
import React, { Component } from 'react';
|
|
import { connect } from 'react-redux';
|
|
import { createSelector } from 'reselect';
|
|
import { fetchInteractiveImportItems, setInteractiveImportSort, clearInteractiveImport, setInteractiveImportMode, updateInteractiveImportItem } from 'Store/Actions/interactiveImportActions';
|
|
import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
|
|
import { executeCommand } from 'Store/Actions/commandActions';
|
|
import * as commandNames from 'Commands/commandNames';
|
|
import InteractiveImportModalContent from './InteractiveImportModalContent';
|
|
|
|
function createMapStateToProps() {
|
|
return createSelector(
|
|
createClientSideCollectionSelector('interactiveImport'),
|
|
(interactiveImport) => {
|
|
return interactiveImport;
|
|
}
|
|
);
|
|
}
|
|
|
|
const mapDispatchToProps = {
|
|
fetchInteractiveImportItems,
|
|
setInteractiveImportSort,
|
|
setInteractiveImportMode,
|
|
clearInteractiveImport,
|
|
updateInteractiveImportItem,
|
|
executeCommand
|
|
};
|
|
|
|
class InteractiveImportModalContentConnector extends Component {
|
|
|
|
//
|
|
// Lifecycle
|
|
|
|
constructor(props, context) {
|
|
super(props, context);
|
|
|
|
this.state = {
|
|
interactiveImportErrorMessage: null,
|
|
filterExistingFiles: true
|
|
};
|
|
}
|
|
|
|
componentDidMount() {
|
|
const {
|
|
downloadId,
|
|
folder
|
|
} = this.props;
|
|
|
|
const {
|
|
filterExistingFiles
|
|
} = this.state;
|
|
|
|
this.props.fetchInteractiveImportItems({
|
|
downloadId,
|
|
folder,
|
|
filterExistingFiles
|
|
});
|
|
}
|
|
|
|
componentDidUpdate(prevProps, prevState) {
|
|
const {
|
|
filterExistingFiles
|
|
} = this.state;
|
|
|
|
if (prevState.filterExistingFiles !== filterExistingFiles) {
|
|
const {
|
|
downloadId,
|
|
folder
|
|
} = this.props;
|
|
|
|
this.props.fetchInteractiveImportItems({
|
|
downloadId,
|
|
folder,
|
|
filterExistingFiles
|
|
});
|
|
}
|
|
}
|
|
|
|
componentWillUnmount() {
|
|
this.props.clearInteractiveImport();
|
|
}
|
|
|
|
//
|
|
// Listeners
|
|
|
|
onSortPress = (sortKey, sortDirection) => {
|
|
this.props.setInteractiveImportSort({ sortKey, sortDirection });
|
|
}
|
|
|
|
onFilterExistingFilesChange = (filterExistingFiles) => {
|
|
this.setState({ filterExistingFiles });
|
|
}
|
|
|
|
onImportModeChange = (importMode) => {
|
|
this.props.setInteractiveImportMode({ importMode });
|
|
}
|
|
|
|
onImportSelectedPress = (selected, importMode) => {
|
|
const files = [];
|
|
|
|
_.forEach(this.props.items, (item) => {
|
|
const isSelected = selected.indexOf(item.id) > -1;
|
|
|
|
if (isSelected) {
|
|
const {
|
|
artist,
|
|
album,
|
|
albumReleaseId,
|
|
tracks,
|
|
quality,
|
|
language
|
|
} = item;
|
|
|
|
if (!artist) {
|
|
this.setState({ interactiveImportErrorMessage: 'Artist must be chosen for each selected file' });
|
|
return false;
|
|
}
|
|
|
|
if (!album) {
|
|
this.setState({ interactiveImportErrorMessage: 'Album must be chosen for each selected file' });
|
|
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;
|
|
}
|
|
|
|
if (!language) {
|
|
this.setState({ interactiveImportErrorMessage: 'Language must be chosen for each selected file' });
|
|
return false;
|
|
}
|
|
|
|
files.push({
|
|
path: item.path,
|
|
folderName: item.folderName,
|
|
artistId: artist.id,
|
|
albumId: album.id,
|
|
albumReleaseId,
|
|
trackIds: _.map(tracks, 'id'),
|
|
quality,
|
|
language,
|
|
downloadId: this.props.downloadId
|
|
});
|
|
}
|
|
});
|
|
|
|
if (!files.length) {
|
|
return;
|
|
}
|
|
|
|
this.props.executeCommand({
|
|
name: commandNames.INTERACTIVE_IMPORT,
|
|
files,
|
|
importMode
|
|
});
|
|
|
|
this.props.onModalClose();
|
|
}
|
|
|
|
//
|
|
// Render
|
|
|
|
render() {
|
|
const {
|
|
interactiveImportErrorMessage,
|
|
filterExistingFiles
|
|
} = this.state;
|
|
|
|
return (
|
|
<InteractiveImportModalContent
|
|
{...this.props}
|
|
interactiveImportErrorMessage={interactiveImportErrorMessage}
|
|
filterExistingFiles={filterExistingFiles}
|
|
onSortPress={this.onSortPress}
|
|
onFilterExistingFilesChange={this.onFilterExistingFilesChange}
|
|
onImportModeChange={this.onImportModeChange}
|
|
onImportSelectedPress={this.onImportSelectedPress}
|
|
/>
|
|
);
|
|
}
|
|
}
|
|
|
|
InteractiveImportModalContentConnector.propTypes = {
|
|
downloadId: PropTypes.string,
|
|
folder: PropTypes.string,
|
|
filterExistingFiles: PropTypes.bool.isRequired,
|
|
items: PropTypes.arrayOf(PropTypes.object).isRequired,
|
|
fetchInteractiveImportItems: PropTypes.func.isRequired,
|
|
setInteractiveImportSort: PropTypes.func.isRequired,
|
|
clearInteractiveImport: PropTypes.func.isRequired,
|
|
setInteractiveImportMode: PropTypes.func.isRequired,
|
|
updateInteractiveImportItem: PropTypes.func.isRequired,
|
|
executeCommand: PropTypes.func.isRequired,
|
|
onModalClose: PropTypes.func.isRequired
|
|
};
|
|
|
|
InteractiveImportModalContentConnector.defaultProps = {
|
|
filterExistingFiles: true
|
|
};
|
|
|
|
export default connect(createMapStateToProps, mapDispatchToProps)(InteractiveImportModalContentConnector);
|