Changes, bugfixes and error messages

Added better example Settings.json file and fixes some stuff and more
responsive error messages

Author: Casper

HourBoostr/BotClass.cs

@@ -17,26 +17,26 @@ class BotClass
         /// <summary>
         /// Bot variables
         /// </summary>
-        public List<int> _Games;
-        private SteamClient _SteamClient;
-        private SteamUser _SteamUser;
-        private SteamUser.LogOnDetails _LogOnDetails;
-        private CallbackManager _CBManager;
+        public List<int>                _Games;
+        public SteamClient              _SteamClient;
+        private SteamUser               _SteamUser;
+        private SteamUser.LogOnDetails  _LogOnDetails;
+        private CallbackManager         _CBManager;
 
-        private string _SentryPath;
-        private string _AuthCode;
-        private string _Nounce;
-        public string  _Username;
-        private string _Password;
+        private string  _SentryPath;
+        private string  _AuthCode;
+        private string  _Nounce;
+        public string   _Username;
+        private string  _Password;
 
-        private bool _IsRunning;
-        public bool _IsLoggedIn;
+        public bool     _IsRunning;
+        public bool     _IsLoggedIn;
 
 
         /// <summary>
         /// Thread variables
         /// </summary>
-        private Thread _CBThread;
+        private Thread  _CBThread;
 
 
         /// <summary>
@@ -165,8 +165,7 @@ private void OnDisconnected(SteamClient.DisconnectedCallback callback)
         private void OnLoggedOn(SteamUser.LoggedOnCallback callback)
         {
             /*Fetch if SteamGuard is required*/
-            bool isSteamGuard = callback.Result == EResult.AccountLogonDenied;
-            if (isSteamGuard)
+            if (callback.Result == EResult.AccountLogonDenied)
             {
                 /*SteamGuard required, tell user to enter the code*/
                 Log("This account is SteamGuard protected.");
@@ -178,15 +177,17 @@ private void OnLoggedOn(SteamUser.LoggedOnCallback callback)
             /*Something terrible has happened*/
             if(callback.Result != EResult.OK)
             {
+                /*Incorrect password*/
                 if(callback.Result == EResult.InvalidPassword)
                 {
-                    Log("Incorrect password! Try again: ");
+                    Log(String.Format("{0} - Incorrect password! Try again:", callback.Result));
                     _LogOnDetails.Password = Config.Password.ReadPassword();
                     _SteamClient.Disconnect();
                     return;
                 }
 
-                Log("Something failed. Redo process please.");
+                /*Something else happened that I didn't account for*/
+                Log(String.Format("{0} - Something failed. Redo process please.", callback.Result));
                 _IsLoggedIn = false;
                 return;
             }
@@ -228,6 +229,7 @@ private void OnMachineAuth(SteamUser.UpdateMachineAuthCallback callback)
             /*Inform steam servers that we're accepting this sentry file*/
             _SteamUser.SendMachineAuthResponse(new SteamUser.MachineAuthDetails
             {
+                /*Set the information recieved*/
                 JobID = callback.JobID,
                 FileName = callback.FileName,
 
@@ -260,7 +262,7 @@ private void SetGamesPlaying()
                 });
             }
 
-            /*Send the information*/
+            /*Tell the client that we're playing these games*/
             _SteamClient.Send(gamesPlaying);
         }
     }

HourBoostr/Program.cs

