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

Misc

Browse Source
This commit is contained in:
JustArchi
2016-02-12 16:06:57 +01:00
parent a841b9494a
commit 7ef8b224eb
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ArchiSteamFarm/Bot.cs
View File

@@ -124,17 +124,17 @@ namespace ArchiSteamFarm {
}
}
internal Bot(string botName, bool initialLaunch = false) {
internal Bot(string botName) {
if (Bots.ContainsKey(botName)) {
return;
}
BotName = botName;
ConfigFile = Path.Combine(Program.ConfigDirectory, BotName + ".xml");
LoginKeyFile = Path.Combine(Program.ConfigDirectory, BotName + ".key");
MobileAuthenticatorFile = Path.Combine(Program.ConfigDirectory, BotName + ".auth");
SentryFile = Path.Combine(Program.ConfigDirectory, BotName + ".bin");
ConfigFile = Path.Combine(Program.ConfigDirectory, botName + ".xml");
LoginKeyFile = Path.Combine(Program.ConfigDirectory, botName + ".key");
MobileAuthenticatorFile = Path.Combine(Program.ConfigDirectory, botName + ".auth");
SentryFile = Path.Combine(Program.ConfigDirectory, botName + ".bin");
if (!ReadConfig()) {
return;
@@ -144,7 +144,7 @@ namespace ArchiSteamFarm {
return;
}
Bots.AddOrUpdate(BotName, this, (key, value) => this);
Bots[botName] = this;
// Initialize
SteamClient = new SteamClient();
@@ -167,7 +167,11 @@ namespace ArchiSteamFarm {
CallbackManager.Subscribe<SteamFriends.FriendMsgHistoryCallback>(OnFriendMsgHistory);
if (UseAsfAsMobileAuthenticator && File.Exists(MobileAuthenticatorFile)) {
SteamGuardAccount = JsonConvert.DeserializeObject<SteamGuardAccount>(File.ReadAllText(MobileAuthenticatorFile));
try {
SteamGuardAccount = JsonConvert.DeserializeObject<SteamGuardAccount>(File.ReadAllText(MobileAuthenticatorFile));
} catch (Exception e) {
Logging.LogGenericException(e, botName);
}
}
SteamUser = SteamClient.GetHandler<SteamUser>();
@@ -187,14 +191,14 @@ namespace ArchiSteamFarm {
if (SendTradePeriod > 0 && SendItemsTimer == null) {
SendItemsTimer = new Timer(
async e => await ResponseSendTrade(BotName).ConfigureAwait(false),
async e => await ResponseSendTrade().ConfigureAwait(false),
null,
TimeSpan.FromHours(SendTradePeriod), // Delay
TimeSpan.FromHours(SendTradePeriod) // Period
);
}
if (initialLaunch && !StartOnLaunch) {
if (!StartOnLaunch) {
return;
}

2
ArchiSteamFarm/CardsFarmer.cs
View File

@@ -40,8 +40,8 @@ namespace ArchiSteamFarm {
private readonly SemaphoreSlim Semaphore = new SemaphoreSlim(1);
private readonly Bot Bot;
private readonly Timer Timer;
internal readonly Timer Timer;
internal readonly ConcurrentDictionary<uint, float> GamesToFarm = new ConcurrentDictionary<uint, float>();
internal readonly List<uint> CurrentGamesFarming = new List<uint>();

2
ArchiSteamFarm/Program.cs
View File

@@ -269,7 +269,7 @@ namespace ArchiSteamFarm {
foreach (var configFile in Directory.EnumerateFiles(ConfigDirectory, "*.xml")) {
string botName = Path.GetFileNameWithoutExtension(configFile);
Bot bot = new Bot(botName, true);
Bot bot = new Bot(botName);
if (!bot.Enabled) {
Logging.LogGenericInfo("Not starting this instance because it's disabled in config file", botName);
}