{
+ this.setState({ isRetaggingArtistModalOpen: true });
+ }
+
+ onRetagArtistModalClose = (organized) => {
+ this.setState({ isRetaggingArtistModalOpen: false });
+
+ if (organized === true) {
+ this.onSelectAllChange({ value: false });
+ }
+ }
+
//
// Render
@@ -162,6 +176,7 @@ class ArtistEditor extends Component {
isDeleting,
deleteError,
isOrganizingArtist,
+ isRetaggingArtist,
showLanguageProfile,
showMetadataProfile,
onSortPress,
@@ -250,10 +265,12 @@ class ArtistEditor extends Component {
isDeleting={isDeleting}
deleteError={deleteError}
isOrganizingArtist={isOrganizingArtist}
+ isRetaggingArtist={isRetaggingArtist}
showLanguageProfile={showLanguageProfile}
showMetadataProfile={showMetadataProfile}
onSaveSelected={this.onSaveSelected}
onOrganizeArtistPress={this.onOrganizeArtistPress}
+ onRetagArtistPress={this.onRetagArtistPress}
/>
+
+
+
);
}
@@ -282,6 +306,7 @@ ArtistEditor.propTypes = {
isDeleting: PropTypes.bool.isRequired,
deleteError: PropTypes.object,
isOrganizingArtist: PropTypes.bool.isRequired,
+ isRetaggingArtist: PropTypes.bool.isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
onSortPress: PropTypes.func.isRequired,
diff --git a/frontend/src/Artist/Editor/ArtistEditorConnector.js b/frontend/src/Artist/Editor/ArtistEditorConnector.js
index d029bbec2..b155a0647 100644
--- a/frontend/src/Artist/Editor/ArtistEditorConnector.js
+++ b/frontend/src/Artist/Editor/ArtistEditorConnector.js
@@ -16,9 +16,11 @@ function createMapStateToProps() {
(state) => state.settings.metadataProfiles,
createClientSideCollectionSelector('artist', 'artistEditor'),
createCommandExecutingSelector(commandNames.RENAME_ARTIST),
- (languageProfiles, metadataProfiles, artist, isOrganizingArtist) => {
+ createCommandExecutingSelector(commandNames.RETAG_ARTIST),
+ (languageProfiles, metadataProfiles, artist, isOrganizingArtist, isRetaggingArtist) => {
return {
isOrganizingArtist,
+ isRetaggingArtist,
showLanguageProfile: languageProfiles.items.length > 1,
showMetadataProfile: metadataProfiles.items.length > 1,
...artist
diff --git a/frontend/src/Artist/Editor/ArtistEditorFooter.js b/frontend/src/Artist/Editor/ArtistEditorFooter.js
index 36b39c518..bb1a5dca2 100644
--- a/frontend/src/Artist/Editor/ArtistEditorFooter.js
+++ b/frontend/src/Artist/Editor/ArtistEditorFooter.js
@@ -145,9 +145,11 @@ class ArtistEditorFooter extends Component {
isSaving,
isDeleting,
isOrganizingArtist,
+ isRetaggingArtist,
showLanguageProfile,
showMetadataProfile,
- onOrganizeArtistPress
+ onOrganizeArtistPress,
+ onRetagArtistPress
} = this.props;
const {
@@ -288,19 +290,29 @@ class ArtistEditorFooter extends Component {
className={styles.organizeSelectedButton}
kind={kinds.WARNING}
isSpinning={isOrganizingArtist}
- isDisabled={!selectedCount || isOrganizingArtist}
+ isDisabled={!selectedCount || isOrganizingArtist || isRetaggingArtist}
onPress={onOrganizeArtistPress}
>
Rename Files
+
+ Write Metadata Tags
+
+
- Set Tags
+ Set Lidarr Tags
@@ -350,10 +362,12 @@ ArtistEditorFooter.propTypes = {
isDeleting: PropTypes.bool.isRequired,
deleteError: PropTypes.object,
isOrganizingArtist: PropTypes.bool.isRequired,
+ isRetaggingArtist: PropTypes.bool.isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
onSaveSelected: PropTypes.func.isRequired,
- onOrganizeArtistPress: PropTypes.func.isRequired
+ onOrganizeArtistPress: PropTypes.func.isRequired,
+ onRetagArtistPress: PropTypes.func.isRequired
};
export default ArtistEditorFooter;
diff --git a/frontend/src/Artist/Editor/AudioTags/RetagArtistModal.js b/frontend/src/Artist/Editor/AudioTags/RetagArtistModal.js
new file mode 100644
index 000000000..636ca6618
--- /dev/null
+++ b/frontend/src/Artist/Editor/AudioTags/RetagArtistModal.js
@@ -0,0 +1,31 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Modal from 'Components/Modal/Modal';
+import RetagArtistModalContentConnector from './RetagArtistModalContentConnector';
+
+function RetagArtistModal(props) {
+ const {
+ isOpen,
+ onModalClose,
+ ...otherProps
+ } = props;
+
+ return (
+
+
+
+ );
+}
+
+RetagArtistModal.propTypes = {
+ isOpen: PropTypes.bool.isRequired,
+ onModalClose: PropTypes.func.isRequired
+};
+
+export default RetagArtistModal;
diff --git a/frontend/src/Artist/Editor/AudioTags/RetagArtistModalContent.css b/frontend/src/Artist/Editor/AudioTags/RetagArtistModalContent.css
new file mode 100644
index 000000000..02c52edc8
--- /dev/null
+++ b/frontend/src/Artist/Editor/AudioTags/RetagArtistModalContent.css
@@ -0,0 +1,8 @@
+.retagIcon {
+ margin-left: 5px;
+}
+
+.message {
+ margin-top: 20px;
+ margin-bottom: 10px;
+}
diff --git a/frontend/src/Artist/Editor/AudioTags/RetagArtistModalContent.js b/frontend/src/Artist/Editor/AudioTags/RetagArtistModalContent.js
new file mode 100644
index 000000000..015112556
--- /dev/null
+++ b/frontend/src/Artist/Editor/AudioTags/RetagArtistModalContent.js
@@ -0,0 +1,73 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import { icons, kinds } from 'Helpers/Props';
+import Alert from 'Components/Alert';
+import Button from 'Components/Link/Button';
+import Icon from 'Components/Icon';
+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 styles from './RetagArtistModalContent.css';
+
+function RetagArtistModalContent(props) {
+ const {
+ artistNames,
+ onModalClose,
+ onRetagArtistPress
+ } = props;
+
+ return (
+
+
+ Retag Selected Artist
+
+
+
+
+ Tip: To preview the tags that will be written... select "Cancel" then click any artist name and use the
+
+
+
+
+ Are you sure you want to re-tag all files in the {artistNames.length} selected artist?
+
+
+ {
+ artistNames.map((artistName) => {
+ return (
+ -
+ {artistName}
+
+ );
+ })
+ }
+
+
+
+
+
+
+
+
+
+ );
+}
+
+RetagArtistModalContent.propTypes = {
+ artistNames: PropTypes.arrayOf(PropTypes.string).isRequired,
+ onModalClose: PropTypes.func.isRequired,
+ onRetagArtistPress: PropTypes.func.isRequired
+};
+
+export default RetagArtistModalContent;
diff --git a/frontend/src/Artist/Editor/AudioTags/RetagArtistModalContentConnector.js b/frontend/src/Artist/Editor/AudioTags/RetagArtistModalContentConnector.js
new file mode 100644
index 000000000..1c104db00
--- /dev/null
+++ b/frontend/src/Artist/Editor/AudioTags/RetagArtistModalContentConnector.js
@@ -0,0 +1,67 @@
+import _ from 'lodash';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import createAllArtistSelector from 'Store/Selectors/createAllArtistSelector';
+import { executeCommand } from 'Store/Actions/commandActions';
+import * as commandNames from 'Commands/commandNames';
+import RetagArtistModalContent from './RetagArtistModalContent';
+
+function createMapStateToProps() {
+ return createSelector(
+ (state, { artistIds }) => artistIds,
+ createAllArtistSelector(),
+ (artistIds, allArtists) => {
+ const artist = _.intersectionWith(allArtists, artistIds, (s, id) => {
+ return s.id === id;
+ });
+
+ const sortedArtist = _.orderBy(artist, 'sortName');
+ const artistNames = _.map(sortedArtist, 'artistName');
+
+ return {
+ artistNames
+ };
+ }
+ );
+}
+
+const mapDispatchToProps = {
+ executeCommand
+};
+
+class RetagArtistModalContentConnector extends Component {
+
+ //
+ // Listeners
+
+ onRetagArtistPress = () => {
+ this.props.executeCommand({
+ name: commandNames.RETAG_ARTIST,
+ artistIds: this.props.artistIds
+ });
+
+ this.props.onModalClose(true);
+ }
+
+ //
+ // Render
+
+ render(props) {
+ return (
+
+ );
+ }
+}
+
+RetagArtistModalContentConnector.propTypes = {
+ artistIds: PropTypes.arrayOf(PropTypes.number).isRequired,
+ onModalClose: PropTypes.func.isRequired,
+ executeCommand: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(RetagArtistModalContentConnector);
diff --git a/frontend/src/Commands/commandNames.js b/frontend/src/Commands/commandNames.js
index f9ff7103a..110f94939 100644
--- a/frontend/src/Commands/commandNames.js
+++ b/frontend/src/Commands/commandNames.js
@@ -14,6 +14,8 @@ export const MOVE_ARTIST = 'MoveArtist';
export const REFRESH_ARTIST = 'RefreshArtist';
export const RENAME_FILES = 'RenameFiles';
export const RENAME_ARTIST = 'RenameArtist';
+export const RETAG_FILES = 'RetagFiles';
+export const RETAG_ARTIST = 'RetagArtist';
export const RESET_API_KEY = 'ResetApiKey';
export const RSS_SYNC = 'RssSync';
export const SEASON_SEARCH = 'AlbumSearch';
diff --git a/frontend/src/Helpers/Props/icons.js b/frontend/src/Helpers/Props/icons.js
index 1e3311aff..86ea9c58b 100644
--- a/frontend/src/Helpers/Props/icons.js
+++ b/frontend/src/Helpers/Props/icons.js
@@ -25,7 +25,9 @@ import {
faArrowCircleLeft as fasArrowCircleLeft,
faArrowCircleRight as fasArrowCircleRight,
faArrowCircleUp as fasArrowCircleUp,
+ faLongArrowAltRight as fasLongArrowAltRight,
faBackward as fasBackward,
+ faBan as fasBan,
faBars as fasBars,
faBolt as fasBolt,
faBookmark as fasBookmark,
@@ -47,6 +49,7 @@ import {
faCopy as fasCopy,
faDesktop as fasDesktop,
faDownload as fasDownload,
+ faEdit as fasEdit,
faEllipsisH as fasEllipsisH,
faExclamationCircle as fasExclamationCircle,
faExclamationTriangle as fasExclamationTriangle,
@@ -111,8 +114,10 @@ export const ALTERNATE_TITLES = farClone;
export const ADVANCED_SETTINGS = fasCog;
export const ARROW_LEFT = fasArrowCircleLeft;
export const ARROW_RIGHT = fasArrowCircleRight;
+export const ARROW_RIGHT_NO_CIRCLE = fasLongArrowAltRight;
export const ARROW_UP = fasArrowCircleUp;
export const BACKUP = farFileArchive;
+export const BAN = fasBan;
export const BUG = fasBug;
export const CALENDAR = fasCalendarAlt;
export const CALENDAR_O = farCalendar;
@@ -176,9 +181,10 @@ export const QUEUED = fasCloud;
export const QUICK = fasRocket;
export const REFRESH = fasSync;
export const REMOVE = fasTimes;
+export const REORDER = fasBars;
export const RESTART = fasRedoAlt;
export const RESTORE = fasHistory;
-export const REORDER = fasBars;
+export const RETAG = fasEdit;
export const RSS = fasRss;
export const SAVE = fasSave;
export const SCHEDULED = farClock;
diff --git a/frontend/src/Organize/OrganizePreviewModalContent.js b/frontend/src/Organize/OrganizePreviewModalContent.js
index 3bb724cfa..6f20a9d3c 100644
--- a/frontend/src/Organize/OrganizePreviewModalContent.js
+++ b/frontend/src/Organize/OrganizePreviewModalContent.js
@@ -74,7 +74,6 @@ class OrganizePreviewModalContent extends Component {
isPopulated,
error,
items,
- renameTracks,
trackFormat,
path,
onModalClose
@@ -107,13 +106,7 @@ class OrganizePreviewModalContent extends Component {
{
!isFetching && isPopulated && !items.length &&
-
- {
- renameTracks ?
-
Success! My work is done, no files to rename.
:
-
Renaming is disabled, nothing to rename
- }
-
Success! My work is done, no files to rename.
}
{
@@ -191,7 +184,6 @@ OrganizePreviewModalContent.propTypes = {
error: PropTypes.object,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
path: PropTypes.string.isRequired,
- renameTracks: PropTypes.bool,
trackFormat: PropTypes.string,
onOrganizePress: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
diff --git a/frontend/src/Organize/OrganizePreviewModalContentConnector.js b/frontend/src/Organize/OrganizePreviewModalContentConnector.js
index f620f8a0e..deec48a13 100644
--- a/frontend/src/Organize/OrganizePreviewModalContentConnector.js
+++ b/frontend/src/Organize/OrganizePreviewModalContentConnector.js
@@ -19,7 +19,6 @@ function createMapStateToProps() {
props.isFetching = organizePreview.isFetching || naming.isFetching;
props.isPopulated = organizePreview.isPopulated && naming.isPopulated;
props.error = organizePreview.error || naming.error;
- props.renameTracks = naming.item.renameTracks;
props.trackFormat = naming.item.standardTrackFormat;
props.path = artist.path;
diff --git a/frontend/src/Retag/RetagPreviewModal.js b/frontend/src/Retag/RetagPreviewModal.js
new file mode 100644
index 000000000..6abcfa09a
--- /dev/null
+++ b/frontend/src/Retag/RetagPreviewModal.js
@@ -0,0 +1,34 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Modal from 'Components/Modal/Modal';
+import RetagPreviewModalContentConnector from './RetagPreviewModalContentConnector';
+
+function RetagPreviewModal(props) {
+ const {
+ isOpen,
+ onModalClose,
+ ...otherProps
+ } = props;
+
+ return (
+
+ {
+ isOpen &&
+
+ }
+
+ );
+}
+
+RetagPreviewModal.propTypes = {
+ isOpen: PropTypes.bool.isRequired,
+ onModalClose: PropTypes.func.isRequired
+};
+
+export default RetagPreviewModal;
diff --git a/frontend/src/Retag/RetagPreviewModalConnector.js b/frontend/src/Retag/RetagPreviewModalConnector.js
new file mode 100644
index 000000000..fa2e69d20
--- /dev/null
+++ b/frontend/src/Retag/RetagPreviewModalConnector.js
@@ -0,0 +1,39 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { clearRetagPreview } from 'Store/Actions/retagPreviewActions';
+import RetagPreviewModal from './RetagPreviewModal';
+
+const mapDispatchToProps = {
+ clearRetagPreview
+};
+
+class RetagPreviewModalConnector extends Component {
+
+ //
+ // Listeners
+
+ onModalClose = () => {
+ this.props.clearRetagPreview();
+ this.props.onModalClose();
+ }
+
+ //
+ // Render
+
+ render() {
+ return (
+
+ );
+ }
+}
+
+RetagPreviewModalConnector.propTypes = {
+ clearRetagPreview: PropTypes.func.isRequired,
+ onModalClose: PropTypes.func.isRequired
+};
+
+export default connect(undefined, mapDispatchToProps)(RetagPreviewModalConnector);
diff --git a/frontend/src/Retag/RetagPreviewModalContent.css b/frontend/src/Retag/RetagPreviewModalContent.css
new file mode 100644
index 000000000..cf20af7a2
--- /dev/null
+++ b/frontend/src/Retag/RetagPreviewModalContent.css
@@ -0,0 +1,24 @@
+.path {
+ margin-left: 5px;
+ font-weight: bold;
+}
+
+.trackFormat {
+ margin-left: 5px;
+ font-family: $monoSpaceFontFamily;
+}
+
+.previews {
+ margin-top: 10px;
+}
+
+.selectAllInputContainer {
+ margin-right: auto;
+ line-height: 30px;
+}
+
+.selectAllInput {
+ composes: input from '~Components/Form/CheckInput.css';
+
+ margin: 0;
+}
diff --git a/frontend/src/Retag/RetagPreviewModalContent.js b/frontend/src/Retag/RetagPreviewModalContent.js
new file mode 100644
index 000000000..5530d63fb
--- /dev/null
+++ b/frontend/src/Retag/RetagPreviewModalContent.js
@@ -0,0 +1,186 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import getSelectedIds from 'Utilities/Table/getSelectedIds';
+import selectAll from 'Utilities/Table/selectAll';
+import toggleSelected from 'Utilities/Table/toggleSelected';
+import { kinds } from 'Helpers/Props';
+import Alert from 'Components/Alert';
+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 CheckInput from 'Components/Form/CheckInput';
+import RetagPreviewRow from './RetagPreviewRow';
+import styles from './RetagPreviewModalContent.css';
+
+function getValue(allSelected, allUnselected) {
+ if (allSelected) {
+ return true;
+ } else if (allUnselected) {
+ return false;
+ }
+
+ return null;
+}
+
+class RetagPreviewModalContent extends Component {
+
+ //
+ // Lifecycle
+
+ constructor(props, context) {
+ super(props, context);
+
+ this.state = {
+ allSelected: false,
+ allUnselected: false,
+ lastToggled: null,
+ selectedState: {}
+ };
+ }
+
+ //
+ // 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);
+ });
+ }
+
+ onRetagPress = () => {
+ this.props.onRetagPress(this.getSelectedIds());
+ }
+
+ //
+ // Render
+
+ render() {
+ const {
+ isFetching,
+ isPopulated,
+ error,
+ items,
+ path,
+ onModalClose
+ } = this.props;
+
+ const {
+ allSelected,
+ allUnselected,
+ selectedState
+ } = this.state;
+
+ const selectAllValue = getValue(allSelected, allUnselected);
+
+ return (
+
+
+ Write Metadata Tags
+
+
+
+ {
+ isFetching &&
+
+ }
+
+ {
+ !isFetching && error &&
+ Error loading previews
+ }
+
+ {
+ !isFetching && ((isPopulated && !items.length)) &&
+ Success! My work is done, no files to retag.
+ }
+
+ {
+ !isFetching && isPopulated && !!items.length &&
+
+
+
+ All paths are relative to:
+
+ {path}
+
+
+
+ MusicBrainz identifiers will also be added to the files; these are not shown below.
+
+
+
+
+ {
+ items.map((item) => {
+ return (
+
+ );
+ })
+ }
+
+
{formatMissing(oldValue)} {formatMissing(newValue)}
+ );
+}
+
+class RetagPreviewRow extends Component {
+
+ //
+ // Lifecycle
+
+ componentDidMount() {
+ const {
+ id,
+ onSelectedChange
+ } = this.props;
+
+ onSelectedChange({ id, value: true });
+ }
+
+ //
+ // Listeners
+
+ onSelectedChange = ({ value, shiftKey }) => {
+ const {
+ id,
+ onSelectedChange
+ } = this.props;
+
+ onSelectedChange({ id, value, shiftKey });
+ }
+
+ //
+ // Render
+
+ render() {
+ const {
+ id,
+ path,
+ changes,
+ isSelected
+ } = this.props;
+
+ return (
+
+
+
+
+
+ {path}
+
+
+
+ {
+ changes.map(({ field, oldValue, newValue }) => {
+ return (
+
+ );
+ })
+ }
+
+
+