@@ -17,13 +17,16 @@ namespace HourBoostr
     class Program
     {
         /// <summary>
-        /// DllImports for hiding/showing window
+        /// DllImports
         /// </summary>
         /// <returns></returns>
         [DllImport("kernel32.dll")]
         static extern IntPtr GetConsoleWindow();
         [DllImport("user32.dll")]
         static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
+        private delegate bool ConsoleEventDelegate(int eventType);
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern bool SetConsoleCtrlHandler(ConsoleEventDelegate callback, bool add);
 
 
         /// <summary>
@@ -54,20 +57,20 @@ static private void Initialize()
             string _filePath = Path.Combine(Application.StartupPath, "Settings.json");
             Console.Title = _Title;
 
-            /*Check if Json settings file exist*/
+            /*Check if Json Settings file exist, else print a new one*/
             if(!File.Exists(_filePath))
             {
                 /*Construct new classes to print an example settings file*/
                 MessageBox.Show("Writing a new Settings.json\nGo and edit it!", "Wizard");
                 Config.SettingsInfo SettingsInfo = new Config.SettingsInfo()
                 {
                     Username = "",
-                    Games = new List<int> { 730 }
+                    Games = new List<int> { 730, 10 }
                 };
                 Config.Settings Settings = new Config.Settings()
                 {
-                    /*Print two json entries as an example*/
-                    Account = new List<Config.SettingsInfo> { SettingsInfo, SettingsInfo }
+                    /*Print three json entries as an example*/
+                    Account = new List<Config.SettingsInfo> { SettingsInfo, SettingsInfo, SettingsInfo }
                 };
 
                 /*Write the serialized class to file*/
@@ -82,7 +85,34 @@ static private void Initialize()
             else
             {
                 /*Parse the Settings.json file*/
-                JObject Settings = JObject.Parse(File.ReadAllText(_filePath));
+                JObject Settings = null;
+                try 
+                {
+                    /*Try to parse the file*/
+                    Settings = JObject.Parse(File.ReadAllText(_filePath)); 
+                }
+                catch (JsonException jEx) 
+                {
+                    /*Error parsing the file. User messed up the syntax*/
+                    MessageBox.Show(
+                        "There was an error parsing Settings.json\n"
+                        + "You probably set it up incorrectly.\n\n"
+                        + "You can delete the Settings.json and run the program again\n"
+                        + "and it will spawn a new example file.\n\n"
+                        + "Error message:\n"
+                        + jEx.Message, "Json error");
+
+                    /*Exit*/
+                    Environment.Exit(1);
+                }
+
+                /*Fool check if Settings isn't null*/
+                if(Settings == null)
+                {
+                    /*Don't know how this would normally proc, but never underestimate users*/
+                    MessageBox.Show("Settings is null.\nExiting.", "Oops.");
+                    Environment.Exit(1);
+                }
 
                 /*Loop through all accounts set*/
                 foreach(var Account in Settings["Account"].Select((value,i) => new {i, value}))
@@ -102,7 +132,7 @@ static private void Initialize()
                     };
 
                     /*If not empty*/
-                    if(User.Username.Length > 0 && User.Games != null)
+                    if(User.Username.Length > 0)
                     {
                         /*Let user type in password to account*/
                         Console.WriteLine("Enter the password for the account '{0}'.", User.Username);
@@ -111,20 +141,16 @@ static private void Initialize()
                         /*Run a new bot with the information*/
                         BotClass Bot = new BotClass(User);
 
-                        /*Add bot to active list*/
+                        /*Add bot to active bot list*/
                         _ActiveBots.Add(Bot);
 
                         /*Wait for bot to log in fully until we initialize the next account*/
                         while (!Bot._IsLoggedIn) { Thread.Sleep(2500); }
                     }
-                    else
-                    {
-                        /*Some information is missing, throw and error and exit app*/
-                        Console.WriteLine(String.Format("Account #{0} has invalid/missing information - skipping", (Account.i + 1)));
-                    }
                 }
 
                 /*Done loading all bots*/
+                /*Print some ascii stuff and information about bots*/
                 Console.Clear();
                 Console.WriteLine("\n  _____             _               _       ");
                 Console.WriteLine(" |  |  |___ _ _ ___| |_ ___ ___ ___| |_ ___ ");
@@ -151,6 +177,8 @@ static private void CheckStatus()
         {
             while(true)
             {
+                /*Get the current time then subtract the time when all bots were done initializing*/
+                /*This will give us an idea of how long the bot has been running*/
                 TimeSpan span = DateTime.Now.Subtract(_InitializedTime);
                 Console.Title = String.Format("{0} | Online for: {1} Hours", _Title, span.Hours);
                 Thread.Sleep(1000);
@@ -165,19 +193,21 @@ static private void CheckStatus()
         /// </summary>
         static private void ToTray()
         {
+            /*Set TrayIcon information*/
             _TrayIcon.Text = String.Format("HourBoostr | {0} Bots", _ActiveBots.Count);
             _TrayIcon.Icon = Properties.Resources.icon;
             _TrayIcon.Click += new EventHandler(_TrayIcon_Click);
             _TrayIcon.Visible = true;
             Application.Run();
 
+            /*Keep the form thread running, otherwise the TrayIcon will dissapear*/
             while (true) { Thread.Sleep(100); }
         }
 
 
         /// <summary>
         /// TrayIcon click event
-        /// Show/Hide the window depending on its' state
+        /// Show/Hide the window depending on its state
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -206,6 +236,30 @@ static private void ShowConsole(bool b)
         }
 
 
+        /// <summary>
+        /// Catch exit event
+        /// Realistically we have 4-5 seconds to preform this
+        /// action before windows forces the program to close
+        /// </summary>
+        /// <param name="eventType"></param>
+        /// <returns></returns>
+        static bool ConsoleEventCallback(int eventType)
+        {
+            if (eventType == 2)
+            {
+                /*Disconnect all clients*/
+                foreach(var Bot in _ActiveBots)
+                {
+                    /*Disconnect bot*/
+                    Bot._IsRunning = false;
+                    Bot._SteamClient.Disconnect();
+                }
+            }
+            return false;
+        }
+        static ConsoleEventDelegate handler;
+
+
         /// <summary>
         /// Main function
         /// Too many comments
@@ -227,6 +281,7 @@ static void Main(string[] args)
             /*Hide console*/
             if (_ActiveBots.Count > 0)
             {
+                /*Hide the program to Tray*/
                 Console.WriteLine("  Hiding console to Tray in 3s...\n\n");
                 Thread.Sleep(3000);
                 ShowConsole(false);
@@ -240,6 +295,10 @@ static void Main(string[] args)
                 Environment.Exit(1);
             }
 
+            /*Set exit events*/
+            handler = new ConsoleEventDelegate(ConsoleEventCallback);
+            SetConsoleCtrlHandler(handler, true);
+
             /*Keep it alive*/
             while(true)
             {

HourBoostr/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]