mirror/Lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/Lidarr synced 2024-12-26 01:27:00 +00:00
Code Issues Releases Wiki Activity

Fixed: Album Metadata Images don't always save in correct folder

Browse source
This commit is contained in:
Qstick 2017-11-25 22:01:50 -05:00
parent 8219a8014b
commit 2afa6c02de
2 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs
View file

@ -331,7 +331,7 @@ public override List<ImageFileResult> AlbumImages(Artist artist, Album album)
return new List<ImageFileResult>(); return new List<ImageFileResult>();
} }
return ProcessAlbumImages(artist, album).ToList(); return ProcessAlbumImages(album).ToList();
} }
public override List<ImageFileResult> TrackImages(Artist artist, TrackFile trackFile) public override List<ImageFileResult> TrackImages(Artist artist, TrackFile trackFile)
@ -351,14 +351,13 @@ private IEnumerable<ImageFileResult> ProcessArtistImages(Artist artist)
} }
} }
private IEnumerable<ImageFileResult> ProcessAlbumImages(Artist artist, Album album) private IEnumerable<ImageFileResult> ProcessAlbumImages(Album album)
{ {
foreach (var image in album.Images) foreach (var image in album.Images)
{ {
var destination = Path.GetFileName(album.Path); var destination = image.CoverType.ToString().ToLowerInvariant() + Path.GetExtension(image.Url);
var filename = string.Format("{0}\\{1}{2}", destination, image.CoverType.ToString().ToLower(), Path.GetExtension(image.Url));
yield return new ImageFileResult(filename, image.Url); yield return new ImageFileResult(destination, image.Url);
} }
} }

28
src/NzbDrone.Core/Extras/Metadata/MetadataService.cs
View file

@ -392,7 +392,7 @@ private List<MetadataFile> ProcessAlbumImages(IMetadata consumer, Artist artist,
Extension = Path.GetExtension(fullPath) Extension = Path.GetExtension(fullPath)
}; };
DownloadImage(artist, image); DownloadImage(album, image);
result.Add(metadata); result.Add(metadata);
} }
@ -476,6 +476,32 @@ private void DownloadImage(Artist artist, ImageFileResult image)
} }
} }
private void DownloadImage(Album album, ImageFileResult image)
{
var fullPath = Path.Combine(album.Path, image.RelativePath);
try
{
if (image.Url.StartsWith("http"))
{
_httpClient.DownloadFile(image.Url, fullPath);
}
else
{
_diskProvider.CopyFile(image.Url, fullPath);
}
_mediaFileAttributeService.SetFilePermissions(fullPath);
}
catch (WebException ex)
{
_logger.Warn(ex, "Couldn't download image {0} for {1}. {2}", image.Url, album, ex.Message);
}
catch (Exception ex)
{
_logger.Error(ex, "Couldn't download image {0} for {1}. {2}", image.Url, album, ex.Message);
}
}
private void SaveMetadataFile(string path, string contents) private void SaveMetadataFile(string path, string contents)
{ {
_diskProvider.WriteAllText(path, contents); _diskProvider.WriteAllText(path, contents);