rebeccanod1/SecondBot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updates the command line stuff so now you just pass the name of the file example madpeter and not j=madpeter.json as the old command line stuff has been removed

Browse source
This commit is contained in:
Madpeter 2020-04-23 20:04:57 +01:00
parent 0aa5f5e96a
commit 5a5854f609
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
CLI/CliHardware.cs
View file

@ -1,12 +1,8 @@
using BetterSecondBot.WikiMake; using BetterSecondBot.WikiMake;
using BetterSecondBotShared.IO; using BetterSecondBotShared.IO;
using BetterSecondBotShared.Json; using BetterSecondBotShared.Json;
using BetterSecondBotShared.Static;
using CommandLine;
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic;
using System.Text;
using static BetterSecondBot.Program; using static BetterSecondBot.Program;
using BetterSecondBotShared.logs; using BetterSecondBotShared.logs;
namespace BetterSecondBot namespace BetterSecondBot
@ -16,17 +12,22 @@ namespace BetterSecondBot
public CliHardware(string[] args) public CliHardware(string[] args)
{ {
SimpleIO io = new SimpleIO(); SimpleIO io = new SimpleIO();
JsonConfig Config; JsonConfig Config = new JsonConfig();
string json_file = ""; string json_file = "";
#if DEBUG #if DEBUG
ConsoleLog.Status("Hardware/Debug version"); ConsoleLog.Status("Hardware/Debug version");
json_file = "debug.json"; json_file = "debug.json";
#else #else
ConsoleLog.Status("Hardware/Live version"); ConsoleLog.Status("Hardware/Live version");
Parser.Default.ParseArguments<Options>(args).WithParsed<Options>(o => if(args.Length == 1)
{ {
json_file = o.Json; json_file = ""+args[0]+".json";
}); }
else
{
json_file = "mybot.json";
ConsoleLog.Warn("Using: mybot.json as the config");
}
#endif #endif
if (SimpleIO.dir_exists("wiki") == false) if (SimpleIO.dir_exists("wiki") == false)
@ -36,12 +37,6 @@ namespace BetterSecondBot
ConsoleLog.Info("Basic Wiki [Ready]"); ConsoleLog.Info("Basic Wiki [Ready]");
io = new SimpleIO(); io = new SimpleIO();
} }
Config = MakeJsonConfig.GetDefault();
if (helpers.notempty(json_file) == false)
{
json_file = "mybot.json";
ConsoleLog.Warn("Using: mybot.json as the config");
}
bool ok_to_try_start = false; bool ok_to_try_start = false;
if (SimpleIO.FileType(json_file, "json") == true) if (SimpleIO.FileType(json_file, "json") == true)
{ {
@ -75,7 +70,7 @@ namespace BetterSecondBot
io.WriteJsonConfig(MakeJsonConfig.GetDefault(), json_file); io.WriteJsonConfig(MakeJsonConfig.GetDefault(), json_file);
} }
} }
else ConsoleLog.Crit("you must select a .json file for config!"); else ConsoleLog.Crit("you must select a .json file for config! example \"BetterSecondBot.exe mybot\" will use the mybot.json file!");
if(ok_to_try_start == true) if(ok_to_try_start == true)
{ {
Config = MakeJsonConfig.http_config_check(Config); Config = MakeJsonConfig.http_config_check(Config);