github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 21:13:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update MediaCover Module to Work with Artist and Album Images

Browse source
This commit is contained in:
Qstick 2017-09-16 23:26:56 -04:00
commit 07b37c1575
7 changed files with 213 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

9
frontend/src/Artist/Details/ArtistDetails.css
View file

@ -32,11 +32,18 @@
color: $white; color: $white;
} }
.logo {
flex-shrink: 0;
margin-right: 35px;
width: 250px;
height: 97px;
}
.poster { .poster {
flex-shrink: 0; flex-shrink: 0;
margin-right: 35px; margin-right: 35px;
width: 250px; width: 250px;
height: 368px; height: 250px;
} }
.info { .info {

12
src/Lidarr.Api.V3/Artist/ArtistModule.cs
View file

@ -28,8 +28,8 @@ namespace Lidarr.Api.V3.Artist
IHandle<ArtistUpdatedEvent>, IHandle<ArtistUpdatedEvent>,
IHandle<ArtistEditedEvent>, IHandle<ArtistEditedEvent>,
IHandle<ArtistDeletedEvent>, IHandle<ArtistDeletedEvent>,
IHandle<ArtistRenamedEvent> IHandle<ArtistRenamedEvent>,
//IHandle<MediaCoversUpdatedEvent> IHandle<MediaCoversUpdatedEvent>
{ {
private readonly IArtistService _artistService; private readonly IArtistService _artistService;
@ -240,9 +240,9 @@ namespace Lidarr.Api.V3.Artist
BroadcastResourceChange(ModelAction.Updated, message.Artist.Id); BroadcastResourceChange(ModelAction.Updated, message.Artist.Id);
} }
//public void Handle(MediaCoversUpdatedEvent message) public void Handle(MediaCoversUpdatedEvent message)
//{ {
// BroadcastResourceChange(ModelAction.Updated, message.Series.Id); BroadcastResourceChange(ModelAction.Updated, message.Artist.Id);
//} }
} }
} }

34
src/NzbDrone.Api/Series/SeriesModule.cs
View file

@ -26,21 +26,21 @@ namespace NzbDrone.Api.Series
IHandle<SeriesUpdatedEvent>, IHandle<SeriesUpdatedEvent>,
IHandle<SeriesEditedEvent>, IHandle<SeriesEditedEvent>,
IHandle<SeriesDeletedEvent>, IHandle<SeriesDeletedEvent>,
IHandle<SeriesRenamedEvent>, IHandle<SeriesRenamedEvent>
IHandle<MediaCoversUpdatedEvent> //IHandle<MediaCoversUpdatedEvent>
{ {
private readonly ISeriesService _seriesService; private readonly ISeriesService _seriesService;
private readonly IAddSeriesService _addSeriesService; private readonly IAddSeriesService _addSeriesService;
private readonly ISeriesStatisticsService _seriesStatisticsService; private readonly ISeriesStatisticsService _seriesStatisticsService;
// private readonly ISceneMappingService _sceneMappingService; //private readonly ISceneMappingService _sceneMappingService;
private readonly IMapCoversToLocal _coverMapper; private readonly IMapCoversToLocal _coverMapper;
public SeriesModule(IBroadcastSignalRMessage signalRBroadcaster, public SeriesModule(IBroadcastSignalRMessage signalRBroadcaster,
ISeriesService seriesService, ISeriesService seriesService,
IAddSeriesService addSeriesService, IAddSeriesService addSeriesService,
ISeriesStatisticsService seriesStatisticsService, ISeriesStatisticsService seriesStatisticsService,
// ISceneMappingService sceneMappingService, //ISceneMappingService sceneMappingService,
IMapCoversToLocal coverMapper, IMapCoversToLocal coverMapper,
RootFolderValidator rootFolderValidator, RootFolderValidator rootFolderValidator,
SeriesPathValidator seriesPathValidator, SeriesPathValidator seriesPathValidator,
@ -96,7 +96,7 @@ namespace NzbDrone.Api.Series
if (series == null) return null; if (series == null) return null;
var resource = series.ToResource(); var resource = series.ToResource();
MapCoversToLocal(resource); //MapCoversToLocal(resource);
FetchAndLinkSeriesStatistics(resource); FetchAndLinkSeriesStatistics(resource);
PopulateAlternateTitles(resource); PopulateAlternateTitles(resource);
@ -108,7 +108,7 @@ namespace NzbDrone.Api.Series
var seriesStats = _seriesStatisticsService.SeriesStatistics(); var seriesStats = _seriesStatisticsService.SeriesStatistics();
var seriesResources = _seriesService.GetAllSeries().ToResource(); var seriesResources = _seriesService.GetAllSeries().ToResource();
MapCoversToLocal(seriesResources.ToArray()); //MapCoversToLocal(seriesResources.ToArray());
LinkSeriesStatistics(seriesResources, seriesStats); LinkSeriesStatistics(seriesResources, seriesStats);
PopulateAlternateTitles(seriesResources); PopulateAlternateTitles(seriesResources);
@ -144,13 +144,13 @@ namespace NzbDrone.Api.Series
_seriesService.DeleteSeries(id, deleteFiles); _seriesService.DeleteSeries(id, deleteFiles);
} }
private void MapCoversToLocal(params SeriesResource[] series) //private void MapCoversToLocal(params SeriesResource[] series)
{ // {
foreach (var seriesResource in series) // foreach (var seriesResource in series)
{ // {
_coverMapper.ConvertToLocalUrls(seriesResource.Id, seriesResource.Images); // _coverMapper.ConvertToLocalUrls(seriesResource.Id, seriesResource.Images);
} // }
} //}
private void FetchAndLinkSeriesStatistics(SeriesResource resource) private void FetchAndLinkSeriesStatistics(SeriesResource resource)
{ {
@ -239,9 +239,9 @@ namespace NzbDrone.Api.Series
BroadcastResourceChange(ModelAction.Updated, message.Series.Id); BroadcastResourceChange(ModelAction.Updated, message.Series.Id);
} }
public void Handle(MediaCoversUpdatedEvent message) //public void Handle(MediaCoversUpdatedEvent message)
{ //{
BroadcastResourceChange(ModelAction.Updated, message.Series.Id); // BroadcastResourceChange(ModelAction.Updated, message.Series.Id);
} //}
} }
} }

