From ba826e9da5239e1d75762a4e4ff5673fbd17c9ea Mon Sep 17 00:00:00 2001 From: Rikki Tooley Date: Sun, 5 Apr 2015 00:57:42 +0100 Subject: [PATCH] Putting Success property back on ILastResponse --- .../Scrobblers/ScrobblerTests.cs | 2 -- src/IF.Lastfm.Core/Api/Helpers/LastResponse.cs | 2 ++ .../Json/PageResponseJsonConverter.cs | 1 + src/IF.Lastfm.Core/Scrobblers/ScrobbleResponse.cs | 14 ++++++++++++-- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/IF.Lastfm.Core.Tests/Scrobblers/ScrobblerTests.cs b/src/IF.Lastfm.Core.Tests/Scrobblers/ScrobblerTests.cs index 79d9991..70693fb 100644 --- a/src/IF.Lastfm.Core.Tests/Scrobblers/ScrobblerTests.cs +++ b/src/IF.Lastfm.Core.Tests/Scrobblers/ScrobblerTests.cs @@ -34,8 +34,6 @@ public void Initialise() _scrobbler = new Scrobbler(_mockAuth.Object, httpClient); } - - [TestMethod] public async Task CorrectResponseWithBadAuth() { diff --git a/src/IF.Lastfm.Core/Api/Helpers/LastResponse.cs b/src/IF.Lastfm.Core/Api/Helpers/LastResponse.cs index 2af5d19..180e005 100644 --- a/src/IF.Lastfm.Core/Api/Helpers/LastResponse.cs +++ b/src/IF.Lastfm.Core/Api/Helpers/LastResponse.cs @@ -7,6 +7,8 @@ namespace IF.Lastfm.Core.Api.Helpers { public interface ILastResponse { + bool Success { get; } + LastResponseStatus Status { get; } } diff --git a/src/IF.Lastfm.Core/Json/PageResponseJsonConverter.cs b/src/IF.Lastfm.Core/Json/PageResponseJsonConverter.cs index 8e47b00..396c401 100644 --- a/src/IF.Lastfm.Core/Json/PageResponseJsonConverter.cs +++ b/src/IF.Lastfm.Core/Json/PageResponseJsonConverter.cs @@ -12,6 +12,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s dynamic container = new { + success = pageResponse.Success, items = pageResponse.Content, page = new { diff --git a/src/IF.Lastfm.Core/Scrobblers/ScrobbleResponse.cs b/src/IF.Lastfm.Core/Scrobblers/ScrobbleResponse.cs index 938a9ae..e4970dd 100644 --- a/src/IF.Lastfm.Core/Scrobblers/ScrobbleResponse.cs +++ b/src/IF.Lastfm.Core/Scrobblers/ScrobbleResponse.cs @@ -8,9 +8,19 @@ public class ScrobbleResponse : ILastResponse { public LastResponseStatus Status { get; internal set; } - public bool Cached + public bool Success { - get { return Status == LastResponseStatus.Cached; } + get + { + switch (Status) + { + case LastResponseStatus.Successful: + case LastResponseStatus.Cached: + return true; + default: + return false; + } + } } public Exception Exception { get; internal set; }