sarsoo/IF.Lastfm
1
0
Fork 0
mirror of https://github.com/Sarsoo/IF.Lastfm.git synced 2024-10-17 07:13:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed error detection logic, fixes #7

Browse Source 
* removed "json.Contains("error")"  - lol
This commit is contained in:
Rikki Tooley 2013-09-11 03:37:55 +01:00
parent 015362fc81
commit f2b0875503
1 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
IF.Lastfm.Core/LastFm.cs
View File

@ -89,14 +89,6 @@ public static string FormatQueryParameters(IEnumerable<KeyValuePair<string, stri
public static bool IsResponseValid(string json, out LastFmApiError error) public static bool IsResponseValid(string json, out LastFmApiError error)
{ {
// hmmm
if (json.Length > 1 && !json.Contains("error"))
{
error = LastFmApiError.None;
return true;
}
error = LastFmApiError.Unknown;
JObject jo; JObject jo;
try try
{ {
@ -104,11 +96,22 @@ public static bool IsResponseValid(string json, out LastFmApiError error)
} }
catch (JsonException) catch (JsonException)
{ {
error = LastFmApiError.Unknown;
return false; return false;
} }
var code = jo.Value<int>("error"); var codeString = jo.Value<string>("error");
if (string.IsNullOrWhiteSpace(codeString) && json.Length > 1)
{
error = LastFmApiError.None;
return true;
}
error = LastFmApiError.Unknown;
int code;
if (Int32.TryParse(codeString, out code))
{
switch (code) switch (code)
{ {
case 2: case 2:
@ -154,6 +157,7 @@ public static bool IsResponseValid(string json, out LastFmApiError error)
error = LastFmApiError.RateLimited; error = LastFmApiError.RateLimited;
break; break;
} }
}
return false; return false;
} }