46
src/NzbDrone.Core.Test/MediaCoverTests/MediaCoverServiceFixture.cs
View file

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using FizzWare.NBuilder; using FizzWare.NBuilder;
@ -9,25 +9,31 @@ using NzbDrone.Common.Disk;
using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Core.MediaCover; using NzbDrone.Core.MediaCover;
using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Tv; using NzbDrone.Core.Music;
using NzbDrone.Core.Tv.Events; using NzbDrone.Core.Music.Events;
namespace NzbDrone.Core.Test.MediaCoverTests namespace NzbDrone.Core.Test.MediaCoverTests
{ {
[TestFixture] [TestFixture]
public class MediaCoverServiceFixture : CoreTest<MediaCoverService> public class MediaCoverServiceFixture : CoreTest<MediaCoverService>
{ {
Series _series; Artist _artist;
Album _album;
[SetUp] [SetUp]
public void Setup() public void Setup()
{ {
Mocker.SetConstant<IAppFolderInfo>(new AppFolderInfo(Mocker.Resolve<IStartupContext>())); Mocker.SetConstant<IAppFolderInfo>(new AppFolderInfo(Mocker.Resolve<IStartupContext>()));
_series = Builder<Series>.CreateNew() _artist = Builder<Artist>.CreateNew()
.With(v => v.Id = 2) .With(v => v.Id = 2)
.With(v => v.Images = new List<MediaCover.MediaCover> { new MediaCover.MediaCover(MediaCoverTypes.Poster, "") }) .With(v => v.Images = new List<MediaCover.MediaCover> { new MediaCover.MediaCover(MediaCoverTypes.Poster, "") })
.Build(); .Build();
_album = Builder<Album>.CreateNew()
.With(v => v.Id = 4)
.With(v => v.Images = new List<MediaCover.MediaCover> { new MediaCover.MediaCover(MediaCoverTypes.Cover, "") })
.Build();
} }
[Test] [Test]
@ -50,6 +56,26 @@ namespace NzbDrone.Core.Test.MediaCoverTests
covers.Single().Url.Should().Be("/MediaCover/12/banner.jpg?lastWrite=1234"); covers.Single().Url.Should().Be("/MediaCover/12/banner.jpg?lastWrite=1234");
} }
[Test]
public void should_convert_album_cover_urls_to_local()
{
var covers = new List<MediaCover.MediaCover>
{
new MediaCover.MediaCover {CoverType = MediaCoverTypes.Disc}
};
Mocker.GetMock<IDiskProvider>().Setup(c => c.FileGetLastWrite(It.IsAny<string>()))
.Returns(new DateTime(1234));
Mocker.GetMock<IDiskProvider>().Setup(c => c.FileExists(It.IsAny<string>()))
.Returns(true);
Subject.ConvertToLocalUrls(12, covers, 6);
covers.Single().Url.Should().Be("/MediaCover/12/6/disc.jpg?lastWrite=1234");
}
[Test] [Test]
public void should_convert_media_urls_to_local_without_time_if_file_doesnt_exist() public void should_convert_media_urls_to_local_without_time_if_file_doesnt_exist()
{ {
@ -76,7 +102,7 @@ namespace NzbDrone.Core.Test.MediaCoverTests
.Setup(v => v.FileExists(It.IsAny<string>())) .Setup(v => v.FileExists(It.IsAny<string>()))
.Returns(true); .Returns(true);
Subject.HandleAsync(new SeriesUpdatedEvent(_series)); Subject.HandleAsync(new ArtistUpdatedEvent(_artist));
Mocker.GetMock<IImageResizer>() Mocker.GetMock<IImageResizer>()
.Verify(v => v.Resize(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>()), Times.Exactly(2)); .Verify(v => v.Resize(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>()), Times.Exactly(2));
@ -93,7 +119,7 @@ namespace NzbDrone.Core.Test.MediaCoverTests
.Setup(v => v.FileExists(It.IsAny<string>())) .Setup(v => v.FileExists(It.IsAny<string>()))
.Returns(false); .Returns(false);
Subject.HandleAsync(new SeriesUpdatedEvent(_series)); Subject.HandleAsync(new ArtistUpdatedEvent(_artist));
Mocker.GetMock<IImageResizer>() Mocker.GetMock<IImageResizer>()
.Verify(v => v.Resize(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>()), Times.Exactly(2)); .Verify(v => v.Resize(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>()), Times.Exactly(2));
@ -114,7 +140,7 @@ namespace NzbDrone.Core.Test.MediaCoverTests
.Setup(v => v.GetFileSize(It.IsAny<string>())) .Setup(v => v.GetFileSize(It.IsAny<string>()))
.Returns(1000); .Returns(1000);
Subject.HandleAsync(new SeriesUpdatedEvent(_series)); Subject.HandleAsync(new ArtistUpdatedEvent(_artist));
Mocker.GetMock<IImageResizer>() Mocker.GetMock<IImageResizer>()
.Verify(v => v.Resize(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>()), Times.Never()); .Verify(v => v.Resize(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>()), Times.Never());
@ -135,7 +161,7 @@ namespace NzbDrone.Core.Test.MediaCoverTests
.Setup(v => v.GetFileSize(It.IsAny<string>())) .Setup(v => v.GetFileSize(It.IsAny<string>()))
.Returns(0); .Returns(0);
Subject.HandleAsync(new SeriesUpdatedEvent(_series)); Subject.HandleAsync(new ArtistUpdatedEvent(_artist));
Mocker.GetMock<IImageResizer>() Mocker.GetMock<IImageResizer>()
.Verify(v => v.Resize(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>()), Times.Exactly(2)); .Verify(v => v.Resize(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>()), Times.Exactly(2));
@ -156,7 +182,7 @@ namespace NzbDrone.Core.Test.MediaCoverTests
.Setup(v => v.Resize(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>())) .Setup(v => v.Resize(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>()))
.Throws<ApplicationException>(); .Throws<ApplicationException>();
Subject.HandleAsync(new SeriesUpdatedEvent(_series)); Subject.HandleAsync(new ArtistUpdatedEvent(_artist));
Mocker.GetMock<IImageResizer>() Mocker.GetMock<IImageResizer>()
.Verify(v => v.Resize(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>()), Times.Exactly(2)); .Verify(v => v.Resize(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>()), Times.Exactly(2));

14
src/NzbDrone.Core/Extras/ExtraService.cs
View file

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -105,13 +105,13 @@ namespace NzbDrone.Core.Extras
public void Handle(MediaCoversUpdatedEvent message) public void Handle(MediaCoversUpdatedEvent message)
{ {
var series = message.Series; //var artist = message.Artist;
var episodeFiles = GetEpisodeFiles(series.Id); //var episodeFiles = GetEpisodeFiles(artist.Id);
foreach (var extraFileManager in _extraFileManagers) //foreach (var extraFileManager in _extraFileManagers)
{ //{
extraFileManager.CreateAfterSeriesScan(series, episodeFiles); // extraFileManager.CreateAfterSeriesScan(artist, episodeFiles);
} //}
} }
public void Handle(EpisodeFolderCreatedEvent message) public void Handle(EpisodeFolderCreatedEvent message)

154
src/NzbDrone.Core/MediaCover/MediaCoverService.cs
View file

@ -9,23 +9,24 @@ using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http; using NzbDrone.Common.Http;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Messaging.Events;
using NzbDrone.Core.Tv; using NzbDrone.Core.Music;
using NzbDrone.Core.Tv.Events; using NzbDrone.Core.Music.Events;
namespace NzbDrone.Core.MediaCover namespace NzbDrone.Core.MediaCover
{ {
public interface IMapCoversToLocal public interface IMapCoversToLocal
{ {
void ConvertToLocalUrls(int seriesId, IEnumerable<MediaCover> covers); void ConvertToLocalUrls(int artistId, IEnumerable<MediaCover> covers, int? albumId = null);
string GetCoverPath(int seriesId, MediaCoverTypes mediaCoverTypes, int? height = null); string GetCoverPath(int artistId, MediaCoverTypes mediaCoverTypes, int? height = null, int? albumId = null);
} }
public class MediaCoverService : public class MediaCoverService :
IHandleAsync<SeriesUpdatedEvent>, IHandleAsync<ArtistUpdatedEvent>,
IHandleAsync<SeriesDeletedEvent>, IHandleAsync<ArtistDeletedEvent>,
IMapCoversToLocal IMapCoversToLocal
{ {
private readonly IImageResizer _resizer; private readonly IImageResizer _resizer;
private readonly IAlbumService _albumService;
private readonly IHttpClient _httpClient; private readonly IHttpClient _httpClient;
private readonly IDiskProvider _diskProvider; private readonly IDiskProvider _diskProvider;
private readonly ICoverExistsSpecification _coverExistsSpecification; private readonly ICoverExistsSpecification _coverExistsSpecification;
@ -36,6 +37,7 @@ namespace NzbDrone.Core.MediaCover
private readonly string _coverRootFolder; private readonly string _coverRootFolder;
public MediaCoverService(IImageResizer resizer, public MediaCoverService(IImageResizer resizer,
IAlbumService albumService,
IHttpClient httpClient, IHttpClient httpClient,
IDiskProvider diskProvider, IDiskProvider diskProvider,
IAppFolderInfo appFolderInfo, IAppFolderInfo appFolderInfo,
@ -45,6 +47,7 @@ namespace NzbDrone.Core.MediaCover
Logger logger) Logger logger)
{ {
_resizer = resizer; _resizer = resizer;
_albumService = albumService;
_httpClient = httpClient; _httpClient = httpClient;
_diskProvider = diskProvider; _diskProvider = diskProvider;
_coverExistsSpecification = coverExistsSpecification; _coverExistsSpecification = coverExistsSpecification;
@ -55,20 +58,32 @@ namespace NzbDrone.Core.MediaCover
_coverRootFolder = appFolderInfo.GetMediaCoverPath(); _coverRootFolder = appFolderInfo.GetMediaCoverPath();
} }
public string GetCoverPath(int seriesId, MediaCoverTypes coverTypes, int? height = null) public string GetCoverPath(int artistId, MediaCoverTypes coverTypes, int? height = null, int? albumId = null)
{ {
var heightSuffix = height.HasValue ? "-" + height.ToString() : ""; var heightSuffix = height.HasValue ? "-" + height.ToString() : "";
return Path.Combine(GetSeriesCoverPath(seriesId), coverTypes.ToString().ToLower() + heightSuffix + ".jpg"); if (albumId.HasValue)
{
return Path.Combine(GetAlbumCoverPath(artistId, albumId.Value), coverTypes.ToString().ToLower() + heightSuffix + ".jpg");
} }
public void ConvertToLocalUrls(int seriesId, IEnumerable<MediaCover> covers) return Path.Combine(GetArtistCoverPath(artistId), coverTypes.ToString().ToLower() + heightSuffix + ".jpg");
}
public void ConvertToLocalUrls(int artistId, IEnumerable<MediaCover> covers, int? albumId = null)
{ {
foreach (var mediaCover in covers) foreach (var mediaCover in covers)
{ {
var filePath = GetCoverPath(seriesId, mediaCover.CoverType); var filePath = GetCoverPath(artistId, mediaCover.CoverType, null, albumId);
mediaCover.Url = _configFileProvider.UrlBase + @"/MediaCover/" + seriesId + "/" + mediaCover.CoverType.ToString().ToLower() + ".jpg"; if (albumId.HasValue)
{
mediaCover.Url = _configFileProvider.UrlBase + @"/MediaCover/" + artistId + "/" + albumId + "/" + mediaCover.CoverType.ToString().ToLower() + ".jpg";
}
else
{
mediaCover.Url = _configFileProvider.UrlBase + @"/MediaCover/" + artistId + "/" + mediaCover.CoverType.ToString().ToLower() + ".jpg";
}
if (_diskProvider.FileExists(filePath)) if (_diskProvider.FileExists(filePath))
{ {
@ -78,47 +93,87 @@ namespace NzbDrone.Core.MediaCover
} }
} }
private string GetSeriesCoverPath(int seriesId) private string GetArtistCoverPath(int artistId)
{ {
return Path.Combine(_coverRootFolder, seriesId.ToString()); return Path.Combine(_coverRootFolder, artistId.ToString());
} }
private void EnsureCovers(Series series) private string GetAlbumCoverPath(int artistId, int albumId)
{ {
foreach (var cover in series.Images) return Path.Combine(_coverRootFolder, artistId.ToString(), albumId.ToString());
}
private void EnsureCovers(Artist artist)
{ {
var fileName = GetCoverPath(series.Id, cover.CoverType); foreach (var cover in artist.Images)
{
var fileName = GetCoverPath(artist.Id, cover.CoverType);
var alreadyExists = false; var alreadyExists = false;
try try
{ {
alreadyExists = _coverExistsSpecification.AlreadyExists(cover.Url, fileName); alreadyExists = _coverExistsSpecification.AlreadyExists(cover.Url, fileName);
if (!alreadyExists) if (!alreadyExists)
{ {
DownloadCover(series, cover); DownloadCover(artist, cover);
} }
} }
catch (WebException e) catch (WebException e)
{ {
_logger.Warn("Couldn't download media cover for {0}. {1}", series, e.Message); _logger.Warn("Couldn't download media cover for {0}. {1}", artist, e.Message);
} }
catch (Exception e) catch (Exception e)
{ {
_logger.Error(e, "Couldn't download media cover for {0}", series); _logger.Error(e, "Couldn't download media cover for {0}", artist);
} }
EnsureResizedCovers(series, cover, !alreadyExists); EnsureResizedCovers(artist, cover, !alreadyExists);
} }
} }
private void DownloadCover(Series series, MediaCover cover) private void EnsureAlbumCovers(Album album)
{ {
var fileName = GetCoverPath(series.Id, cover.CoverType); foreach (var cover in album.Images)
{
var fileName = GetCoverPath(album.ArtistId, cover.CoverType, null, album.Id);
var alreadyExists = false;
try
{
alreadyExists = _coverExistsSpecification.AlreadyExists(cover.Url, fileName);
if (!alreadyExists)
{
DownloadAlbumCover(album, cover);
}
}
catch (WebException e)
{
_logger.Warn("Couldn't download media cover for {0}. {1}", album, e.Message);
}
catch (Exception e)
{
_logger.Error(e, "Couldn't download media cover for {0}", album);
}
_logger.Info("Downloading {0} for {1} {2}", cover.CoverType, series, cover.Url); EnsureResizedCovers(album.Artist, cover, !alreadyExists, album);
}
}
private void DownloadCover(Artist artist, MediaCover cover)
{
var fileName = GetCoverPath(artist.Id, cover.CoverType);
_logger.Info("Downloading {0} for {1} {2}", cover.CoverType, artist, cover.Url);
_httpClient.DownloadFile(cover.Url, fileName); _httpClient.DownloadFile(cover.Url, fileName);
} }
private void EnsureResizedCovers(Series series, MediaCover cover, bool forceResize) private void DownloadAlbumCover(Album album, MediaCover cover)
{
var fileName = GetCoverPath(album.ArtistId, cover.CoverType, null, album.Id);
_logger.Info("Downloading {0} for {1} {2}", cover.CoverType, album, cover.Url);
_httpClient.DownloadFile(cover.Url, fileName);
}
private void EnsureResizedCovers(Artist artist, MediaCover cover, bool forceResize, Album album = null)
{ {
int[] heights; int[] heights;
@ -145,14 +200,17 @@ namespace NzbDrone.Core.MediaCover
break; break;
} }
if (album == null)
{
foreach (var height in heights) foreach (var height in heights)
{ {
var mainFileName = GetCoverPath(series.Id, cover.CoverType); var mainFileName = GetCoverPath(artist.Id, cover.CoverType);
var resizeFileName = GetCoverPath(series.Id, cover.CoverType, height); var resizeFileName = GetCoverPath(artist.Id, cover.CoverType, height);
if (forceResize || !_diskProvider.FileExists(resizeFileName) || _diskProvider.GetFileSize(resizeFileName) == 0) if (forceResize || !_diskProvider.FileExists(resizeFileName) || _diskProvider.GetFileSize(resizeFileName) == 0)
{ {
_logger.Debug("Resizing {0}-{1} for {2}", cover.CoverType, height, series); _logger.Debug("Resizing {0}-{1} for {2}", cover.CoverType, height, artist);
try try
{ {
@ -160,21 +218,51 @@ namespace NzbDrone.Core.MediaCover
} }
catch catch
{ {
_logger.Debug("Couldn't resize media cover {0}-{1} for {2}, using full size image instead.", cover.CoverType, height, series); _logger.Debug("Couldn't resize media cover {0}-{1} for {2}, using full size image instead.", cover.CoverType, height, artist);
}
}
}
}
else
{
foreach (var height in heights)
{
var mainFileName = GetCoverPath(album.ArtistId, cover.CoverType, null, album.Id);
var resizeFileName = GetCoverPath(album.ArtistId, cover.CoverType, height, album.Id);
if (forceResize || !_diskProvider.FileExists(resizeFileName) || _diskProvider.GetFileSize(resizeFileName) == 0)
{
_logger.Debug("Resizing {0}-{1} for {2}", cover.CoverType, height, artist);
try
{
_resizer.Resize(mainFileName, resizeFileName, height);
}
catch
{
_logger.Debug("Couldn't resize media cover {0}-{1} for {2}, using full size image instead.", cover.CoverType, height, album);
}
} }
} }
} }
} }
public void HandleAsync(SeriesUpdatedEvent message) public void HandleAsync(ArtistUpdatedEvent message)
{ {
EnsureCovers(message.Series); EnsureCovers(message.Artist);
_eventAggregator.PublishEvent(new MediaCoversUpdatedEvent(message.Series));
var albums = _albumService.GetAlbumsByArtist(message.Artist.Id);
foreach (Album album in albums)
{
EnsureAlbumCovers(album);
} }
public void HandleAsync(SeriesDeletedEvent message) _eventAggregator.PublishEvent(new MediaCoversUpdatedEvent(message.Artist));
}
public void HandleAsync(ArtistDeletedEvent message)
{ {
var path = GetSeriesCoverPath(message.Series.Id); var path = GetArtistCoverPath(message.Artist.Id);
if (_diskProvider.FolderExists(path)) if (_diskProvider.FolderExists(path))
{ {
_diskProvider.DeleteFolder(path, true); _diskProvider.DeleteFolder(path, true);

15
src/NzbDrone.Core/MediaCover/MediaCoversUpdatedEvent.cs
View file

@ -1,15 +1,22 @@
using NzbDrone.Common.Messaging; using NzbDrone.Common.Messaging;
using NzbDrone.Core.Tv; using NzbDrone.Core.Tv;
using NzbDrone.Core.Music;
namespace NzbDrone.Core.MediaCover namespace NzbDrone.Core.MediaCover
{ {
public class MediaCoversUpdatedEvent : IEvent public class MediaCoversUpdatedEvent : IEvent
{ {
public Series Series { get; set; } public Artist Artist { get; set; }
public Album Album { get; set; }
public MediaCoversUpdatedEvent(Series series) public MediaCoversUpdatedEvent(Artist artist)
{ {
Series = series; Artist = artist;
}
public MediaCoversUpdatedEvent(Album album)
{
Album = album;
} }
} }
} }