Fix: Use StashId for Tag Exclusion (#11)

sampulsar · web-flow · commit 3c19ccdcf7e8 · 2026-01-17T15:03:52.000-05:00
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.tsx b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.tsx
@@ -29,7 +29,6 @@ import styles from './EditImportListExclusionModalContent.css';
 
 const newImportListExclusion = {
   movieTitle: '',
-  movieYear: 0,
   type: 'scene',
   foreignId: '',
 };
@@ -80,7 +79,7 @@ function EditImportListExclusionModalContent({
   const { isFetching, isSaving, item, error, saveError, ...otherProps } =
     useSelector(createImportListExclusionSelector(id));
 
-  const { movieTitle, movieYear, foreignId, type } = item;
+  const { movieTitle, foreignId, type } = item;
 
   const dispatch = useDispatch();
   const previousIsSaving = usePrevious(isSaving);
@@ -175,18 +174,6 @@ function EditImportListExclusionModalContent({
                 onChange={onInputChange}
               />
             </FormGroup>
-
-            <FormGroup>
-              <FormLabel>{translate('Year')}</FormLabel>
-
-              <FormInputGroup
-                type={inputTypes.NUMBER}
-                name="movieYear"
-                helpText={translate('MovieYearToExcludeHelpText')}
-                {...movieYear}
-                onChange={onInputChange}
-              />
-            </FormGroup>
           </Form>
         )}
       </ModalBody>
@@ -201,7 +188,6 @@ function EditImportListExclusionModalContent({
             {translate('Delete')}
           </Button>
         )}
-        : null
         <Button onPress={onModalClose}>{translate('Cancel')}</Button>
         <SpinnerErrorButton
           isSpinning={isSaving}
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusionRow.tsx b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusionRow.tsx
@@ -20,15 +20,8 @@ interface ImportListExclusionRowProps extends ImportListExclusion {
 }
 
 function ImportListExclusionRow(props: ImportListExclusionRowProps) {
-  const {
-    id,
-    foreignId,
-    type,
-    movieTitle,
-    movieYear,
-    isSelected,
-    onSelectedChange,
-  } = props;
+  const { id, foreignId, type, movieTitle, isSelected, onSelectedChange } =
+    props;
 
   const dispatch = useDispatch();
 
@@ -59,7 +52,6 @@ function ImportListExclusionRow(props: ImportListExclusionRowProps) {
       <TableRowCell>{movieTitle}</TableRowCell>
       <TableRowCell className={styles.foreignId}>{foreignId}</TableRowCell>
       <TableRowCell>{type}</TableRowCell>
-      <TableRowCell>{movieYear}</TableRowCell>
 
       <TableRowCell className={styles.actions}>
         <IconButton
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.tsx b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.tsx
@@ -60,12 +60,6 @@ const COLUMNS: Column[] = [
     isVisible: true,
     isSortable: true,
   },
-  {
-    name: 'movieYear',
-    label: () => translate('Year'),
-    isVisible: true,
-    isSortable: true,
-  },
   {
     className: styles.actions,
     name: 'actions',
@@ -261,7 +255,7 @@ function ImportListExclusions() {
             })}
 
             <TableRow>
-              <TableRowCell colSpan={5}>
+              <TableRowCell colSpan={4}>
                 <SpinnerButton
                   kind={kinds.DANGER}
                   isSpinning={isDeleting}
diff --git a/frontend/src/typings/ImportListExclusion.ts b/frontend/src/typings/ImportListExclusion.ts
@@ -3,6 +3,5 @@ import ModelBase from 'App/ModelBase';
 export default interface ImportListExclusion extends ModelBase {
   foreignId: string;
   movieTitle: string;
-  movieYear: number;
   type: string;
 }
diff --git a/src/NzbDrone.Core/Datastore/TableMapping.cs b/src/NzbDrone.Core/Datastore/TableMapping.cs
@@ -173,7 +173,8 @@ public static void Map()
 
                   Mapper.Entity<UpdateHistory>("UpdateHistory").RegisterModel();
 
-                  Mapper.Entity<MovieMetadata>("MovieMetadata").RegisterModel();
+                  Mapper.Entity<MovieMetadata>("MovieMetadata").RegisterModel()
+                    .Ignore(i => i.TagIds);
 
                   Mapper.Entity<Performer>("Performers").RegisterModel()
                         .Ignore(e => e.MergedIntoId);
diff --git a/src/NzbDrone.Core/ImportLists/ImportExclusions/ImportListExclusion.cs b/src/NzbDrone.Core/ImportLists/ImportExclusions/ImportListExclusion.cs
@@ -7,11 +7,10 @@ public class ImportListExclusion : ModelBase
         public string ForeignId { get; set; }
         public string MovieTitle { get; set; }
         public ImportExclusionType Type { get; set; }
-        public int? MovieYear { get; set; }
 
         public new string ToString()
         {
-            return string.Format("Exclusion: [{0}][{1}][{2} {3}]", Type, ForeignId, MovieTitle, MovieYear);
+            return string.Format("Exclusion: [{0}][{1}][{2}]", Type, ForeignId, MovieTitle);
         }
     }
 }
diff --git a/src/NzbDrone.Core/ImportLists/ImportExclusions/ImportListExclusionService.cs b/src/NzbDrone.Core/ImportLists/ImportExclusions/ImportListExclusionService.cs
@@ -121,7 +121,7 @@ public void HandleAsync(MoviesDeletedEvent message)
             {
                 _logger.Debug("Adding {0} Deleted Movies to Import Exclusions", message.Movies.Count);
 
-                var exclusions = message.Movies.Select(m => new ImportListExclusion { ForeignId = m.ForeignId, Type = ToImportExclusionType(m.MovieMetadata.Value.ItemType), MovieTitle = m.Title, MovieYear = m.Year }).ToList();
+                var exclusions = message.Movies.Select(m => new ImportListExclusion { ForeignId = m.ForeignId, Type = ToImportExclusionType(m.MovieMetadata.Value.ItemType), MovieTitle = m.ToFormattedString() }).ToList();
                 _exclusionRepository.InsertMany(DeDupeExclusions(exclusions));
             }
         }
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
@@ -1302,7 +1302,7 @@
   "MovieSearchResultsLoadError": "Unable to load results for this movie search. Try again later",
   "MoviesSelectedInterp": "{count} Movie(s) Selected",
   "MovieTitle": "Movie Title",
-  "MovieTitleToExcludeHelpText": "The title of the movie to exclude (can be anything meaningful)",
+  "MovieTitleToExcludeHelpText": "The title of the item to exclude",
   "MovieYear": "Movie Year",
   "MovieYearToExcludeHelpText": "The year of the movie to exclude",
   "MultiLanguage": "Multi-Language",
diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/MovieResource.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/MovieResource.cs
@@ -16,6 +16,7 @@ public class MovieResource
         public int? Duration { get; set; }
         public List<ImageResource> Images { get; set; }
         public List<string> Genres { get; set; }
+        public List<TagResource> Tags { get; set; }
         public string Code { get; set; }
         public int Year { get; set; }
         public string ReleaseDate { get; set; }
diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/TagResource.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/TagResource.cs
@@ -0,0 +1,9 @@
+namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
+{
+    public class TagResource
+    {
+        public string Name { get; set; }
+
+        public ExternalIdResource ForeignIds { get; set; }
+    }
+}
diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
@@ -527,6 +527,17 @@ public MovieMetadata MapMovie(MovieResource resource)
             movie.Ratings = MapRatings(resource.Ratings) ?? new Ratings();
 
             movie.Genres = resource.Genres;
+
+            // Check for tags with StashIDs as used for exclusion/tagging in Whisparr not stored locally
+            if (resource.Tags != null && resource.Tags.Where(t => !string.IsNullOrEmpty(t.ForeignIds?.StashId)).Any())
+            {
+                movie.TagIds = resource.Tags.Select(t => t.ForeignIds.StashId).ToList();
+            }
+            else
+            {
+                movie.TagIds = new List<string>();
+            }
+
             movie.Images = resource.Images.Select(MapImage).ToList();
 
             movie.ItemType = resource.ItemType;
diff --git a/src/NzbDrone.Core/Movies/AddMovieService.cs b/src/NzbDrone.Core/Movies/AddMovieService.cs
@@ -254,7 +254,7 @@ private Movie SetPropertiesAndValidate(Movie newMovie)
             var type = newMovie.MovieMetadata.Value.ItemType == ItemType.Scene ? ImportExclusionType.Scene : ImportExclusionType.Movie;
             if (!_importListExclusionService.IsExcluded(newMovie.ForeignId, type))
             {
-                var newExclusion = new ImportListExclusion { ForeignId = newMovie.ForeignId, Type = type, MovieTitle = newMovie.Title, MovieYear = newMovie.Year };
+                var newExclusion = new ImportListExclusion { ForeignId = newMovie.ForeignId, Type = type, MovieTitle = newMovie.ToFormattedString() };
                 if (newMovie.MovieMetadata?.Value?.Studio != null)
                 {
                     var stashId = newMovie.MovieMetadata.Value.Studio.ForeignIds.StashId;
@@ -317,7 +317,7 @@ private Movie SetPropertiesAndValidate(Movie newMovie)
                         if (_configService.WhisparrAlwaysExcludePerformersTag.IsNullOrWhiteSpace())
                         {
                             _importListExclusionService.AddExclusion(newExclusion);
-                            throw new ValidationException($"Performer: [{string.Join(",", excludedPerformers.Select(ep => ep.MovieTitle).ToList())}] has been excluded");
+                            throw new ValidationException($"Performer: [{string.Join(",", excludedPerformers.Select(ep => ep.ToString()).ToList())}] has been excluded");
                         }
                         else
                         {
@@ -328,21 +328,31 @@ private Movie SetPropertiesAndValidate(Movie newMovie)
                             }
 
                             newMovie.Monitored = false;
-                            _logger.Info("Performer: [{0}] has been excluded. Marking movie as unmonitored.", string.Join(",", excludedPerformers.Select(ep => ep.MovieTitle).ToList()));
+                            _logger.Info("Performer: [{0}] has been excluded. Marking movie as unmonitored.", string.Join(",", excludedPerformers.Select(ep => ep.ToString()).ToList()));
                         }
                     }
                 }
 
