Skip to content

Commit

Permalink
update to net6.0 and tasks
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rudokhvist
Rudokhvist committed Dec 14, 2021
1 parent c690e14 commit 02fdde6
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 46 deletions.
4 changes: 2 additions & 2 deletions ASFAchievementManager/ASF-Achievement-Manager.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<Authors>Ryzhehvost</Authors>
<AssemblyVersion>0.2.0.0</AssemblyVersion>
<TargetFrameworks>net5.0;net48</TargetFrameworks>
<AssemblyVersion>0.2.1.0</AssemblyVersion>
<TargetFrameworks>net6.0;net48</TargetFrameworks>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
</PropertyGroup>
Expand Down
77 changes: 35 additions & 42 deletions ASFAchievementManager/ASFAchievementManager.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Composition;
using System.Threading.Tasks;
Expand All @@ -8,59 +8,52 @@
using ArchiSteamFarm.Steam.Storage;
using ArchiSteamFarm.Plugins.Interfaces;
using ArchiSteamFarm.Localization;
using JetBrains.Annotations;
using SteamKit2;
using System.Linq;
using System.Collections.Concurrent;

namespace ASFAchievementManager {
[Export(typeof(IPlugin))]
public sealed class ASFAchievementManager : IBotSteamClient, IBotCommand {
private static ConcurrentDictionary<Bot, AchievementHandler> AchievementHandlers = new ConcurrentDictionary<Bot, AchievementHandler>();
private static readonly ConcurrentDictionary<Bot, AchievementHandler> AchievementHandlers = new();
public string Name => "ASF Achievement Manager";
public Version Version => typeof(ASFAchievementManager).Assembly.GetName().Version ?? new Version("0");

public void OnLoaded() => ASF.ArchiLogger.LogGenericInfo("ASF Achievement Manager Plugin by Ryzhehvost, powered by ginger cats");
public Task OnLoaded() {
ASF.ArchiLogger.LogGenericInfo("ASF Achievement Manager Plugin by Ryzhehvost, powered by ginger cats");
return Task.CompletedTask;
}

public async Task<string?> OnBotCommand([NotNull] Bot bot, ulong steamID, [NotNull] string message, string[] args) {
public async Task<string?> OnBotCommand(Bot bot, ulong steamID, string message, string[] args) {

switch (args.Length) {
case 0:
bot.ArchiLogger.LogNullError(nameof(args));

return null;
case 1:
switch (args[0].ToUpperInvariant()) {

default:
return null;
}
return args[0].ToUpperInvariant() switch {
_ => null,
};
default:
switch (args[0].ToUpperInvariant()) {
case "ALIST" when args.Length > 2:
return await ResponseAchievementList(steamID, args[1], Utilities.GetArgsAsText(args, 2, ",")).ConfigureAwait(false);
case "ALIST":
return await ResponseAchievementList(steamID, bot, args[1]).ConfigureAwait(false);
case "ASET" when args.Length > 3:
return await ResponseAchievementSet(steamID, args[1], args[2], Utilities.GetArgsAsText(args, 3, ","), true).ConfigureAwait(false);
case "ASET" when args.Length > 2:
return await ResponseAchievementSet(steamID, bot, args[1], Utilities.GetArgsAsText(args, 2, ","), true).ConfigureAwait(false);
case "ARESET" when args.Length > 3:
return await ResponseAchievementSet(steamID, args[1], args[2], Utilities.GetArgsAsText(args, 3, ","), false).ConfigureAwait(false);
case "ARESET" when args.Length > 2:
return await ResponseAchievementSet(steamID, bot, args[1], Utilities.GetArgsAsText(args, 2, ","), false).ConfigureAwait(false);
default:
return null;
}
return args[0].ToUpperInvariant() switch {
"ALIST" when args.Length > 2 => await ResponseAchievementList(steamID, args[1], Utilities.GetArgsAsText(args, 2, ",")).ConfigureAwait(false),
"ALIST" => await ResponseAchievementList(steamID, bot, args[1]).ConfigureAwait(false),
"ASET" when args.Length > 3 => await ResponseAchievementSet(steamID, args[1], args[2], Utilities.GetArgsAsText(args, 3, ","), true).ConfigureAwait(false),
"ASET" when args.Length > 2 => await ResponseAchievementSet(steamID, bot, args[1], Utilities.GetArgsAsText(args, 2, ","), true).ConfigureAwait(false),
"ARESET" when args.Length > 3 => await ResponseAchievementSet(steamID, args[1], args[2], Utilities.GetArgsAsText(args, 3, ","), false).ConfigureAwait(false),
"ARESET" when args.Length > 2 => await ResponseAchievementSet(steamID, bot, args[1], Utilities.GetArgsAsText(args, 2, ","), false).ConfigureAwait(false),
_ => null,
};
}
}

public void OnBotSteamCallbacksInit([NotNull] Bot bot, [NotNull] CallbackManager callbackManager) { }
public Task OnBotSteamCallbacksInit(Bot bot, CallbackManager callbackManager) => Task.CompletedTask;

public IReadOnlyCollection<ClientMsgHandler> OnBotSteamHandlersInit([NotNull] Bot bot) {
AchievementHandler CurrentBotAchievementHandler = new AchievementHandler();
public Task<IReadOnlyCollection<ClientMsgHandler>?> OnBotSteamHandlersInit(Bot bot) {
AchievementHandler CurrentBotAchievementHandler = new();
AchievementHandlers.TryAdd(bot, CurrentBotAchievementHandler);
return new HashSet<ClientMsgHandler> { CurrentBotAchievementHandler };
return Task.FromResult<IReadOnlyCollection<ClientMsgHandler>?>(new HashSet<ClientMsgHandler> { CurrentBotAchievementHandler });
}

//Responses
Expand All @@ -82,7 +75,7 @@ public IReadOnlyCollection<ClientMsgHandler> OnBotSteamHandlersInit([NotNull] Bo
return null;
}

HashSet<uint> gamesToGetAchievements = new HashSet<uint>();
HashSet<uint> gamesToGetAchievements = new();

foreach (string game in gameIDs) {
if (!uint.TryParse(game, out uint gameID) || (gameID == 0)) {
Expand All @@ -95,7 +88,7 @@ public IReadOnlyCollection<ClientMsgHandler> OnBotSteamHandlersInit([NotNull] Bo

IList<string> results = await Utilities.InParallel(gamesToGetAchievements.Select(appID => Task.Run<string>(() => AchievementHandler.GetAchievements(bot, appID)))).ConfigureAwait(false);

List<string> responses = new List<string>(results.Where(result => !string.IsNullOrEmpty(result)));
List<string> responses = new(results.Where(result => !string.IsNullOrEmpty(result)));

return responses.Count > 0 ? bot.Commands.FormatBotResponse(string.Join(Environment.NewLine, responses)) : null;

Expand All @@ -116,19 +109,19 @@ public IReadOnlyCollection<ClientMsgHandler> OnBotSteamHandlersInit([NotNull] Bo

IList<string?> results = await Utilities.InParallel(bots.Select(bot => ResponseAchievementList(steamID, bot, appids))).ConfigureAwait(false);

List<string?> responses = new List<string?>(results.Where(result => !string.IsNullOrEmpty(result)));
List<string?> responses = new(results.Where(result => !string.IsNullOrEmpty(result)));

return responses.Count > 0 ? string.Join(Environment.NewLine, responses) : null;
}


private static async Task<string?> ResponseAchievementSet(ulong steamID, Bot bot, string appid, string AchievementNumbers, bool set = true) {
private static async Task<string?> ResponseAchievementSet(ulong steamID, Bot bot, string appid, string achievementNumbers, bool set = true) {
if (!bot.HasAccess(steamID, BotConfig.EAccess.Master)) {
return null;
}

if (string.IsNullOrEmpty(AchievementNumbers)) {
return bot.Commands.FormatBotResponse(string.Format(Strings.ErrorObjectIsNull, nameof(AchievementNumbers)));
if (string.IsNullOrEmpty(achievementNumbers)) {
return bot.Commands.FormatBotResponse(string.Format(Strings.ErrorObjectIsNull, nameof(achievementNumbers)));
}
if (!uint.TryParse(appid, out uint appId)) {
return bot.Commands.FormatBotResponse(string.Format(Strings.ErrorIsInvalid, nameof(appId)));
Expand All @@ -143,11 +136,11 @@ public IReadOnlyCollection<ClientMsgHandler> OnBotSteamHandlersInit([NotNull] Bo
return null;
}

HashSet<uint> achievements = new HashSet<uint>();
HashSet<uint> achievements = new();

string[] achievementStrings = AchievementNumbers.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
string[] achievementStrings = achievementNumbers.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);

if (!AchievementNumbers.Equals("*")) {
if (!achievementNumbers.Equals("*")) {
foreach (string achievement in achievementStrings) {
if (!uint.TryParse(achievement, out uint achievementNumber) || (achievementNumber == 0)) {
return bot.Commands.FormatBotResponse(string.Format(Strings.ErrorParsingObject, achievement));
Expand All @@ -162,17 +155,17 @@ public IReadOnlyCollection<ClientMsgHandler> OnBotSteamHandlersInit([NotNull] Bo
return bot.Commands.FormatBotResponse(await Task.Run<string>(() => AchievementHandler.SetAchievements(bot, appId, achievements, set)).ConfigureAwait(false));
}

private static async Task<string?> ResponseAchievementSet(ulong steamID, string botNames, string appid, string AchievementNumbers, bool set = true) {
private static async Task<string?> ResponseAchievementSet(ulong steamID, string botNames, string appid, string achievementNumbers, bool set = true) {

HashSet<Bot>? bots = Bot.GetBots(botNames);

if ((bots == null) || (bots.Count == 0)) {
return Commands.FormatStaticResponse(string.Format(Strings.BotNotFound, botNames));
}

IList<string?> results = await Utilities.InParallel(bots.Select(bot => ResponseAchievementSet(steamID, bot, appid, AchievementNumbers, set))).ConfigureAwait(false);
IList<string?> results = await Utilities.InParallel(bots.Select(bot => ResponseAchievementSet(steamID, bot, appid, achievementNumbers, set))).ConfigureAwait(false);

List<string?> responses = new List<string?>(results.Where(result => !string.IsNullOrEmpty(result)));
List<string?> responses = new(results.Where(result => !string.IsNullOrEmpty(result)));

return responses.Count > 0 ? string.Join(Environment.NewLine, responses) : null;
}
Expand Down
2 changes: 1 addition & 1 deletion ArchiSteamFarm
Submodule ArchiSteamFarm updated 297 files
2 changes: 1 addition & 1 deletion build.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if exist out rmdir /Q /S out

rem release generic version

dotnet publish -c "Release" -f "net5.0" -o "out/generic" "/p:LinkDuringPublish=false"
dotnet publish -c "Release" -f "net6.0" -o "out/generic" "/p:LinkDuringPublish=false"
mkdir .\out\%CurrDirName%
copy .\out\generic\%CurrDirName%.dll .\out\%CurrDirName%
7z a -tzip -mx7 .\out\%CurrDirName%.zip .\out\%CurrDirName%
Expand Down

0 comments on commit 02fdde6

Please sign in to comment.