diff --git a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.tsx b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.tsx index 51431c843..3dbd2cb18 100644 --- a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.tsx +++ b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.tsx @@ -80,7 +80,7 @@ function EditImportListModalContent({ qualityProfileId, seriesType, seasonFolder, - retroApplyTags, + tagExisting, tags, fields, } = item; @@ -295,13 +295,13 @@ function EditImportListModalContent({ - {translate('RetroApplyTags')} + {translate('TagExisting')} diff --git a/frontend/src/Settings/ImportLists/ImportLists/Manage/Edit/ManageImportListsEditModalContent.tsx b/frontend/src/Settings/ImportLists/ImportLists/Manage/Edit/ManageImportListsEditModalContent.tsx index 193daf7a1..504b959ce 100644 --- a/frontend/src/Settings/ImportLists/ImportLists/Manage/Edit/ManageImportListsEditModalContent.tsx +++ b/frontend/src/Settings/ImportLists/ImportLists/Manage/Edit/ManageImportListsEditModalContent.tsx @@ -17,7 +17,7 @@ interface SavePayload { enableAutomaticAdd?: boolean; qualityProfileId?: number; rootFolderPath?: string; - retroApplyTags?: boolean; + tagExisting?: boolean; } interface ManageImportListsEditModalContentProps { @@ -60,7 +60,7 @@ function ManageImportListsEditModalContent( NO_CHANGE ); const [rootFolderPath, setRootFolderPath] = useState(NO_CHANGE); - const [retroApplyTags, setRetroApplyTags] = useState(NO_CHANGE); + const [tagExisting, setTagExisting] = useState(NO_CHANGE); const save = useCallback(() => { let hasChanges = false; @@ -80,9 +80,9 @@ function ManageImportListsEditModalContent( hasChanges = true; payload.rootFolderPath = rootFolderPath; } - if (retroApplyTags !== NO_CHANGE) { + if (tagExisting !== NO_CHANGE) { hasChanges = true; - payload.retroApplyTags = retroApplyTags === 'enabled'; + payload.tagExisting = tagExisting === 'enabled'; } if (hasChanges) { @@ -94,7 +94,7 @@ function ManageImportListsEditModalContent( enableAutomaticAdd, qualityProfileId, rootFolderPath, - retroApplyTags, + tagExisting, onSavePress, onModalClose, ]); @@ -110,8 +110,8 @@ function ManageImportListsEditModalContent( case 'rootFolderPath': setRootFolderPath(value as string); break; - case 'retroApplyTags': - setRetroApplyTags(value as string); + case 'tagExisting': + setTagExisting(value as string); break; default: console.warn(`EditImportListModalContent Unknown Input: '${name}'`); @@ -165,12 +165,12 @@ function ManageImportListsEditModalContent( - {translate('RetroApplyTags')} + {translate('TagExisting')} diff --git a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalContent.tsx b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalContent.tsx index 1a97757a0..678234eae 100644 --- a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalContent.tsx +++ b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalContent.tsx @@ -66,8 +66,8 @@ const COLUMNS = [ isVisible: true, }, { - name: 'retroApplyTags', - label: () => translate('RetroApplyTags'), + name: 'tagExisting', + label: () => translate('TagExisting'), isSortable: true, isVisible: true, }, diff --git a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.css b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.css index f68fd624c..0b4bae36c 100644 --- a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.css +++ b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.css @@ -3,7 +3,7 @@ .enableAutomaticAdd, .qualityProfileId, .rootFolderPath, -.retroApply, +.tagExisting, .implementation { composes: cell from '~Components/Table/Cells/TableRowCell.css'; diff --git a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.css.d.ts b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.css.d.ts index 90190d74c..1ea8ce6f9 100644 --- a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.css.d.ts +++ b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.css.d.ts @@ -5,8 +5,8 @@ interface CssExports { 'implementation': string; 'name': string; 'qualityProfileId': string; - 'retroApply': string; 'rootFolderPath': string; + 'tagExisting': string; 'tags': string; } export const cssExports: CssExports; diff --git a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.tsx b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.tsx index 2361c47a8..d6c64855f 100644 --- a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.tsx +++ b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.tsx @@ -18,7 +18,7 @@ interface ManageImportListsModalRowProps { qualityProfileId: number; implementation: string; tags: number[]; - retroApplyTags: boolean; + tagExisting: boolean; enableAutomaticAdd: boolean; columns: Column[]; } @@ -32,7 +32,7 @@ function ManageImportListsModalRow(props: ManageImportListsModalRowProps) { implementation, enableAutomaticAdd, tags, - retroApplyTags, + tagExisting, } = props; const { toggleSelected, useIsSelected } = useSelect(); @@ -81,8 +81,8 @@ function ManageImportListsModalRow(props: ManageImportListsModalRowProps) { - - {retroApplyTags ? translate('Yes') : translate('No')} + + {tagExisting ? translate('Yes') : translate('No')} ); diff --git a/frontend/src/typings/ImportList.ts b/frontend/src/typings/ImportList.ts index 15dedd809..b8b9e0ef0 100644 --- a/frontend/src/typings/ImportList.ts +++ b/frontend/src/typings/ImportList.ts @@ -16,7 +16,7 @@ interface ImportList extends Provider { minRefreshInterval: string; name: string; tags: number[]; - retroApplyTags: boolean; + tagExisting: boolean; } export default ImportList; diff --git a/src/NzbDrone.Core/Datastore/Migration/231_add_retroapply_to_importlists.cs b/src/NzbDrone.Core/Datastore/Migration/231_add_tag_existing_to_importlists.cs similarity index 54% rename from src/NzbDrone.Core/Datastore/Migration/231_add_retroapply_to_importlists.cs rename to src/NzbDrone.Core/Datastore/Migration/231_add_tag_existing_to_importlists.cs index b5c491c9c..b9d6f9cbc 100644 --- a/src/NzbDrone.Core/Datastore/Migration/231_add_retroapply_to_importlists.cs +++ b/src/NzbDrone.Core/Datastore/Migration/231_add_tag_existing_to_importlists.cs @@ -4,10 +4,10 @@ namespace NzbDrone.Core.Datastore.Migration; [Migration(231)] -public class add_retroapply_to_importlists : NzbDroneMigrationBase +public class add_tag_existing_to_importlists : NzbDroneMigrationBase { protected override void MainDbUpgrade() { - Alter.Table("ImportLists").AddColumn("RetroApplyTags").AsBoolean().WithDefaultValue(false); + Alter.Table("ImportLists").AddColumn("TagExisting").AsBoolean().WithDefaultValue(false); } } diff --git a/src/NzbDrone.Core/ImportLists/ImportListDefinition.cs b/src/NzbDrone.Core/ImportLists/ImportListDefinition.cs index a586b2bcf..049ae95c3 100644 --- a/src/NzbDrone.Core/ImportLists/ImportListDefinition.cs +++ b/src/NzbDrone.Core/ImportLists/ImportListDefinition.cs @@ -17,7 +17,7 @@ public class ImportListDefinition : ProviderDefinition, IEquatable EnableAutomaticAdd; diff --git a/src/NzbDrone.Core/ImportLists/ImportListSyncService.cs b/src/NzbDrone.Core/ImportLists/ImportListSyncService.cs index 563209684..11250fecc 100644 --- a/src/NzbDrone.Core/ImportLists/ImportListSyncService.cs +++ b/src/NzbDrone.Core/ImportLists/ImportListSyncService.cs @@ -225,7 +225,7 @@ private void ProcessListItems(List items) // Break if Series Exists in DB if (existingTvdbIds.Any(x => x == item.TvdbId)) { - RetroApplyTags(importList, item); + TagExisting(importList, item); _logger.Debug("{0} [{1}] Rejected, series exists in database", item.TvdbId, item.Title); continue; } @@ -264,9 +264,9 @@ private void ProcessListItems(List items) _logger.ProgressInfo("Import List Sync Completed. Items found: {0}, Series added: {1}", items.Count, seriesToAdd.Count); } - private void RetroApplyTags(ImportListDefinition importList, ImportListItemInfo report) + private void TagExisting(ImportListDefinition importList, ImportListItemInfo report) { - if (importList.RetroApplyTags) + if (importList.TagExisting) { var series = _seriesService.FindByTvdbId(report.TvdbId); diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index 636e38504..577a193b1 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -1871,8 +1871,8 @@ "Result": "Result", "Retention": "Retention", "RetentionHelpText": "Usenet only: Set to zero to set for unlimited retention", - "RetroApplyListTagsHelpText": "Retroactively apply tags to series already in {appName}", - "RetroApplyTags": "Retroactively Apply Tags", + "TagExistingHelpText": "Apply tags to series already in {appName}", + "TagExisting": "Tag Existing", "RetryingDownloadOn": "Retrying download on {date} at {time}", "RootFolder": "Root Folder", "RootFolderEmptyHealthCheckMessage": "Empty root folder: {rootFolderPath}", diff --git a/src/Sonarr.Api.V3/ImportLists/ImportListBulkResource.cs b/src/Sonarr.Api.V3/ImportLists/ImportListBulkResource.cs index 763a66f86..f3d39b39d 100644 --- a/src/Sonarr.Api.V3/ImportLists/ImportListBulkResource.cs +++ b/src/Sonarr.Api.V3/ImportLists/ImportListBulkResource.cs @@ -8,7 +8,7 @@ public class ImportListBulkResource : ProviderBulkResource @@ -25,7 +25,7 @@ public override List UpdateModel(ImportListBulkResource re existing.EnableAutomaticAdd = resource.EnableAutomaticAdd ?? existing.EnableAutomaticAdd; existing.RootFolderPath = resource.RootFolderPath ?? existing.RootFolderPath; existing.QualityProfileId = resource.QualityProfileId ?? existing.QualityProfileId; - existing.RetroApplyTags = resource.RetroApplyTags ?? existing.RetroApplyTags; + existing.TagExisting = resource.TagExisting ?? existing.TagExisting; }); return existingDefinitions; diff --git a/src/Sonarr.Api.V3/ImportLists/ImportListResource.cs b/src/Sonarr.Api.V3/ImportLists/ImportListResource.cs index 02d6352a1..21520d6b5 100644 --- a/src/Sonarr.Api.V3/ImportLists/ImportListResource.cs +++ b/src/Sonarr.Api.V3/ImportLists/ImportListResource.cs @@ -17,7 +17,7 @@ public class ImportListResource : ProviderResource public ImportListType ListType { get; set; } public int ListOrder { get; set; } public TimeSpan MinRefreshInterval { get; set; } - public bool RetroApplyTags { get; set; } + public bool TagExisting { get; set; } } public class ImportListResourceMapper : ProviderResourceMapper @@ -42,7 +42,7 @@ public override ImportListResource ToResource(ImportListDefinition definition) resource.ListType = definition.ListType; resource.ListOrder = (int)definition.ListType; resource.MinRefreshInterval = definition.MinRefreshInterval; - resource.RetroApplyTags = definition.RetroApplyTags; + resource.TagExisting = definition.TagExisting; return resource; } @@ -66,7 +66,7 @@ public override ImportListDefinition ToModel(ImportListResource resource, Import definition.SeasonFolder = resource.SeasonFolder; definition.ListType = resource.ListType; definition.MinRefreshInterval = resource.MinRefreshInterval; - definition.RetroApplyTags = resource.RetroApplyTags; + definition.TagExisting = resource.TagExisting; return definition; }