-                var tagNames = newMovie.MovieMetadata.Value.Genres;
-                var excludedTags = _importListExclusionService.GetAllByType(ImportExclusionType.Tag);
-                var exclusions = excludedTags.Where(e => tagNames.Contains(e.MovieTitle, StringComparer.OrdinalIgnoreCase)).ToList();
+                // check by tag ids
+                var exclusions = new List<ImportListExclusion>();
+                var tagIds = newMovie.MovieMetadata.Value.TagIds ?? new List<string>();
+                var isExcludedByTag = false;
+                foreach (var tagId in tagIds)
+                {
+                    isExcludedByTag = _importListExclusionService.IsExcluded(tagId, ImportExclusionType.Tag);
+                    if (isExcludedByTag)
+                    {
+                        exclusions = _importListExclusionService.GetAllByType(ImportExclusionType.Tag).Where(e => e.ForeignId == tagId).ToList();
+                        break;
+                    }
+                }
 
-                if (exclusions.Any())
+                if (isExcludedByTag)
                 {
                     if (_configService.WhisparrAlwaysExcludeTagsTag.IsNullOrWhiteSpace())
                     {
                         _importListExclusionService.AddExclusion(newExclusion);
-                        throw new ValidationException($"Tag(s): [{string.Join(",", exclusions.Select(et => et.MovieTitle).ToList())}] excluded");
+                        throw new ValidationException($"Tag(s): [{string.Join(",", exclusions.Select(et => et.ToString()).ToList())}] excluded");
                     }
                     else
                     {
@@ -353,7 +363,7 @@ private Movie SetPropertiesAndValidate(Movie newMovie)
                         }
 
                         newMovie.Monitored = false;
-                        _logger.Info("Tag(s): [{0}] has been excluded. Marking movie as unmonitored.", string.Join(",", exclusions.Select(et => et.MovieTitle).ToList()));
+                        _logger.Info("Tag(s): [{0}] has been excluded. Marking movie as unmonitored.", string.Join(",", exclusions.Select(et => et.ToString()).ToList()));
                     }
                 }
             }
