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

Cleanup existing code first, #478

Browse Source
This commit is contained in:
JustArchi
2017-02-25 17:47:33 +01:00
parent 7dd26e419c
commit f772cfc0d6
2 changed files with 50 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ArchiSteamFarm/Program.cs
View File

@@ -52,7 +52,7 @@ namespace ArchiSteamFarm {
private static bool ShutdownSequenceInitialized;
private static Dictionary<KeyValuePair<string, ASF.EUserInputType>, string> UserInputs = new Dictionary<KeyValuePair<string, ASF.EUserInputType>, string>();
private static readonly Dictionary<KeyValuePair<string, ASF.EUserInputType>, string> UserInputs = new Dictionary<KeyValuePair<string, ASF.EUserInputType>, string>();
internal static async Task Exit(byte exitCode = 0) {
if (exitCode != 0) {
@@ -71,7 +71,7 @@ namespace ArchiSteamFarm {
string result;
if (GlobalConfig.Headless || !Runtime.IsUserInteractive) {
var userInputKey = new KeyValuePair<string, ASF.EUserInputType>(botName, userInputType);
KeyValuePair<string, ASF.EUserInputType> userInputKey = new KeyValuePair<string, ASF.EUserInputType>(botName, userInputType);
if (UserInputs.ContainsKey(userInputKey)) {
result = UserInputs[userInputKey];
UserInputs.Remove(userInputKey);
@@ -124,19 +124,6 @@ namespace ArchiSteamFarm {
return !string.IsNullOrEmpty(result) ? result.Trim() : null;
}
internal static void SetUserInput(ASF.EUserInputType userInputType, string botName, string userInputValue) {
if (String.IsNullOrEmpty(botName) || String.IsNullOrEmpty(userInputValue) || userInputType == ASF.EUserInputType.Unknown) {
ASF.ArchiLogger.LogGenericWarning(Strings.ErrorObjectIsNull);
return;
}
var userInputKey = new KeyValuePair<string, ASF.EUserInputType>(botName, userInputType);
if (UserInputs.ContainsKey(userInputKey)) {
UserInputs[userInputKey] = userInputValue;
} else {
UserInputs.Add(userInputKey, userInputValue);
}
}
internal static async Task Restart() {
if (!await InitShutdownSequence().ConfigureAwait(false)) {
return;
@@ -152,6 +139,20 @@ namespace ArchiSteamFarm {
Environment.Exit(0);
}
internal static void SetUserInput(ASF.EUserInputType userInputType, string botName, string userInputValue) {
if (string.IsNullOrEmpty(botName) || string.IsNullOrEmpty(userInputValue) || (userInputType == ASF.EUserInputType.Unknown)) {
ASF.ArchiLogger.LogGenericWarning(Strings.ErrorObjectIsNull);
return;
}
KeyValuePair<string, ASF.EUserInputType> userInputKey = new KeyValuePair<string, ASF.EUserInputType>(botName, userInputType);
if (UserInputs.ContainsKey(userInputKey)) {
UserInputs[userInputKey] = userInputValue;
} else {
UserInputs.Add(userInputKey, userInputValue);
}
}
private static async Task Init(string[] args) {
AppDomain.CurrentDomain.UnhandledException += UnhandledExceptionHandler;
TaskScheduler.UnobservedTaskException += UnobservedTaskExceptionHandler;