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

Code cleanup after #2004

Browse Source
This commit is contained in:
JustArchi
2020-10-21 18:48:13 +02:00
parent 1f8b68f5ee
commit 25e549b7e2
5 changed files with 212 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
ArchiSteamFarm/ArchiWebHandler.cs
View File

@@ -42,8 +42,6 @@ using Formatting = Newtonsoft.Json.Formatting;
namespace ArchiSteamFarm {
public sealed class ArchiWebHandler : IDisposable {
private static readonly ConcurrentDictionary<uint, byte> CachedCardCountsForGame = new ConcurrentDictionary<uint, byte>();
[PublicAPI]
public const string SteamCommunityURL = "https://" + SteamCommunityHost;
@@ -63,6 +61,7 @@ namespace ArchiSteamFarm {
private const string SteamCommunityHost = "steamcommunity.com";
private const string SteamHelpHost = "help.steampowered.com";
private const string SteamStoreHost = "store.steampowered.com";
private static readonly ConcurrentDictionary<uint, byte> CachedCardCountsForGame = new ConcurrentDictionary<uint, byte>();
[PublicAPI]
public readonly ArchiCacheable<string> CachedApiKey;
@@ -1590,6 +1589,37 @@ namespace ArchiSteamFarm {
return response?.Content;
}
internal async Task<byte> GetCardCountForGame(uint appID) {
if (appID == 0) {
throw new ArgumentNullException(nameof(appID));
}
if (CachedCardCountsForGame.TryGetValue(appID, out byte result)) {
return result;
}
using IDocument? htmlDocument = await GetGameCardsPage(appID).ConfigureAwait(false);
if (htmlDocument == null) {
Bot.ArchiLogger.LogNullError(nameof(htmlDocument));
return 0;
}
List<IElement> htmlNodes = htmlDocument.SelectNodes("//div[@class='badge_card_set_cards']/div[starts-with(@class, 'badge_card_set_card')]");
if (htmlNodes.Count == 0) {
Bot.ArchiLogger.LogNullError(nameof(htmlNodes));
return 0;
}
result = (byte) htmlNodes.Count;
CachedCardCountsForGame.TryAdd(appID, result);
return result;
}
internal async Task<IDocument?> GetConfirmationsPage(string deviceID, string confirmationHash, uint time) {
if (string.IsNullOrEmpty(deviceID) || string.IsNullOrEmpty(confirmationHash) || (time == 0)) {
throw new ArgumentNullException(nameof(deviceID) + " || " + nameof(confirmationHash) + " || " + nameof(time));
@@ -1704,37 +1734,6 @@ namespace ArchiSteamFarm {
return result;
}
internal async Task<byte> GetCardCountForGame(uint appID) {
if (appID == 0) {
throw new ArgumentNullException(nameof(appID));
}
if (CachedCardCountsForGame.TryGetValue(appID, out byte result)) {
return result;
}
using IDocument? htmlDocument = await GetGameCardsPage(appID).ConfigureAwait(false);
if (htmlDocument == null) {
Bot.ArchiLogger.LogNullError(nameof(htmlDocument));
return 0;
}
List<IElement> htmlNodes = htmlDocument.SelectNodes("//div[@class='badge_card_set_cards']/div[starts-with(@class, 'badge_card_set_card')]");
if (htmlNodes.Count == 0) {
Bot.ArchiLogger.LogNullError(nameof(htmlNodes));
return 0;
}
result = (byte) htmlNodes.Count;
CachedCardCountsForGame.TryAdd(appID, result);
return result;
}
internal async Task<IDocument?> GetGameCardsPage(uint appID) {
if (appID == 0) {
throw new ArgumentNullException(nameof(appID));