Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-01 06:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to bulletproof against #3119 a bit

Browse Source
This commit is contained in:
Archi
2024-02-05 20:49:34 +01:00
parent 9c6cd7f692
commit 01b99d20f6
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ArchiSteamFarm/Steam/Cards/CardsFarmer.cs
View File

@@ -858,7 +858,7 @@ public sealed class CardsFarmer : IAsyncDisposable, IDisposable {
await Bot.IdleGame(game).ConfigureAwait(false);
bool success = true;
bool keepFarming = true;
DateTime endFarmingDate = DateTime.UtcNow.AddHours(ASF.GlobalConfig?.MaxFarmingTime ?? GlobalConfig.DefaultMaxFarmingTime);
while ((DateTime.UtcNow < endFarmingDate) && (await ShouldFarm(game).ConfigureAwait(false)).GetValueOrDefault(true)) {
@@ -873,7 +873,12 @@ public sealed class CardsFarmer : IAsyncDisposable, IDisposable {
TimeSpan timeSpan = TimeSpan.FromMinutes(ASF.GlobalConfig?.FarmingDelay ?? GlobalConfig.DefaultFarmingDelay) + TimeSpan.FromSeconds(ExtraFarmingDelaySeconds);
try {
success = await FarmingResetEvent.Task.WaitAsync(timeSpan).ConfigureAwait(false);
keepFarming = await FarmingResetEvent.Task.WaitAsync(timeSpan).ConfigureAwait(false);
if (keepFarming) {
// We've got an event that suggests item drop, wait for a brief moment to fight with potential cache issues
await Task.Delay(5000).ConfigureAwait(false);
}
} catch (TimeoutException e) {
Bot.ArchiLogger.LogGenericDebuggingException(e);
}
@@ -881,14 +886,14 @@ public sealed class CardsFarmer : IAsyncDisposable, IDisposable {
// Don't forget to update our GamesToFarm hours
game.HoursPlayed += (float) DateTime.UtcNow.Subtract(startFarmingPeriod).TotalHours;
if (!success) {
if (!keepFarming) {
break;
}
}
Bot.ArchiLogger.LogGenericInfo(string.Format(CultureInfo.CurrentCulture, Strings.StoppedIdling, game.AppID, game.GameName));
return success;
return keepFarming;
}
private async Task<bool> FarmHours(IReadOnlyCollection<Game> games) {
@@ -912,7 +917,7 @@ public sealed class CardsFarmer : IAsyncDisposable, IDisposable {
await Bot.IdleGames(games).ConfigureAwait(false);
bool success = true;
bool keepFarming = true;
while (maxHour < Bot.BotConfig.HoursUntilCardDrops) {
Bot.ArchiLogger.LogGenericInfo(string.Format(CultureInfo.CurrentCulture, Strings.StillIdlingList, string.Join(", ", games.Select(static game => game.AppID))));
@@ -926,7 +931,7 @@ public sealed class CardsFarmer : IAsyncDisposable, IDisposable {
TimeSpan timeSpan = TimeSpan.FromMinutes(ASF.GlobalConfig?.FarmingDelay ?? GlobalConfig.DefaultFarmingDelay) + TimeSpan.FromSeconds(ExtraFarmingDelaySeconds);
try {
success = await FarmingResetEvent.Task.WaitAsync(timeSpan).ConfigureAwait(false);
keepFarming = await FarmingResetEvent.Task.WaitAsync(timeSpan).ConfigureAwait(false);
} catch (TimeoutException e) {
Bot.ArchiLogger.LogGenericDebuggingException(e);
}
@@ -938,7 +943,7 @@ public sealed class CardsFarmer : IAsyncDisposable, IDisposable {
game.HoursPlayed += timePlayed;
}
if (!success) {
if (!keepFarming) {
break;
}
@@ -947,7 +952,7 @@ public sealed class CardsFarmer : IAsyncDisposable, IDisposable {
Bot.ArchiLogger.LogGenericInfo(string.Format(CultureInfo.CurrentCulture, Strings.StoppedIdlingList, string.Join(", ", games.Select(static game => game.AppID))));
return success;
return keepFarming;
}
private async Task<bool> FarmMultiple(IReadOnlyCollection<Game> games) {