diff --git a/src/NzbDrone.Core/Movies/Movie.cs b/src/NzbDrone.Core/Movies/Movie.cs
@@ -103,33 +103,45 @@ public bool IsAvailable(int delay = 0)
             return MovieMetadata.Value.ReleaseDateUtc;
         }
 
-        public override string ToString()
+        public string ToFormattedString()
         {
             var result = string.Empty;
 
             if (MovieMetadata.Value.ItemType == ItemType.Scene)
             {
                 if (MovieMetadata.Value.Title != null)
                 {
-                    result += string.Format("[{0} - {1} - {2}]", MovieMetadata.Value.StudioTitle.NullSafe(), MovieMetadata.Value.ReleaseDate.NullSafe(), MovieMetadata.Value.Title.NullSafe());
+                    result += string.Format("{0} - {1} - {2}", MovieMetadata.Value.StudioTitle.NullSafe(), MovieMetadata.Value.ReleaseDate.NullSafe(), MovieMetadata.Value.Title.NullSafe());
                 }
             }
             else
             {
                 if (MovieMetadata.Value.Title != null)
                 {
-                    result += string.Format("[{0} ({1})]", MovieMetadata.Value.Title.NullSafe(), MovieMetadata.Value.Year.NullSafe());
+                    result += string.Format("{0} ({1})", MovieMetadata.Value.Title.NullSafe(), MovieMetadata.Value.Year.NullSafe());
                 }
             }
 
+            return result;
+        }
+
+        public override string ToString()
+        {
+            var result = ToFormattedString();
+
             if (MovieMetadata.Value.ImdbId != null)
             {
-                result += $"[{MovieMetadata.Value.ImdbId}]";
+                result += $" [{MovieMetadata.Value.ImdbId}]";
             }
 
             if (MovieMetadata.Value.ForeignId != null)
             {
-                result += $"[{MovieMetadata.Value.ForeignId}]";
+                result += $" [{MovieMetadata.Value.ForeignId}]";
+            }
+
+            if (result.IsNullOrWhiteSpace())
+            {
+                result = $"[{result}]";
             }
 
             return result;
diff --git a/src/NzbDrone.Core/Movies/MovieMetadata.cs b/src/NzbDrone.Core/Movies/MovieMetadata.cs
@@ -19,12 +19,14 @@ public MovieMetadata()
             OriginalLanguage = Language.English;
             Recommendations = new List<int>();
             Ratings = new Ratings();
+            TagIds = new List<string>();
         }
 
         public string ForeignId { get; set; }
 
         public List<MediaCover.MediaCover> Images { get; set; }
         public List<string> Genres { get; set; }
