From 15df7456805d9a213e0648ddbd41881d161fe331 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Mon, 18 Sep 2017 16:54:28 +0200 Subject: [PATCH] Test --- ArchiSteamFarm/ArchiWebHandler.cs | 3 ++- ArchiSteamFarm/JSON/Steam.cs | 6 ++++++ ArchiSteamFarm/WebBrowser.cs | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ArchiSteamFarm/ArchiWebHandler.cs b/ArchiSteamFarm/ArchiWebHandler.cs index 20e1317d7..fbc2b49c0 100644 --- a/ArchiSteamFarm/ArchiWebHandler.cs +++ b/ArchiSteamFarm/ArchiWebHandler.cs @@ -494,11 +494,12 @@ namespace ArchiSteamFarm { while (true) { Steam.InventoryResponse response = await WebBrowser.UrlGetToJsonResultRetry(request + (startAssetID > 0 ? "&start_assetid=" + startAssetID : "")).ConfigureAwait(false); - if (response == null) { + if (response?.Success != true) { return null; } if ((response.Assets == null) || (response.Assets.Count == 0) || (response.Descriptions == null) || (response.Descriptions.Count == 0)) { + // Empty inventory return result; } diff --git a/ArchiSteamFarm/JSON/Steam.cs b/ArchiSteamFarm/JSON/Steam.cs index 87ef66944..bbaa86296 100644 --- a/ArchiSteamFarm/JSON/Steam.cs +++ b/ArchiSteamFarm/JSON/Steam.cs @@ -372,6 +372,7 @@ namespace ArchiSteamFarm.JSON { internal ulong LastAssetID { get; private set; } internal bool MoreItems { get; private set; } + internal bool Success { get; private set; } [JsonProperty(PropertyName = "last_assetid", Required = Required.DisallowNull)] private string LastAssetIDString { @@ -395,6 +396,11 @@ namespace ArchiSteamFarm.JSON { set => MoreItems = value > 0; } + [JsonProperty(PropertyName = "success", Required = Required.Always)] + private byte SuccessNumber { + set => Success = value > 0; + } + // Deserialized from JSON private InventoryResponse() { } diff --git a/ArchiSteamFarm/WebBrowser.cs b/ArchiSteamFarm/WebBrowser.cs index 9c9c1b463..68e9c89db 100644 --- a/ArchiSteamFarm/WebBrowser.cs +++ b/ArchiSteamFarm/WebBrowser.cs @@ -143,6 +143,8 @@ namespace ArchiSteamFarm { return default; } + ArchiLogger.LogGenericDebug("JSON: <" + json + ">"); + try { return JsonConvert.DeserializeObject(json); } catch (JsonException e) {