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

Rename Clearart to Clearlogo, use png for Clearlogo

Browse source 
(cherry picked from commit 349f7cf4c934fbf53516f7e92026282750180a16)

Fixes #3721
This commit is contained in:
Mark McDowall 2023-05-22 10:28:18 -07:00 • committed by Bogdan
commit b30dec13dc
2 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/NzbDrone.Core/MediaCover/MediaCover.cs
View file

@ -16,7 +16,7 @@ namespace NzbDrone.Core.MediaCover
Cover = 6,
Disc = 7,
Logo = 8,
Clearart = 9
Clearlogo = 9
}
public enum MediaCoverEntity

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

@ -19,7 +19,7 @@ namespace NzbDrone.Core.MediaCover
public interface IMapCoversToLocal
{
void ConvertToLocalUrls(int entityId, MediaCoverEntity coverEntity, IEnumerable<MediaCover> covers);
string GetCoverPath(int entityId, MediaCoverEntity coverEntity, MediaCoverTypes mediaCoverTypes, string extension, int? height = null);
string GetCoverPath(int entityId, MediaCoverEntity coverEntity, MediaCoverTypes coverType, string extension, int? height = null);
bool EnsureAlbumCovers(Album album);
}
@ -70,18 +70,16 @@ namespace NzbDrone.Core.MediaCover
_coverRootFolder = appFolderInfo.GetMediaCoverPath();
}
public string GetCoverPath(int entityId, MediaCoverEntity coverEntity, MediaCoverTypes coverTypes, string extension, int? height = null)
public string GetCoverPath(int entityId, MediaCoverEntity coverEntity, MediaCoverTypes coverType, string extension, int? height = null)
{
var heightSuffix = height.HasValue ? "-" + height.ToString() : "";
if (coverEntity == MediaCoverEntity.Album)
{
return Path.Combine(GetAlbumCoverPath(entityId), coverTypes.ToString().ToLower() + heightSuffix + extension);
}
else
{
return Path.Combine(GetArtistCoverPath(entityId), coverTypes.ToString().ToLower() + heightSuffix + extension);
return Path.Combine(GetAlbumCoverPath(entityId), coverType.ToString().ToLower() + heightSuffix + GetExtension(coverType, extension));
}
return Path.Combine(GetArtistCoverPath(entityId), coverType.ToString().ToLower() + heightSuffix + GetExtension(coverType, extension));
}
public void ConvertToLocalUrls(int entityId, MediaCoverEntity coverEntity, IEnumerable<MediaCover> covers)
@ -99,17 +97,22 @@ namespace NzbDrone.Core.MediaCover
{
foreach (var mediaCover in covers)
{
if (mediaCover.CoverType == MediaCoverTypes.Unknown)
{
continue;
}
var filePath = GetCoverPath(entityId, coverEntity, mediaCover.CoverType, mediaCover.Extension, null);
mediaCover.RemoteUrl = mediaCover.Url;
if (coverEntity == MediaCoverEntity.Album)
{
mediaCover.Url = _configFileProvider.UrlBase + @"/MediaCover/Albums/" + entityId + "/" + mediaCover.CoverType.ToString().ToLower() + mediaCover.Extension;
mediaCover.Url = _configFileProvider.UrlBase + @"/MediaCover/Albums/" + entityId + "/" + mediaCover.CoverType.ToString().ToLower() + GetExtension(mediaCover.CoverType, mediaCover.Extension);
}
else
{
mediaCover.Url = _configFileProvider.UrlBase + @"/MediaCover/" + entityId + "/" + mediaCover.CoverType.ToString().ToLower() + mediaCover.Extension;
mediaCover.Url = _configFileProvider.UrlBase + @"/MediaCover/" + entityId + "/" + mediaCover.CoverType.ToString().ToLower() + GetExtension(mediaCover.CoverType, mediaCover.Extension);
}
if (_diskProvider.FileExists(filePath))
@ -312,6 +315,15 @@ namespace NzbDrone.Core.MediaCover
}
}
private string GetExtension(MediaCoverTypes coverType, string defaultExtension)
{
return coverType switch
{
MediaCoverTypes.Clearlogo => ".png",
_ => defaultExtension
};
}
public void HandleAsync(ArtistRefreshCompleteEvent message)
{
var updated = EnsureArtistCovers(message.Artist);