diff --git a/src/Ombi.Api.Radarr/CommandResult.cs b/src/Ombi.Api.Radarr/CommandResult.cs new file mode 100644 index 000000000..e658a1ede --- /dev/null +++ b/src/Ombi.Api.Radarr/CommandResult.cs @@ -0,0 +1,9 @@ +using System; + +namespace Ombi.Api.Radarr +{ + public class CommandResult + { + public string name { get; set; } + } +} diff --git a/src/Ombi.Api.Radarr/Models/RadarrAddMovie.cs b/src/Ombi.Api.Radarr/Models/RadarrAddMovie.cs index eaf7ee6da..9288058f9 100644 --- a/src/Ombi.Api.Radarr/Models/RadarrAddMovie.cs +++ b/src/Ombi.Api.Radarr/Models/RadarrAddMovie.cs @@ -17,10 +17,7 @@ namespace Ombi.Api.Radarr.Models public bool monitored { get; set; } public int tmdbId { get; set; } public List images { get; set; } - public string cleanTitle { get; set; } - public string imdbId { get; set; } public string titleSlug { get; set; } - public int id { get; set; } public int year { get; set; } public string minimumAvailability { get; set; } } diff --git a/src/Ombi.Api.Radarr/Models/RadarrError.cs b/src/Ombi.Api.Radarr/Models/RadarrError.cs index a42c2ca52..654f83772 100644 --- a/src/Ombi.Api.Radarr/Models/RadarrError.cs +++ b/src/Ombi.Api.Radarr/Models/RadarrError.cs @@ -3,19 +3,10 @@ public class RadarrError { public string message { get; set; } - public string description { get; set; } } public class RadarrErrorResponse { - public string propertyName { get; set; } public string errorMessage { get; set; } - public object attemptedValue { get; set; } - public FormattedMessagePlaceholderValues formattedMessagePlaceholderValues { get; set; } - } - public class FormattedMessagePlaceholderValues - { - public string propertyName { get; set; } - public object propertyValue { get; set; } } } \ No newline at end of file diff --git a/src/Ombi.Api.Radarr/RadarrApi.CommandResult.cs b/src/Ombi.Api.Radarr/RadarrApi.CommandResult.cs deleted file mode 100644 index b14863840..000000000 --- a/src/Ombi.Api.Radarr/RadarrApi.CommandResult.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; - -namespace Ombi.Api.Radarr -{ - public partial class RadarrApi - { - public class CommandResult - { - public string name { get; set; } - public DateTime startedOn { get; set; } - public DateTime stateChangeTime { get; set; } - public bool sendUpdatesToClient { get; set; } - public string state { get; set; } - public int id { get; set; } - } - } -} diff --git a/src/Ombi.Api.Radarr/RadarrApi.cs b/src/Ombi.Api.Radarr/RadarrApi.cs index 00786fda6..447d479bc 100644 --- a/src/Ombi.Api.Radarr/RadarrApi.cs +++ b/src/Ombi.Api.Radarr/RadarrApi.cs @@ -82,7 +82,7 @@ namespace Ombi.Api.Radarr titleSlug = title, monitored = true, year = year, - minimumAvailability = minimumAvailability, + minimumAvailability = minimumAvailability }; if (searchNow) @@ -97,9 +97,9 @@ namespace Ombi.Api.Radarr request.AddHeader("X-Api-Key", apiKey); request.AddJsonBody(options); + var response = await Api.RequestContent(request); try { - var response = await Api.RequestContent(request); if (response.Contains("\"message\":")) { var error = JsonConvert.DeserializeObject(response); @@ -114,7 +114,7 @@ namespace Ombi.Api.Radarr } catch (JsonSerializationException jse) { - Logger.LogError(LoggingEvents.RadarrApi, jse, "Error When adding movie to Radarr"); + Logger.LogError(LoggingEvents.RadarrApi, jse, "Error When adding movie to Radarr, Reponse: {0}", response); } return null; } diff --git a/src/Ombi.Api.Sonarr/Models/CommandResult.cs b/src/Ombi.Api.Sonarr/Models/CommandResult.cs index 0e9565eb8..8680bd1e3 100644 --- a/src/Ombi.Api.Sonarr/Models/CommandResult.cs +++ b/src/Ombi.Api.Sonarr/Models/CommandResult.cs @@ -8,11 +8,6 @@ namespace Ombi.Api.Sonarr.Models public class CommandResult { public string name { get; set; } - public DateTime startedOn { get; set; } - public DateTime stateChangeTime { get; set; } - public bool sendUpdatesToClient { get; set; } - public string state { get; set; } - public int id { get; set; } } }