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:
Qstick 2019-08-02 07:50:09 -04:00 committed by GitHub
parent 8f791abbf6
commit 8b860bcb82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
227 changed files with 345 additions and 5873 deletions

View file

@ -58,7 +58,6 @@
composes: button from '~Components/Link/SpinnerButton.css';
}
.hideLanguageProfile,
.hideMetadataProfile {
composes: group from '~Components/Form/FormGroup.css';

View file

@ -42,10 +42,6 @@ class AddNewArtistModalContent extends Component {
this.props.onInputChange({ name: 'qualityProfileId', value: parseInt(value) });
}
onLanguageProfileIdChange = ({ value }) => {
this.props.onInputChange({ name: 'languageProfileId', value: parseInt(value) });
}
onMetadataProfileIdChange = ({ value }) => {
this.props.onInputChange({ name: 'metadataProfileId', value: parseInt(value) });
}
@ -66,11 +62,9 @@ class AddNewArtistModalContent extends Component {
rootFolderPath,
monitor,
qualityProfileId,
languageProfileId,
metadataProfileId,
albumFolder,
tags,
showLanguageProfile,
showMetadataProfile,
isSmallScreen,
onModalClose,
@ -159,17 +153,6 @@ class AddNewArtistModalContent extends Component {
/>
</FormGroup>
<FormGroup className={showLanguageProfile ? undefined : styles.hideLanguageProfile}>
<FormLabel>Language Profile</FormLabel>
<FormInputGroup
type={inputTypes.LANGUAGE_PROFILE_SELECT}
name="languageProfileId"
onChange={this.onLanguageProfileIdChange}
{...languageProfileId}
/>
</FormGroup>
<FormGroup className={showMetadataProfile ? undefined : styles.hideMetadataProfile}>
<FormLabel>Metadata Profile</FormLabel>
@ -245,11 +228,9 @@ AddNewArtistModalContent.propTypes = {
rootFolderPath: PropTypes.object,
monitor: PropTypes.object.isRequired,
qualityProfileId: PropTypes.object,
languageProfileId: PropTypes.object,
metadataProfileId: PropTypes.object,
albumFolder: PropTypes.object.isRequired,
tags: PropTypes.object.isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
isSmallScreen: PropTypes.bool.isRequired,
onModalClose: PropTypes.func.isRequired,

View file

@ -10,10 +10,9 @@ import AddNewArtistModalContent from './AddNewArtistModalContent';
function createMapStateToProps() {
return createSelector(
(state) => state.addArtist,
(state) => state.settings.languageProfiles,
(state) => state.settings.metadataProfiles,
createDimensionsSelector(),
(addArtistState, languageProfiles, metadataProfiles, dimensions) => {
(addArtistState, metadataProfiles, dimensions) => {
const {
isAdding,
addError,
@ -29,7 +28,6 @@ function createMapStateToProps() {
return {
isAdding,
addError,
showLanguageProfile: languageProfiles.items.length > 1,
showMetadataProfile: metadataProfiles.items.length > 1,
isSmallScreen: dimensions.isSmallScreen,
validationErrors,
@ -60,7 +58,6 @@ class AddNewArtistModalContentConnector extends Component {
rootFolderPath,
monitor,
qualityProfileId,
languageProfileId,
metadataProfileId,
albumFolder,
tags
@ -71,7 +68,6 @@ class AddNewArtistModalContentConnector extends Component {
rootFolderPath: rootFolderPath.value,
monitor: monitor.value,
qualityProfileId: qualityProfileId.value,
languageProfileId: languageProfileId.value,
metadataProfileId: metadataProfileId.value,
albumFolder: albumFolder.value,
tags: tags.value,
@ -98,7 +94,6 @@ AddNewArtistModalContentConnector.propTypes = {
rootFolderPath: PropTypes.object,
monitor: PropTypes.object.isRequired,
qualityProfileId: PropTypes.object,
languageProfileId: PropTypes.object,
metadataProfileId: PropTypes.object,
albumFolder: PropTypes.object.isRequired,
tags: PropTypes.object.isRequired,

View file

@ -87,7 +87,6 @@ class ImportArtist extends Component {
rootFoldersPopulated,
rootFoldersError,
unmappedFolders,
showLanguageProfile,
showMetadataProfile
} = this.props;
@ -130,7 +129,6 @@ class ImportArtist extends Component {
allUnselected={allUnselected}
selectedState={selectedState}
contentBody={contentBody}
showLanguageProfile={showLanguageProfile}
showMetadataProfile={showMetadataProfile}
scrollTop={this.state.scrollTop}
onSelectAllChange={this.onSelectAllChange}
@ -145,7 +143,6 @@ class ImportArtist extends Component {
!rootFoldersError && rootFoldersPopulated && !!unmappedFolders.length &&
<ImportArtistFooterConnector
selectedIds={this.getSelectedIds()}
showLanguageProfile={showLanguageProfile}
showMetadataProfile={showMetadataProfile}
onInputChange={this.onInputChange}
onImportPress={this.onImportPress}
@ -164,7 +161,6 @@ ImportArtist.propTypes = {
rootFoldersError: PropTypes.object,
unmappedFolders: PropTypes.arrayOf(PropTypes.object),
items: PropTypes.arrayOf(PropTypes.object),
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
onInputChange: PropTypes.func.isRequired,
onImportPress: PropTypes.func.isRequired

View file

@ -17,7 +17,6 @@ function createMapStateToProps() {
(state) => state.addArtist,
(state) => state.importArtist,
(state) => state.settings.qualityProfiles,
(state) => state.settings.languageProfiles,
(state) => state.settings.metadataProfiles,
(
match,
@ -25,7 +24,6 @@ function createMapStateToProps() {
addArtist,
importArtistState,
qualityProfiles,
languageProfiles,
metadataProfiles
) => {
const {
@ -43,12 +41,9 @@ function createMapStateToProps() {
rootFoldersPopulated,
rootFoldersError,
qualityProfiles: qualityProfiles.items,
languageProfiles: languageProfiles.items,
metadataProfiles: metadataProfiles.items,
showLanguageProfile: languageProfiles.items.length > 1,
showMetadataProfile: metadataProfiles.items.length > 1,
defaultQualityProfileId: addArtist.defaults.qualityProfileId,
defaultLanguageProfileId: addArtist.defaults.languageProfileId,
defaultMetadataProfileId: addArtist.defaults.metadataProfileId
};
@ -83,10 +78,8 @@ class ImportArtistConnector extends Component {
componentDidMount() {
const {
qualityProfiles,
languageProfiles,
metadataProfiles,
defaultQualityProfileId,
defaultLanguageProfileId,
defaultMetadataProfileId,
dispatchFetchRootFolders,
dispatchSetAddArtistDefault
@ -107,14 +100,6 @@ class ImportArtistConnector extends Component {
setDefaultPayload.qualityProfileId = qualityProfiles[0].id;
}
if (
!defaultLanguageProfileId ||
!languageProfiles.some((p) => p.id === defaultLanguageProfileId)
) {
setDefaults = true;
setDefaultPayload.languageProfileId = languageProfiles[0].id;
}
if (
!defaultMetadataProfileId ||
!metadataProfiles.some((p) => p.id === defaultMetadataProfileId)
@ -172,10 +157,8 @@ ImportArtistConnector.propTypes = {
match: routeMatchShape.isRequired,
rootFoldersPopulated: PropTypes.bool.isRequired,
qualityProfiles: PropTypes.arrayOf(PropTypes.object).isRequired,
languageProfiles: PropTypes.arrayOf(PropTypes.object).isRequired,
metadataProfiles: PropTypes.arrayOf(PropTypes.object).isRequired,
defaultQualityProfileId: PropTypes.number.isRequired,
defaultLanguageProfileId: PropTypes.number.isRequired,
defaultMetadataProfileId: PropTypes.number.isRequired,
dispatchSetImportArtistValue: PropTypes.func.isRequired,
dispatchImportArtist: PropTypes.func.isRequired,

View file

@ -23,7 +23,6 @@ class ImportArtistFooter extends Component {
const {
defaultMonitor,
defaultQualityProfileId,
defaultLanguageProfileId,
defaultMetadataProfileId,
defaultAlbumFolder
} = props;
@ -31,7 +30,6 @@ class ImportArtistFooter extends Component {
this.state = {
monitor: defaultMonitor,
qualityProfileId: defaultQualityProfileId,
languageProfileId: defaultLanguageProfileId,
metadataProfileId: defaultMetadataProfileId,
albumFolder: defaultAlbumFolder
};
@ -41,12 +39,10 @@ class ImportArtistFooter extends Component {
const {
defaultMonitor,
defaultQualityProfileId,
defaultLanguageProfileId,
defaultMetadataProfileId,
defaultAlbumFolder,
isMonitorMixed,
isQualityProfileIdMixed,
isLanguageProfileIdMixed,
isMetadataProfileIdMixed,
isAlbumFolderMixed
} = this.props;
@ -54,7 +50,6 @@ class ImportArtistFooter extends Component {
const {
monitor,
qualityProfileId,
languageProfileId,
metadataProfileId,
albumFolder
} = this.state;
@ -73,12 +68,6 @@ class ImportArtistFooter extends Component {
newState.qualityProfileId = defaultQualityProfileId;
}
if (isLanguageProfileIdMixed && languageProfileId !== MIXED) {
newState.languageProfileId = MIXED;
} else if (!isLanguageProfileIdMixed && languageProfileId !== defaultLanguageProfileId) {
newState.languageProfileId = defaultLanguageProfileId;
}
if (isMetadataProfileIdMixed && metadataProfileId !== MIXED) {
newState.metadataProfileId = MIXED;
} else if (!isMetadataProfileIdMixed && metadataProfileId !== defaultMetadataProfileId) {
@ -114,10 +103,8 @@ class ImportArtistFooter extends Component {
isLookingUpArtist,
isMonitorMixed,
isQualityProfileIdMixed,
isLanguageProfileIdMixed,
isMetadataProfileIdMixed,
hasUnsearchedItems,
showLanguageProfile,
showMetadataProfile,
onImportPress,
onLookupPress,
@ -127,7 +114,6 @@ class ImportArtistFooter extends Component {
const {
monitor,
qualityProfileId,
languageProfileId,
metadataProfileId,
albumFolder
} = this.state;
@ -164,24 +150,6 @@ class ImportArtistFooter extends Component {
/>
</div>
{
showLanguageProfile &&
<div className={styles.inputContainer}>
<div className={styles.label}>
Language Profile
</div>
<FormInputGroup
type={inputTypes.LANGUAGE_PROFILE_SELECT}
name="languageProfileId"
value={languageProfileId}
isDisabled={!selectedCount}
includeMixed={isLanguageProfileIdMixed}
onChange={this.onInputChange}
/>
</div>
}
{
showMetadataProfile &&
<div className={styles.inputContainer}>
@ -276,16 +244,13 @@ ImportArtistFooter.propTypes = {
isLookingUpArtist: PropTypes.bool.isRequired,
defaultMonitor: PropTypes.string.isRequired,
defaultQualityProfileId: PropTypes.number,
defaultLanguageProfileId: PropTypes.number,
defaultMetadataProfileId: PropTypes.number,
defaultAlbumFolder: PropTypes.bool.isRequired,
isMonitorMixed: PropTypes.bool.isRequired,
isQualityProfileIdMixed: PropTypes.bool.isRequired,
isLanguageProfileIdMixed: PropTypes.bool.isRequired,
isMetadataProfileIdMixed: PropTypes.bool.isRequired,
isAlbumFolderMixed: PropTypes.bool.isRequired,
hasUnsearchedItems: PropTypes.bool.isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
onInputChange: PropTypes.func.isRequired,
onImportPress: PropTypes.func.isRequired,

View file

@ -19,7 +19,6 @@ function createMapStateToProps() {
const {
monitor: defaultMonitor,
qualityProfileId: defaultQualityProfileId,
languageProfileId: defaultLanguageProfileId,
metadataProfileId: defaultMetadataProfileId,
albumFolder: defaultAlbumFolder
} = addArtist.defaults;
@ -32,7 +31,6 @@ function createMapStateToProps() {
const isMonitorMixed = isMixed(items, selectedIds, defaultMonitor, 'monitor');
const isQualityProfileIdMixed = isMixed(items, selectedIds, defaultQualityProfileId, 'qualityProfileId');
const isLanguageProfileIdMixed = isMixed(items, selectedIds, defaultLanguageProfileId, 'languageProfileId');
const isMetadataProfileIdMixed = isMixed(items, selectedIds, defaultMetadataProfileId, 'metadataProfileId');
const isAlbumFolderMixed = isMixed(items, selectedIds, defaultAlbumFolder, 'albumFolder');
const hasUnsearchedItems = !isLookingUpArtist && items.some((item) => !item.isPopulated);
@ -43,12 +41,10 @@ function createMapStateToProps() {
isImporting,
defaultMonitor,
defaultQualityProfileId,
defaultLanguageProfileId,
defaultMetadataProfileId,
defaultAlbumFolder,
isMonitorMixed,
isQualityProfileIdMixed,
isLanguageProfileIdMixed,
isMetadataProfileIdMixed,
isAlbumFolderMixed,
hasUnsearchedItems

View file

@ -12,7 +12,6 @@
}
.qualityProfile,
.languageProfile,
.metadataProfile {
composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';

View file

@ -12,7 +12,6 @@ import styles from './ImportArtistHeader.css';
function ImportArtistHeader(props) {
const {
showLanguageProfile,
showMetadataProfile,
allSelected,
allUnselected,
@ -60,16 +59,6 @@ function ImportArtistHeader(props) {
Quality Profile
</VirtualTableHeaderCell>
{
showLanguageProfile &&
<VirtualTableHeaderCell
className={styles.languageProfile}
name="languageProfileId"
>
Language Profile
</VirtualTableHeaderCell>
}
{
showMetadataProfile &&
<VirtualTableHeaderCell
@ -98,7 +87,6 @@ function ImportArtistHeader(props) {
}
ImportArtistHeader.propTypes = {
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
allSelected: PropTypes.bool.isRequired,
allUnselected: PropTypes.bool.isRequired,

View file

@ -17,7 +17,6 @@
}
.qualityProfile,
.languageProfile,
.metadataProfile {
composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
@ -39,7 +38,6 @@
min-width: 300px;
}
.hideLanguageProfile,
.hideMetadataProfile {
composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';

View file

@ -14,12 +14,10 @@ function ImportArtistRow(props) {
id,
monitor,
qualityProfileId,
languageProfileId,
metadataProfileId,
albumFolder,
selectedArtist,
isExistingArtist,
showLanguageProfile,
showMetadataProfile,
isSelected,
onSelectedChange,
@ -58,17 +56,6 @@ function ImportArtistRow(props) {
/>
</VirtualTableRowCell>
<VirtualTableRowCell
className={showLanguageProfile ? styles.languageProfile : styles.hideLanguageProfile}
>
<FormInputGroup
type={inputTypes.LANGUAGE_PROFILE_SELECT}
name="languageProfileId"
value={languageProfileId}
onChange={onInputChange}
/>
</VirtualTableRowCell>
<VirtualTableRowCell
className={showMetadataProfile ? styles.metadataProfile : styles.hideMetadataProfile}
>
@ -104,13 +91,11 @@ ImportArtistRow.propTypes = {
id: PropTypes.string.isRequired,
monitor: PropTypes.string.isRequired,
qualityProfileId: PropTypes.number.isRequired,
languageProfileId: PropTypes.number.isRequired,
metadataProfileId: PropTypes.number.isRequired,
albumFolder: PropTypes.bool.isRequired,
selectedArtist: PropTypes.object,
isExistingArtist: PropTypes.bool.isRequired,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
isSelected: PropTypes.bool,
onSelectedChange: PropTypes.func.isRequired,

View file

@ -15,7 +15,6 @@ class ImportArtistTable extends Component {
unmappedFolders,
defaultMonitor,
defaultQualityProfileId,
defaultLanguageProfileId,
defaultMetadataProfileId,
defaultAlbumFolder,
onArtistLookup,
@ -25,7 +24,6 @@ class ImportArtistTable extends Component {
const values = {
monitor: defaultMonitor,
qualityProfileId: defaultQualityProfileId,
languageProfileId: defaultLanguageProfileId,
metadataProfileId: defaultMetadataProfileId,
albumFolder: defaultAlbumFolder
};
@ -105,7 +103,6 @@ class ImportArtistTable extends Component {
rootFolderId,
items,
selectedState,
showLanguageProfile,
showMetadataProfile,
onSelectedChange
} = this.props;
@ -117,7 +114,6 @@ class ImportArtistTable extends Component {
key={key}
style={style}
rootFolderId={rootFolderId}
showLanguageProfile={showLanguageProfile}
showMetadataProfile={showMetadataProfile}
isSelected={selectedState[item.id]}
onSelectedChange={onSelectedChange}
@ -136,7 +132,6 @@ class ImportArtistTable extends Component {
allUnselected,
isSmallScreen,
contentBody,
showLanguageProfile,
showMetadataProfile,
scrollTop,
selectedState,
@ -159,7 +154,6 @@ class ImportArtistTable extends Component {
rowRenderer={this.rowRenderer}
header={
<ImportArtistHeader
showLanguageProfile={showLanguageProfile}
showMetadataProfile={showMetadataProfile}
allSelected={allSelected}
allUnselected={allUnselected}
@ -179,7 +173,6 @@ ImportArtistTable.propTypes = {
unmappedFolders: PropTypes.arrayOf(PropTypes.object),
defaultMonitor: PropTypes.string.isRequired,
defaultQualityProfileId: PropTypes.number,
defaultLanguageProfileId: PropTypes.number,
defaultMetadataProfileId: PropTypes.number,
defaultAlbumFolder: PropTypes.bool.isRequired,
allSelected: PropTypes.bool.isRequired,
@ -188,7 +181,6 @@ ImportArtistTable.propTypes = {
isSmallScreen: PropTypes.bool.isRequired,
allArtists: PropTypes.arrayOf(PropTypes.object),
contentBody: PropTypes.object.isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
scrollTop: PropTypes.number.isRequired,
onSelectAllChange: PropTypes.func.isRequired,

View file

@ -14,7 +14,6 @@ function createMapStateToProps() {
return {
defaultMonitor: addArtist.defaults.monitor,
defaultQualityProfileId: addArtist.defaults.qualityProfileId,
defaultLanguageProfileId: addArtist.defaults.languageProfileId,
defaultMetadataProfileId: addArtist.defaults.metadataProfileId,
defaultAlbumFolder: addArtist.defaults.albumFolder,
items: importArtist.items,