github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-21 05:43:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Patched Lidarr enabled checks

Browse source
This commit is contained in:
Nick Wallace 2021-08-10 17:31:47 -05:00
commit 4e971c937f
1 changed files with 49 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

93
src/Ombi.Core/Engine/V2/MusicSearchEngineV2.cs
View file

@ -42,20 +42,22 @@ namespace Ombi.Core.Engine.V2
{ {
var lidarrSettings = await GetLidarrSettings(); var lidarrSettings = await GetLidarrSettings();
Task<AlbumLookup> lidarrAlbumTask = null; Task<AlbumLookup> lidarrAlbumTask = null;
var release = new ReleaseGroup{};
if (lidarrSettings.Enabled) if (lidarrSettings.Enabled)
{ {
lidarrAlbumTask = _lidarrApi.GetAlbumByForeignId(albumId, lidarrSettings.ApiKey, lidarrSettings.FullUri); lidarrAlbumTask = _lidarrApi.GetAlbumByForeignId(albumId, lidarrSettings.ApiKey, lidarrSettings.FullUri);
} var albumResult = await lidarrAlbumTask;
var albumResult = await lidarrAlbumTask; release = new ReleaseGroup
var release = new ReleaseGroup {
{ ReleaseType = albumResult.artistType,
ReleaseType = albumResult.artistType, Id = albumResult.artistId.ToString(),
Id = albumResult.artistId.ToString(), Title = albumResult.title,
Title = albumResult.title, ReleaseDate = albumResult.releaseDate.ToString(),
ReleaseDate = albumResult.releaseDate.ToString(), };
};
await RunSearchRules(release);
}
await RunSearchRules(release);
return release; return release;
} }
@ -63,32 +65,34 @@ namespace Ombi.Core.Engine.V2
{ {
var lidarrSettings = await GetLidarrSettings(); var lidarrSettings = await GetLidarrSettings();
Task<ArtistResult> lidarrArtistTask = null; Task<ArtistResult> lidarrArtistTask = null;
var info = new ArtistInformation { };
if (lidarrSettings.Enabled) if (lidarrSettings.Enabled)
{ {
lidarrArtistTask = _lidarrApi.GetArtistByForeignId(artistId, lidarrSettings.ApiKey, lidarrSettings.FullUri); lidarrArtistTask = _lidarrApi.GetArtistByForeignId(artistId, lidarrSettings.ApiKey, lidarrSettings.FullUri);
} info = new ArtistInformation { };
var info = new ArtistInformation{}; if (lidarrArtistTask != null)
if (lidarrArtistTask != null)
{
try
{ {
var artistResult = await lidarrArtistTask; try
info.Banner = artistResult.images?.FirstOrDefault(x => x.coverType.Equals("banner", StringComparison.InvariantCultureIgnoreCase))?.url.ToHttpsUrl(); {
info.Logo = artistResult.images?.FirstOrDefault(x => x.coverType.Equals("logo", StringComparison.InvariantCultureIgnoreCase))?.url.ToHttpsUrl(); var artistResult = await lidarrArtistTask;
info.Poster = artistResult.images?.FirstOrDefault(x => x.coverType.Equals("poster", StringComparison.InvariantCultureIgnoreCase))?.url.ToHttpsUrl(); info.Banner = artistResult.images?.FirstOrDefault(x => x.coverType.Equals("banner", StringComparison.InvariantCultureIgnoreCase))?.url.ToHttpsUrl();
info.FanArt = artistResult.images?.FirstOrDefault(x => x.coverType.Equals("fanart", StringComparison.InvariantCultureIgnoreCase))?.url.ToHttpsUrl(); info.Logo = artistResult.images?.FirstOrDefault(x => x.coverType.Equals("logo", StringComparison.InvariantCultureIgnoreCase))?.url.ToHttpsUrl();
info.Overview = artistResult.overview; info.Poster = artistResult.images?.FirstOrDefault(x => x.coverType.Equals("poster", StringComparison.InvariantCultureIgnoreCase))?.url.ToHttpsUrl();
info.Name = artistResult.artistName; info.FanArt = artistResult.images?.FirstOrDefault(x => x.coverType.Equals("fanart", StringComparison.InvariantCultureIgnoreCase))?.url.ToHttpsUrl();
info.Monitored = artistResult.monitored; info.Overview = artistResult.overview;
} info.Name = artistResult.artistName;
catch (JsonSerializationException) info.Monitored = artistResult.monitored;
{ }
// swallow, Lidarr probably doesn't have this artist catch (JsonSerializationException)
{
// swallow, Lidarr probably doesn't have this artist
}
} }
} }
return info; return info;
} }
@ -96,28 +100,27 @@ namespace Ombi.Core.Engine.V2
{ {
var lidarrSettings = await GetLidarrSettings(); var lidarrSettings = await GetLidarrSettings();
Task<AlbumLookup> lidarrAlbumTask = null; Task<AlbumLookup> lidarrAlbumTask = null;
var info = new AlbumInformation { };
if (lidarrSettings.Enabled) if (lidarrSettings.Enabled)
{ {
lidarrAlbumTask = _lidarrApi.GetAlbumByForeignId(albumId, lidarrSettings.ApiKey, lidarrSettings.FullUri); lidarrAlbumTask = _lidarrApi.GetAlbumByForeignId(albumId, lidarrSettings.ApiKey, lidarrSettings.FullUri);
}
var info = new AlbumInformation { }; if (lidarrAlbumTask != null)
if (lidarrAlbumTask != null)
{
try
{ {
var albumResult = await lidarrAlbumTask; try
info.Cover = albumResult.images?.FirstOrDefault(x => x.coverType.Equals("cover", StringComparison.InvariantCultureIgnoreCase))?.url.ToHttpsUrl(); {
info.Title = albumResult.title; var albumResult = await lidarrAlbumTask;
info.Disambiguation = albumResult.disambiguation; info.Cover = albumResult.images?.FirstOrDefault(x => x.coverType.Equals("cover", StringComparison.InvariantCultureIgnoreCase))?.url.ToHttpsUrl();
info.Overview = albumResult.overview; info.Title = albumResult.title;
info.Monitored = albumResult.monitored; info.Disambiguation = albumResult.disambiguation;
info.Id = albumResult.foreignAlbumId; info.Overview = albumResult.overview;
} info.Monitored = albumResult.monitored;
catch (JsonSerializationException) info.Id = albumResult.foreignAlbumId;
{ }
// swallow, Lidarr probably doesn't have this album catch (JsonSerializationException)
{
// swallow, Lidarr probably doesn't have this album
}
} }
} }