mirror/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2025-02-24 07:10:57 +00:00
Code Issues Releases Wiki Activity

Fixed: Don't die on movie refresh when collection has been deleted from TMDB

Browse source 
Fixes #8664
This commit is contained in:
Qstick 2023-06-07 20:12:59 -05:00
parent d5cc84d8c8
commit 3542b263c7
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/NzbDrone.Core/Movies/Collections/AddMovieCollectionService.cs
View file

@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using FluentValidation;
using FluentValidation.Results;
using NLog;
using NzbDrone.Common.EnsureThat;
using NzbDrone.Core.Exceptions;
@ -42,6 +39,12 @@ public MovieCollection AddMovieCollection(MovieCollection newCollection)
}
newCollection = AddSkyhookData(newCollection);
if (newCollection == null)
{
return null;
}
newCollection = SetPropertiesAndValidate(newCollection);
_logger.Info("Adding Collection {0}[{1}]", newCollection.Title, newCollection.TmdbId);
@ -63,10 +66,7 @@ private MovieCollection AddSkyhookData(MovieCollection newCollection)
{
_logger.Error("TmdbId {0} was not found, it may have been removed from TMDb.", newCollection.TmdbId);
throw new ValidationException(new List<ValidationFailure>
{
new ValidationFailure("TmdbId", $"A collection with this ID was not found.", newCollection.TmdbId)
});
return null;
}
collection.ApplyChanges(newCollection);

5
src/NzbDrone.Core/Movies/Collections/MovieCollectionService.cs
View file

@ -122,6 +122,11 @@ public void HandleAsync(MoviesDeletedEvent message)
var collection = FindByTmdbId(collectionTmdbId);
if (collection == null)
{
continue;
}
_repo.Delete(collection.Id);
_eventAggregator.PublishEvent(new CollectionDeletedEvent(collection));

3
src/NzbDrone.Core/Movies/RefreshMovieService.cs
View file

@ -144,9 +144,12 @@ private Movie RefreshMovieInfo(int movieId)
RootFolderPath = _folderService.GetBestRootFolderPath(movie.Path).TrimEnd('/', '\\', ' ')
});
if (newCollection != null)
{
movieMetadata.CollectionTmdbId = newCollection.TmdbId;
movieMetadata.CollectionTitle = newCollection.Title;
}
}
movieMetadata.AlternativeTitles = _titleService.UpdateTitles(movieInfo.AlternativeTitles, movieMetadata);
_movieTranslationService.UpdateTranslations(movieInfo.Translations, movieMetadata);