From 856a615d2d0d518db451a1c5c340183de6e06bd0 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Sun, 12 Nov 2017 23:25:03 +0100 Subject: [PATCH] Misc optimization I noticed that first card usually pops up around 2-3 seconds after second default FarmingDelay check, so we can add a few extra seconds and avoid doing 3rd request. --- ArchiSteamFarm/ArchiWebHandler.cs | 4 ++-- ArchiSteamFarm/CardsFarmer.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ArchiSteamFarm/ArchiWebHandler.cs b/ArchiSteamFarm/ArchiWebHandler.cs index 6fd4e08c0..48937ddca 100644 --- a/ArchiSteamFarm/ArchiWebHandler.cs +++ b/ArchiSteamFarm/ArchiWebHandler.cs @@ -41,13 +41,13 @@ using Formatting = Newtonsoft.Json.Formatting; namespace ArchiSteamFarm { internal sealed class ArchiWebHandler : IDisposable { + internal const byte MinSessionTTL = GlobalConfig.DefaultConnectionTimeout / 6; // Assume session is valid for at least that amount of seconds + private const string IEconService = "IEconService"; private const string IPlayerService = "IPlayerService"; private const string ISteamUserAuth = "ISteamUserAuth"; private const string ITwoFactorService = "ITwoFactorService"; - private const byte MinSessionTTL = GlobalConfig.DefaultConnectionTimeout / 6; // Assume session is valid for at least that amount of seconds - // We must use HTTPS for SteamCommunity, as http would make certain POST requests failing (trades) private const string SteamCommunityHost = "steamcommunity.com"; diff --git a/ArchiSteamFarm/CardsFarmer.cs b/ArchiSteamFarm/CardsFarmer.cs index 142dc9a1a..c673677b0 100755 --- a/ArchiSteamFarm/CardsFarmer.cs +++ b/ArchiSteamFarm/CardsFarmer.cs @@ -690,7 +690,7 @@ namespace ArchiSteamFarm { Bot.ArchiLogger.LogGenericInfo(string.Format(Strings.StillIdling, game.AppID, game.GameName)); DateTime startFarmingPeriod = DateTime.UtcNow; - if (await FarmingResetSemaphore.WaitAsync(60 * 1000 * Program.GlobalConfig.FarmingDelay).ConfigureAwait(false)) { + if (await FarmingResetSemaphore.WaitAsync(Program.GlobalConfig.FarmingDelay * 60 * 1000 + ArchiWebHandler.MinSessionTTL * 1000).ConfigureAwait(false)) { success = KeepFarming; } @@ -730,7 +730,7 @@ namespace ArchiSteamFarm { Bot.ArchiLogger.LogGenericInfo(string.Format(Strings.StillIdlingList, string.Join(", ", games.Select(game => game.AppID)))); DateTime startFarmingPeriod = DateTime.UtcNow; - if (await FarmingResetSemaphore.WaitAsync(60 * 1000 * Program.GlobalConfig.FarmingDelay).ConfigureAwait(false)) { + if (await FarmingResetSemaphore.WaitAsync(Program.GlobalConfig.FarmingDelay * 60 * 1000 + ArchiWebHandler.MinSessionTTL * 1000).ConfigureAwait(false)) { success = KeepFarming; }