mirror of
https://github.com/lidarr/lidarr.git
synced 2025-07-07 13:32:17 -07:00
Changed: Remove Language Profiles (#870)
* Changed: Remove Language Profiles * fixup! Changed: Remove Language Profiles * fixup! Changed: Remove Language Profiles * Remove unused method in FileNameBuilder * Fixed: Cleanup Int Converter Copy/Paste Issues and Grammar
This commit is contained in:
parent
8f791abbf6
commit
8b860bcb82
227 changed files with 345 additions and 5873 deletions
|
@ -32,11 +32,6 @@ const columns = [
|
|||
label: 'Relative Path',
|
||||
isVisible: true
|
||||
},
|
||||
{
|
||||
name: 'language',
|
||||
label: 'Language',
|
||||
isVisible: true
|
||||
},
|
||||
{
|
||||
name: 'quality',
|
||||
label: 'Quality',
|
||||
|
@ -112,16 +107,6 @@ class TrackFileEditorModalContent extends Component {
|
|||
this.setState({ isConfirmDeleteModalOpen: false });
|
||||
}
|
||||
|
||||
onLanguageChange = ({ value }) => {
|
||||
const selectedIds = this.getSelectedIds();
|
||||
|
||||
if (!selectedIds.length) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.props.onLanguageChange(selectedIds, parseInt(value));
|
||||
}
|
||||
|
||||
onQualityChange = ({ value }) => {
|
||||
const selectedIds = this.getSelectedIds();
|
||||
|
||||
|
@ -142,7 +127,6 @@ class TrackFileEditorModalContent extends Component {
|
|||
isPopulated,
|
||||
error,
|
||||
items,
|
||||
languages,
|
||||
qualities,
|
||||
onModalClose
|
||||
} = this.props;
|
||||
|
@ -154,15 +138,6 @@ class TrackFileEditorModalContent extends Component {
|
|||
isConfirmDeleteModalOpen
|
||||
} = this.state;
|
||||
|
||||
const languageOptions = _.reduceRight(languages, (acc, language) => {
|
||||
acc.push({
|
||||
key: language.id,
|
||||
value: language.name
|
||||
});
|
||||
|
||||
return acc;
|
||||
}, [{ key: 'selectLanguage', value: 'Select Language', disabled: true }]);
|
||||
|
||||
const qualityOptions = _.reduceRight(qualities, (acc, quality) => {
|
||||
acc.push({
|
||||
key: quality.id,
|
||||
|
@ -240,16 +215,6 @@ class TrackFileEditorModalContent extends Component {
|
|||
Delete
|
||||
</SpinnerButton>
|
||||
|
||||
<div className={styles.selectInput}>
|
||||
<SelectInput
|
||||
name="language"
|
||||
value="selectLanguage"
|
||||
values={languageOptions}
|
||||
isDisabled={!hasSelectedFiles}
|
||||
onChange={this.onLanguageChange}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className={styles.selectInput}>
|
||||
<SelectInput
|
||||
name="quality"
|
||||
|
@ -288,10 +253,8 @@ TrackFileEditorModalContent.propTypes = {
|
|||
isPopulated: PropTypes.bool.isRequired,
|
||||
error: PropTypes.object,
|
||||
items: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||
languages: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||
qualities: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||
onDeletePress: PropTypes.func.isRequired,
|
||||
onLanguageChange: PropTypes.func.isRequired,
|
||||
onQualityChange: PropTypes.func.isRequired,
|
||||
onModalClose: PropTypes.func.isRequired
|
||||
};
|
||||
|
|
|
@ -8,30 +8,25 @@ import getQualities from 'Utilities/Quality/getQualities';
|
|||
import createArtistSelector from 'Store/Selectors/createArtistSelector';
|
||||
import { deleteTrackFiles, updateTrackFiles } from 'Store/Actions/trackFileActions';
|
||||
import { fetchTracks, clearTracks } from 'Store/Actions/trackActions';
|
||||
import { fetchLanguageProfileSchema, fetchQualityProfileSchema } from 'Store/Actions/settingsActions';
|
||||
import { fetchQualityProfileSchema } from 'Store/Actions/settingsActions';
|
||||
import TrackFileEditorModalContent from './TrackFileEditorModalContent';
|
||||
|
||||
function createSchemaSelector() {
|
||||
return createSelector(
|
||||
(state) => state.settings.languageProfiles,
|
||||
(state) => state.settings.qualityProfiles,
|
||||
(languageProfiles, qualityProfiles) => {
|
||||
const languages = _.map(languageProfiles.schema.languages, 'language');
|
||||
(qualityProfiles) => {
|
||||
const qualities = getQualities(qualityProfiles.schema.items);
|
||||
|
||||
let error = null;
|
||||
|
||||
if (languageProfiles.schemaError) {
|
||||
error = 'Unable to load languages';
|
||||
} else if (qualityProfiles.schemaError) {
|
||||
if (qualityProfiles.schemaError) {
|
||||
error = 'Unable to load qualities';
|
||||
}
|
||||
|
||||
return {
|
||||
isFetching: languageProfiles.isSchemaFetching || qualityProfiles.isSchemaFetching,
|
||||
isPopulated: languageProfiles.isSchemaPopulated && qualityProfiles.isSchemaPopulated,
|
||||
isFetching: qualityProfiles.isSchemaFetching,
|
||||
isPopulated: qualityProfiles.isSchemaPopulated,
|
||||
error,
|
||||
languages,
|
||||
qualities
|
||||
};
|
||||
}
|
||||
|
@ -71,7 +66,6 @@ function createMapStateToProps() {
|
|||
|
||||
return {
|
||||
relativePath: trackFile.relativePath,
|
||||
language: trackFile.language,
|
||||
quality: trackFile.quality,
|
||||
...track
|
||||
};
|
||||
|
@ -98,10 +92,6 @@ function createMapDispatchToProps(dispatch, props) {
|
|||
dispatch(fetchTracks(updateProps));
|
||||
},
|
||||
|
||||
dispatchFetchLanguageProfileSchema(name, path) {
|
||||
dispatch(fetchLanguageProfileSchema());
|
||||
},
|
||||
|
||||
dispatchFetchQualityProfileSchema(name, path) {
|
||||
dispatch(fetchQualityProfileSchema());
|
||||
},
|
||||
|
@ -127,7 +117,6 @@ class TrackFileEditorModalContentConnector extends Component {
|
|||
|
||||
this.props.dispatchFetchTracks({ artistId, albumId });
|
||||
|
||||
this.props.dispatchFetchLanguageProfileSchema();
|
||||
this.props.dispatchFetchQualityProfileSchema();
|
||||
}
|
||||
|
||||
|
@ -138,12 +127,6 @@ class TrackFileEditorModalContentConnector extends Component {
|
|||
//
|
||||
// Listeners
|
||||
|
||||
onLanguageChange = (trackFileIds, languageId) => {
|
||||
const language = _.find(this.props.languages, { id: languageId });
|
||||
|
||||
this.props.dispatchUpdateTrackFiles({ trackFileIds, language });
|
||||
}
|
||||
|
||||
onQualityChange = (trackFileIds, qualityId) => {
|
||||
const quality = {
|
||||
quality: _.find(this.props.qualities, { id: qualityId }),
|
||||
|
@ -161,7 +144,6 @@ class TrackFileEditorModalContentConnector extends Component {
|
|||
|
||||
render() {
|
||||
const {
|
||||
dispatchFetchLanguageProfileSchema,
|
||||
dispatchFetchQualityProfileSchema,
|
||||
dispatchUpdateTrackFiles,
|
||||
dispatchFetchTracks,
|
||||
|
@ -172,7 +154,6 @@ class TrackFileEditorModalContentConnector extends Component {
|
|||
return (
|
||||
<TrackFileEditorModalContent
|
||||
{...otherProps}
|
||||
onLanguageChange={this.onLanguageChange}
|
||||
onQualityChange={this.onQualityChange}
|
||||
/>
|
||||
);
|
||||
|
@ -182,11 +163,9 @@ class TrackFileEditorModalContentConnector extends Component {
|
|||
TrackFileEditorModalContentConnector.propTypes = {
|
||||
artistId: PropTypes.number.isRequired,
|
||||
albumId: PropTypes.number,
|
||||
languages: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||
qualities: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||
dispatchFetchTracks: PropTypes.func.isRequired,
|
||||
dispatchClearTracks: PropTypes.func.isRequired,
|
||||
dispatchFetchLanguageProfileSchema: PropTypes.func.isRequired,
|
||||
dispatchFetchQualityProfileSchema: PropTypes.func.isRequired,
|
||||
dispatchUpdateTrackFiles: PropTypes.func.isRequired
|
||||
};
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
import PropTypes from 'prop-types';
|
||||
import React from 'react';
|
||||
import padNumber from 'Utilities/Number/padNumber';
|
||||
import Label from 'Components/Label';
|
||||
import TableRow from 'Components/Table/TableRow';
|
||||
import TableRowCell from 'Components/Table/Cells/TableRowCell';
|
||||
import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
|
||||
|
@ -12,7 +11,6 @@ function TrackFileEditorRow(props) {
|
|||
id,
|
||||
trackNumber,
|
||||
relativePath,
|
||||
language,
|
||||
quality,
|
||||
isSelected,
|
||||
onSelectedChange
|
||||
|
@ -34,12 +32,6 @@ function TrackFileEditorRow(props) {
|
|||
{relativePath}
|
||||
</TableRowCell>
|
||||
|
||||
<TableRowCell>
|
||||
<Label>
|
||||
{language.name}
|
||||
</Label>
|
||||
</TableRowCell>
|
||||
|
||||
<TableRowCell>
|
||||
<TrackQuality
|
||||
quality={quality}
|
||||
|
@ -53,7 +45,6 @@ TrackFileEditorRow.propTypes = {
|
|||
id: PropTypes.number.isRequired,
|
||||
trackNumber: PropTypes.string.isRequired,
|
||||
relativePath: PropTypes.string.isRequired,
|
||||
language: PropTypes.object.isRequired,
|
||||
quality: PropTypes.object.isRequired,
|
||||
isSelected: PropTypes.bool,
|
||||
onSelectedChange: PropTypes.func.isRequired
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
import { connect } from 'react-redux';
|
||||
import { createSelector } from 'reselect';
|
||||
import createTrackFileSelector from 'Store/Selectors/createTrackFileSelector';
|
||||
import TrackLanguage from 'Album/TrackLanguage';
|
||||
|
||||
function createMapStateToProps() {
|
||||
return createSelector(
|
||||
createTrackFileSelector(),
|
||||
(trackFile) => {
|
||||
return {
|
||||
language: trackFile ? trackFile.language : undefined
|
||||
};
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
export default connect(createMapStateToProps)(TrackLanguage);
|
Loading…
Add table
Add a link
Reference in a new issue