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

Respect additional config properties in APIs

Browse Source
This commit is contained in:
JustArchi
2019-03-08 16:24:49 +01:00
parent d6f122b078
commit 19891c3f59
7 changed files with 149 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ArchiSteamFarm/IPC/Controllers/Api/ASFController.cs
View File

@@ -20,12 +20,14 @@
// limitations under the License.
using System;
using System.IO;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using ArchiSteamFarm.IPC.Requests;
using ArchiSteamFarm.IPC.Responses;
using ArchiSteamFarm.Localization;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
namespace ArchiSteamFarm.IPC.Controllers.Api {
[Route("Api/ASF")]
@@ -62,14 +64,32 @@ namespace ArchiSteamFarm.IPC.Controllers.Api {
return BadRequest(new GenericResponse(false, errorMessage));
}
request.GlobalConfig.ShouldSerializeEverything = false;
request.GlobalConfig.ShouldSerializeHelperProperties = false;
if (!request.GlobalConfig.IsWebProxyPasswordSet && ASF.GlobalConfig.IsWebProxyPasswordSet) {
request.GlobalConfig.WebProxyPassword = ASF.GlobalConfig.WebProxyPassword;
}
request.GlobalConfig.ShouldSerializeEverything = false;
request.GlobalConfig.ShouldSerializeHelperProperties = false;
if ((ASF.GlobalConfig.AdditionalProperties != null) && (ASF.GlobalConfig.AdditionalProperties.Count > 0)) {
if (request.GlobalConfig.AdditionalProperties == null) {
request.GlobalConfig.AdditionalProperties = new Dictionary<string, JToken>(ASF.GlobalConfig.AdditionalProperties.Count);
}
string filePath = Path.Combine(SharedInfo.ConfigDirectory, SharedInfo.GlobalConfigFileName);
foreach ((string key, JToken value) in ASF.GlobalConfig.AdditionalProperties.Where(property => !request.GlobalConfig.AdditionalProperties.ContainsKey(property.Key))) {
request.GlobalConfig.AdditionalProperties.Add(key, value);
}
request.GlobalConfig.AdditionalProperties.TrimExcess();
}
string filePath = ASF.GetFilePath(ASF.EFileType.Config);
if (string.IsNullOrEmpty(filePath)) {
ASF.ArchiLogger.LogNullError(filePath);
return BadRequest(new GenericResponse(false, string.Format(Strings.ErrorIsInvalid, nameof(filePath))));
}
bool result = await GlobalConfig.Write(filePath, request.GlobalConfig).ConfigureAwait(false);

37
ArchiSteamFarm/IPC/Controllers/Api/BotController.cs
View File

@@ -22,13 +22,13 @@
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using ArchiSteamFarm.IPC.Requests;
using ArchiSteamFarm.IPC.Responses;
using ArchiSteamFarm.Localization;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
namespace ArchiSteamFarm.IPC.Controllers.Api {
[Route("Api/Bot")]
@@ -99,18 +99,12 @@ namespace ArchiSteamFarm.IPC.Controllers.Api {
request.BotConfig.ShouldSerializeEverything = false;
request.BotConfig.ShouldSerializeHelperProperties = false;
string originalSteamLogin = request.BotConfig.SteamLogin;
string originalDecryptedSteamPassword = request.BotConfig.DecryptedSteamPassword;
string originalSteamParentalCode = request.BotConfig.SteamParentalCode;
HashSet<string> bots = botNames.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Where(botName => botName != SharedInfo.ASF).ToHashSet();
Dictionary<string, bool> result = new Dictionary<string, bool>(bots.Count);
foreach (string botName in bots) {
bool botExists = Bot.Bots.TryGetValue(botName, out Bot bot);
if (botExists) {
if (Bot.Bots.TryGetValue(botName, out Bot bot)) {
if (!request.BotConfig.IsSteamLoginSet && bot.BotConfig.IsSteamLoginSet) {
request.BotConfig.SteamLogin = bot.BotConfig.SteamLogin;
}
@@ -122,16 +116,29 @@ namespace ArchiSteamFarm.IPC.Controllers.Api {
if (!request.BotConfig.IsSteamParentalCodeSet && bot.BotConfig.IsSteamParentalCodeSet) {
request.BotConfig.SteamParentalCode = bot.BotConfig.SteamParentalCode;
}
if ((bot.BotConfig.AdditionalProperties != null) && (bot.BotConfig.AdditionalProperties.Count > 0)) {
if (request.BotConfig.AdditionalProperties == null) {
request.BotConfig.AdditionalProperties = new Dictionary<string, JToken>(bot.BotConfig.AdditionalProperties.Count);
}
foreach ((string key, JToken value) in bot.BotConfig.AdditionalProperties.Where(property => !request.BotConfig.AdditionalProperties.ContainsKey(property.Key))) {
request.BotConfig.AdditionalProperties.Add(key, value);
}
request.BotConfig.AdditionalProperties.TrimExcess();
}
}
string filePath = Bot.GetFilePath(botName, Bot.EFileType.Config);
if (string.IsNullOrEmpty(filePath)) {
ASF.ArchiLogger.LogNullError(filePath);
return BadRequest(new GenericResponse<IReadOnlyDictionary<string, bool>>(false, string.Format(Strings.ErrorIsInvalid, nameof(filePath))));
}
string filePath = Path.Combine(SharedInfo.ConfigDirectory, botName + SharedInfo.ConfigExtension);
result[botName] = await BotConfig.Write(filePath, request.BotConfig).ConfigureAwait(false);
if (botExists) {
request.BotConfig.SteamLogin = originalSteamLogin;
request.BotConfig.DecryptedSteamPassword = originalDecryptedSteamPassword;
request.BotConfig.SteamParentalCode = originalSteamParentalCode;
}
}
return Ok(new GenericResponse<IReadOnlyDictionary<string, bool>>(result.Values.All(value => value), result));