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

Improve !owns output for multiple bots

Browse Source
This commit is contained in:
JustArchi
2018-02-13 13:23:33 +01:00
parent 4c739b7c51
commit 27e37b79e0
3 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
ArchiSteamFarm/Bot.cs
View File

@@ -3507,18 +3507,18 @@ namespace ArchiSteamFarm {
return responses.Count > 0 ? string.Join("", responses) : null;
}
private async Task<(string Response, bool OwnsEverything)> ResponseOwns(ulong steamID, string query) {
private async Task<(string Response, HashSet<uint> OwnedGameIDs)> ResponseOwns(ulong steamID, string query) {
if ((steamID == 0) || string.IsNullOrEmpty(query)) {
ArchiLogger.LogNullError(nameof(steamID) + " || " + nameof(query));
return (null, false);
return (null, null);
}
if (!IsOperator(steamID)) {
return (null, false);
return (null, null);
}
if (!IsConnectedAndLoggedOn) {
return (FormatBotResponse(Strings.BotNotConnected), false);
return (FormatBotResponse(Strings.BotNotConnected), null);
}
await LimitGiftsRequestsAsync().ConfigureAwait(false);
@@ -3531,15 +3531,15 @@ namespace ArchiSteamFarm {
}
if ((ownedGames == null) || (ownedGames.Count == 0)) {
return (FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(ownedGames))), false);
return (FormatBotResponse(string.Format(Strings.ErrorIsEmpty, nameof(ownedGames))), null);
}
StringBuilder response = new StringBuilder();
bool ownsEverything = true;
HashSet<uint> ownedGameIDs = new HashSet<uint>();
if (query.Equals("*")) {
foreach (KeyValuePair<uint, string> ownedGame in ownedGames) {
ownedGameIDs.Add(ownedGame.Key);
response.Append(FormatBotResponse(string.Format(Strings.BotOwnedAlreadyWithName, ownedGame.Key, ownedGame.Value)));
}
} else {
@@ -3549,14 +3549,15 @@ namespace ArchiSteamFarm {
// Check if this is gameID
if (uint.TryParse(game, out uint gameID) && (gameID != 0)) {
if (OwnedPackageIDs.ContainsKey(gameID)) {
ownedGameIDs.Add(gameID);
response.Append(FormatBotResponse(string.Format(Strings.BotOwnedAlready, gameID)));
continue;
}
if (ownedGames.TryGetValue(gameID, out string ownedName)) {
ownedGameIDs.Add(gameID);
response.Append(FormatBotResponse(string.Format(Strings.BotOwnedAlreadyWithName, gameID, ownedName)));
} else {
ownsEverything = false;
response.Append(FormatBotResponse(string.Format(Strings.BotNotOwnedYet, gameID)));
}
@@ -3564,19 +3565,14 @@ namespace ArchiSteamFarm {
}
// This is a string, so check our entire library
bool ownsAnything = false;
foreach (KeyValuePair<uint, string> ownedGame in ownedGames.Where(ownedGame => ownedGame.Value.IndexOf(game, StringComparison.OrdinalIgnoreCase) >= 0)) {
ownsAnything = true;
ownedGameIDs.Add(ownedGame.Key);
response.Append(FormatBotResponse(string.Format(Strings.BotOwnedAlreadyWithName, ownedGame.Key, ownedGame.Value)));
}
if (!ownsAnything) {
ownsEverything = false;
}
}
}
return (response.Length > 0 ? response.ToString() : FormatBotResponse(string.Format(Strings.BotNotOwnedYet, query)), ownsEverything);
return (response.Length > 0 ? response.ToString() : FormatBotResponse(string.Format(Strings.BotNotOwnedYet, query)), ownedGameIDs);
}
private static async Task<string> ResponseOwns(ulong steamID, string botNames, string query) {
@@ -3590,13 +3586,13 @@ namespace ArchiSteamFarm {
return IsOwner(steamID) ? FormatStaticResponse(string.Format(Strings.BotNotFound, botNames)) : null;
}
IEnumerable<Task<(string Response, bool OwnsEverything)>> tasks = bots.Select(bot => bot.ResponseOwns(steamID, query));
ICollection<(string Response, bool OwnsEverything)> results;
IEnumerable<Task<(string Response, HashSet<uint> OwnedGameIDs)>> tasks = bots.Select(bot => bot.ResponseOwns(steamID, query));
ICollection<(string Response, HashSet<uint> OwnedGameIDs)> results;
switch (Program.GlobalConfig.OptimizationMode) {
case GlobalConfig.EOptimizationMode.MinMemoryUsage:
results = new List<(string Response, bool OwnsEverything)>(bots.Count);
foreach (Task<(string Response, bool OwnsEverything)> task in tasks) {
results = new List<(string Response, HashSet<uint> OwnedGameIDs)>(bots.Count);
foreach (Task<(string Response, HashSet<uint> OwnedGameIDs)> task in tasks) {
results.Add(await task.ConfigureAwait(false));
}
@@ -3606,13 +3602,22 @@ namespace ArchiSteamFarm {
break;
}
List<(string Response, bool OwnsEverything)> validResults = new List<(string Response, bool OwnsEverything)>(results.Where(result => !string.IsNullOrEmpty(result.Response)));
List<(string Response, HashSet<uint> OwnedGameIDs)> validResults = new List<(string Response, HashSet<uint> OwnedGameIDs)>(results.Where(result => !string.IsNullOrEmpty(result.Response)));
if (validResults.Count == 0) {
return null;
}
string extraResponse = string.Format(Strings.BotOwnsOverview, validResults.Count(result => result.OwnsEverything), validResults.Count);
return string.Join("", validResults.Select(result => result.Response)) + FormatStaticResponse(extraResponse);
Dictionary<uint, ushort> ownedGameCounts = new Dictionary<uint, ushort>();
foreach (uint gameID in validResults.Where(validResult => (validResult.OwnedGameIDs != null) && (validResult.OwnedGameIDs.Count > 0)).SelectMany(validResult => validResult.OwnedGameIDs)) {
if (ownedGameCounts.TryGetValue(gameID, out ushort count)) {
ownedGameCounts[gameID] = ++count;
} else {
ownedGameCounts[gameID] = 1;
}
}
IEnumerable<string> extraResponses = ownedGameCounts.Select(kv => FormatStaticResponse(string.Format(Strings.BotOwnsOverviewPerGame, kv.Value, validResults.Count, kv.Key)));
return string.Join("", validResults.Select(result => result.Response).Concat(extraResponses));
}
private string ResponsePassword(ulong steamID) {

6
ArchiSteamFarm/Localization/Strings.Designer.cs generated
View File

@@ -484,11 +484,11 @@ namespace ArchiSteamFarm.Localization {
}
/// <summary>
/// Wyszukuje zlokalizowany ciąg podobny do ciągu There are {0}/{1} bots that already own all of the games being checked..
/// Wyszukuje zlokalizowany ciąg podobny do ciągu {0}/{1} bots already own game {2}..
/// </summary>
internal static string BotOwnsOverview {
internal static string BotOwnsOverviewPerGame {
get {
return ResourceManager.GetString("BotOwnsOverview", resourceCulture);
return ResourceManager.GetString("BotOwnsOverviewPerGame", resourceCulture);
}
}

6
ArchiSteamFarm/Localization/Strings.resx
View File

@@ -654,9 +654,9 @@ StackTrace:
<value>Done clearing Steam discovery queue #{0}.</value>
<comment>{0} will be replaced by queue number</comment>
</data>
<data name="BotOwnsOverview" xml:space="preserve">
<value>There are {0}/{1} bots that already own all of the games being checked.</value>
<comment>{0} will be replaced by number of bots that already own games being checked, {1} will be replaced by total number of bots that were checked during the process</comment>
<data name="BotOwnsOverviewPerGame" xml:space="preserve">
<value>{0}/{1} bots already own game {2}.</value>
<comment>{0} will be replaced by number of bots that already own particular game being checked, {1} will be replaced by total number of bots that were checked during the process, {2} will be replaced by game's ID (number)</comment>
</data>
<data name="BotRefreshingPackagesData" xml:space="preserve">
<value>Refreshing packages data...</value>