github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-16 10:03:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add Metadata Profiles (#132)

Browse source 
* Add Metadata Profiles

* fixup! Codacy
This commit is contained in:
Qstick 2017-11-25 22:51:37 -05:00 • committed by GitHub
parent dd11f74073
commit 5b7339cd73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
92 changed files with 2611 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/AddArtist/AddNewArtist/AddNewArtistModalContent.css
View file

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

47
frontend/src/AddArtist/AddNewArtist/AddNewArtistModalContent.js
View file

@ -46,6 +46,10 @@ class AddNewArtistModalContent extends Component {
this.props.onInputChange({ name: 'languageProfileId', value: parseInt(value) });
}
onMetadataProfileIdChange = ({ value }) => {
this.props.onInputChange({ name: 'metadataProfileId', value: parseInt(value) });
}
onAddArtistPress = () => {
this.props.onAddArtistPress(this.state.searchForMissingAlbums);
}
@ -63,11 +67,11 @@ class AddNewArtistModalContent extends Component {
monitor,
qualityProfileId,
languageProfileId,
metadataProfileId,
albumFolder,
primaryAlbumTypes,
secondaryAlbumTypes,
tags,
showLanguageProfile,
showMetadataProfile,
isSmallScreen,
onModalClose,
onInputChange
@ -149,16 +153,33 @@ class AddNewArtistModalContent extends Component {
/>
</FormGroup>
<FormGroup className={showLanguageProfile ? null : styles.hideLanguageProfile}>
<FormLabel>Language Profile</FormLabel>
{
showLanguageProfile &&
<FormGroup>
<FormLabel>Language Profile</FormLabel>
<FormInputGroup
type={inputTypes.LANGUAGE_PROFILE_SELECT}
name="languageProfileId"
onChange={this.onLanguageProfileIdChange}
{...languageProfileId}
/>
</FormGroup>
<FormInputGroup
type={inputTypes.LANGUAGE_PROFILE_SELECT}
name="languageProfileId"
onChange={this.onLanguageProfileIdChange}
{...languageProfileId}
/>
</FormGroup>
}
{
showMetadataProfile &&
<FormGroup>
<FormLabel>Metadata Profile</FormLabel>
<FormInputGroup
type={inputTypes.METADATA_PROFILE_SELECT}
name="metadataProfileId"
onChange={this.onMetadataProfileIdChange}
{...metadataProfileId}
/>
</FormGroup>
}
<FormGroup>
<FormLabel>Album Folder</FormLabel>
@ -225,11 +246,11 @@ AddNewArtistModalContent.propTypes = {
monitor: PropTypes.object.isRequired,
qualityProfileId: PropTypes.object,
languageProfileId: PropTypes.object,
metadataProfileId: PropTypes.object,
albumFolder: PropTypes.object.isRequired,
primaryAlbumTypes: PropTypes.object.isRequired,
secondaryAlbumTypes: PropTypes.object.isRequired,
tags: PropTypes.object.isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
isSmallScreen: PropTypes.bool.isRequired,
onModalClose: PropTypes.func.isRequired,
onInputChange: PropTypes.func.isRequired,

15
frontend/src/AddArtist/AddNewArtist/AddNewArtistModalContentConnector.js
View file

@ -11,8 +11,9 @@ function createMapStateToProps() {
return createSelector(
(state) => state.addArtist,
(state) => state.settings.languageProfiles,
(state) => state.settings.metadataProfiles,
createDimensionsSelector(),
(addArtistState, languageProfiles, dimensions) => {
(addArtistState, languageProfiles, metadataProfiles, dimensions) => {
const {
isAdding,
addError,
@ -28,7 +29,8 @@ function createMapStateToProps() {
return {
isAdding,
addError,
showLanguageProfile: languageProfiles.length > 1,
showLanguageProfile: languageProfiles.items.length > 1,
showMetadataProfile: metadataProfiles.items.length > 1,
isSmallScreen: dimensions.isSmallScreen,
validationErrors,
validationWarnings,
@ -59,9 +61,8 @@ class AddNewArtistModalContentConnector extends Component {
monitor,
qualityProfileId,
languageProfileId,
metadataProfileId,
albumFolder,
primaryAlbumTypes,
secondaryAlbumTypes,
tags
} = this.props;
@ -71,9 +72,8 @@ class AddNewArtistModalContentConnector extends Component {
monitor: monitor.value,
qualityProfileId: qualityProfileId.value,
languageProfileId: languageProfileId.value,
metadataProfileId: metadataProfileId.value,
albumFolder: albumFolder.value,
primaryAlbumTypes: primaryAlbumTypes.value,
secondaryAlbumTypes: secondaryAlbumTypes.value,
tags: tags.value,
searchForMissingAlbums
});
@ -99,9 +99,8 @@ AddNewArtistModalContentConnector.propTypes = {
monitor: PropTypes.object.isRequired,
qualityProfileId: PropTypes.object,
languageProfileId: PropTypes.object,
metadataProfileId: PropTypes.object,
albumFolder: PropTypes.object.isRequired,
primaryAlbumTypes: PropTypes.object.isRequired,
secondaryAlbumTypes: PropTypes.object.isRequired,
tags: PropTypes.object.isRequired,
onModalClose: PropTypes.func.isRequired,
setAddArtistDefault: PropTypes.func.isRequired,

6
frontend/src/AddArtist/ImportArtist/Import/ImportArtist.js
View file

@ -87,7 +87,8 @@ class ImportArtist extends Component {
rootFoldersPopulated,
rootFoldersError,
unmappedFolders,
showLanguageProfile
showLanguageProfile,
showMetadataProfile
} = this.props;
const {
@ -130,6 +131,7 @@ class ImportArtist extends Component {
selectedState={selectedState}
contentBody={contentBody}
showLanguageProfile={showLanguageProfile}
showMetadataProfile={showMetadataProfile}
scrollTop={this.state.scrollTop}
onSelectAllChange={this.onSelectAllChange}
onSelectedChange={this.onSelectedChange}
@ -144,6 +146,7 @@ class ImportArtist extends Component {
<ImportArtistFooterConnector
selectedIds={this.getSelectedIds()}
showLanguageProfile={showLanguageProfile}
showMetadataProfile={showMetadataProfile}
onInputChange={this.onInputChange}
onImportPress={this.onImportPress}
/>
@ -162,6 +165,7 @@ ImportArtist.propTypes = {
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
};

6
frontend/src/AddArtist/ImportArtist/Import/ImportArtistConnector.js
View file

@ -16,7 +16,8 @@ function createMapStateToProps() {
(state) => state.addArtist,
(state) => state.importArtist,
(state) => state.settings.languageProfiles,
(match, rootFolders, addArtist, importArtistState, languageProfiles) => {
(state) => state.settings.metadataProfiles,
(match, rootFolders, addArtist, importArtistState, languageProfiles, metadataProfiles) => {
const {
isFetching: rootFoldersFetching,
isPopulated: rootFoldersPopulated,
@ -31,7 +32,8 @@ function createMapStateToProps() {
rootFoldersFetching,
rootFoldersPopulated,
rootFoldersError,
showLanguageProfile: languageProfiles.items.length > 1
showLanguageProfile: languageProfiles.items.length > 1,
showMetadataProfile: metadataProfiles.items.length > 1
};
if (items.length) {

74
frontend/src/AddArtist/ImportArtist/Import/ImportArtistFooter.js
View file

@ -23,18 +23,16 @@ class ImportArtistFooter extends Component {
defaultMonitor,
defaultQualityProfileId,
defaultLanguageProfileId,
defaultAlbumFolder,
defaultPrimaryAlbumTypes,
defaultSecondaryAlbumTypes
defaultMetadataProfileId,
defaultAlbumFolder
} = props;
this.state = {
monitor: defaultMonitor,
qualityProfileId: defaultQualityProfileId,
languageProfileId: defaultLanguageProfileId,
albumFolder: defaultAlbumFolder,
primaryAlbumTypes: defaultPrimaryAlbumTypes,
secondaryAlbumTypes: defaultSecondaryAlbumTypes
metadataProfileId: defaultMetadataProfileId,
albumFolder: defaultAlbumFolder
};
}
@ -43,24 +41,21 @@ class ImportArtistFooter extends Component {
defaultMonitor,
defaultQualityProfileId,
defaultLanguageProfileId,
defaultMetadataProfileId,
defaultAlbumFolder,
defaultPrimaryAlbumTypes,
defaultSecondaryAlbumTypes,
isMonitorMixed,
isQualityProfileIdMixed,
isLanguageProfileIdMixed,
isAlbumFolderMixed,
isPrimaryAlbumTypesMixed,
isSecondaryAlbumTypesMixed
isMetadataProfileIdMixed,
isAlbumFolderMixed
} = this.props;
const {
monitor,
qualityProfileId,
languageProfileId,
albumFolder,
primaryAlbumTypes,
secondaryAlbumTypes
metadataProfileId,
albumFolder
} = this.state;
const newState = {};
@ -83,24 +78,18 @@ class ImportArtistFooter extends Component {
newState.languageProfileId = defaultLanguageProfileId;
}
if (isMetadataProfileIdMixed && metadataProfileId !== MIXED) {
newState.metadataProfileId = MIXED;
} else if (!isMetadataProfileIdMixed && metadataProfileId !== defaultMetadataProfileId) {
newState.metadataProfileId = defaultMetadataProfileId;
}
if (isAlbumFolderMixed && albumFolder != null) {
newState.albumFolder = null;
} else if (!isAlbumFolderMixed && albumFolder !== defaultAlbumFolder) {
newState.albumFolder = defaultAlbumFolder;
}
if (isPrimaryAlbumTypesMixed && primaryAlbumTypes != null) {
newState.primaryAlbumTypes = null;
} else if (!isPrimaryAlbumTypesMixed && primaryAlbumTypes !== defaultPrimaryAlbumTypes) {
newState.primaryAlbumTypes = defaultPrimaryAlbumTypes;
}
if (isSecondaryAlbumTypesMixed && secondaryAlbumTypes != null) {
newState.secondaryAlbumTypes = null;
} else if (!isSecondaryAlbumTypesMixed && secondaryAlbumTypes !== defaultSecondaryAlbumTypes) {
newState.secondaryAlbumTypes = defaultSecondaryAlbumTypes;
}
if (!_.isEmpty(newState)) {
this.setState(newState);
}
@ -125,7 +114,9 @@ class ImportArtistFooter extends Component {
isMonitorMixed,
isQualityProfileIdMixed,
isLanguageProfileIdMixed,
isMetadataProfileIdMixed,
showLanguageProfile,
showMetadataProfile,
onImportPress
} = this.props;
@ -133,9 +124,8 @@ class ImportArtistFooter extends Component {
monitor,
qualityProfileId,
languageProfileId,
albumFolder,
primaryAlbumTypes,
secondaryAlbumTypes
metadataProfileId,
albumFolder
} = this.state;
return (
@ -189,6 +179,25 @@ class ImportArtistFooter extends Component {
</div>
}
{
showMetadataProfile &&
<div className={styles.inputContainer}>
<div className={styles.label}>
Metadata Profile
</div>
<FormInputGroup
type={inputTypes.METADATA_PROFILE_SELECT}
name="metadataProfileId"
value={metadataProfileId}
isDisabled={!selectedCount}
includeMixed={isMetadataProfileIdMixed}
onChange={this.onInputChange}
/>
</div>
}
<div className={styles.inputContainer}>
<div className={styles.label}>
Album Folder
@ -244,16 +253,15 @@ ImportArtistFooter.propTypes = {
defaultMonitor: PropTypes.string.isRequired,
defaultQualityProfileId: PropTypes.number,
defaultLanguageProfileId: PropTypes.number,
defaultMetadataProfileId: PropTypes.number,
defaultAlbumFolder: PropTypes.bool.isRequired,
defaultPrimaryAlbumTypes: PropTypes.arrayOf(PropTypes.string).isRequired,
defaultSecondaryAlbumTypes: PropTypes.arrayOf(PropTypes.string).isRequired,
isMonitorMixed: PropTypes.bool.isRequired,
isQualityProfileIdMixed: PropTypes.bool.isRequired,
isLanguageProfileIdMixed: PropTypes.bool.isRequired,
isMetadataProfileIdMixed: PropTypes.bool.isRequired,
isAlbumFolderMixed: PropTypes.bool.isRequired,
isPrimaryAlbumTypesMixed: PropTypes.bool.isRequired,
isSecondaryAlbumTypesMixed: PropTypes.bool.isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
onInputChange: PropTypes.func.isRequired,
onImportPress: PropTypes.func.isRequired
};

16
frontend/src/AddArtist/ImportArtist/Import/ImportArtistFooterConnector.js
View file

@ -19,9 +19,8 @@ function createMapStateToProps() {
monitor: defaultMonitor,
qualityProfileId: defaultQualityProfileId,
languageProfileId: defaultLanguageProfileId,
albumFolder: defaultAlbumFolder,
primaryAlbumTypes: defaultPrimaryAlbumTypes,
secondaryAlbumTypes: defaultSecondaryAlbumTypes
metadataProfileId: defaultMetadataProfileId,
albumFolder: defaultAlbumFolder
} = addArtist.defaults;
const items = importArtist.items;
@ -33,9 +32,8 @@ 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 isPrimaryAlbumTypesMixed = isMixed(items, selectedIds, defaultPrimaryAlbumTypes, 'primaryAlbumTypes');
const isSecondaryAlbumTypesMixed = isMixed(items, selectedIds, defaultSecondaryAlbumTypes, 'secondaryAlbumTypes');
return {
selectedCount: selectedIds.length,
@ -44,15 +42,13 @@ function createMapStateToProps() {
defaultMonitor,
defaultQualityProfileId,
defaultLanguageProfileId,
defaultMetadataProfileId,
defaultAlbumFolder,
defaultPrimaryAlbumTypes,
defaultSecondaryAlbumTypes,
isMonitorMixed,
isQualityProfileIdMixed,
isLanguageProfileIdMixed,
isAlbumFolderMixed,
isPrimaryAlbumTypesMixed,
isSecondaryAlbumTypesMixed
isMetadataProfileIdMixed,
isAlbumFolderMixed
};
}
);

3
frontend/src/AddArtist/ImportArtist/Import/ImportArtistHeader.css
View file

@ -12,7 +12,8 @@
}
.qualityProfile,
.languageProfile {
.languageProfile,
.metadataProfile {
composes: headerCell from 'Components/Table/VirtualTableHeaderCell.css';
flex: 0 1 250px;

12
frontend/src/AddArtist/ImportArtist/Import/ImportArtistHeader.js
View file

@ -13,6 +13,7 @@ import styles from './ImportArtistHeader.css';
function ImportArtistHeader(props) {
const {
showLanguageProfile,
showMetadataProfile,
allSelected,
allUnselected,
onSelectAllChange
@ -69,6 +70,16 @@ function ImportArtistHeader(props) {
</VirtualTableHeaderCell>
}
{
showMetadataProfile &&
<VirtualTableHeaderCell
className={styles.metadataProfile}
name="metadataProfileId"
>
Metadata Profile
</VirtualTableHeaderCell>
}
<VirtualTableHeaderCell
className={styles.albumFolder}
name="albumFolder"
@ -88,6 +99,7 @@ function ImportArtistHeader(props) {
ImportArtistHeader.propTypes = {
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
allSelected: PropTypes.bool.isRequired,
allUnselected: PropTypes.bool.isRequired,
onSelectAllChange: PropTypes.func.isRequired

6
frontend/src/AddArtist/ImportArtist/Import/ImportArtistRow.css
View file

@ -17,7 +17,8 @@
}
.qualityProfile,
.languageProfile {
.languageProfile,
.metadataProfile {
composes: cell from 'Components/Table/Cells/VirtualTableRowCell.css';
flex: 0 1 250px;
@ -38,7 +39,8 @@
min-width: 300px;
}
.hideLanguageProfile {
.hideLanguageProfile,
.hideMetadataProfile {
composes: cell from 'Components/Table/Cells/VirtualTableRowCell.css';
display: none;

15
frontend/src/AddArtist/ImportArtist/Import/ImportArtistRow.js
View file

@ -15,10 +15,12 @@ function ImportArtistRow(props) {
monitor,
qualityProfileId,
languageProfileId,
metadataProfileId,
albumFolder,
selectedArtist,
isExistingArtist,
showLanguageProfile,
showMetadataProfile,
isSelected,
onSelectedChange,
onInputChange
@ -67,6 +69,17 @@ function ImportArtistRow(props) {
/>
</VirtualTableRowCell>
<VirtualTableRowCell
className={showMetadataProfile ? styles.metadataProfile : styles.hideMetadataProfile}
>
<FormInputGroup
type={inputTypes.METADATA_PROFILE_SELECT}
name="metadataProfileId"
value={metadataProfileId}
onChange={onInputChange}
/>
</VirtualTableRowCell>
<VirtualTableRowCell className={styles.albumFolder}>
<FormInputGroup
type={inputTypes.CHECK}
@ -92,12 +105,14 @@ ImportArtistRow.propTypes = {
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,
queued: PropTypes.bool.isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
isSelected: PropTypes.bool,
onSelectedChange: PropTypes.func.isRequired,
onInputChange: PropTypes.func.isRequired

16
frontend/src/AddArtist/ImportArtist/Import/ImportArtistTable.js
View file

@ -22,9 +22,8 @@ class ImportArtistTable extends Component {
defaultMonitor,
defaultQualityProfileId,
defaultLanguageProfileId,
defaultMetadataProfileId,
defaultAlbumFolder,
defaultPrimaryAlbumTypes,
defaultSecondaryAlbumTypes,
onArtistLookup,
onSetImportArtistValue
} = this.props;
@ -33,9 +32,8 @@ class ImportArtistTable extends Component {
monitor: defaultMonitor,
qualityProfileId: defaultQualityProfileId,
languageProfileId: defaultLanguageProfileId,
albumFolder: defaultAlbumFolder,
primaryAlbumTypes: defaultPrimaryAlbumTypes,
secondaryAlbumTypes: defaultSecondaryAlbumTypes
metadataProfileId: defaultMetadataProfileId,
albumFolder: defaultAlbumFolder
};
unmappedFolders.forEach((unmappedFolder) => {
@ -125,6 +123,7 @@ class ImportArtistTable extends Component {
items,
selectedState,
showLanguageProfile,
showMetadataProfile,
onSelectedChange
} = this.props;
@ -136,6 +135,7 @@ class ImportArtistTable extends Component {
style={style}
rootFolderId={rootFolderId}
showLanguageProfile={showLanguageProfile}
showMetadataProfile={showMetadataProfile}
isSelected={selectedState[item.id]}
onSelectedChange={onSelectedChange}
id={item.id}
@ -154,6 +154,7 @@ class ImportArtistTable extends Component {
isSmallScreen,
contentBody,
showLanguageProfile,
showMetadataProfile,
scrollTop,
onSelectAllChange,
onScroll
@ -176,6 +177,7 @@ class ImportArtistTable extends Component {
header={
<ImportArtistHeader
showLanguageProfile={showLanguageProfile}
showMetadataProfile={showMetadataProfile}
allSelected={allSelected}
allUnselected={allUnselected}
onSelectAllChange={onSelectAllChange}
@ -194,9 +196,8 @@ ImportArtistTable.propTypes = {
defaultMonitor: PropTypes.string.isRequired,
defaultQualityProfileId: PropTypes.number,
defaultLanguageProfileId: PropTypes.number,
defaultMetadataProfileId: PropTypes.number,
defaultAlbumFolder: PropTypes.bool.isRequired,
defaultPrimaryAlbumTypes: PropTypes.arrayOf(PropTypes.string).isRequired,
defaultSecondaryAlbumTypes: PropTypes.arrayOf(PropTypes.string).isRequired,
allSelected: PropTypes.bool.isRequired,
allUnselected: PropTypes.bool.isRequired,
selectedState: PropTypes.object.isRequired,
@ -204,6 +205,7 @@ ImportArtistTable.propTypes = {
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,
onSelectedChange: PropTypes.func.isRequired,

3
frontend/src/AddArtist/ImportArtist/Import/ImportArtistTableConnector.js
View file

@ -15,9 +15,8 @@ function createMapStateToProps() {
defaultMonitor: addArtist.defaults.monitor,
defaultQualityProfileId: addArtist.defaults.qualityProfileId,
defaultLanguageProfileId: addArtist.defaults.languageProfileId,
defaultMetadataProfileId: addArtist.defaults.metadataProfileId,
defaultAlbumFolder: addArtist.defaults.albumFolder,
defaultPrimaryAlbumTypes: addArtist.defaults.primaryAlbumTypes,
defaultSecondaryAlbumTypes: addArtist.defaults.secondaryAlbumTypes,
items: importArtist.items,
isSmallScreen: dimensions.isSmallScreen,
allArtists