Fixed a couple of bugs

Abbin44 · Sep 23, 2021 · 237c78c · 237c78c
1 parent 4914393
commit 237c78c
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -341,3 +341,5 @@ healthchecksdb
 /CodeGraphData/Result_files/xml
 /CodeGraphData
 /CMD++.jpg
+/logo.txt
+/logo2.txt
diff --git a/CustomShell/MainController.cs b/CustomShell/MainController.cs
@@ -5,6 +5,7 @@
 using System.Drawing;
 using System.IO;
 using System.Text;
+using System.Threading;
 using System.Windows.Forms;
 using static CustomShell.Calculator;
 
@@ -35,7 +36,7 @@ public MainController()
                 Directory.CreateDirectory(@"C:\Users\" + Environment.UserName + @"\AppData\Local\CMD++");
 
             if (!File.Exists(historyFilePath))
-                File.Create(historyFilePath);
+                File.Create(historyFilePath).Close();
 
             if (controller != null)
                 throw new Exception("Only one instance of MainController may ever exist!");
@@ -113,8 +114,9 @@ public void AddCommandToConsole(string[] tokens)
 
         public void UpdateHistoryFile(string command)
         {
-            if(cmdHistory[cmdHistory.Length - 1] != command)//Check if the last command is the same as the current one so that there are no doubles in the history
-                File.AppendAllText(historyFilePath, command + "\n");
+            if(cmdHistory.Length > 0)
+                if(cmdHistory[cmdHistory.Length - 1] != command)//Check if the last command is the same as the current one so that there are no doubles in the history
+                    File.AppendAllText(historyFilePath, command + "\n");
 
             LoadHistoryFile();//Update history array
         }
@@ -914,6 +916,8 @@ go out of bounds or change index by 2
             */
             if (e.KeyCode == Keys.Up)
             {
+                if (cmdHistory.Length == 0 || cmdHistory == null)
+                    return;
                 e.Handled = true;
                 if (historyIndex > 0 && historyIndex <= cmdHistory.Length)
                 {
@@ -929,6 +933,8 @@ go out of bounds or change index by 2
 
             if (e.KeyCode == Keys.Down)
             {
+                if (cmdHistory.Length == 0 || cmdHistory == null)
+                    return;
                 e.Handled = true;
                 if (historyIndex > 0 && historyIndex < cmdHistory.Length - 1)
                 {
@@ -965,9 +971,7 @@ private void inputBox_KeyUp(object sender, KeyEventArgs e)
         private void wandTextBox_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.Control && e.KeyCode == Keys.S)//Save and quit from Wand
-            {
                 wand.SaveAndExit();
-            }
             else if (e.Control && e.KeyCode == Keys.H)//Toggle syntax highlighting
             {
                 if (syntaxHighlight == true)
@@ -982,9 +986,7 @@ private void wandTextBox_KeyDown(object sender, KeyEventArgs e)
                 }
             }
             else if (e.Control && e.KeyCode == Keys.Q)//Quit without save Wand
-            {
                 wand.Exit();
-            }
         }
 
         private void MainController_FormClosing(object sender, FormClosingEventArgs e)
@@ -993,8 +995,15 @@ private void MainController_FormClosing(object sender, FormClosingEventArgs e)
                 ftpController = null;
 
             if(sshClient != null)
+            {
                 if (sshClient.client.IsConnected)
                     sshClient.TerminateConnection();
+
+                sshClient = null;
+            }
+
+            if (systemInfo != null)
+                systemInfo = null;
         }
     }
 }
diff --git a/CustomShell/SystemInformation.cs b/CustomShell/SystemInformation.cs
@@ -19,13 +19,26 @@ class SystemInformation
         */
         public SystemInformation()
         {
+            GetIcon();
+        }
+
+        private void CompileInformation()
+        {
+            string os = string.Empty;
+            string cpu = string.Empty;
+            string gpu = string.Empty;
+            string ram = string.Empty;
+            string uptime = string.Empty;
+
+            GetOS();
+            GetCPU();
+            GetGPU();
             GetRAM();
+
         }
 
         private string GetOS()
         {
-            //searcher = new ManagementObjectSearcher("select * from " + Key);
-
             string os = string.Empty;
 
             return os;
@@ -96,5 +109,22 @@ private string GetRAM()
             }
             return ram;
         }
+
+        private void GetIcon()
+        {
+            //This is too large, needs to be replaced
+            string icon =
+                $@"________ /\\\\\\\\\_   __/\\\\____________ /\\\\_    __/\\\\\\\\\\\\____    _______________    _______________
+                    _____ /\\\////////__   _\/\\\\\\________/\\\\\\_     _\/\\\////////\\\__    _______________    _______________
+                     ___ /\\\/ __________   _\/\\\//\\\____/\\\//\\\_     _\/\\\______\//\\\_    ______/\\\_____    ______/\\\_____
+                      __ /\\\_____________   _\/\\\\///\\\/\\\/_\/\\\_     _\/\\\_______\/\\\_    _____\/\\\_____    _____\/\\\_____
+                       _\/\\\_____________    _\/\\\__\///\\\/___\/\\\_     _\/\\\_______\/\\\_    __/\\\\\\\\\\\_    __/\\\\\\\\\\\_
+                        _\//\\\____________    _\/\\\____\///_____\/\\\_     _\/\\\_______\/\\\_    _\/////\\\///__    _\/////\\\///__
+                         __\///\\\__________    _\/\\\_____________\/\\\_     _\/\\\_______/\\\__    _____\/\\\_____    _____\/\\\_____
+                          ____\////\\\\\\\\\_    _\/\\\_____________\/\\\_     _\/\\\\\\\\\\\\/___    _____\///______    _____\///______
+                           _______\/////////__    _\///______________\///__     _\////////////_____    _______________    _______________";
+
+            MainController.controller.outputBox.AppendText(icon);
+        }
     }
 }