open-source-mirrors
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New: Added MinAvailability Option to UI

Browse Source
pull/3823/head
Qstick 5 years ago
parent 5eb7fe958f
commit 1514613f61
25 changed files with 246 additions and 28 deletions
Show Stats Download Patch File Download Diff File

13
frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.js
Unescape View File

@ -55,6 +55,7 @@ class AddNewMovieModalContent extends Component {
rootFolderPath,
monitor,
qualityProfileId,
minimumAvailability,
folder,
tags,
isSmallScreen,
@ -126,6 +127,17 @@ class AddNewMovieModalContent extends Component {
/>
</FormGroup>
<FormGroup>
<FormLabel>Minimum Availability</FormLabel>
<FormInputGroup
type={inputTypes.AVAILABILITY_SELECT}
name="minimumAvailability"
onChange={onInputChange}
{...minimumAvailability}
/>
</FormGroup>
<FormGroup>
<FormLabel>Quality Profile</FormLabel>
@ -191,6 +203,7 @@ AddNewMovieModalContent.propTypes = {
rootFolderPath: PropTypes.object,
monitor: PropTypes.object.isRequired,
qualityProfileId: PropTypes.object,
minimumAvailability: PropTypes.object.isRequired,
folder: PropTypes.string.isRequired,
tags: PropTypes.object.isRequired,
isSmallScreen: PropTypes.bool.isRequired,

3
frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContentConnector.js
Unescape View File

@ -59,6 +59,7 @@ class AddNewMovieModalContentConnector extends Component {
rootFolderPath,
monitor,
qualityProfileId,
minimumAvailability,
tags
} = this.props;
@ -67,6 +68,7 @@ class AddNewMovieModalContentConnector extends Component {
rootFolderPath: rootFolderPath.value,
monitor: monitor.value,
qualityProfileId: qualityProfileId.value,
minimumAvailability: minimumAvailability.value,
tags: tags.value,
searchForMovie
});
@ -91,6 +93,7 @@ AddNewMovieModalContentConnector.propTypes = {
rootFolderPath: PropTypes.object,
monitor: PropTypes.object.isRequired,
qualityProfileId: PropTypes.object,
minimumAvailability: PropTypes.object.isRequired,
tags: PropTypes.object.isRequired,
onModalClose: PropTypes.func.isRequired,
setAddMovieDefault: PropTypes.func.isRequired,

40
frontend/src/AddMovie/ImportMovie/Import/ImportMovieFooter.js
Unescape View File

@ -22,12 +22,14 @@ class ImportMovieFooter extends Component {
const {
defaultMonitor,
defaultQualityProfileId
defaultQualityProfileId,
defaultMinimumAvailability
} = props;
this.state = {
monitor: defaultMonitor,
qualityProfileId: defaultQualityProfileId
qualityProfileId: defaultQualityProfileId,
minimumAvailability: defaultMinimumAvailability
};
}
@ -35,13 +37,16 @@ class ImportMovieFooter extends Component {
const {
defaultMonitor,
defaultQualityProfileId,
defaultMinimumAvailability,
isMonitorMixed,
isQualityProfileIdMixed
isQualityProfileIdMixed,
isMinimumAvailabilityMixed
} = this.props;
const {
monitor,
qualityProfileId
qualityProfileId,
minimumAvailability
} = this.state;
const newState = {};
@ -58,6 +63,12 @@ class ImportMovieFooter extends Component {
newState.qualityProfileId = defaultQualityProfileId;
}
if (isMinimumAvailabilityMixed && minimumAvailability !== MIXED) {
newState.minimumAvailability = MIXED;
} else if (!isMinimumAvailabilityMixed && minimumAvailability !== defaultMinimumAvailability) {
newState.minimumAvailability = defaultMinimumAvailability;
}
if (!_.isEmpty(newState)) {
this.setState(newState);
}
@ -81,13 +92,15 @@ class ImportMovieFooter extends Component {
isLookingUpMovie,
isMonitorMixed,
isQualityProfileIdMixed,
isMinimumAvailabilityMixed,
onImportPress,
onCancelLookupPress
} = this.props;
const {
monitor,
qualityProfileId
qualityProfileId,
minimumAvailability
} = this.state;
return (
@ -107,6 +120,21 @@ class ImportMovieFooter extends Component {
/>
</div>
<div className={styles.inputContainer}>
<div className={styles.label}>
Minimum Availability
</div>
<FormInputGroup
type={inputTypes.AVAILABILITY_SELECT}
name="minimumAvailability"
value={minimumAvailability}
isDisabled={!selectedCount}
includeMixed={isMinimumAvailabilityMixed}
onChange={this.onInputChange}
/>
</div>
<div className={styles.inputContainer}>
<div className={styles.label}>
Quality Profile
@ -174,8 +202,10 @@ ImportMovieFooter.propTypes = {
isLookingUpMovie: PropTypes.bool.isRequired,
defaultMonitor: PropTypes.string.isRequired,
defaultQualityProfileId: PropTypes.number,
defaultMinimumAvailability: PropTypes.string,
isMonitorMixed: PropTypes.bool.isRequired,
isQualityProfileIdMixed: PropTypes.bool.isRequired,
isMinimumAvailabilityMixed: PropTypes.bool.isRequired,
onInputChange: PropTypes.func.isRequired,
onImportPress: PropTypes.func.isRequired,
onCancelLookupPress: PropTypes.func.isRequired

8
frontend/src/AddMovie/ImportMovie/Import/ImportMovieFooterConnector.js
Unescape View File

@ -18,7 +18,8 @@ function createMapStateToProps() {
(addMovie, importMovie, selectedIds) => {
const {
monitor: defaultMonitor,
qualityProfileId: defaultQualityProfileId
qualityProfileId: defaultQualityProfileId,
minimumAvailability: defaultMinimumAvailability
} = addMovie.defaults;
const {
@ -29,6 +30,7 @@ function createMapStateToProps() {
const isMonitorMixed = isMixed(items, selectedIds, defaultMonitor, 'monitor');
const isQualityProfileIdMixed = isMixed(items, selectedIds, defaultQualityProfileId, 'qualityProfileId');
const isMinimumAvailabilityMixed = isMixed(items, selectedIds, defaultMinimumAvailability, 'minimumAvailability');
return {
selectedCount: selectedIds.length,
@ -36,8 +38,10 @@ function createMapStateToProps() {
isImporting,
defaultMonitor,
defaultQualityProfileId,
defaultMinimumAvailability,
isMonitorMixed,
isQualityProfileIdMixed
isQualityProfileIdMixed,
isMinimumAvailabilityMixed
};
}
);

1
frontend/src/AddMovie/ImportMovie/Import/ImportMovieHeader.css
Unescape View File

@ -11,6 +11,7 @@
min-width: 185px;
}
.minimumAvailability,
.qualityProfile {
composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';

7
frontend/src/AddMovie/ImportMovie/Import/ImportMovieHeader.js
Unescape View File

@ -34,6 +34,13 @@ function ImportMovieHeader(props) {
Monitor
</VirtualTableHeaderCell>
<VirtualTableHeaderCell
className={styles.minimumAvailability}
name="minimumAvailability"
>
Min Availability
</VirtualTableHeaderCell>
<VirtualTableHeaderCell
className={styles.qualityProfile}
name="qualityProfileId"

1
frontend/src/AddMovie/ImportMovie/Import/ImportMovieRow.css
Unescape View File

@ -16,6 +16,7 @@
min-width: 185px;
}
.minimumAvailability,
.qualityProfile {
composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';

11
frontend/src/AddMovie/ImportMovie/Import/ImportMovieRow.js
Unescape View File

@ -14,6 +14,7 @@ function ImportMovieRow(props) {
id,
monitor,
qualityProfileId,
minimumAvailability,
selectedMovie,
isExistingMovie,
isSelected,
@ -44,6 +45,15 @@ function ImportMovieRow(props) {
/>
</VirtualTableRowCell>
<VirtualTableRowCell className={styles.minimumAvailability}>
<FormInputGroup
type={inputTypes.AVAILABILITY_SELECT}
name="minimumAvailability"
value={minimumAvailability}
onChange={onInputChange}
/>
</VirtualTableRowCell>
<VirtualTableRowCell className={styles.qualityProfile}>
<FormInputGroup
type={inputTypes.QUALITY_PROFILE_SELECT}
@ -68,6 +78,7 @@ ImportMovieRow.propTypes = {
id: PropTypes.string.isRequired,
monitor: PropTypes.string.isRequired,
qualityProfileId: PropTypes.number.isRequired,
minimumAvailability: PropTypes.string.isRequired,
selectedMovie: PropTypes.object,
isExistingMovie: PropTypes.bool.isRequired,
items: PropTypes.arrayOf(PropTypes.object).isRequired,

5
frontend/src/AddMovie/ImportMovie/Import/ImportMovieTable.js
Unescape View File

@ -15,13 +15,15 @@ class ImportMovieTable extends Component {
unmappedFolders,
defaultMonitor,
defaultQualityProfileId,
defaultMinimumAvailability,
onMovieLookup,
onSetImportMovieValue
} = this.props;
const values = {
monitor: defaultMonitor,
qualityProfileId: defaultQualityProfileId
qualityProfileId: defaultQualityProfileId,
minimumAvailability: defaultMinimumAvailability
};
unmappedFolders.forEach((unmappedFolder) => {
@ -165,6 +167,7 @@ ImportMovieTable.propTypes = {
unmappedFolders: PropTypes.arrayOf(PropTypes.object),
defaultMonitor: PropTypes.string.isRequired,
defaultQualityProfileId: PropTypes.number,
defaultMinimumAvailability: PropTypes.string,
allSelected: PropTypes.bool.isRequired,
allUnselected: PropTypes.bool.isRequired,
selectedState: PropTypes.object.isRequired,

1
frontend/src/AddMovie/ImportMovie/Import/ImportMovieTableConnector.js
Unescape View File

@ -14,6 +14,7 @@ function createMapStateToProps() {
return {
defaultMonitor: addMovie.defaults.monitor,
defaultQualityProfileId: addMovie.defaults.qualityProfileId,
defaultMinimumAvailability: addMovie.defaults.minimumAvailability,
items: importMovie.items,
isSmallScreen: dimensions.isSmallScreen,
allMovies

54
frontend/src/Components/Form/AvailabilitySelectInput.js
Unescape View File

@ -0,0 +1,54 @@
import PropTypes from 'prop-types';
import React from 'react';
import SelectInput from './SelectInput';
const availabilityOptions = [
{ key: 'announced', value: 'Announced' },
{ key: 'inCinemas', value: 'In Cinemas' },
{ key: 'released', value: 'Released' },
{ key: 'preDB', value: 'PreDB' }
];
function AvailabilitySelectInput(props) {
const values = [...availabilityOptions];
const {
includeNoChange,
includeMixed
} = props;
if (includeNoChange) {
values.unshift({
key: 'noChange',
value: 'No Change',
disabled: true
});
}
if (includeMixed) {
values.unshift({
key: 'mixed',
value: '(Mixed)',
disabled: true
});
}
return (
<SelectInput
{...props}
values={values}
/>
);
}
AvailabilitySelectInput.propTypes = {
includeNoChange: PropTypes.bool.isRequired,
includeMixed: PropTypes.bool.isRequired
};
AvailabilitySelectInput.defaultProps = {
includeNoChange: false,
includeMixed: false
};
export default AvailabilitySelectInput;

4
frontend/src/Components/Form/FormInputGroup.js
Unescape View File

@ -3,6 +3,7 @@ import React from 'react';
import { inputTypes } from 'Helpers/Props';
import Link from 'Components/Link/Link';
import AutoCompleteInput from './AutoCompleteInput';
import AvailabilitySelectInput from './AvailabilitySelectInput';
import CaptchaInputConnector from './CaptchaInputConnector';
import CheckInput from './CheckInput';
import DeviceInputConnector from './DeviceInputConnector';
@ -26,6 +27,9 @@ function getComponent(type) {
case inputTypes.AUTO_COMPLETE:
return AutoCompleteInput;
case inputTypes.AVAILABILITY_SELECT:
return AvailabilitySelectInput;
case inputTypes.CAPTCHA:
return CaptchaInputConnector;

2
frontend/src/Helpers/Props/inputTypes.js
Unescape View File

@ -1,4 +1,5 @@
export const AUTO_COMPLETE = 'autoComplete';
export const AVAILABILITY_SELECT = 'availabilitySelect';
export const CAPTCHA = 'captcha';
export const CHECK = 'check';
export const DEVICE = 'device';
@ -16,6 +17,7 @@ export const TEXT_TAG = 'textTag';
export const all = [
AUTO_COMPLETE,
AVAILABILITY_SELECT,
CAPTCHA,
CHECK,
DEVICE,

12
frontend/src/Movie/Edit/EditMovieModalContent.js
Unescape View File

@ -69,6 +69,7 @@ class EditMovieModalContent extends Component {
const {
monitored,
qualityProfileId,
minimumAvailability,
// Id,
path,
tags
@ -96,6 +97,17 @@ class EditMovieModalContent extends Component {
/>
</FormGroup>
<FormGroup>
<FormLabel>Minimum Availability</FormLabel>
<FormInputGroup
type={inputTypes.AVAILABILITY_SELECT}
name="minimumAvailability"
{...minimumAvailability}
onChange={onInputChange}
/>
</FormGroup>
<FormGroup>
<FormLabel>Quality Profile</FormLabel>

1
frontend/src/Movie/Edit/EditMovieModalContentConnector.js
Unescape View File

@ -39,6 +39,7 @@ function createMapStateToProps() {
const movieSettings = _.pick(movie, [
'monitored',
'qualityProfileId',
'minimumAvailability',
'path',
'tags'
]);

19
frontend/src/Movie/Editor/MovieEditorFooter.js
Unescape View File

@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { kinds } from 'Helpers/Props';
import SelectInput from 'Components/Form/SelectInput';
import AvailabilitySelectInput from 'Components/Form/AvailabilitySelectInput';
import QualityProfileSelectInputConnector from 'Components/Form/QualityProfileSelectInputConnector';
import RootFolderSelectInputConnector from 'Components/Form/RootFolderSelectInputConnector';
import SpinnerButton from 'Components/Link/SpinnerButton';
@ -25,6 +26,7 @@ class MovieEditorFooter extends Component {
this.state = {
monitored: NO_CHANGE,
qualityProfileId: NO_CHANGE,
minimumAvailability: NO_CHANGE,
rootFolderPath: NO_CHANGE,
savingTags: false,
isDeleteMovieModalOpen: false,
@ -44,6 +46,7 @@ class MovieEditorFooter extends Component {
this.setState({
monitored: NO_CHANGE,
qualityProfileId: NO_CHANGE,
minimumAvailability: NO_CHANGE,
rootFolderPath: NO_CHANGE,
savingTags: false
});
@ -140,6 +143,7 @@ class MovieEditorFooter extends Component {
const {
monitored,
qualityProfileId,
minimumAvailability,
rootFolderPath,
savingTags,
isTagsModalOpen,
@ -186,6 +190,21 @@ class MovieEditorFooter extends Component {
/>
</div>
<div className={styles.inputContainer}>
<MovieEditorFooterLabel
label="Minimum Availability"
isSaving={isSaving && minimumAvailability !== NO_CHANGE}
/>
<AvailabilitySelectInput
name="minimumAvailability"
value={minimumAvailability}
includeNoChange={true}
isDisabled={!selectedCount}
onChange={this.onInputChange}
/>
</div>
<div className={styles.inputContainer}>
<MovieEditorFooterLabel
label="Root Folder"

6
frontend/src/Movie/Index/Table/MovieIndexHeader.css
Unescape View File

@ -10,6 +10,12 @@
flex: 4 0 110px;
}
.minimumAvailability {
composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';
flex: 0 0 140px;
}
.studio {
composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';

22
frontend/src/Movie/Index/Table/MovieIndexHeader.js
Unescape View File

@ -62,15 +62,19 @@ class MovieIndexHeader extends Component {
return null;
}
if (isMovieEditorActive && name === 'select') {
return (
<VirtualTableSelectAllHeaderCell
key={name}
allSelected={allSelected}
allUnselected={allUnselected}
onSelectAllChange={onSelectAllChange}
/>
);
if (name === 'select') {
if (isMovieEditorActive) {
return (
<VirtualTableSelectAllHeaderCell
key={name}
allSelected={allSelected}
allUnselected={allUnselected}
onSelectAllChange={onSelectAllChange}
/>
);
}
return null;
}
if (name === 'actions') {

35
frontend/src/Movie/Index/Table/MovieIndexRow.css
Unescape View File

@ -1,23 +1,36 @@
.status {
.cell {
composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
display: flex;
align-items: center;
}
.status {
composes: cell;
flex: 0 0 60px;
}
.sortTitle {
composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
composes: cell;
flex: 4 0 110px;
}
.minimumAvailability {
composes: cell;
flex: 0 0 140px;
}
.studio {
composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
composes: cell;
flex: 2 0 90px;
}
.qualityProfileId {
composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
composes: cell;
flex: 1 0 125px;
}
@ -26,44 +39,44 @@
.inCinemas,
.physicalRelease,
.genres {
composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
composes: cell;
flex: 0 0 180px;
}
.movieStatus,
.certification {
composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
composes: cell;
flex: 0 0 100px;
}
.path {
composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
composes: cell;
flex: 1 0 150px;
}
.sizeOnDisk {
composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
composes: cell;
flex: 0 0 120px;
}
.ratings {
composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';
composes: cell;
flex: 0 0 80px;
}
.tags {
composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
composes: cell;
flex: 1 0 60px;
}
.actions {
composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
composes: cell;
flex: 0 1 90px;
}

14
frontend/src/Movie/Index/Table/MovieIndexRow.js
Unescape View File

@ -1,6 +1,7 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
// import getProgressBarKind from 'Utilities/Series/getProgressBarKind';
import titleCase from 'Utilities/String/titleCase';
import { icons } from 'Helpers/Props';
import HeartRating from 'Components/HeartRating';
import IconButton from 'Components/Link/IconButton';
@ -73,6 +74,7 @@ class MovieIndexRow extends Component {
added,
inCinemas,
physicalRelease,
minimumAvailability,
path,
genres,
ratings,
@ -201,6 +203,17 @@ class MovieIndexRow extends Component {
);
}
if (name === 'minimumAvailability') {
return (
<VirtualTableRowCell
key={name}
className={styles[name]}
>
{titleCase(minimumAvailability)}
</VirtualTableRowCell>
);
}
if (name === 'path') {
return (
<VirtualTableRowCell
@ -343,6 +356,7 @@ MovieIndexRow.propTypes = {
added: PropTypes.string,
inCinemas: PropTypes.string,
physicalRelease: PropTypes.string,
minimumAvailability: PropTypes.string.isRequired,
path: PropTypes.string.isRequired,
genres: PropTypes.arrayOf(PropTypes.string).isRequired,
ratings: PropTypes.object.isRequired,

1
frontend/src/Store/Actions/addMovieActions.js
Unescape View File

@ -45,6 +45,7 @@ export const defaultState = {
rootFolderPath: '',
monitor: 'true',
qualityProfileId: 0,
minimumAvailability: 'announced',
tags: []
},

6
frontend/src/Store/Actions/movieIndexActions.js
Unescape View File

@ -108,6 +108,12 @@ export const defaultState = {
isSortable: true,
isVisible: false
},
{
name: 'minimumAvailability',
label: 'Min Availability',
isSortable: true,
isVisible: false
},
{
name: 'path',
label: 'Path',

2
frontend/src/Utilities/Movie/getNewMovie.js
Unescape View File

@ -4,6 +4,7 @@ function getNewMovie(movie, payload) {
rootFolderPath,
monitor,
qualityProfileId,
minimumAvailability,
tags,
searchForMovie = false
} = payload;
@ -15,6 +16,7 @@ function getNewMovie(movie, payload) {
movie.addOptions = addOptions;
movie.monitored = monitor === 'true';
movie.qualityProfileId = qualityProfileId;
movie.minimumAvailability = minimumAvailability;
movie.rootFolderPath = rootFolderPath;
movie.tags = tags;

5
src/Radarr.Api.V2/Movies/MovieEditorModule.cs
Unescape View File

@ -41,6 +41,11 @@ namespace Radarr.Api.V2.Movies
movie.ProfileId = resource.QualityProfileId.Value;
}
if (resource.MinimumAvailability.HasValue)
{
movie.MinimumAvailability = resource.MinimumAvailability.Value;
}
if (resource.RootFolderPath.IsNotNullOrWhiteSpace())
{
movie.RootFolderPath = resource.RootFolderPath;

1
src/Radarr.Api.V2/Movies/MovieEditorResource.cs
Unescape View File

@ -9,6 +9,7 @@ namespace Radarr.Api.V2.Movies
public List<int> MovieIds { get; set; }
public bool? Monitored { get; set; }
public int? QualityProfileId { get; set; }
public MovieStatusType? MinimumAvailability { get; set; }
public string RootFolderPath { get; set; }
public List<int> Tags { get; set; }
public ApplyTags ApplyTags { get; set; }

Write Preview
Loading…
Cancel
Save