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

Misc

Browse Source
This commit is contained in:
JustArchi
2016-07-31 17:38:14 +02:00
parent fda3b1ac31
commit 82cbcecb6b
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ArchiSteamFarm/Bot.cs
View File

@@ -137,9 +137,11 @@ namespace ArchiSteamFarm {
BotName = botName; BotName = botName;
SentryFile = botPath + ".bin"; SentryFile = botPath + ".bin";
BotConfig = BotConfig.Load(botPath + ".json"); string botConfigFile = botPath + ".json";
BotConfig = BotConfig.Load(botConfigFile);
if (BotConfig == null) { if (BotConfig == null) {
Logging.LogGenericError("Your bot config is invalid, refusing to start this bot instance!", botName); Logging.LogGenericError("Your bot config is invalid, please verify content of " + botConfigFile + " and try again!", botName);
return; return;
} }
@@ -148,9 +150,11 @@ namespace ArchiSteamFarm {
return; return;
} }
BotDatabase = BotDatabase.Load(botPath + ".db"); string botDatabaseFile = botPath + ".db";
BotDatabase = BotDatabase.Load(botDatabaseFile);
if (BotDatabase == null) { if (BotDatabase == null) {
Logging.LogGenericError("Bot database could not be loaded, refusing to create this bot instance! In order to recreate it, remove " + BotDatabase + " and try again!", botName); Logging.LogGenericError("Bot database could not be loaded, refusing to create this bot instance! In order to recreate it, remove " + botDatabaseFile + " and try again!", botName);
return; return;
} }

5
ArchiSteamFarm/BotConfig.cs
View File

@@ -147,6 +147,11 @@ namespace ArchiSteamFarm {
return null; return null;
} }
if (botConfig == null) {
Logging.LogNullError(nameof(botConfig));
return null;
}
// Support encrypted passwords // Support encrypted passwords
if ((botConfig.PasswordFormat != CryptoHelper.ECryptoMethod.PlainText) && !string.IsNullOrEmpty(botConfig.SteamPassword)) { if ((botConfig.PasswordFormat != CryptoHelper.ECryptoMethod.PlainText) && !string.IsNullOrEmpty(botConfig.SteamPassword)) {
// In worst case password will result in null, which will have to be corrected by user during runtime // In worst case password will result in null, which will have to be corrected by user during runtime

16
ArchiSteamFarm/Program.cs
View File

@@ -65,8 +65,8 @@ namespace ArchiSteamFarm {
internal const string LogFile = "log.txt"; internal const string LogFile = "log.txt";
private const string GithubReleaseURL = "https://api.github.com/repos/" + SharedInfo.GithubRepo + "/releases"; // GitHub API is HTTPS only private const string GithubReleaseURL = "https://api.github.com/repos/" + SharedInfo.GithubRepo + "/releases"; // GitHub API is HTTPS only
private const string GlobalConfigFile = ASF + ".json"; private const string GlobalConfigFileName = ASF + ".json";
private const string GlobalDatabaseFile = ASF + ".db"; private const string GlobalDatabaseFileName = ASF + ".db";
internal static readonly Version Version = Assembly.GetEntryAssembly().GetName().Version; internal static readonly Version Version = Assembly.GetEntryAssembly().GetName().Version;
@@ -378,16 +378,20 @@ namespace ArchiSteamFarm {
} }
private static void InitServices() { private static void InitServices() {
GlobalConfig = GlobalConfig.Load(Path.Combine(ConfigDirectory, GlobalConfigFile)); string globalConfigFile = Path.Combine(ConfigDirectory, GlobalConfigFileName);
GlobalConfig = GlobalConfig.Load(globalConfigFile);
if (GlobalConfig == null) { if (GlobalConfig == null) {
Logging.LogGenericError("Global config could not be loaded, please make sure that " + GlobalConfigFile + " exists and is valid!"); Logging.LogGenericError("Global config could not be loaded, please make sure that " + globalConfigFile + " exists and is valid!");
Thread.Sleep(5000); Thread.Sleep(5000);
Exit(1); Exit(1);
} }
GlobalDatabase = GlobalDatabase.Load(Path.Combine(ConfigDirectory, GlobalDatabaseFile)); string globalDatabaseFile = Path.Combine(ConfigDirectory, GlobalDatabaseFileName);
GlobalDatabase = GlobalDatabase.Load(globalDatabaseFile);
if (GlobalDatabase == null) { if (GlobalDatabase == null) {
Logging.LogGenericError("Global database could not be loaded, if issue persists, please remove " + GlobalDatabaseFile + " in order to recreate database!"); Logging.LogGenericError("Global database could not be loaded, if issue persists, please remove " + globalDatabaseFile + " in order to recreate database!");
Thread.Sleep(5000); Thread.Sleep(5000);
Exit(1); Exit(1);
} }