mirror of
https://github.com/Radarr/Radarr.git
synced 2026-04-25 22:37:27 -04:00
Fixed: Misc Extra File Improvements (This changes mapping of backdrop images to Fanart instead of Banner) (#2642)
Fixes #2556 Fixes #2639 Fixes #2547
This commit is contained in:
@@ -19,11 +19,12 @@ namespace NzbDrone.Core.Extras
|
||||
{
|
||||
public interface IExtraService
|
||||
{
|
||||
void ImportExtraFiles(LocalMovie localMovie, MovieFile movieFile, bool isReadOnly);
|
||||
void ImportMovie(LocalMovie localMovie, MovieFile movieFile, bool isReadOnly);
|
||||
}
|
||||
|
||||
public class ExtraService : IExtraService,
|
||||
IHandle<MediaCoversUpdatedEvent>,
|
||||
IHandle<MovieFolderCreatedEvent>,
|
||||
IHandle<MovieRenamedEvent>
|
||||
{
|
||||
private readonly IMediaFileService _mediaFileService;
|
||||
@@ -48,15 +49,15 @@ namespace NzbDrone.Core.Extras
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
public void ImportMovie(LocalMovie localMovie, MovieFile movieFile, bool isReadOnly)
|
||||
{
|
||||
ImportExtraFiles(localMovie, movieFile, isReadOnly);
|
||||
|
||||
CreateAfterImport(localMovie.Movie, movieFile);
|
||||
}
|
||||
|
||||
public void ImportExtraFiles(LocalMovie localMovie, MovieFile movieFile, bool isReadOnly)
|
||||
{
|
||||
var movie = localMovie.Movie;
|
||||
|
||||
foreach (var extraFileManager in _extraFileManagers)
|
||||
{
|
||||
extraFileManager.CreateAfterMovieImport(movie, movieFile);
|
||||
}
|
||||
|
||||
if (!_configService.ImportExtraFiles)
|
||||
{
|
||||
return;
|
||||
@@ -87,7 +88,7 @@ namespace NzbDrone.Core.Extras
|
||||
foreach (var extraFileManager in _extraFileManagers)
|
||||
{
|
||||
var extension = Path.GetExtension(matchingFilename);
|
||||
var extraFile = extraFileManager.Import(movie, movieFile, matchingFilename, extension, isReadOnly);
|
||||
var extraFile = extraFileManager.Import(localMovie.Movie, movieFile, matchingFilename, extension, isReadOnly);
|
||||
|
||||
if (extraFile != null)
|
||||
{
|
||||
@@ -102,6 +103,14 @@ namespace NzbDrone.Core.Extras
|
||||
}
|
||||
}
|
||||
|
||||
private void CreateAfterImport(Movie movie, MovieFile movieFile)
|
||||
{
|
||||
foreach (var extraFileManager in _extraFileManagers)
|
||||
{
|
||||
extraFileManager.CreateAfterMovieImport(movie, movieFile);
|
||||
}
|
||||
}
|
||||
|
||||
public void Handle(MediaCoversUpdatedEvent message)
|
||||
{
|
||||
var movie = message.Movie;
|
||||
@@ -113,6 +122,16 @@ namespace NzbDrone.Core.Extras
|
||||
}
|
||||
}
|
||||
|
||||
public void Handle(MovieFolderCreatedEvent message)
|
||||
{
|
||||
var movie = message.Movie;
|
||||
|
||||
foreach (var extraFileManager in _extraFileManagers)
|
||||
{
|
||||
extraFileManager.CreateAfterMovieImport(movie, message.MovieFolder);
|
||||
}
|
||||
}
|
||||
|
||||
public void Handle(MovieRenamedEvent message)
|
||||
{
|
||||
var movie = message.Movie;
|
||||
|
||||
Reference in New Issue
Block a user