From 68c3400bb03373fd5549c4984dde992c0fef23fe Mon Sep 17 00:00:00 2001 From: scphantm Date: Thu, 23 Apr 2026 00:01:25 -0400 Subject: [PATCH] Rename `retroApplyTags` to `tagExisting` across frontend and backend for consistent terminology. --- .../EditImportListModalContent.tsx | 10 +++++----- .../ManageImportListsEditModalContent.tsx | 20 +++++++++---------- .../Manage/ManageImportListsModalContent.tsx | 4 ++-- .../Manage/ManageImportListsModalRow.css | 1 + .../Manage/ManageImportListsModalRow.css.d.ts | 1 + .../Manage/ManageImportListsModalRow.tsx | 8 ++++---- frontend/src/typings/ImportList.ts | 2 +- ...=> 243_add_tag_existing_to_importlists.cs} | 4 ++-- .../ImportLists/ImportListDefinition.cs | 2 +- .../ImportLists/ImportListSyncService.cs | 10 +++++----- src/NzbDrone.Core/Localization/Core/en.json | 5 ++--- .../ImportLists/ImportListBulkResource.cs | 4 ++-- .../ImportLists/ImportListResource.cs | 6 +++--- 13 files changed, 39 insertions(+), 38 deletions(-) rename src/NzbDrone.Core/Datastore/Migration/{243_add_retroapply_to_importlists.cs => 243_add_tag_existing_to_importlists.cs} (54%) diff --git a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.tsx b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.tsx index 106fd4909e..64398debbb 100644 --- a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.tsx +++ b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.tsx @@ -78,7 +78,7 @@ function EditImportListModalContent({ qualityProfileId, searchOnAdd, tags, - retroApplyTags, + tagExisting, fields, } = item; @@ -258,13 +258,13 @@ function EditImportListModalContent({ - {translate('RadarrRetroactiveApply')} + {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 2c6cbb50e6..5c55519a79 100644 --- a/frontend/src/Settings/ImportLists/ImportLists/Manage/Edit/ManageImportListsEditModalContent.tsx +++ b/frontend/src/Settings/ImportLists/ImportLists/Manage/Edit/ManageImportListsEditModalContent.tsx @@ -18,7 +18,7 @@ interface SavePayload { qualityProfileId?: number; minimumAvailability?: string; rootFolderPath?: string; - retroApplyTags?: boolean; + tagExisting?: boolean; } interface ManageImportListsEditModalContentProps { @@ -63,7 +63,7 @@ function ManageImportListsEditModalContent( ); const [minimumAvailability, setMinimumAvailability] = useState(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; const payload: SavePayload = {}; @@ -92,9 +92,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) { @@ -108,7 +108,7 @@ function ManageImportListsEditModalContent( qualityProfileId, minimumAvailability, rootFolderPath, - retroApplyTags, + tagExisting, onSavePress, onModalClose, ]); @@ -130,8 +130,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}'`); @@ -210,12 +210,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 7ae41d6a30..23acb0b4bf 100644 --- a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalContent.tsx +++ b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalContent.tsx @@ -83,8 +83,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 7045ed925b..f18c48db21 100644 --- a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.css +++ b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.css @@ -5,6 +5,7 @@ .minimumAvailability, .qualityProfileId, .rootFolderPath, +.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 c6cb99a370..78ff64f037 100644 --- a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.css.d.ts +++ b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.css.d.ts @@ -8,6 +8,7 @@ interface CssExports { 'name': string; 'qualityProfileId': 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 681ff03d34..cb25677406 100644 --- a/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.tsx +++ b/frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.tsx @@ -19,7 +19,7 @@ interface ManageImportListsModalRowProps { minimumAvailability: string; implementation: string; tags: number[]; - retroApplyTags: boolean; + tagExisting: boolean; enabled: boolean; enableAuto: boolean; columns: Column[]; @@ -39,7 +39,7 @@ function ManageImportListsModalRow(props: ManageImportListsModalRowProps) { enabled, enableAuto, tags, - retroApplyTags, + tagExisting, onSelectedChange, } = props; @@ -94,8 +94,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 9623e4a04a..69672d4d0d 100644 --- a/frontend/src/typings/ImportList.ts +++ b/frontend/src/typings/ImportList.ts @@ -15,7 +15,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/243_add_retroapply_to_importlists.cs b/src/NzbDrone.Core/Datastore/Migration/243_add_tag_existing_to_importlists.cs similarity index 54% rename from src/NzbDrone.Core/Datastore/Migration/243_add_retroapply_to_importlists.cs rename to src/NzbDrone.Core/Datastore/Migration/243_add_tag_existing_to_importlists.cs index 1cfaeefd70..cf26ab3954 100644 --- a/src/NzbDrone.Core/Datastore/Migration/243_add_retroapply_to_importlists.cs +++ b/src/NzbDrone.Core/Datastore/Migration/243_add_tag_existing_to_importlists.cs @@ -4,10 +4,10 @@ namespace NzbDrone.Core.Datastore.Migration; [Migration(243)] -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 4be4f50638..268b7d27b1 100644 --- a/src/NzbDrone.Core/ImportLists/ImportListDefinition.cs +++ b/src/NzbDrone.Core/ImportLists/ImportListDefinition.cs @@ -16,7 +16,7 @@ public class ImportListDefinition : ProviderDefinition, IEquatable Enabled; diff --git a/src/NzbDrone.Core/ImportLists/ImportListSyncService.cs b/src/NzbDrone.Core/ImportLists/ImportListSyncService.cs index 27f6f8d718..9d48ff61d2 100644 --- a/src/NzbDrone.Core/ImportLists/ImportListSyncService.cs +++ b/src/NzbDrone.Core/ImportLists/ImportListSyncService.cs @@ -81,10 +81,10 @@ private void ProcessMovieReport(ImportListDefinition importList, ImportListMovie return; } - // Check to see if movie in DB and maybe apply retro-tags + // Check to see if movie in DB and maybe apply tags if (dbMovies.Contains(report.TmdbId)) { - RetroApplyTags(importList, report); + TagExisting(importList, report); _logger.Debug("{0} [{1}] Rejected, Movie Exists in DB", report.TmdbId, report.Title); return; } @@ -130,9 +130,9 @@ private void ProcessMovieReport(ImportListDefinition importList, ImportListMovie } } - private void RetroApplyTags(ImportListDefinition importList, ImportListMovie report) + private void TagExisting(ImportListDefinition importList, ImportListMovie report) { - if (importList.RetroApplyTags) + if (importList.TagExisting) { var movie = _movieService.FindByTmdbId(report.TmdbId); @@ -145,7 +145,7 @@ private void RetroApplyTags(ImportListDefinition importList, ImportListMovie rep if (preCount != movie.Tags.Count) { _movieService.UpdateMovie(movie); - _logger.Debug("{0} [{1}] Retro-Actively added tags to movie", report.TmdbId, report.Title); + _logger.Debug("{0} [{1}] Tagged existing movie", report.TmdbId, report.Title); } } } diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index 3540cb73af..7ddd0b6c5b 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -1547,7 +1547,6 @@ "QueueLoadError": "Failed to load Queue", "Queued": "Queued", "QuickImport": "Move Automatically", - "RadarrRetroactiveApply": "Retro-Apply Tags", "RadarrTags": "{appName} Tags", "Rating": "Rating", "Ratings": "Ratings", @@ -1698,8 +1697,8 @@ "Result": "Result", "Retention": "Retention", "RetentionHelpText": "Usenet only: Set to zero to set for unlimited retention", - "RetroApplyListTagsHelpText": "Retro-Actively apply tags to movies already in Radarr", - "RetroApplyTags": "Retro-Actively Apply Tags", + "TagExistingHelpText": "Tag existing movies in {appName}", + "TagExisting": "Tag Existing", "RetryingDownloadOn": "Retrying download on {date} at {time}", "RootFolder": "Root Folder", "RootFolderCheckMultipleMessage": "Multiple root folders are missing: {rootFolderPaths}", diff --git a/src/Radarr.Api.V3/ImportLists/ImportListBulkResource.cs b/src/Radarr.Api.V3/ImportLists/ImportListBulkResource.cs index cacd841f5d..73e6712c63 100644 --- a/src/Radarr.Api.V3/ImportLists/ImportListBulkResource.cs +++ b/src/Radarr.Api.V3/ImportLists/ImportListBulkResource.cs @@ -11,7 +11,7 @@ public class ImportListBulkResource : ProviderBulkResource @@ -30,7 +30,7 @@ public override List UpdateModel(ImportListBulkResource re existing.RootFolderPath = resource.RootFolderPath ?? existing.RootFolderPath; existing.QualityProfileId = resource.QualityProfileId ?? existing.QualityProfileId; existing.MinimumAvailability = resource.MinimumAvailability ?? existing.MinimumAvailability; - existing.RetroApplyTags = resource.RetroApplyTags ?? existing.RetroApplyTags; + existing.TagExisting = resource.TagExisting ?? existing.TagExisting; }); return existingDefinitions; diff --git a/src/Radarr.Api.V3/ImportLists/ImportListResource.cs b/src/Radarr.Api.V3/ImportLists/ImportListResource.cs index ced81ecb62..27eabb0d89 100644 --- a/src/Radarr.Api.V3/ImportLists/ImportListResource.cs +++ b/src/Radarr.Api.V3/ImportLists/ImportListResource.cs @@ -16,7 +16,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 @@ -40,7 +40,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; } @@ -63,7 +63,7 @@ public override ImportListDefinition ToModel(ImportListResource resource, Import definition.MinimumAvailability = resource.MinimumAvailability; definition.ListType = resource.ListType; definition.MinRefreshInterval = resource.MinRefreshInterval; - definition.RetroApplyTags = resource.RetroApplyTags; + definition.TagExisting = resource.TagExisting; return definition; }