+        public List<string> TagIds { get; set; }
         public DateTime? ReleaseDateUtc { get; set; }
         public string ReleaseDate { get; set; }
         public int Year { get; set; }
diff --git a/src/Whisparr.Api.V3/ImportLists/ImportListExclusionController.cs b/src/Whisparr.Api.V3/ImportLists/ImportListExclusionController.cs
@@ -41,7 +41,6 @@ public ImportListExclusionController(IImportListExclusionService importListExclu
                 .SetValidator(importListExclusionExistsValidator);
 
             SharedValidator.RuleFor(c => c.MovieTitle).NotEmpty();
-            SharedValidator.RuleFor(c => c.MovieYear).GreaterThan(0);
         }
 
         // Endpoint only used by stasharr to show excluded scenes
diff --git a/src/Whisparr.Api.V3/ImportLists/ImportListExclusionResource.cs b/src/Whisparr.Api.V3/ImportLists/ImportListExclusionResource.cs
@@ -10,7 +10,6 @@ public class ImportListExclusionResource : ProviderResource<ImportListExclusionR
         public string ForeignId { get; set; }
         public string MovieTitle { get; set; }
         public ImportExclusionType Type { get; set; }
-        public int? MovieYear { get; set; }
     }
 
     public static class ImportListExclusionResourceMapper
@@ -28,7 +27,6 @@ public static ImportListExclusionResource ToResource(this ImportListExclusion mo
                 ForeignId = model.ForeignId,
                 MovieTitle = model.MovieTitle,
                 Type = model.Type,
-                MovieYear = model.MovieYear
             };
         }
 
@@ -45,7 +43,6 @@ public static ImportListExclusion ToModel(this ImportListExclusionResource resou
                 ForeignId = resource.ForeignId,
                 MovieTitle = resource.MovieTitle,
                 Type = resource.Type,
-                MovieYear = resource.MovieYear ?? 0
             };
         }
 

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,5 @@ import ModelBase from 'App/ModelBase';`
`3`	`3`	`export default interface ImportListExclusion extends ModelBase {`
`4`	`4`	`foreignId: string;`
`5`	`5`	`movieTitle: string;`
`6`		`- movieYear: number;`
`7`	`6`	`type: string;`
`8`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,10 @@ public class ImportListExclusion : ModelBase`
`7`	`7`	`public string ForeignId { get; set; }`
`8`	`8`	`public string MovieTitle { get; set; }`
`9`	`9`	`public ImportExclusionType Type { get; set; }`
`10`		`- public int? MovieYear { get; set; }`
`11`	`10`
`12`	`11`	`public new string ToString()`
`13`	`12`	`{`
`14`		`- return string.Format("Exclusion: [{0}][{1}][{2} {3}]", Type, ForeignId, MovieTitle, MovieYear);`
	`13`	`+ return string.Format("Exclusion: [{0}][{1}][{2}]", Type, ForeignId, MovieTitle);`
`15`	`14`	`}`
`16`	`15`	`}`
`17`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public void HandleAsync(MoviesDeletedEvent message)`
`121`	`121`	`{`
`122`	`122`	`_logger.Debug("Adding {0} Deleted Movies to Import Exclusions", message.Movies.Count);`
`123`	`123`
`124`		`- var exclusions = message.Movies.Select(m => new ImportListExclusion { ForeignId = m.ForeignId, Type = ToImportExclusionType(m.MovieMetadata.Value.ItemType), MovieTitle = m.Title, MovieYear = m.Year }).ToList();`
	`124`	`+ var exclusions = message.Movies.Select(m => new ImportListExclusion { ForeignId = m.ForeignId, Type = ToImportExclusionType(m.MovieMetadata.Value.ItemType), MovieTitle = m.ToFormattedString() }).ToList();`
`125`	`125`	`_exclusionRepository.InsertMany(DeDupeExclusions(exclusions));`
`126`	`126`	`}`
`127`	`127`	`}`