From c9a816fbf4be5384ed61c2f111c181031ff86aa0 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 12 Jun 2019 16:47:06 +0100 Subject: [PATCH 1/6] #3010 - Make sure we only sync the Monitored Radarr movies... --- src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs b/src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs index 8212aad3b..e61efc9a4 100644 --- a/src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs +++ b/src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs @@ -52,7 +52,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 { From b96cf6a8802bb9bb9073b57a9501368157449895 Mon Sep 17 00:00:00 2001 From: bdrumm1234 Date: Thu, 13 Jun 2019 00:27:23 -0400 Subject: [PATCH 2/6] Renamed "Extensions" for Spelling Mistake. --- .../{HttpRequestExtnesions.cs => HttpRequestExtensions.cs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/Ombi.Api/{HttpRequestExtnesions.cs => HttpRequestExtensions.cs} (100%) 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 From 8b450b41699c3c27fe0c8fe4f17e94496db5160b Mon Sep 17 00:00:00 2001 From: Jamie Date: Thu, 13 Jun 2019 18:32:07 +0100 Subject: [PATCH 3/6] Really fixed #3010 this time. That's embarrassing --- src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs b/src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs index e61efc9a4..a2877df47 100644 --- a/src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs +++ b/src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs @@ -52,7 +52,7 @@ namespace Ombi.Schedule.Jobs.Radarr var movieIds = new List(); foreach (var m in movies) { - if (m.tmdbId > 0 && !m.monitored) + if (m.tmdbId > 0 && m.monitored) { movieIds.Add(new RadarrCache { @@ -111,4 +111,4 @@ namespace Ombi.Schedule.Jobs.Radarr GC.SuppressFinalize(this); } } -} \ No newline at end of file +} From e0dab68c31bec735a8241a7d5735392a20998985 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 13 Jun 2019 22:10:15 +0100 Subject: [PATCH 4/6] Added further logging into the API's (debug logging) --- src/Ombi.Api/Api.cs | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/Ombi.Api/Api.cs b/src/Ombi.Api/Api.cs index e405b6bca..7ef16f436 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) @@ -153,11 +155,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); + } + } } } From da745e663c33938f7e4de57885cd1b60aed66495 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 13 Jun 2019 22:11:55 +0100 Subject: [PATCH 5/6] Log the request --- src/Ombi.Api/Api.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Ombi.Api/Api.cs b/src/Ombi.Api/Api.cs index 7ef16f436..8748530ec 100644 --- a/src/Ombi.Api/Api.cs +++ b/src/Ombi.Api/Api.cs @@ -134,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 From 9ccadec645c362871846a81b6e5f232fff4ae716 Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 19 Jun 2019 13:32:30 +0100 Subject: [PATCH 6/6] Fix #3027 --- src/Ombi.Api.Lidarr/LidarrApi.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); }