Fixed: Changes to Profiles, Languages, Manual Import

This commit is contained in:
Qstick
2019-06-18 22:50:17 -04:00
parent c76364a891
commit 9350f6a04c
97 changed files with 1217 additions and 428 deletions

View File

@@ -11,6 +11,7 @@ function ErrorPage(props) {
customFiltersError,
tagsError,
qualityProfilesError,
languagesError,
uiSettingsError,
systemStatusError
} = props;
@@ -27,6 +28,8 @@ function ErrorPage(props) {
errorMessage = getErrorMessage(tagsError, 'Failed to load tags from API');
} else if (qualityProfilesError) {
errorMessage = getErrorMessage(qualityProfilesError, 'Failed to load quality profiles from API');
} else if (languagesError) {
errorMessage = getErrorMessage(languagesError, 'Failed to load languages from API');
} else if (uiSettingsError) {
errorMessage = getErrorMessage(uiSettingsError, 'Failed to load UI settings from API');
} else if (systemStatusError) {
@@ -53,6 +56,7 @@ ErrorPage.propTypes = {
customFiltersError: PropTypes.object,
tagsError: PropTypes.object,
qualityProfilesError: PropTypes.object,
languagesError: PropTypes.object,
uiSettingsError: PropTypes.object,
systemStatusError: PropTypes.object
};

View File

@@ -15,8 +15,9 @@
padding-left: 20px;
}
.logoLink {
line-height: 0;
.logoFull {
width: 144px;
height: 48px;
}
.logo {

View File

@@ -45,19 +45,17 @@ class PageHeader extends Component {
render() {
const {
onSidebarToggle
onSidebarToggle,
isSmallScreen
} = this.props;
return (
<div className={styles.header}>
<div className={styles.logoContainer}>
<Link
className={styles.logoLink}
to={`${window.Radarr.urlBase}/`}
>
<Link to={`${window.Radarr.urlBase}/`}>
<img
className={styles.logo}
src={`${window.Radarr.urlBase}/Content/Images/logo.svg`}
className={isSmallScreen ? styles.logo : styles.logoFull}
src={isSmallScreen ? `${window.Radarr.urlBase}/Content/Images/logo.png` : `${window.Radarr.urlBase}/Content/Images/logo-full.png`}
/>
</Link>
</div>
@@ -95,6 +93,7 @@ class PageHeader extends Component {
PageHeader.propTypes = {
onSidebarToggle: PropTypes.func.isRequired,
isSmallScreen: PropTypes.bool.isRequired,
bindShortcut: PropTypes.func.isRequired
};

View File

@@ -86,6 +86,7 @@ class Page extends Component {
<PageHeader
onSidebarToggle={onSidebarToggle}
isSmallScreen={isSmallScreen}
/>
<div className={styles.main}>

View File

@@ -8,7 +8,7 @@ import { saveDimensions, setIsSidebarVisible } from 'Store/Actions/appActions';
import { fetchCustomFilters } from 'Store/Actions/customFilterActions';
import { fetchMovies } from 'Store/Actions/movieActions';
import { fetchTags } from 'Store/Actions/tagActions';
import { fetchQualityProfiles, fetchUISettings } from 'Store/Actions/settingsActions';
import { fetchQualityProfiles, fetchUISettings, fetchLanguages } from 'Store/Actions/settingsActions';
import { fetchStatus } from 'Store/Actions/systemActions';
import ErrorPage from './ErrorPage';
import LoadingPage from './LoadingPage';
@@ -48,6 +48,7 @@ const selectIsPopulated = createSelector(
(state) => state.tags.isPopulated,
(state) => state.settings.ui.isPopulated,
(state) => state.settings.qualityProfiles.isPopulated,
(state) => state.settings.languages.isPopulated,
(state) => state.system.status.isPopulated,
(
moviesIsPopulated,
@@ -55,6 +56,7 @@ const selectIsPopulated = createSelector(
tagsIsPopulated,
uiSettingsIsPopulated,
qualityProfilesIsPopulated,
languagesIsPopulated,
systemStatusIsPopulated
) => {
return (
@@ -63,6 +65,7 @@ const selectIsPopulated = createSelector(
tagsIsPopulated &&
uiSettingsIsPopulated &&
qualityProfilesIsPopulated &&
languagesIsPopulated &&
systemStatusIsPopulated
);
}
@@ -74,6 +77,7 @@ const selectErrors = createSelector(
(state) => state.tags.error,
(state) => state.settings.ui.error,
(state) => state.settings.qualityProfiles.error,
(state) => state.settings.languages.error,
(state) => state.system.status.error,
(
moviesError,
@@ -81,6 +85,7 @@ const selectErrors = createSelector(
tagsError,
uiSettingsError,
qualityProfilesError,
languagesError,
systemStatusError
) => {
const hasError = !!(
@@ -89,6 +94,7 @@ const selectErrors = createSelector(
tagsError ||
uiSettingsError ||
qualityProfilesError ||
languagesError ||
systemStatusError
);
@@ -99,6 +105,7 @@ const selectErrors = createSelector(
tagsError,
uiSettingsError,
qualityProfilesError,
languagesError,
systemStatusError
};
}
@@ -143,6 +150,9 @@ function createMapDispatchToProps(dispatch, props) {
dispatchFetchQualityProfiles() {
dispatch(fetchQualityProfiles());
},
dispatchFetchLanguages() {
dispatch(fetchLanguages());
},
dispatchFetchUISettings() {
dispatch(fetchUISettings());
},
@@ -177,6 +187,7 @@ class PageConnector extends Component {
this.props.dispatchFetchCustomFilters();
this.props.dispatchFetchTags();
this.props.dispatchFetchQualityProfiles();
this.props.dispatchFetchLanguages();
this.props.dispatchFetchUISettings();
this.props.dispatchFetchStatus();
}
@@ -199,6 +210,7 @@ class PageConnector extends Component {
dispatchFetchMovies,
dispatchFetchTags,
dispatchFetchQualityProfiles,
dispatchFetchLanguages,
dispatchFetchUISettings,
dispatchFetchStatus,
...otherProps
@@ -236,6 +248,7 @@ PageConnector.propTypes = {
dispatchFetchCustomFilters: PropTypes.func.isRequired,
dispatchFetchTags: PropTypes.func.isRequired,
dispatchFetchQualityProfiles: PropTypes.func.isRequired,
dispatchFetchLanguages: PropTypes.func.isRequired,
dispatchFetchUISettings: PropTypes.func.isRequired,
dispatchFetchStatus: PropTypes.func.isRequired,
onSidebarVisibleChange: PropTypes.func.isRequired

View File

@@ -16,24 +16,21 @@
}
.leftButtons,
.centerButtons,
.rightButtons {
display: flex;
flex: 1 0 33%;
flex: 1 0 50%;
flex-wrap: wrap;
}
.centerButtons {
justify-content: center;
}
.rightButtons {
justify-content: flex-end;
}
.importMode {
.importMode,
.bulkSelect {
composes: select from '~Components/Form/SelectInput.css';
margin-right: 10px;
width: auto;
}
@@ -44,7 +41,6 @@
@media only screen and (max-width: $breakpointSmall) {
.footer {
.leftButtons,
.centerButtons,
.rightButtons {
flex-direction: column;
}
@@ -53,10 +49,6 @@
align-items: flex-start;
}
.centerButtons {
align-items: center;
}
.rightButtons {
align-items: flex-end;
}

View File

@@ -20,7 +20,9 @@ import ModalBody from 'Components/Modal/ModalBody';
import ModalFooter from 'Components/Modal/ModalFooter';
import Table from 'Components/Table/Table';
import TableBody from 'Components/Table/TableBody';
import SelectSeriesModal from 'InteractiveImport/Series/SelectSeriesModal';
import SelectLanguageModal from 'InteractiveImport/Language/SelectLanguageModal';
import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal';
import SelectMovieModal from 'InteractiveImport/Movie/SelectMovieModal';
import InteractiveImportRow from './InteractiveImportRow';
import styles from './InteractiveImportModalContent.css';
@@ -32,8 +34,8 @@ const columns = [
isVisible: true
},
{
name: 'series',
label: 'Series',
name: 'movie',
label: 'Movie',
isSortable: true,
isVisible: true
},
@@ -69,6 +71,16 @@ const filterExistingFilesOptions = {
NEW: 'new'
};
const importModeOptions = [
{ key: 'move', value: 'Move Files' },
{ key: 'copy', value: 'Copy Files' }
];
const SELECT = 'select';
const MOVIE = 'movie';
const LANGUAGE = 'language';
const QUALITY = 'quality';
class InteractiveImportModalContent extends Component {
//
@@ -83,7 +95,7 @@ class InteractiveImportModalContent extends Component {
lastToggled: null,
selectedState: {},
invalidRowsSelected: [],
isSelectSeriesModalOpen: false
selectModalOpen: null
};
}
@@ -122,9 +134,17 @@ class InteractiveImportModalContent extends Component {
}
onImportSelectedPress = () => {
const selected = this.getSelectedIds();
const {
downloadId,
showImportMode,
importMode,
onImportSelectedPress
} = this.props;
this.props.onImportSelectedPress(selected, this.props.importMode);
const selected = this.getSelectedIds();
const finalImportMode = downloadId || !showImportMode ? 'auto' : importMode;
onImportSelectedPress(selected, finalImportMode);
}
onFilterExistingFilesChange = (value) => {
@@ -135,12 +155,12 @@ class InteractiveImportModalContent extends Component {
this.props.onImportModeChange(value);
}
onSelectSeriesPress = () => {
this.setState({ isSelectSeriesModalOpen: true });
onSelectModalSelect = ({ value }) => {
this.setState({ selectModalOpen: value });
}
onSelectSeriesModalClose = () => {
this.setState({ isSelectSeriesModalOpen: false });
onSelectModalClose = () => {
this.setState({ selectModalOpen: null });
}
//
@@ -149,7 +169,7 @@ class InteractiveImportModalContent extends Component {
render() {
const {
downloadId,
allowSeriesChange,
allowMovieChange,
showFilterExistingFiles,
showImportMode,
filterExistingFiles,
@@ -172,17 +192,25 @@ class InteractiveImportModalContent extends Component {
allUnselected,
selectedState,
invalidRowsSelected,
isSelectSeriesModalOpen
selectModalOpen
} = this.state;
const selectedIds = this.getSelectedIds();
const errorMessage = getErrorMessage(error, 'Unable to load manual import items');
const importModeOptions = [
{ key: 'move', value: 'Move Files' },
{ key: 'copy', value: 'Copy Files' }
const bulkSelectOptions = [
{ key: SELECT, value: 'Select...', disabled: true },
{ key: LANGUAGE, value: 'Select Language' },
{ key: QUALITY, value: 'Select Quality' }
];
if (allowMovieChange) {
bulkSelectOptions.splice(1, 0, {
key: MOVIE,
value: 'Select Movie'
});
}
return (
<ModalContent onModalClose={onModalClose}>
<ModalHeader>
@@ -258,7 +286,7 @@ class InteractiveImportModalContent extends Component {
key={item.id}
isSelected={selectedState[item.id]}
{...item}
allowSeriesChange={allowSeriesChange}
allowMovieChange={allowMovieChange}
onSelectedChange={this.onSelectedChange}
onValidRowChange={this.onValidRowChange}
/>
@@ -278,24 +306,25 @@ class InteractiveImportModalContent extends Component {
<ModalFooter className={styles.footer}>
<div className={styles.leftButtons}>
{
!downloadId && showImportMode &&
!downloadId && showImportMode ?
<SelectInput
className={styles.importMode}
name="importMode"
value={importMode}
values={importModeOptions}
onChange={this.onImportModeChange}
/>
/> :
null
}
</div>
<div className={styles.centerButtons}>
{
allowSeriesChange &&
<Button onPress={this.onSelectSeriesPress}>
Select Series
</Button>
}
<SelectInput
className={styles.bulkSelect}
name="select"
value={SELECT}
values={bulkSelectOptions}
isDisabled={!selectedIds.length}
onChange={this.onSelectModalSelect}
/>
</div>
<div className={styles.rightButtons}>
@@ -318,10 +347,26 @@ class InteractiveImportModalContent extends Component {
</div>
</ModalFooter>
<SelectSeriesModal
isOpen={isSelectSeriesModalOpen}
<SelectMovieModal
isOpen={selectModalOpen === MOVIE}
ids={selectedIds}
onModalClose={this.onSelectSeriesModalClose}
onModalClose={this.onSelectModalClose}
/>
<SelectLanguageModal
isOpen={selectModalOpen === LANGUAGE}
ids={selectedIds}
languageId={0}
onModalClose={this.onSelectModalClose}
/>
<SelectQualityModal
isOpen={selectModalOpen === QUALITY}
ids={selectedIds}
qualityId={0}
proper={false}
real={false}
onModalClose={this.onSelectModalClose}
/>
</ModalContent>
);
@@ -330,7 +375,7 @@ class InteractiveImportModalContent extends Component {
InteractiveImportModalContent.propTypes = {
downloadId: PropTypes.string,
allowSeriesChange: PropTypes.bool.isRequired,
allowMovieChange: PropTypes.bool.isRequired,
showImportMode: PropTypes.bool.isRequired,
showFilterExistingFiles: PropTypes.bool.isRequired,
filterExistingFiles: PropTypes.bool.isRequired,
@@ -352,7 +397,7 @@ InteractiveImportModalContent.propTypes = {
};
InteractiveImportModalContent.defaultProps = {
allowSeriesChange: true,
allowMovieChange: true,
showFilterExistingFiles: false,
showImportMode: true,
importMode: 'move'

View File

@@ -19,11 +19,11 @@ function createMapStateToProps() {
}
const mapDispatchToProps = {
fetchInteractiveImportItems,
setInteractiveImportSort,
setInteractiveImportMode,
clearInteractiveImport,
executeCommand
dispatchFetchInteractiveImportItems: fetchInteractiveImportItems,
dispatchSetInteractiveImportSort: setInteractiveImportSort,
dispatchSetInteractiveImportMode: setInteractiveImportMode,
dispatchClearInteractiveImport: clearInteractiveImport,
dispatchExecuteCommand: executeCommand
};
class InteractiveImportModalContentConnector extends Component {
@@ -50,7 +50,7 @@ class InteractiveImportModalContentConnector extends Component {
filterExistingFiles
} = this.state;
this.props.fetchInteractiveImportItems({
this.props.dispatchFetchInteractiveImportItems({
downloadId,
folder,
filterExistingFiles
@@ -68,7 +68,7 @@ class InteractiveImportModalContentConnector extends Component {
folder
} = this.props;
this.props.fetchInteractiveImportItems({
this.props.dispatchFetchInteractiveImportItems({
downloadId,
folder,
filterExistingFiles
@@ -77,14 +77,14 @@ class InteractiveImportModalContentConnector extends Component {
}
componentWillUnmount() {
this.props.clearInteractiveImport();
this.props.dispatchClearInteractiveImport();
}
//
// Listeners
onSortPress = (sortKey, sortDirection) => {
this.props.setInteractiveImportSort({ sortKey, sortDirection });
this.props.dispatchSetInteractiveImportSort({ sortKey, sortDirection });
}
onFilterExistingFilesChange = (filterExistingFiles) => {
@@ -92,7 +92,7 @@ class InteractiveImportModalContentConnector extends Component {
}
onImportModeChange = (importMode) => {
this.props.setInteractiveImportMode({ importMode });
this.props.dispatchSetInteractiveImportMode({ importMode });
}
onImportSelectedPress = (selected, importMode) => {
@@ -103,25 +103,13 @@ class InteractiveImportModalContentConnector extends Component {
if (isSelected) {
const {
series,
seasonNumber,
episodes,
movie,
quality,
language
} = item;
if (!series) {
this.setState({ interactiveImportErrorMessage: 'Series must be chosen for each selected file' });
return false;
}
if (isNaN(seasonNumber)) {
this.setState({ interactiveImportErrorMessage: 'Season must be chosen for each selected file' });
return false;
}
if (!episodes || !episodes.length) {
this.setState({ interactiveImportErrorMessage: 'One or more episodes must be chosen for each selected file' });
if (!movie) {
this.setState({ interactiveImportErrorMessage: 'Movie must be chosen for each selected file' });
return false;
}
@@ -138,8 +126,7 @@ class InteractiveImportModalContentConnector extends Component {
files.push({
path: item.path,
folderName: item.folderName,
seriesId: series.id,
episodeIds: _.map(episodes, 'id'),
movieId: movie.id,
quality,
language,
downloadId: this.props.downloadId
@@ -151,7 +138,7 @@ class InteractiveImportModalContentConnector extends Component {
return;
}
this.props.executeCommand({
this.props.dispatchExecuteCommand({
name: commandNames.INTERACTIVE_IMPORT,
files,
importMode
@@ -188,11 +175,11 @@ InteractiveImportModalContentConnector.propTypes = {
folder: PropTypes.string,
filterExistingFiles: PropTypes.bool.isRequired,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
fetchInteractiveImportItems: PropTypes.func.isRequired,
setInteractiveImportSort: PropTypes.func.isRequired,
clearInteractiveImport: PropTypes.func.isRequired,
setInteractiveImportMode: PropTypes.func.isRequired,
executeCommand: PropTypes.func.isRequired,
dispatchFetchInteractiveImportItems: PropTypes.func.isRequired,
dispatchSetInteractiveImportSort: PropTypes.func.isRequired,
dispatchSetInteractiveImportMode: PropTypes.func.isRequired,
dispatchClearInteractiveImport: PropTypes.func.isRequired,
dispatchExecuteCommand: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};

View File

@@ -9,9 +9,10 @@ import TableRowCellButton from 'Components/Table/Cells/TableRowCellButton';
import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
import Popover from 'Components/Tooltip/Popover';
import MovieQuality from 'Movie/MovieQuality';
// import EpisodeLanguage from 'Episode/EpisodeLanguage';
import SelectSeriesModal from 'InteractiveImport/Series/SelectSeriesModal';
// import MovieLanguage from 'Movie/MovieLanguage';
import SelectMovieModal from 'InteractiveImport/Movie/SelectMovieModal';
import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal';
import SelectLanguageModal from 'InteractiveImport/Language/SelectLanguageModal';
import InteractiveImportRowCellPlaceholder from './InteractiveImportRowCellPlaceholder';
import styles from './InteractiveImportRow.css';
@@ -24,21 +25,24 @@ class InteractiveImportRow extends Component {
super(props, context);
this.state = {
isSelectSeriesModalOpen: false,
isSelectQualityModalOpen: false
isSelectMovieModalOpen: false,
isSelectQualityModalOpen: false,
isSelectLanguageModalOpen: false
};
}
componentDidMount() {
const {
id,
series,
quality
movie,
quality,
language
} = this.props;
if (
series &&
quality
movie &&
quality &&
language
) {
this.props.onSelectedChange({ id, value: true });
}
@@ -47,23 +51,26 @@ class InteractiveImportRow extends Component {
componentDidUpdate(prevProps) {
const {
id,
series,
movie,
quality,
language,
isSelected,
onValidRowChange
} = this.props;
if (
prevProps.series === series &&
prevProps.movie === movie &&
prevProps.quality === quality &&
prevProps.language === language &&
prevProps.isSelected === isSelected
) {
return;
}
const isValid = !!(
series &&
quality
movie &&
quality &&
language
);
if (isSelected && !isValid) {
@@ -90,16 +97,20 @@ class InteractiveImportRow extends Component {
//
// Listeners
onSelectSeriesPress = () => {
this.setState({ isSelectSeriesModalOpen: true });
onSelectMoviePress = () => {
this.setState({ isSelectMovieModalOpen: true });
}
onSelectQualityPress = () => {
this.setState({ isSelectQualityModalOpen: true });
}
onSelectSeriesModalClose = (changed) => {
this.setState({ isSelectSeriesModalOpen: false });
onSelectLanguagePress = () => {
this.setState({ isSelectLanguageModalOpen: true });
}
onSelectMovieModalClose = (changed) => {
this.setState({ isSelectMovieModalOpen: false });
this.selectRowAfterChange(changed);
}
@@ -108,16 +119,22 @@ class InteractiveImportRow extends Component {
this.selectRowAfterChange(changed);
}
onSelectLanguageModalClose = (changed) => {
this.setState({ isSelectLanguageModalOpen: false });
this.selectRowAfterChange(changed);
}
//
// Render
render() {
const {
id,
allowSeriesChange,
allowMovieChange,
relativePath,
series,
movie,
quality,
language,
size,
rejections,
isSelected,
@@ -125,14 +142,16 @@ class InteractiveImportRow extends Component {
} = this.props;
const {
isSelectSeriesModalOpen,
isSelectQualityModalOpen
isSelectMovieModalOpen,
isSelectQualityModalOpen,
isSelectLanguageModalOpen
} = this.state;
const seriesTitle = series ? series.title : '';
const movieTitle = movie ? movie.title : '';
const showSeriesPlaceholder = isSelected && !series;
const showMoviePlaceholder = isSelected && !movie;
const showQualityPlaceholder = isSelected && !quality;
const showLanguagePlaceholder = isSelected && !language;
return (
<TableRow>
@@ -150,16 +169,18 @@ class InteractiveImportRow extends Component {
</TableRowCell>
<TableRowCellButton
isDisabled={!allowSeriesChange}
onPress={this.onSelectSeriesPress}
isDisabled={!allowMovieChange}
title={allowMovieChange ? 'Click to change movie' : undefined}
onPress={this.onSelectMoviePress}
>
{
showSeriesPlaceholder ? <InteractiveImportRowCellPlaceholder /> : seriesTitle
showMoviePlaceholder ? <InteractiveImportRowCellPlaceholder /> : movieTitle
}
</TableRowCellButton>
<TableRowCellButton
className={styles.quality}
title="Click to change quality"
onPress={this.onSelectQualityPress}
>
{
@@ -176,6 +197,25 @@ class InteractiveImportRow extends Component {
}
</TableRowCellButton>
<TableRowCellButton
className={styles.language}
title="Click to change language"
onPress={this.onSelectLanguagePress}
>
{
showLanguagePlaceholder &&
<InteractiveImportRowCellPlaceholder />
}
{/* {
!showLanguagePlaceholder && !!language &&
<MovieLanguage
className={styles.label}
language={language}
/>
} */}
</TableRowCellButton>
<TableRowCell>
{formatBytes(size)}
</TableRowCell>
@@ -209,20 +249,27 @@ class InteractiveImportRow extends Component {
}
</TableRowCell>
<SelectSeriesModal
isOpen={isSelectSeriesModalOpen}
<SelectMovieModal
isOpen={isSelectMovieModalOpen}
ids={[id]}
onModalClose={this.onSelectSeriesModalClose}
onModalClose={this.onSelectMovieModalClose}
/>
<SelectQualityModal
isOpen={isSelectQualityModalOpen}
id={id}
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]}
languageId={language ? language.id : 0}
onModalClose={this.onSelectLanguageModalClose}
/>
</TableRow>
);
}
@@ -231,12 +278,11 @@ class InteractiveImportRow extends Component {
InteractiveImportRow.propTypes = {
id: PropTypes.number.isRequired,
allowSeriesChange: PropTypes.bool.isRequired,
allowMovieChange: PropTypes.bool.isRequired,
relativePath: PropTypes.string.isRequired,
series: PropTypes.object,
seasonNumber: PropTypes.number,
episodes: PropTypes.arrayOf(PropTypes.object).isRequired,
movie: PropTypes.object,
quality: PropTypes.object,
language: PropTypes.object,
size: PropTypes.number.isRequired,
rejections: PropTypes.arrayOf(PropTypes.object).isRequired,
isSelected: PropTypes.bool,
@@ -244,8 +290,4 @@ InteractiveImportRow.propTypes = {
onValidRowChange: PropTypes.func.isRequired
};
InteractiveImportRow.defaultProps = {
episodes: []
};
export default InteractiveImportRow;

View File

@@ -0,0 +1,37 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import Modal from 'Components/Modal/Modal';
import SelectLanguageModalContentConnector from './SelectLanguageModalContentConnector';
class SelectLanguageModal extends Component {
//
// Render
render() {
const {
isOpen,
onModalClose,
...otherProps
} = this.props;
return (
<Modal
isOpen={isOpen}
onModalClose={onModalClose}
>
<SelectLanguageModalContentConnector
{...otherProps}
onModalClose={onModalClose}
/>
</Modal>
);
}
}
SelectLanguageModal.propTypes = {
isOpen: PropTypes.bool.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default SelectLanguageModal;

View File

@@ -0,0 +1,87 @@
import PropTypes from 'prop-types';
import React from 'react';
import { inputTypes } from 'Helpers/Props';
import Button from 'Components/Link/Button';
import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import Form from 'Components/Form/Form';
import FormGroup from 'Components/Form/FormGroup';
import FormLabel from 'Components/Form/FormLabel';
import FormInputGroup from 'Components/Form/FormInputGroup';
import ModalContent from 'Components/Modal/ModalContent';
import ModalHeader from 'Components/Modal/ModalHeader';
import ModalBody from 'Components/Modal/ModalBody';
import ModalFooter from 'Components/Modal/ModalFooter';
function SelectLanguageModalContent(props) {
const {
languageId,
isFetching,
isPopulated,
error,
items,
onModalClose,
onLanguageSelect
} = props;
const languageOptions = items.map(( language ) => {
return {
key: language.id,
value: language.name
};
});
return (
<ModalContent onModalClose={onModalClose}>
<ModalHeader>
Manual Import - Select Language
</ModalHeader>
<ModalBody>
{
isFetching &&
<LoadingIndicator />
}
{
!isFetching && !!error &&
<div>Unable to load languages</div>
}
{
isPopulated && !error &&
<Form>
<FormGroup>
<FormLabel>Language</FormLabel>
<FormInputGroup
type={inputTypes.SELECT}
name="language"
value={languageId}
values={languageOptions}
onChange={onLanguageSelect}
/>
</FormGroup>
</Form>
}
</ModalBody>
<ModalFooter>
<Button onPress={onModalClose}>
Cancel
</Button>
</ModalFooter>
</ModalContent>
);
}
SelectLanguageModalContent.propTypes = {
languageId: PropTypes.number.isRequired,
isFetching: PropTypes.bool.isRequired,
isPopulated: PropTypes.bool.isRequired,
error: PropTypes.object,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
onLanguageSelect: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default SelectLanguageModalContent;

View File

@@ -0,0 +1,88 @@
import _ from 'lodash';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { fetchLanguages } from 'Store/Actions/settingsActions';
import { updateInteractiveImportItems } from 'Store/Actions/interactiveImportActions';
import SelectLanguageModalContent from './SelectLanguageModalContent';
function createMapStateToProps() {
return createSelector(
(state) => state.settings.languages,
(languages) => {
const {
isFetching,
isPopulated,
error,
items
} = languages;
return {
isFetching,
isPopulated,
error,
items
};
}
);
}
const mapDispatchToProps = {
dispatchFetchLanguages: fetchLanguages,
dispatchUpdateInteractiveImportItems: updateInteractiveImportItems
};
class SelectLanguageModalContentConnector extends Component {
//
// Lifecycle
componentDidMount = () => {
if (!this.props.isPopulated) {
this.props.dispatchFetchLanguages();
}
}
//
// Listeners
onLanguageSelect = ({ value }) => {
const languageId = parseInt(value);
const language = _.find(this.props.items,
(item) => item.id === languageId);
this.props.dispatchUpdateInteractiveImportItems({
ids: this.props.ids,
language
});
this.props.onModalClose(true);
}
//
// Render
render() {
return (
<SelectLanguageModalContent
{...this.props}
onLanguageSelect={this.onLanguageSelect}
/>
);
}
}
SelectLanguageModalContentConnector.propTypes = {
ids: PropTypes.arrayOf(PropTypes.number).isRequired,
isFetching: PropTypes.bool.isRequired,
isPopulated: PropTypes.bool.isRequired,
error: PropTypes.object,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
dispatchFetchLanguages: PropTypes.func.isRequired,
dispatchUpdateInteractiveImportItems: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default connect(createMapStateToProps, mapDispatchToProps)(SelectLanguageModalContentConnector);

View File

@@ -1,9 +1,9 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import Modal from 'Components/Modal/Modal';
import SelectSeriesModalContentConnector from './SelectSeriesModalContentConnector';
import SelectMovieModalContentConnector from './SelectMovieModalContentConnector';
class SelectSeriesModal extends Component {
class SelectMovieModal extends Component {
//
// Render
@@ -20,7 +20,7 @@ class SelectSeriesModal extends Component {
isOpen={isOpen}
onModalClose={onModalClose}
>
<SelectSeriesModalContentConnector
<SelectMovieModalContentConnector
{...otherProps}
onModalClose={onModalClose}
/>
@@ -29,9 +29,9 @@ class SelectSeriesModal extends Component {
}
}
SelectSeriesModal.propTypes = {
SelectMovieModal.propTypes = {
isOpen: PropTypes.bool.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default SelectSeriesModal;
export default SelectMovieModal;

View File

@@ -8,10 +8,10 @@ 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 SelectSeriesRow from './SelectSeriesRow';
import styles from './SelectSeriesModalContent.css';
import SelectMovieRow from './SelectMovieRow';
import styles from './SelectMovieModalContent.css';
class SelectSeriesModalContent extends Component {
class SelectMovieModalContent extends Component {
//
// Lifecycle
@@ -46,7 +46,7 @@ class SelectSeriesModalContent extends Component {
return (
<ModalContent onModalClose={onModalClose}>
<ModalHeader>
Manual Import - Select Series
Manual Import - Select Movie
</ModalHeader>
<ModalBody
@@ -55,7 +55,7 @@ class SelectSeriesModalContent extends Component {
>
<TextInput
className={styles.filterInput}
placeholder="Filter series"
placeholder="Filter movie"
name="filter"
value={filter}
autoFocus={true}
@@ -67,7 +67,7 @@ class SelectSeriesModalContent extends Component {
items.map((item) => {
return item.title.toLowerCase().includes(filter) ?
(
<SelectSeriesRow
<SelectMovieRow
key={item.id}
id={item.id}
title={item.title}
@@ -90,10 +90,10 @@ class SelectSeriesModalContent extends Component {
}
}
SelectSeriesModalContent.propTypes = {
SelectMovieModalContent.propTypes = {
items: PropTypes.arrayOf(PropTypes.object).isRequired,
onMovieSelect: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default SelectSeriesModalContent;
export default SelectMovieModalContent;

View File

@@ -1,11 +1,10 @@
import _ from 'lodash';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { updateInteractiveImportItem } from 'Store/Actions/interactiveImportActions';
import createAllMoviesSelector from 'Store/Selectors/createAllMoviesSelector';
import SelectSeriesModalContent from './SelectSeriesModalContent';
import SelectMovieModalContent from './SelectMovieModalContent';
function createMapStateToProps() {
return createSelector(
@@ -29,27 +28,32 @@ function createMapStateToProps() {
}
const mapDispatchToProps = {
updateInteractiveImportItem
dispatchUpdateInteractiveImportItem: updateInteractiveImportItem
};
class SelectSeriesModalContentConnector extends Component {
class SelectMovieModalContentConnector extends Component {
//
// Listeners
onMovieSelect = (seriesId) => {
const series = _.find(this.props.items, { id: seriesId });
onMovieSelect = (movieId) => {
const {
ids,
items,
dispatchUpdateInteractiveImportItem,
onModalClose
} = this.props;
this.props.ids.forEach((id) => {
this.props.updateInteractiveImportItem({
const movie = items.find((s) => s.id === movieId);
ids.forEach((id) => {
dispatchUpdateInteractiveImportItem({
id,
series,
seasonNumber: undefined,
episodes: []
movie
});
});
this.props.onModalClose(true);
onModalClose(true);
}
//
@@ -57,7 +61,7 @@ class SelectSeriesModalContentConnector extends Component {
render() {
return (
<SelectSeriesModalContent
<SelectMovieModalContent
{...this.props}
onMovieSelect={this.onMovieSelect}
/>
@@ -65,11 +69,11 @@ class SelectSeriesModalContentConnector extends Component {
}
}
SelectSeriesModalContentConnector.propTypes = {
SelectMovieModalContentConnector.propTypes = {
ids: PropTypes.arrayOf(PropTypes.number).isRequired,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
updateInteractiveImportItem: PropTypes.func.isRequired,
dispatchUpdateInteractiveImportItem: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default connect(createMapStateToProps, mapDispatchToProps)(SelectSeriesModalContentConnector);
export default connect(createMapStateToProps, mapDispatchToProps)(SelectMovieModalContentConnector);

View File

@@ -1,4 +1,4 @@
.series {
.movie {
padding: 8px;
border-bottom: 1px solid $borderColor;
}

View File

@@ -1,9 +1,9 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import Link from 'Components/Link/Link';
import styles from './SelectSeriesRow.css';
import styles from './SelectMovieRow.css';
class SelectSeriesRow extends Component {
class SelectMovieRow extends Component {
//
// Listeners
@@ -18,7 +18,7 @@ class SelectSeriesRow extends Component {
render() {
return (
<Link
className={styles.series}
className={styles.movie}
component="div"
onPress={this.onPress}
>
@@ -28,10 +28,10 @@ class SelectSeriesRow extends Component {
}
}
SelectSeriesRow.propTypes = {
SelectMovieRow.propTypes = {
id: PropTypes.number.isRequired,
title: PropTypes.string.isRequired,
onMovieSelect: PropTypes.func.isRequired
};
export default SelectSeriesRow;
export default SelectMovieRow;

View File

@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import getQualities from 'Utilities/Quality/getQualities';
import { fetchQualityProfileSchema } from 'Store/Actions/settingsActions';
import { updateInteractiveImportItem } from 'Store/Actions/interactiveImportActions';
import { updateInteractiveImportItems } from 'Store/Actions/interactiveImportActions';
import SelectQualityModalContent from './SelectQualityModalContent';
function createMapStateToProps() {
@@ -30,8 +30,8 @@ function createMapStateToProps() {
}
const mapDispatchToProps = {
fetchQualityProfileSchema,
updateInteractiveImportItem
dispatchFetchQualityProfileSchema: fetchQualityProfileSchema,
dispatchUpdateInteractiveImportItems: updateInteractiveImportItems
};
class SelectQualityModalContentConnector extends Component {
@@ -41,7 +41,7 @@ class SelectQualityModalContentConnector extends Component {
componentDidMount = () => {
if (!this.props.isPopulated) {
this.props.fetchQualityProfileSchema();
this.props.dispatchFetchQualityProfileSchema();
}
}
@@ -57,8 +57,8 @@ class SelectQualityModalContentConnector extends Component {
real: real ? 1 : 0
};
this.props.updateInteractiveImportItem({
id: this.props.id,
this.props.dispatchUpdateInteractiveImportItems({
ids: this.props.ids,
quality: {
quality,
revision
@@ -82,13 +82,13 @@ class SelectQualityModalContentConnector extends Component {
}
SelectQualityModalContentConnector.propTypes = {
id: PropTypes.number.isRequired,
ids: PropTypes.arrayOf(PropTypes.number).isRequired,
isFetching: PropTypes.bool.isRequired,
isPopulated: PropTypes.bool.isRequired,
error: PropTypes.object,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
fetchQualityProfileSchema: PropTypes.func.isRequired,
updateInteractiveImportItem: PropTypes.func.isRequired,
dispatchFetchQualityProfileSchema: PropTypes.func.isRequired,
dispatchUpdateInteractiveImportItems: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};

View File

@@ -21,6 +21,7 @@ import MovieIndexFilterMenu from './Menus/MovieIndexFilterMenu';
import MovieIndexSortMenu from './Menus/MovieIndexSortMenu';
import MovieIndexViewMenu from './Menus/MovieIndexViewMenu';
import MovieIndexFooterConnector from './MovieIndexFooterConnector';
import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal';
import styles from './MovieIndex.css';
function getViewComponent(view) {
@@ -49,6 +50,7 @@ class MovieIndex extends Component {
jumpToCharacter: null,
isPosterOptionsModalOpen: false,
isOverviewOptionsModalOpen: false,
isInteractiveImportModalOpen: false,
isRendered: false
};
}
@@ -137,6 +139,14 @@ class MovieIndex extends Component {
this.setState({ isOverviewOptionsModalOpen: false });
}
onInteractiveImportPress = () => {
this.setState({ isInteractiveImportModalOpen: true });
}
onInteractiveImportModalClose = () => {
this.setState({ isInteractiveImportModalOpen: false });
}
onJumpBarItemPress = (jumpToCharacter) => {
this.setState({ jumpToCharacter });
}
@@ -195,6 +205,7 @@ class MovieIndex extends Component {
jumpToCharacter,
isPosterOptionsModalOpen,
isOverviewOptionsModalOpen,
isInteractiveImportModalOpen,
isRendered
} = this.state;
@@ -223,6 +234,28 @@ class MovieIndex extends Component {
onPress={onRssSyncPress}
/>
<PageToolbarSeparator />
<PageToolbarButton
label="Search Missing"
iconName={icons.SEARCH}
isDisabled={hasNoMovie}
/>
<PageToolbarButton
label="Manual Import"
iconName={icons.INTERACTIVE}
onPress={this.onInteractiveImportPress}
/>
<PageToolbarSeparator />
<PageToolbarButton
label="Edit Mode"
iconName={icons.EDIT}
isDisabled={hasNoMovie}
/>
</PageToolbarSection>
<PageToolbarSection
@@ -339,6 +372,11 @@ class MovieIndex extends Component {
isOpen={isOverviewOptionsModalOpen}
onModalClose={this.onOverviewOptionsModalClose}
/>
<InteractiveImportModal
isOpen={isInteractiveImportModalOpen}
onModalClose={this.onInteractiveImportModalClose}
/>
</PageContent>
);
}

View File

@@ -24,6 +24,7 @@
.added,
.inCinemas,
.physicalRelease,
.genres {
composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';

View File

@@ -92,10 +92,12 @@ class EditQualityProfileModalContent extends Component {
isSaving,
saveError,
qualities,
languages,
item,
isInUse,
onInputChange,
onCutoffChange,
onLanguageChange,
onSavePress,
onModalClose,
onDeleteQualityProfilePress,
@@ -105,10 +107,14 @@ class EditQualityProfileModalContent extends Component {
const {
id,
name,
upgradeAllowed,
cutoff,
language,
items
} = item;
const languageId = language.value.id;
return (
<ModalContent onModalClose={onModalClose}>
<Measure
@@ -159,16 +165,48 @@ class EditQualityProfileModalContent extends Component {
<FormGroup size={sizes.EXTRA_SMALL}>
<FormLabel size={sizes.SMALL}>
Cutoff
Upgrades Allowed
</FormLabel>
<FormInputGroup
type={inputTypes.CHECK}
name="upgradeAllowed"
{...upgradeAllowed}
helpText="If disabled qualities will not be upgraded"
onChange={onInputChange}
/>
</FormGroup>
{
upgradeAllowed.value &&
<FormGroup size={sizes.EXTRA_SMALL}>
<FormLabel size={sizes.SMALL}>
Upgrade Until
</FormLabel>
<FormInputGroup
type={inputTypes.SELECT}
name="cutoff"
{...cutoff}
values={qualities}
helpText="Once this quality is reached Radarr will no longer download movies"
onChange={onCutoffChange}
/>
</FormGroup>
}
<FormGroup size={sizes.EXTRA_SMALL}>
<FormLabel size={sizes.SMALL}>
Language
</FormLabel>
<FormInputGroup
type={inputTypes.SELECT}
name="cutoff"
{...cutoff}
values={qualities}
helpText="Once this quality is reached Radarr will no longer download movies"
onChange={onCutoffChange}
name="language"
values={languages}
value={languageId}
helpText="Language for Releases"
onChange={onLanguageChange}
/>
</FormGroup>
</div>
@@ -197,10 +235,10 @@ class EditQualityProfileModalContent extends Component {
>
<ModalFooter>
{
id &&
id ?
<div
className={styles.deleteButtonContainer}
title={isInUse && 'Can\'t delete a quality profile that is attached to a series'}
title={isInUse ? 'Can\'t delete a quality profile that is attached to a movie' : undefined}
>
<Button
kind={kinds.DANGER}
@@ -209,7 +247,8 @@ class EditQualityProfileModalContent extends Component {
>
Delete
</Button>
</div>
</div> :
null
}
<Button
@@ -239,10 +278,12 @@ EditQualityProfileModalContent.propTypes = {
isSaving: PropTypes.bool.isRequired,
saveError: PropTypes.object,
qualities: PropTypes.arrayOf(PropTypes.object).isRequired,
languages: PropTypes.arrayOf(PropTypes.object).isRequired,
item: PropTypes.object.isRequired,
isInUse: PropTypes.bool.isRequired,
onInputChange: PropTypes.func.isRequired,
onCutoffChange: PropTypes.func.isRequired,
onLanguageChange: PropTypes.func.isRequired,
onSavePress: PropTypes.func.isRequired,
onContentHeightChange: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired,

View File

@@ -61,14 +61,38 @@ function createQualitiesSelector() {
);
}
function createLanguagesSelector() {
return createSelector(
(state) => state.settings.languages,
(languages) => {
const items = languages.items;
if (!items) {
return [];
}
const newItems = items.map((item) => {
return {
key: item.id,
value: item.name
};
});
return newItems;
}
);
}
function createMapStateToProps() {
return createSelector(
createProviderSettingsSelector('qualityProfiles'),
createQualitiesSelector(),
createLanguagesSelector(),
createProfileInUseSelector('qualityProfileId'),
(qualityProfile, qualities, isInUse) => {
(qualityProfile, qualities, languages, isInUse) => {
return {
qualities,
languages,
...qualityProfile,
isInUse
};
@@ -159,6 +183,15 @@ class EditQualityProfileModalContentConnector extends Component {
this.props.setQualityProfileValue({ name, value: cutoffId });
}
onLanguageChange = ({ name, value }) => {
const id = parseInt(value);
const language = _.find(this.props.languages, (item) => item.key === id);
this.props.setQualityProfileValue({ name, value: { id: language.key, Name: language.value } });
}
onSavePress = () => {
this.props.saveQualityProfile({ id: this.props.id });
}
@@ -413,6 +446,7 @@ class EditQualityProfileModalContentConnector extends Component {
onSavePress={this.onSavePress}
onInputChange={this.onInputChange}
onCutoffChange={this.onCutoffChange}
onLanguageChange={this.onLanguageChange}
onCreateGroupPress={this.onCreateGroupPress}
onDeleteGroupPress={this.onDeleteGroupPress}
onQualityProfileItemAllowedChange={this.onQualityProfileItemAllowedChange}
@@ -433,6 +467,7 @@ EditQualityProfileModalContentConnector.propTypes = {
isSaving: PropTypes.bool.isRequired,
saveError: PropTypes.object,
item: PropTypes.object.isRequired,
languages: PropTypes.arrayOf(PropTypes.object).isRequired,
setQualityProfileValue: PropTypes.func.isRequired,
fetchQualityProfileSchema: PropTypes.func.isRequired,
saveQualityProfile: PropTypes.func.isRequired,

View File

@@ -65,6 +65,7 @@ class QualityProfile extends Component {
const {
id,
name,
upgradeAllowed,
cutoff,
items,
isDeleting
@@ -97,7 +98,7 @@ class QualityProfile extends Component {
}
if (item.quality) {
const isCutoff = item.quality.id === cutoff;
const isCutoff = upgradeAllowed && item.quality.id === cutoff;
return (
<Label
@@ -110,7 +111,7 @@ class QualityProfile extends Component {
);
}
const isCutoff = item.id === cutoff;
const isCutoff = upgradeAllowed && item.id === cutoff;
return (
<Tooltip
@@ -174,6 +175,7 @@ class QualityProfile extends Component {
QualityProfile.propTypes = {
id: PropTypes.number.isRequired,
name: PropTypes.string.isRequired,
upgradeAllowed: PropTypes.bool.isRequired,
cutoff: PropTypes.number.isRequired,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
isDeleting: PropTypes.bool.isRequired,

View File

@@ -0,0 +1,48 @@
import { createThunk } from 'Store/thunks';
import createFetchHandler from 'Store/Actions/Creators/createFetchHandler';
//
// Variables
const section = 'settings.languages';
//
// Actions Types
export const FETCH_LANGUAGES = 'settings/languages/fetchLanguages';
//
// Action Creators
export const fetchLanguages = createThunk(FETCH_LANGUAGES);
//
// Details
export default {
//
// State
defaultState: {
isFetching: false,
isPopulated: false,
error: null,
items: []
},
//
// Action Handlers
actionHandlers: {
[FETCH_LANGUAGES]: createFetchHandler(section, '/language')
},
//
// Reducers
reducers: {
}
};

View File

@@ -2,11 +2,9 @@ import moment from 'moment';
import { createAction } from 'redux-actions';
import { batchActions } from 'redux-batched-actions';
import createAjaxRequest from 'Utilities/createAjaxRequest';
import updateSectionState from 'Utilities/State/updateSectionState';
import { createThunk, handleThunks } from 'Store/thunks';
import { sortDirections } from 'Helpers/Props';
import createSetClientSideCollectionSortReducer from './Creators/Reducers/createSetClientSideCollectionSortReducer';
import createFetchHandler from './Creators/createFetchHandler';
import createHandleActions from './Creators/createHandleActions';
import { set, update } from './baseActions';
@@ -15,8 +13,6 @@ import { set, update } from './baseActions';
export const section = 'interactiveImport';
const episodesSection = `${section}.episodes`;
//
// State
@@ -36,24 +32,15 @@ export const defaultState = {
return relativePath.toLowerCase();
},
series: function(item, direction) {
const series = item.series;
movie: function(item, direction) {
const movie = item.movie;
return series ? series.sortTitle : '';
return movie ? movie.sortTitle : '';
},
quality: function(item, direction) {
return item.quality ? item.quality.qualityWeight : 0;
}
},
episodes: {
isFetching: false,
isPopulated: false,
error: null,
sortKey: 'episodeNumber',
sortDirection: sortDirections.ASCENDING,
items: []
}
};
@@ -68,30 +55,24 @@ export const persistState = [
export const FETCH_INTERACTIVE_IMPORT_ITEMS = 'interactiveImport/fetchInteractiveImportItems';
export const SET_INTERACTIVE_IMPORT_SORT = 'interactiveImport/setInteractiveImportSort';
export const UPDATE_INTERACTIVE_IMPORT_ITEM = 'interactiveImport/updateInteractiveImportItem';
export const UPDATE_INTERACTIVE_IMPORT_ITEMS = 'interactiveImport/updateInteractiveImportItems';
export const CLEAR_INTERACTIVE_IMPORT = 'interactiveImport/clearInteractiveImport';
export const ADD_RECENT_FOLDER = 'interactiveImport/addRecentFolder';
export const REMOVE_RECENT_FOLDER = 'interactiveImport/removeRecentFolder';
export const SET_INTERACTIVE_IMPORT_MODE = 'interactiveImport/setInteractiveImportMode';
export const FETCH_INTERACTIVE_IMPORT_EPISODES = 'interactiveImport/fetchInteractiveImportEpisodes';
export const SET_INTERACTIVE_IMPORT_EPISODES_SORT = 'interactiveImport/setInteractiveImportEpisodesSort';
export const CLEAR_INTERACTIVE_IMPORT_EPISODES = 'interactiveImport/clearInteractiveImportEpisodes';
//
// Action Creators
export const fetchInteractiveImportItems = createThunk(FETCH_INTERACTIVE_IMPORT_ITEMS);
export const setInteractiveImportSort = createAction(SET_INTERACTIVE_IMPORT_SORT);
export const updateInteractiveImportItem = createAction(UPDATE_INTERACTIVE_IMPORT_ITEM);
export const updateInteractiveImportItems = createAction(UPDATE_INTERACTIVE_IMPORT_ITEMS);
export const clearInteractiveImport = createAction(CLEAR_INTERACTIVE_IMPORT);
export const addRecentFolder = createAction(ADD_RECENT_FOLDER);
export const removeRecentFolder = createAction(REMOVE_RECENT_FOLDER);
export const setInteractiveImportMode = createAction(SET_INTERACTIVE_IMPORT_MODE);
export const fetchInteractiveImportEpisodes = createThunk(FETCH_INTERACTIVE_IMPORT_EPISODES);
export const setInteractiveImportEpisodesSort = createAction(SET_INTERACTIVE_IMPORT_EPISODES_SORT);
export const clearInteractiveImportEpisodes = createAction(CLEAR_INTERACTIVE_IMPORT_EPISODES);
//
// Action Handlers
export const actionHandlers = handleThunks({
@@ -129,9 +110,7 @@ export const actionHandlers = handleThunks({
error: xhr
}));
});
},
[FETCH_INTERACTIVE_IMPORT_EPISODES]: createFetchHandler('interactiveImport.episodes', '/episode')
}
});
//
@@ -152,6 +131,23 @@ export const reducers = createHandleActions({
return newState;
},
[UPDATE_INTERACTIVE_IMPORT_ITEMS]: (state, { payload }) => {
const ids = payload.ids;
const newState = Object.assign({}, state);
const items = [...newState.items];
ids.forEach((id) => {
const index = items.findIndex((item) => item.id === id);
const item = Object.assign({}, items[index], payload);
items.splice(index, 1, item);
});
newState.items = items;
return newState;
},
[ADD_RECENT_FOLDER]: function(state, { payload }) {
const folder = payload.folder;
const recentFolder = { folder, lastUsed: moment().toISOString() };
@@ -191,14 +187,6 @@ export const reducers = createHandleActions({
[SET_INTERACTIVE_IMPORT_MODE]: function(state, { payload }) {
return Object.assign({}, state, { importMode: payload.importMode });
},
[SET_INTERACTIVE_IMPORT_EPISODES_SORT]: createSetClientSideCollectionSortReducer(episodesSection),
[CLEAR_INTERACTIVE_IMPORT_EPISODES]: (state) => {
return updateSectionState(state, episodesSection, {
...defaultState.episodes
});
}
}, defaultState, section);

View File

@@ -8,6 +8,7 @@ import downloadClientOptions from './Settings/downloadClientOptions';
import general from './Settings/general';
import indexerOptions from './Settings/indexerOptions';
import indexers from './Settings/indexers';
import languages from './Settings/languages';
import netImportOptions from './Settings/netImportOptions';
import netImports from './Settings/netImports';
import mediaManagement from './Settings/mediaManagement';
@@ -28,6 +29,7 @@ export * from './Settings/downloadClientOptions';
export * from './Settings/general';
export * from './Settings/indexerOptions';
export * from './Settings/indexers';
export * from './Settings/languages';
export * from './Settings/netImportOptions';
export * from './Settings/netImports';
export * from './Settings/mediaManagement';
@@ -59,6 +61,7 @@ export const defaultState = {
general: general.defaultState,
indexerOptions: indexerOptions.defaultState,
indexers: indexers.defaultState,
languages: languages.defaultState,
netImportOptions: netImportOptions.defaultState,
netImports: netImports.defaultState,
mediaManagement: mediaManagement.defaultState,
@@ -98,6 +101,7 @@ export const actionHandlers = handleThunks({
...general.actionHandlers,
...indexerOptions.actionHandlers,
...indexers.actionHandlers,
...languages.actionHandlers,
...netImportOptions.actionHandlers,
...netImports.actionHandlers,
...mediaManagement.actionHandlers,
@@ -128,6 +132,7 @@ export const reducers = createHandleActions({
...general.reducers,
...indexerOptions.reducers,
...indexers.reducers,
...languages.reducers,
...netImportOptions.reducers,
...netImports.reducers,
...mediaManagement.reducers,