) => void;
}
@@ -96,6 +98,7 @@ export function PathInputInternal(props: PathInputInternalProps) {
value: inputValue = '',
paths,
includeFiles,
+ hasButton,
hasFileBrowser = true,
onChange,
onFetchPaths,
@@ -229,9 +232,12 @@ export function PathInputInternal(props: PathInputInternalProps) {
/>
{hasFileBrowser ? (
-
+ <>
@@ -245,7 +251,7 @@ export function PathInputInternal(props: PathInputInternalProps) {
onChange={onChange}
onModalClose={handleFileBrowserModalClose}
/>
-
+
) : null}
);
diff --git a/frontend/src/Components/Form/Select/RootFolderSelectInput.tsx b/frontend/src/Components/Form/Select/RootFolderSelectInput.tsx
index 4704a3cd4..68b3d3da2 100644
--- a/frontend/src/Components/Form/Select/RootFolderSelectInput.tsx
+++ b/frontend/src/Components/Form/Select/RootFolderSelectInput.tsx
@@ -3,7 +3,10 @@ import { useDispatch, useSelector } from 'react-redux';
import { createSelector } from 'reselect';
import FileBrowserModal from 'Components/FileBrowser/FileBrowserModal';
import usePrevious from 'Helpers/Hooks/usePrevious';
-import { addRootFolder } from 'Store/Actions/rootFolderActions';
+import {
+ addRootFolder,
+ fetchRootFolders,
+} from 'Store/Actions/rootFolderActions';
import createRootFoldersSelector from 'Store/Selectors/createRootFoldersSelector';
import { EnhancedSelectInputChanged, InputChanged } from 'typings/inputs';
import translate from 'Utilities/String/translate';
@@ -189,6 +192,10 @@ function RootFolderSelectInput({
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
+ useEffect(() => {
+ dispatch(fetchRootFolders());
+ }, [dispatch]);
+
return (
<>
{
+ this.props.clearPendingChanges({ section: 'series' });
+ this.props.onModalClose();
+ };
+
+ //
+ // Render
+
+ render() {
+ return (
+
+ );
+ }
+}
+
+EditSeriesModalConnector.propTypes = {
+ ...EditSeriesModal.propTypes,
+ onModalClose: PropTypes.func.isRequired,
+ clearPendingChanges: PropTypes.func.isRequired
+};
+
+export default connect(undefined, mapDispatchToProps)(EditSeriesModalConnector);
diff --git a/frontend/src/Series/Edit/EditSeriesModalContent.tsx b/frontend/src/Series/Edit/EditSeriesModalContent.tsx
index f1a7ffca4..2362000a9 100644
--- a/frontend/src/Series/Edit/EditSeriesModalContent.tsx
+++ b/frontend/src/Series/Edit/EditSeriesModalContent.tsx
@@ -4,6 +4,7 @@ import SeriesMonitorNewItemsOptionsPopoverContent from 'AddSeries/SeriesMonitorN
import AppState from 'App/State/AppState';
import Form from 'Components/Form/Form';
import FormGroup from 'Components/Form/FormGroup';
+import FormInputButton from 'Components/Form/FormInputButton';
import FormInputGroup from 'Components/Form/FormInputGroup';
import FormLabel from 'Components/Form/FormLabel';
import Icon from 'Components/Icon';
@@ -21,6 +22,8 @@ import { saveSeries, setSeriesValue } from 'Store/Actions/seriesActions';
import selectSettings from 'Store/Selectors/selectSettings';
import { InputChanged } from 'typings/inputs';
import translate from 'Utilities/String/translate';
+import RootFolderModal from './RootFolder/RootFolderModal';
+import { RootFolderUpdated } from './RootFolder/RootFolderModalContent';
import styles from './EditSeriesModalContent.css';
export interface EditSeriesModalContentProps {
@@ -43,11 +46,17 @@ function EditSeriesModalContent({
seriesType,
path,
tags,
+ rootFolderPath: initialRootFolderPath,
} = useSeries(seriesId)!;
+
const { isSaving, saveError, pendingChanges } = useSelector(
(state: AppState) => state.series
);
+ const [isRootFolderModalOpen, setIsRootFolderModalOpen] = useState(false);
+
+ const [rootFolderPath, setRootFolderPath] = useState(initialRootFolderPath);
+
const isPathChanging = pendingChanges.path && path !== pendingChanges.path;
const [isConfirmMoveModalOpen, setIsConfirmMoveModalOpen] = useState(false);
@@ -86,6 +95,26 @@ function EditSeriesModalContent({
[dispatch]
);
+ const handleRootFolderPress = useCallback(() => {
+ setIsRootFolderModalOpen(true);
+ }, []);
+
+ const handleRootFolderModalClose = useCallback(() => {
+ setIsRootFolderModalOpen(false);
+ }, []);
+
+ const handleRootFolderChange = useCallback(
+ ({
+ path: newPath,
+ rootFolderPath: newRootFolderPath,
+ }: RootFolderUpdated) => {
+ setIsRootFolderModalOpen(false);
+ setRootFolderPath(newRootFolderPath);
+ handleInputChange({ name: 'path', value: newPath });
+ },
+ [handleInputChange]
+ );
+
const handleCancelPress = useCallback(() => {
setIsConfirmMoveModalOpen(false);
}, []);
@@ -196,6 +225,16 @@ function EditSeriesModalContent({
type={inputTypes.PATH}
name="path"
{...settings.path}
+ buttons={[
+
+
+ ,
+ ]}
onChange={handleInputChange}
/>
@@ -233,6 +272,14 @@ function EditSeriesModalContent({
+
+
+
+
+ );
+}
+
+export default RootFolderModal;
diff --git a/frontend/src/Series/Edit/RootFolder/RootFolderModalContent.tsx b/frontend/src/Series/Edit/RootFolder/RootFolderModalContent.tsx
new file mode 100644
index 000000000..d53d5e306
--- /dev/null
+++ b/frontend/src/Series/Edit/RootFolder/RootFolderModalContent.tsx
@@ -0,0 +1,93 @@
+import React, { useCallback, useState } from 'react';
+import { useSelector } from 'react-redux';
+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 ModalBody from 'Components/Modal/ModalBody';
+import ModalContent from 'Components/Modal/ModalContent';
+import ModalFooter from 'Components/Modal/ModalFooter';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import useApiQuery from 'Helpers/Hooks/useApiQuery';
+import { inputTypes } from 'Helpers/Props';
+import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector';
+import { InputChanged } from 'typings/inputs';
+import translate from 'Utilities/String/translate';
+
+export interface RootFolderUpdated {
+ path: string;
+ rootFolderPath: string;
+}
+
+export interface RootFolderModalContentProps {
+ seriesId: number;
+ rootFolderPath: string;
+ onSavePress(change: RootFolderUpdated): void;
+ onModalClose(): void;
+}
+
+interface SeriesFolder {
+ folder: string;
+}
+
+function RootFolderModalContent(props: RootFolderModalContentProps) {
+ const { seriesId, onSavePress, onModalClose } = props;
+ const { isWindows } = useSelector(createSystemStatusSelector());
+
+ const [rootFolderPath, setRootFolderPath] = useState(props.rootFolderPath);
+
+ const { isLoading, data } = useApiQuery({
+ url: `/series/${seriesId}/folder`,
+ });
+
+ const onInputChange = useCallback(({ value }: InputChanged) => {
+ setRootFolderPath(value);
+ }, []);
+
+ const handleSavePress = useCallback(() => {
+ const separator = isWindows ? '\\' : '/';
+
+ onSavePress({
+ path: `${rootFolderPath}${separator}${data?.folder}`,
+ rootFolderPath,
+ });
+ }, [rootFolderPath, isWindows, data, onSavePress]);
+
+ return (
+
+ {translate('UpdateSeriesPath')}
+
+
+
+ {translate('RootFolder')}
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+export default RootFolderModalContent;
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index d70350e67..53321e959 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -2085,6 +2085,8 @@
"UpdateStartupTranslocationHealthCheckMessage": "Cannot install update because startup folder '{startupFolder}' is in an App Translocation folder.",
"UpdateUiNotWritableHealthCheckMessage": "Cannot install update because UI folder '{uiFolder}' is not writable by the user '{userName}'.",
"UpdaterLogFiles": "Updater Log Files",
+ "UpdatePath": "Update Path",
+ "UpdateSeriesPath": "Update Series Path",
"Updates": "Updates",
"UpgradeUntil": "Upgrade Until",
"UpgradeUntilCustomFormatScore": "Upgrade Until Custom Format Score",
diff --git a/src/NzbDrone.Core/RootFolders/RootFolderService.cs b/src/NzbDrone.Core/RootFolders/RootFolderService.cs
index 09bbf7134..277290cae 100644
--- a/src/NzbDrone.Core/RootFolders/RootFolderService.cs
+++ b/src/NzbDrone.Core/RootFolders/RootFolderService.cs
@@ -219,10 +219,10 @@ namespace NzbDrone.Core.RootFolders
{
var osPath = new OsPath(path);
- return osPath.Directory.ToString().TrimEnd(osPath.IsUnixPath ? '/' : '\\');
+ return osPath.Directory.ToString().GetCleanPath();
}
- return possibleRootFolder.Path;
+ return possibleRootFolder.Path.GetCleanPath();
}
}
}
diff --git a/src/Sonarr.Api.V3/Series/SeriesFolderController.cs b/src/Sonarr.Api.V3/Series/SeriesFolderController.cs
new file mode 100644
index 000000000..06b8b141f
--- /dev/null
+++ b/src/Sonarr.Api.V3/Series/SeriesFolderController.cs
@@ -0,0 +1,31 @@
+using Microsoft.AspNetCore.Mvc;
+using NzbDrone.Core.Organizer;
+using NzbDrone.Core.Tv;
+using Sonarr.Http;
+
+namespace Sonarr.Api.V3.Series;
+
+[V3ApiController("series")]
+public class SeriesFolderController : Controller
+{
+ private readonly ISeriesService _seriesService;
+ private readonly IBuildFileNames _fileNameBuilder;
+
+ public SeriesFolderController(ISeriesService seriesService, IBuildFileNames fileNameBuilder)
+ {
+ _seriesService = seriesService;
+ _fileNameBuilder = fileNameBuilder;
+ }
+
+ [HttpGet("{id}/folder")]
+ public object GetFolder([FromRoute] int id)
+ {
+ var series = _seriesService.GetSeries(id);
+ var folder = _fileNameBuilder.GetSeriesFolder(series);
+
+ return new
+ {
+ folder
+ };
+ }
+}