shaunrd0/lidarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Improve Artist/Album lookup error handling

Browse Source
This commit is contained in:
bakerboy448
2025-08-26 18:25:38 -05:00
parent f8664bf2f1
commit 3eb9ff605f
1 changed files with 59 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
+59 -13
View File
@@ -88,6 +88,10 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
{ {
throw new BadRequestException(foreignArtistId); throw new BadRequestException(foreignArtistId);
} }
else if (httpResponse.StatusCode == HttpStatusCode.ServiceUnavailable)
{
throw new SkyHookException("Unable to communicate with LidarrAPI. Service temporarily unavailable (503).");
}
else else
{ {
throw new HttpException(httpRequest, httpResponse); throw new HttpException(httpRequest, httpResponse);
@@ -166,6 +170,10 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
{ {
throw new BadRequestException(foreignAlbumId); throw new BadRequestException(foreignAlbumId);
} }
else if (httpResponse.StatusCode == HttpStatusCode.ServiceUnavailable)
{
throw new SkyHookException("Unable to communicate with LidarrAPI. Service temporarily unavailable (503).");
}
else else
{ {
throw new HttpException(httpRequest, httpResponse); throw new HttpException(httpRequest, httpResponse);
@@ -298,8 +306,14 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
.Where(x => x != null) .Where(x => x != null)
.ToList(); .ToList();
} }
catch (HttpException) catch (HttpException ex)
{ {
if (ex.Response != null && ex.Response.StatusCode == HttpStatusCode.ServiceUnavailable)
{
_logger.Warn("Album search failed for '{0}', service temporarily unavailable", title);
return new List<Album>();
}
throw new SkyHookException("Search for '{0}' failed. Unable to communicate with LidarrAPI.", title); throw new SkyHookException("Search for '{0}' failed. Unable to communicate with LidarrAPI.", title);
} }
catch (Exception ex) catch (Exception ex)
@@ -332,25 +346,51 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
if (IsMbidQuery(lowerTitle)) if (IsMbidQuery(lowerTitle))
{ {
var artist = SearchForNewArtist(lowerTitle); List<Artist> artist = null;
if (artist.Any()) try
{
artist = SearchForNewArtist(lowerTitle);
}
catch (SkyHookException ex)
{
_logger.Warn(ex, $"Artist search failed for '{lowerTitle}', will try album search.");
}
catch (Exception ex)
{
_logger.Warn(ex, $"Artist search failed for '{lowerTitle}', will try album search.");
}
if (artist != null && artist.Any())
{ {
return new List<object> { artist.First() }; return new List<object> { artist.First() };
} }
var album = SearchForNewAlbum(lowerTitle, null); try
if (album.Any())
{ {
var result = album.Where(x => x.AlbumReleases.Value.Any()).FirstOrDefault(); var album = SearchForNewAlbum(lowerTitle, null);
if (result != null) if (album.Any())
{ {
return new List<object> { result }; var result = album.Where(x => x.AlbumReleases.Value.Any()).FirstOrDefault();
} if (result != null)
else {
{ return new List<object> { result };
return new List<object>(); }
else
{
return new List<object>();
}
} }
} }
catch (SkyHookException ex)
{
_logger.Warn(ex, $"Album search failed for '{lowerTitle}'.");
}
catch (Exception ex)
{
_logger.Warn(ex, $"Album search failed for '{lowerTitle}'.");
}
return new List<object>();
} }
try try
@@ -367,8 +407,14 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
.Where(x => x != null) .Where(x => x != null)
.ToList(); .ToList();
} }
catch (HttpException) catch (HttpException ex)
{ {
if (ex.Response != null && ex.Response.StatusCode == HttpStatusCode.ServiceUnavailable)
{
_logger.Warn("Entity search failed for '{0}', service temporarily unavailable", title);
return new List<object>();
}
throw new SkyHookException("Search for '{0}' failed. Unable to communicate with LidarrAPI.", title); throw new SkyHookException("Search for '{0}' failed. Unable to communicate with LidarrAPI.", title);
} }
catch (Exception ex) catch (Exception ex)