github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-06 21:12:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

New: Default name when adding providers

Browse source 
(cherry picked from commit 16d95ea6bf3d9340845fee19904a2d48616be8dc)

Closes #4007
This commit is contained in:
Bogdan 2023-08-14 02:27:59 +03:00
parent fd9bd5f691
commit c88d64a9ac
19 changed files with 61 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContent.js
View file

@ -41,7 +41,7 @@ function EditSpecificationModalContent(props) {
return ( return (
<ModalContent onModalClose={onCancelPress}> <ModalContent onModalClose={onCancelPress}>
<ModalHeader> <ModalHeader>
{`${id ? 'Edit' : 'Add'} Condition - ${implementationName}`} {id ? translate('EditConditionImplementation', { implementationName }) : translate('AddConditionImplementation', { implementationName })}
</ModalHeader> </ModalHeader>
<ModalBody> <ModalBody>

2
frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js
View file

@ -58,7 +58,7 @@ class EditDownloadClientModalContent extends Component {
return ( return (
<ModalContent onModalClose={onModalClose}> <ModalContent onModalClose={onModalClose}>
<ModalHeader> <ModalHeader>
{`${id ? 'Edit' : 'Add'} Download Client - ${implementationName}`} {id ? translate('EditDownloadClientImplementation', { implementationName }) : translate('AddDownloadClientImplementation', { implementationName })}
</ModalHeader> </ModalHeader>
<ModalBody> <ModalBody>

12
frontend/src/Settings/ImportLists/ImportLists/AddImportListItem.js
View file

@ -16,10 +16,12 @@ class AddImportListItem extends Component {
onImportListSelect = () => { onImportListSelect = () => {
const { const {
implementation implementation,
implementationName,
minRefreshInterval
} = this.props; } = this.props;
this.props.onImportListSelect({ implementation }); this.props.onImportListSelect({ implementation, implementationName, minRefreshInterval });
}; };
// //
@ -29,6 +31,7 @@ class AddImportListItem extends Component {
const { const {
implementation, implementation,
implementationName, implementationName,
minRefreshInterval,
infoLink, infoLink,
presets, presets,
onImportListSelect onImportListSelect
@ -56,7 +59,7 @@ class AddImportListItem extends Component {
<span> <span>
<Button <Button
size={sizes.SMALL} size={sizes.SMALL}
onPress={this.onListSelect} onPress={this.onImportListSelect}
> >
{translate('Custom')} {translate('Custom')}
</Button> </Button>
@ -77,6 +80,8 @@ class AddImportListItem extends Component {
key={preset.name} key={preset.name}
name={preset.name} name={preset.name}
implementation={implementation} implementation={implementation}
implementationName={implementationName}
minRefreshInterval={minRefreshInterval}
onPress={onImportListSelect} onPress={onImportListSelect}
/> />
); );
@ -103,6 +108,7 @@ class AddImportListItem extends Component {
AddImportListItem.propTypes = { AddImportListItem.propTypes = {
implementation: PropTypes.string.isRequired, implementation: PropTypes.string.isRequired,
implementationName: PropTypes.string.isRequired, implementationName: PropTypes.string.isRequired,
minRefreshInterval: PropTypes.string.isRequired,
infoLink: PropTypes.string.isRequired, infoLink: PropTypes.string.isRequired,
presets: PropTypes.arrayOf(PropTypes.object), presets: PropTypes.arrayOf(PropTypes.object),
onImportListSelect: PropTypes.func.isRequired onImportListSelect: PropTypes.func.isRequired

2
frontend/src/Settings/ImportLists/ImportLists/AddImportListModalContent.js
View file

@ -32,7 +32,7 @@ class AddImportListModalContent extends Component {
return ( return (
<ModalContent onModalClose={onModalClose}> <ModalContent onModalClose={onModalClose}>
<ModalHeader> <ModalHeader>
Add List {translate('AddImportList')}
</ModalHeader> </ModalHeader>
<ModalBody> <ModalBody>

4
frontend/src/Settings/ImportLists/ImportLists/AddImportListModalContentConnector.js
View file

@ -49,8 +49,8 @@ class AddImportListModalContentConnector extends Component {
// //
// Listeners // Listeners
onImportListSelect = ({ implementation, name }) => { onImportListSelect = ({ implementation, implementationName, name, minRefreshInterval }) => {
this.props.selectImportListSchema({ implementation, presetName: name }); this.props.selectImportListSchema({ implementation, implementationName, presetName: name, minRefreshInterval });
this.props.onModalClose({ listSelected: true }); this.props.onModalClose({ listSelected: true });
}; };

12
frontend/src/Settings/ImportLists/ImportLists/AddImportListPresetMenuItem.js
View file

@ -10,12 +10,16 @@ class AddImportListPresetMenuItem extends Component {
onPress = () => { onPress = () => {
const { const {
name, name,
implementation implementation,
implementationName,
minRefreshInterval
} = this.props; } = this.props;
this.props.onPress({ this.props.onPress({
name, name,
implementation implementation,
implementationName,
minRefreshInterval
}); });
}; };
@ -26,6 +30,8 @@ class AddImportListPresetMenuItem extends Component {
const { const {
name, name,
implementation, implementation,
implementationName,
minRefreshInterval,
...otherProps ...otherProps
} = this.props; } = this.props;
@ -43,6 +49,8 @@ class AddImportListPresetMenuItem extends Component {
AddImportListPresetMenuItem.propTypes = { AddImportListPresetMenuItem.propTypes = {
name: PropTypes.string.isRequired, name: PropTypes.string.isRequired,
implementation: PropTypes.string.isRequired, implementation: PropTypes.string.isRequired,
implementationName: PropTypes.string.isRequired,
minRefreshInterval: PropTypes.string.isRequired,
onPress: PropTypes.func.isRequired onPress: PropTypes.func.isRequired
}; };

3
frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js
View file

@ -73,6 +73,7 @@ function EditImportListModalContent(props) {
const { const {
id, id,
implementationName,
name, name,
enableAutomaticAdd, enableAutomaticAdd,
minRefreshInterval, minRefreshInterval,
@ -91,7 +92,7 @@ function EditImportListModalContent(props) {
return ( return (
<ModalContent onModalClose={onModalClose}> <ModalContent onModalClose={onModalClose}>
<ModalHeader> <ModalHeader>
{id ? translate('EditList') : translate('AddList')} {id ? translate('EditImportListImplementation', { implementationName }) : translate('AddImportListImplementation', { implementationName })}
</ModalHeader> </ModalHeader>
<ModalBody> <ModalBody>

6
frontend/src/Settings/Indexers/Indexers/AddIndexerItem.js
View file

@ -16,10 +16,11 @@ class AddIndexerItem extends Component {
onIndexerSelect = () => { onIndexerSelect = () => {
const { const {
implementation implementation,
implementationName
} = this.props; } = this.props;
this.props.onIndexerSelect({ implementation }); this.props.onIndexerSelect({ implementation, implementationName });
}; };
// //
@ -77,6 +78,7 @@ class AddIndexerItem extends Component {
key={preset.name} key={preset.name}
name={preset.name} name={preset.name}
implementation={implementation} implementation={implementation}
implementationName={implementationName}
onPress={onIndexerSelect} onPress={onIndexerSelect}
/> />
); );

4
frontend/src/Settings/Indexers/Indexers/AddIndexerModalContentConnector.js
View file

@ -48,8 +48,8 @@ class AddIndexerModalContentConnector extends Component {
// //
// Listeners // Listeners
onIndexerSelect = ({ implementation, name }) => { onIndexerSelect = ({ implementation, implementationName, name }) => {
this.props.selectIndexerSchema({ implementation, presetName: name }); this.props.selectIndexerSchema({ implementation, implementationName, presetName: name });
this.props.onModalClose({ indexerSelected: true }); this.props.onModalClose({ indexerSelected: true });
}; };

8
frontend/src/Settings/Indexers/Indexers/AddIndexerPresetMenuItem.js
View file

@ -10,12 +10,14 @@ class AddIndexerPresetMenuItem extends Component {
onPress = () => { onPress = () => {
const { const {
name, name,
implementation implementation,
implementationName
} = this.props; } = this.props;
this.props.onPress({ this.props.onPress({
name, name,
implementation implementation,
implementationName
}); });
}; };
@ -26,6 +28,7 @@ class AddIndexerPresetMenuItem extends Component {
const { const {
name, name,
implementation, implementation,
implementationName,
...otherProps ...otherProps
} = this.props; } = this.props;
@ -43,6 +46,7 @@ class AddIndexerPresetMenuItem extends Component {
AddIndexerPresetMenuItem.propTypes = { AddIndexerPresetMenuItem.propTypes = {
name: PropTypes.string.isRequired, name: PropTypes.string.isRequired,
implementation: PropTypes.string.isRequired, implementation: PropTypes.string.isRequired,
implementationName: PropTypes.string.isRequired,
onPress: PropTypes.func.isRequired onPress: PropTypes.func.isRequired
}; };

2
frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.js
View file

@ -55,7 +55,7 @@ function EditIndexerModalContent(props) {
return ( return (
<ModalContent onModalClose={onModalClose}> <ModalContent onModalClose={onModalClose}>
<ModalHeader> <ModalHeader>
{`${id ? translate('EditIndexer') : translate('AddIndexer')} - ${implementationName}`} {id ? translate('EditIndexerImplementation', { implementationName }) : translate('AddIndexerImplementation', { implementationName })}
</ModalHeader> </ModalHeader>
<ModalBody> <ModalBody>

2
frontend/src/Settings/Notifications/Notifications/AddNotificationModalContent.js
View file

@ -28,7 +28,7 @@ class AddNotificationModalContent extends Component {
return ( return (
<ModalContent onModalClose={onModalClose}> <ModalContent onModalClose={onModalClose}>
<ModalHeader> <ModalHeader>
Add Notification {translate('AddConnection')}
</ModalHeader> </ModalHeader>
<ModalBody> <ModalBody>

2
frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js
View file

@ -48,7 +48,7 @@ function EditNotificationModalContent(props) {
return ( return (
<ModalContent onModalClose={onModalClose}> <ModalContent onModalClose={onModalClose}>
<ModalHeader> <ModalHeader>
{`${id ? translate('EditConnection') : translate('AddConnection')} - ${implementationName}`} {id ? translate('EditConnectionImplementation', { implementationName }) : translate('AddConnectionImplementation', { implementationName })}
</ModalHeader> </ModalHeader>
<ModalBody> <ModalBody>

1
frontend/src/Store/Actions/Settings/downloadClients.js
View file

@ -117,6 +117,7 @@ export default {
[SELECT_DOWNLOAD_CLIENT_SCHEMA]: (state, { payload }) => { [SELECT_DOWNLOAD_CLIENT_SCHEMA]: (state, { payload }) => {
return selectProviderSchema(state, section, payload, (selectedSchema) => { return selectProviderSchema(state, section, payload, (selectedSchema) => {
selectedSchema.name = selectedSchema.implementationName;
selectedSchema.enable = true; selectedSchema.enable = true;
return selectedSchema; return selectedSchema;

4
frontend/src/Store/Actions/Settings/importLists.js
View file

@ -117,8 +117,12 @@ export default {
[SELECT_IMPORT_LIST_SCHEMA]: (state, { payload }) => { [SELECT_IMPORT_LIST_SCHEMA]: (state, { payload }) => {
return selectProviderSchema(state, section, payload, (selectedSchema) => { return selectProviderSchema(state, section, payload, (selectedSchema) => {
selectedSchema.name = payload.presetName ?? payload.implementationName;
selectedSchema.implementationName = payload.implementationName;
selectedSchema.minRefreshInterval = payload.minRefreshInterval;
selectedSchema.enableAutomaticAdd = true; selectedSchema.enableAutomaticAdd = true;
selectedSchema.shouldMonitor = 'entireArtist'; selectedSchema.shouldMonitor = 'entireArtist';
selectedSchema.rootFolderPath = '';
return selectedSchema; return selectedSchema;
}); });

2
frontend/src/Store/Actions/Settings/indexers.js
View file

@ -121,6 +121,8 @@ export default {
[SELECT_INDEXER_SCHEMA]: (state, { payload }) => { [SELECT_INDEXER_SCHEMA]: (state, { payload }) => {
return selectProviderSchema(state, section, payload, (selectedSchema) => { return selectProviderSchema(state, section, payload, (selectedSchema) => {
selectedSchema.name = payload.presetName ?? payload.implementationName;
selectedSchema.implementationName = payload.implementationName;
selectedSchema.enableRss = selectedSchema.supportsRss; selectedSchema.enableRss = selectedSchema.supportsRss;
selectedSchema.enableAutomaticSearch = selectedSchema.supportsSearch; selectedSchema.enableAutomaticSearch = selectedSchema.supportsSearch;
selectedSchema.enableInteractiveSearch = selectedSchema.supportsSearch; selectedSchema.enableInteractiveSearch = selectedSchema.supportsSearch;

1
frontend/src/Store/Actions/Settings/notifications.js
View file

@ -102,6 +102,7 @@ export default {
[SELECT_NOTIFICATION_SCHEMA]: (state, { payload }) => { [SELECT_NOTIFICATION_SCHEMA]: (state, { payload }) => {
return selectProviderSchema(state, section, payload, (selectedSchema) => { return selectProviderSchema(state, section, payload, (selectedSchema) => {
selectedSchema.name = selectedSchema.implementationName;
selectedSchema.onGrab = selectedSchema.supportsOnGrab; selectedSchema.onGrab = selectedSchema.supportsOnGrab;
selectedSchema.onReleaseImport = selectedSchema.supportsOnReleaseImport; selectedSchema.onReleaseImport = selectedSchema.supportsOnReleaseImport;
selectedSchema.onUpgrade = selectedSchema.supportsOnUpgrade; selectedSchema.onUpgrade = selectedSchema.supportsOnUpgrade;

1
src/NzbDrone.Core/ImportLists/ImportListBase.cs
View file

@ -44,7 +44,6 @@ namespace NzbDrone.Core.ImportLists
yield return new ImportListDefinition yield return new ImportListDefinition
{ {
Name = GetType().Name,
EnableAutomaticAdd = config.Validate().IsValid, EnableAutomaticAdd = config.Validate().IsValid,
Implementation = GetType().Name, Implementation = GetType().Name,
Settings = config Settings = config

17
src/NzbDrone.Core/Localization/Core/en.json
View file

@ -8,13 +8,18 @@
"Actions": "Actions", "Actions": "Actions",
"Activity": "Activity", "Activity": "Activity",
"Add": "Add", "Add": "Add",
"AddConditionImplementation": "Add Condition - {implementationName}",
"AddConnection": "Add Connection", "AddConnection": "Add Connection",
"AddConnectionImplementation": "Add Connection - {implementationName}",
"AddDelayProfile": "Add Delay Profile", "AddDelayProfile": "Add Delay Profile",
"AddDownloadClientImplementation": "Add Download Client - {implementationName}",
"AddImportList": "Add Import List",
"AddImportListExclusion": "Add Import List Exclusion", "AddImportListExclusion": "Add Import List Exclusion",
"AddImportListExclusionAlbumHelpText": "Prevent album from being added to Lidarr by Import lists", "AddImportListExclusionAlbumHelpText": "Prevent album from being added to Lidarr by Import lists",
"AddImportListExclusionArtistHelpText": "Prevent artist from being added to Lidarr by Import lists", "AddImportListExclusionArtistHelpText": "Prevent artist from being added to Lidarr by Import lists",
"AddImportListImplementation": "Add Import List - {implementationName}",
"AddIndexer": "Add Indexer", "AddIndexer": "Add Indexer",
"AddList": "Add List", "AddIndexerImplementation": "Add Indexer - {implementationName}",
"AddListExclusion": "Add List Exclusion", "AddListExclusion": "Add List Exclusion",
"AddMetadataProfile": "Add Metadata Profile", "AddMetadataProfile": "Add Metadata Profile",
"AddMissing": "Add missing", "AddMissing": "Add missing",
@ -155,7 +160,7 @@
"CombineWithExistingFiles": "Combine With Existing Files", "CombineWithExistingFiles": "Combine With Existing Files",
"CompletedDownloadHandling": "Completed Download Handling", "CompletedDownloadHandling": "Completed Download Handling",
"Component": "Component", "Component": "Component",
"Conditions": "'Conditions'", "Conditions": "Conditions",
"Connect": "Connect", "Connect": "Connect",
"ConnectSettings": "Connect Settings", "ConnectSettings": "Connect Settings",
"ConnectionLost": "Connection Lost", "ConnectionLost": "Connection Lost",
@ -295,12 +300,14 @@
"Duration": "Duration", "Duration": "Duration",
"Edit": "Edit", "Edit": "Edit",
"EditArtist": "Edit Artist", "EditArtist": "Edit Artist",
"EditConnection": "Edit Connection", "EditConditionImplementation": "Edit Condition - {implementationName}",
"EditConnectionImplementation": "Edit Connection - {implementationName}",
"EditDelayProfile": "Edit Delay Profile", "EditDelayProfile": "Edit Delay Profile",
"EditDownloadClientImplementation": "Edit Download Client - {implementationName}",
"EditGroups": "Edit Groups", "EditGroups": "Edit Groups",
"EditImportListExclusion": "Edit Import List Exclusion", "EditImportListExclusion": "Edit Import List Exclusion",
"EditIndexer": "Edit Indexer", "EditImportListImplementation": "Edit Import List - {implementationName}",
"EditList": "Edit List", "EditIndexerImplementation": "Edit Indexer - {implementationName}",
"EditMetadata": "Edit Metadata", "EditMetadata": "Edit Metadata",
"EditMetadataProfile": "Edit Metadata Profile", "EditMetadataProfile": "Edit Metadata Profile",
"EditQualityProfile": "Edit Quality Profile", "EditQualityProfile": "Edit Quality Profile",