diff --git a/src/Ombi.Api.Lidarr/LidarrApi.cs b/src/Ombi.Api.Lidarr/LidarrApi.cs index 61752e9b8..0f03aa1b0 100644 --- a/src/Ombi.Api.Lidarr/LidarrApi.cs +++ b/src/Ombi.Api.Lidarr/LidarrApi.cs @@ -84,7 +84,7 @@ namespace Ombi.Api.Lidarr public Task GetAlbumsByArtist(string foreignArtistId) { - var request = new Request(string.Empty, $"https://api.lidarr.audio/api/v0.3/artist/{foreignArtistId}", + var request = new Request(string.Empty, $"https://api.lidarr.audio/api/v0.4/artist/{foreignArtistId}", HttpMethod.Get) {IgnoreBaseUrlAppend = true}; return Api.Request(request); } diff --git a/src/Ombi.Api/Api.cs b/src/Ombi.Api/Api.cs index e405b6bca..8748530ec 100644 --- a/src/Ombi.Api/Api.cs +++ b/src/Ombi.Api/Api.cs @@ -72,6 +72,7 @@ namespace Ombi.Api // do something with the response var receivedString = await httpResponseMessage.Content.ReadAsStringAsync(); + LogDebugContent(receivedString); if (request.ContentType == ContentType.Json) { request.OnBeforeDeserialization?.Invoke(receivedString); @@ -110,7 +111,7 @@ namespace Ombi.Api } // do something with the response var data = httpResponseMessage.Content; - + await LogDebugContent(httpResponseMessage); return await data.ReadAsStringAsync(); } @@ -122,6 +123,7 @@ namespace Ombi.Api { AddHeadersBody(request, httpRequestMessage); var httpResponseMessage = await _client.SendAsync(httpRequestMessage); + await LogDebugContent(httpResponseMessage); if (!httpResponseMessage.IsSuccessStatusCode) { if (!request.IgnoreErrors) @@ -132,11 +134,12 @@ namespace Ombi.Api } } - private static void AddHeadersBody(Request request, HttpRequestMessage httpRequestMessage) + private void AddHeadersBody(Request request, HttpRequestMessage httpRequestMessage) { // Add the Json Body if (request.JsonBody != null) { + LogDebugContent("REQUEST: " + request.JsonBody); httpRequestMessage.Content = new JsonContent(request.JsonBody); httpRequestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("application/json"); // Emby connect fails if we have the charset in the header @@ -153,11 +156,24 @@ namespace Ombi.Api { Logger.LogError(LoggingEvents.Api, $"StatusCode: {httpResponseMessage.StatusCode}, Reason: {httpResponseMessage.ReasonPhrase}, RequestUri: {request.FullUri}"); + await LogDebugContent(httpResponseMessage); + } + + private async Task LogDebugContent(HttpResponseMessage message) + { if (Logger.IsEnabled(LogLevel.Debug)) { - var content = await httpResponseMessage.Content.ReadAsStringAsync(); + var content = await message.Content.ReadAsStringAsync(); Logger.LogDebug(content); } } + + private void LogDebugContent(string message) + { + if (Logger.IsEnabled(LogLevel.Debug)) + { + Logger.LogDebug(message); + } + } } } diff --git a/src/Ombi.Api/HttpRequestExtnesions.cs b/src/Ombi.Api/HttpRequestExtensions.cs similarity index 100% rename from src/Ombi.Api/HttpRequestExtnesions.cs rename to src/Ombi.Api/HttpRequestExtensions.cs diff --git a/src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs b/src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs index d51743e4b..6fa4c1bc8 100644 --- a/src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs +++ b/src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs @@ -56,7 +56,7 @@ namespace Ombi.Schedule.Jobs.Radarr var movieIds = new List(); foreach (var m in movies) { - if (m.tmdbId > 0) + if (m.tmdbId > 0 && m.monitored) { movieIds.Add(new RadarrCache { @@ -120,4 +120,4 @@ namespace Ombi.Schedule.Jobs.Radarr GC.SuppressFinalize(this); } } -} \ No newline at end of file +}