tedkulp/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2026-04-26 22:46:53 -04:00
Code Issues Projects Releases Wiki Activity

New: Edit RlsGroup, Flags, and Edition for Movie Files (#5183)

Browse Source 
* New: Edit RlsGroup and Edition for Movie Files

* fixup! remove console log

* fixup! translation
This commit is contained in:
Qstick
2020-10-15 10:38:30 -04:00
committed by GitHub
parent f2f26d88b9
commit e52288bd67
18 changed files with 685 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/MovieFile/Edit/FileEditModal.js
+37
View File
@@ -0,0 +1,37 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import Modal from 'Components/Modal/Modal';
import FileEditModalContentConnector from './FileEditModalContentConnector';
class FileEditModal extends Component {
//
// Render
render() {
const {
isOpen,
onModalClose,
...otherProps
} = this.props;
return (
<Modal
isOpen={isOpen}
onModalClose={onModalClose}
>
<FileEditModalContentConnector
{...otherProps}
onModalClose={onModalClose}
/>
</Modal>
);
}
}
FileEditModal.propTypes = {
isOpen: PropTypes.bool.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default FileEditModal;
frontend/src/MovieFile/Edit/FileEditModalContent.js
+237
View File
@@ -0,0 +1,237 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import Form from 'Components/Form/Form';
import FormGroup from 'Components/Form/FormGroup';
import FormInputGroup from 'Components/Form/FormInputGroup';
import FormLabel from 'Components/Form/FormLabel';
import Button from 'Components/Link/Button';
import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import ModalBody from 'Components/Modal/ModalBody';
import ModalContent from 'Components/Modal/ModalContent';
import ModalFooter from 'Components/Modal/ModalFooter';
import ModalHeader from 'Components/Modal/ModalHeader';
import { inputTypes, kinds } from 'Helpers/Props';
import translate from 'Utilities/String/translate';
class FileEditModalContent extends Component {
//
// Lifecycle
constructor(props, context) {
super(props, context);
const {
qualityId,
languageIds,
indexerFlags,
proper,
real,
edition,
releaseGroup
} = props;
this.state = {
qualityId,
languageIds,
indexerFlags,
proper,
real,
edition,
releaseGroup
};
}
//
// Listeners
onQualityChange = ({ value }) => {
this.setState({ qualityId: parseInt(value) });
}
onInputChange = ({ name, value }) => {
this.setState({ [name]: value });
}
onSaveInputs = () => {
this.props.onSaveInputs(this.state);
}
//
// Render
render() {
const {
isFetching,
isPopulated,
error,
qualities,
languages,
relativePath,
onModalClose
} = this.props;
const {
qualityId,
languageIds,
indexerFlags,
proper,
real,
edition,
releaseGroup
} = this.state;
const qualityOptions = qualities.map(({ id, name }) => {
return {
key: id,
value: name
};
});
const languageOptions = languages.map(({ id, name }) => {
return {
key: id,
value: name
};
});
return (
<ModalContent onModalClose={onModalClose}>
<ModalHeader>
{translate('EditMovieFile')} - {relativePath}
</ModalHeader>
<ModalBody>
{
isFetching &&
<LoadingIndicator />
}
{
!isFetching && !!error &&
<div>
{translate('UnableToLoadQualities')}
</div>
}
{
isPopulated && !error &&
<Form>
<FormGroup>
<FormLabel>{translate('Quality')}</FormLabel>
<FormInputGroup
type={inputTypes.SELECT}
name="quality"
value={qualityId}
values={qualityOptions}
onChange={this.onQualityChange}
/>
</FormGroup>
<FormGroup>
<FormLabel>{translate('Proper')}</FormLabel>
<FormInputGroup
type={inputTypes.CHECK}
name="proper"
value={proper}
onChange={this.onInputChange}
/>
</FormGroup>
<FormGroup>
<FormLabel>{translate('Real')}</FormLabel>
<FormInputGroup
type={inputTypes.CHECK}
name="real"
value={real}
onChange={this.onInputChange}
/>
</FormGroup>
<FormGroup>
<FormLabel>{translate('Languages')}</FormLabel>
<FormInputGroup
type={inputTypes.SELECT}
name="languageIds"
value={languageIds}
values={languageOptions}
onChange={this.onInputChange}
/>
</FormGroup>
<FormGroup>
<FormLabel>{translate('IndexerFlags')}</FormLabel>
<FormInputGroup
type={inputTypes.INDEXER_FLAGS_SELECT}
name="indexerFlags"
indexerFlags={indexerFlags}
onChange={this.onInputChange}
/>
</FormGroup>
<FormGroup>
<FormLabel>{translate('Edition')}</FormLabel>
<FormInputGroup
type={inputTypes.TEXT}
name="edition"
value={edition}
onChange={this.onInputChange}
/>
</FormGroup>
<FormGroup>
<FormLabel>{translate('ReleaseGroup')}</FormLabel>
<FormInputGroup
type={inputTypes.TEXT}
name="releaseGroup"
value={releaseGroup}
onChange={this.onInputChange}
/>
</FormGroup>
</Form>
}
</ModalBody>
<ModalFooter>
<Button onPress={onModalClose}>
{translate('Cancel')}
</Button>
<Button
kind={kinds.SUCCESS}
onPress={this.onSaveInputs}
>
{translate('Save')}
</Button>
</ModalFooter>
</ModalContent>
);
}
}
FileEditModalContent.propTypes = {
qualityId: PropTypes.number.isRequired,
proper: PropTypes.bool.isRequired,
real: PropTypes.bool.isRequired,
relativePath: PropTypes.string.isRequired,
edition: PropTypes.string.isRequired,
releaseGroup: PropTypes.string.isRequired,
languageIds: PropTypes.arrayOf(PropTypes.number).isRequired,
languages: PropTypes.arrayOf(PropTypes.object).isRequired,
indexerFlags: PropTypes.number.isRequired,
isFetching: PropTypes.bool.isRequired,
isPopulated: PropTypes.bool.isRequired,
error: PropTypes.object,
qualities: PropTypes.arrayOf(PropTypes.object).isRequired,
onSaveInputs: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default FileEditModalContent;
frontend/src/MovieFile/Edit/FileEditModalContentConnector.js
+139
View File
@@ -0,0 +1,139 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { updateMovieFiles } from 'Store/Actions/movieFileActions';
import { fetchQualityProfileSchema } from 'Store/Actions/settingsActions';
import createMovieFileSelector from 'Store/Selectors/createMovieFileSelector';
import getQualities from 'Utilities/Quality/getQualities';
import FileEditModalContent from './FileEditModalContent';
function createMapStateToProps() {
return createSelector(
createMovieFileSelector(),
(state) => state.settings.qualityProfiles,
(state) => state.settings.languages,
(movieFile, qualityProfiles, languages) => {
const filterItems = ['Any', 'Original'];
const filteredLanguages = languages.items.filter((lang) => !filterItems.includes(lang.name));
const quality = movieFile.quality;
return {
isFetching: qualityProfiles.isSchemaFetching || languages.isFetching,
isPopulated: qualityProfiles.isSchemaPopulated && languages.isPopulated,
error: qualityProfiles.error || languages.error,
qualityId: quality ? quality.quality.id : 0,
real: quality ? quality.revision.real > 0 : false,
proper: quality ? quality.revision.version > 1 : false,
qualities: getQualities(qualityProfiles.schema.items),
languageIds: movieFile.languages ? movieFile.languages.map((l) => l.id) : [],
languages: filteredLanguages,
indexerFlags: movieFile.indexerFlags,
edition: movieFile.edition,
releaseGroup: movieFile.releaseGroup,
relativePath: movieFile.relativePath
};
}
);
}
const mapDispatchToProps = {
dispatchFetchQualityProfileSchema: fetchQualityProfileSchema,
dispatchUpdateMovieFiles: updateMovieFiles
};
class FileEditModalContentConnector extends Component {
//
// Lifecycle
componentDidMount = () => {
if (!this.props.isPopulated) {
this.props.dispatchFetchQualityProfileSchema();
}
}
//
// Listeners
onSaveInputs = ( payload ) => {
const {
qualityId,
real,
proper,
languageIds,
edition,
releaseGroup,
indexerFlags
} = payload;
const quality = this.props.qualities.find((item) => item.id === qualityId);
const languages = [];
languageIds.forEach((languageId) => {
const language = this.props.languages.find((item) => item.id === parseInt(languageId));
if (language !== undefined) {
languages.push(language);
}
});
const revision = {
version: proper ? 2 : 1,
real: real ? 1 : 0
};
const movieFileIds = [this.props.movieFileId];
this.props.dispatchUpdateMovieFiles({
movieFileIds,
languages,
indexerFlags,
edition,
releaseGroup,
quality: {
quality,
revision
}
});
this.props.onModalClose(true);
}
//
// Render
render() {
return (
<FileEditModalContent
{...this.props}
onSaveInputs={this.onSaveInputs}
/>
);
}
}
FileEditModalContentConnector.propTypes = {
movieFileId: PropTypes.number.isRequired,
isFetching: PropTypes.bool.isRequired,
isPopulated: PropTypes.bool.isRequired,
error: PropTypes.object,
qualities: PropTypes.arrayOf(PropTypes.object).isRequired,
languages: PropTypes.arrayOf(PropTypes.object).isRequired,
languageIds: PropTypes.arrayOf(PropTypes.number).isRequired,
indexerFlags: PropTypes.number.isRequired,
qualityId: PropTypes.number.isRequired,
real: PropTypes.bool.isRequired,
edition: PropTypes.string.isRequired,
releaseGroup: PropTypes.string.isRequired,
relativePath: PropTypes.string.isRequired,
proper: PropTypes.bool.isRequired,
dispatchFetchQualityProfileSchema: PropTypes.func.isRequired,
dispatchUpdateMovieFiles: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default connect(createMapStateToProps, mapDispatchToProps)(FileEditModalContentConnector);
frontend/src/MovieFile/Editor/MovieFileEditorRow.js
+27 -48
View File
@@ -3,16 +3,14 @@ import React, { Component } from 'react';
import IconButton from 'Components/Link/IconButton';
import ConfirmModal from 'Components/Modal/ConfirmModal';
import TableRowCell from 'Components/Table/Cells/TableRowCell';
import TableRowCellButton from 'Components/Table/Cells/TableRowCellButton';
import TableRow from 'Components/Table/TableRow';
import { icons, kinds } from 'Helpers/Props';
import MovieFormats from 'Movie/MovieFormats';
import MovieLanguage from 'Movie/MovieLanguage';
import MovieQuality from 'Movie/MovieQuality';
import SelectLanguageModal from 'MovieFile/Language/SelectLanguageModal';
import FileEditModal from 'MovieFile/Edit/FileEditModal';
import MediaInfoConnector from 'MovieFile/MediaInfoConnector';
import * as mediaInfoTypes from 'MovieFile/mediaInfoTypes';
import SelectQualityModal from 'MovieFile/Quality/SelectQualityModal';
import formatBytes from 'Utilities/Number/formatBytes';
import translate from 'Utilities/String/translate';
import FileDetailsModal from '../FileDetailsModal';
@@ -28,32 +26,15 @@ class MovieFileEditorRow extends Component {
super(props, context);
this.state = {
isSelectQualityModalOpen: false,
isSelectLanguageModalOpen: false,
isConfirmDeleteModalOpen: false,
isFileDetailsModalOpen: false
isFileDetailsModalOpen: false,
isFileEditModalOpen: false
};
}
//
// Listeners
onSelectQualityPress = () => {
this.setState({ isSelectQualityModalOpen: true });
}
onSelectLanguagePress = () => {
this.setState({ isSelectLanguageModalOpen: true });
}
onSelectQualityModalClose = () => {
this.setState({ isSelectQualityModalOpen: false });
}
onSelectLanguageModalClose = () => {
this.setState({ isSelectLanguageModalOpen: false });
}
onDeletePress = () => {
this.setState({ isConfirmDeleteModalOpen: true });
}
@@ -76,6 +57,14 @@ class MovieFileEditorRow extends Component {
this.setState({ isFileDetailsModalOpen: false });
}
onFileEditPress = () => {
this.setState({ isFileEditModalOpen: true });
}
onFileEditModalClose = () => {
this.setState({ isFileEditModalOpen: false });
}
//
// Render
@@ -92,9 +81,8 @@ class MovieFileEditorRow extends Component {
} = this.props;
const {
isSelectQualityModalOpen,
isSelectLanguageModalOpen,
isFileDetailsModalOpen,
isFileEditModalOpen,
isConfirmDeleteModalOpen
} = this.state;
@@ -132,10 +120,8 @@ class MovieFileEditorRow extends Component {
{formatBytes(size)}
</TableRowCell>
<TableRowCellButton
<TableRowCell
className={styles.language}
title={translate('ClickToChangeLanguage')}
onPress={this.onSelectLanguagePress}
>
{
showLanguagePlaceholder &&
@@ -149,12 +135,10 @@ class MovieFileEditorRow extends Component {
languages={languages}
/>
}
</TableRowCellButton>
</TableRowCell>
<TableRowCellButton
<TableRowCell
className={styles.quality}
title={translate('ClickToChangeQuality')}
onPress={this.onSelectQualityPress}
>
{
showQualityPlaceholder &&
@@ -169,7 +153,7 @@ class MovieFileEditorRow extends Component {
isCutoffNotMet={qualityCutoffNotMet}
/>
}
</TableRowCellButton>
</TableRowCell>
<TableRowCell
className={styles.formats}
@@ -180,6 +164,11 @@ class MovieFileEditorRow extends Component {
</TableRowCell>
<TableRowCell className={styles.actions}>
<IconButton
name={icons.EDIT}
onPress={this.onFileEditPress}
/>
<IconButton
name={icons.MEDIA_INFO}
onPress={this.onFileDetailsPress}
@@ -198,6 +187,12 @@ class MovieFileEditorRow extends Component {
mediaInfo={mediaInfo}
/>
<FileEditModal
movieFileId={id}
isOpen={isFileEditModalOpen}
onModalClose={this.onFileEditModalClose}
/>
<ConfirmModal
isOpen={isConfirmDeleteModalOpen}
ids={[id]}
@@ -208,22 +203,6 @@ class MovieFileEditorRow extends Component {
onConfirm={this.onConfirmDelete}
onCancel={this.onConfirmDeleteModalClose}
/>
<SelectQualityModal
isOpen={isSelectQualityModalOpen}
ids={[id]}
qualityId={quality ? quality.quality.id : 0}
proper={quality ? quality.revision.version > 1 : false}
real={quality ? quality.revision.real > 0 : false}
onModalClose={this.onSelectQualityModalClose}
/>
<SelectLanguageModal
isOpen={isSelectLanguageModalOpen}
ids={[id]}
languageIds={languages ? languages.map((l) => l.id) : []}
onModalClose={this.onSelectLanguageModalClose}
/>
</TableRow>
);
}