Hotfix 1.0.2: Bugfixes

Author: Albert Møller Nielsen

Advanced Installer/Advanced Installer.aip

@@ -6,8 +6,8 @@
   <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
     <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
     <ROW Property="AI_FINDEXE_TITLE" Value="Select the installation package for [|ProductName]" ValueLocId="AI.Property.FindExeTitle"/>
-    <ROW Property="AI_PROPPATH_DIR_PERBUILD_AssistantComputerControl.exe" Value="..\AssistantComputerControl\bin\Release"/>
-    <ROW Property="AI_PROPPATH_DIR_PERBUILD_AssistantComputerControl.exe.config" Value="..\AssistantComputerControl\bin\Release"/>
+    <ROW Property="AI_PROPPATH_DIR_PERBUILD_AssistantComputerControl.exe" Value="..\AssistantComputerControl\bin\Debug"/>
+    <ROW Property="AI_PROPPATH_DIR_PERBUILD_AssistantComputerControl.exe.config" Value="..\AssistantComputerControl\bin\Debug"/>
     <ROW Property="AI_PROPPATH_DIR_PERBUILD_Microsoft.WindowsAPICodePack.Shell.dll" Value="..\packages\Microsoft.WindowsAPICodePack.Shell.1.1.0\lib"/>
     <ROW Property="AI_PROPPATH_DIR_PERBUILD_Microsoft.WindowsAPICodePack.dll" Value="..\packages\Microsoft.WindowsAPICodePack.Core.1.1.0\lib"/>
     <ROW Property="AI_PROPPATH_DIR_PERBUILD_Newtonsoft.Json.dll" Value="..\packages\Newtonsoft.Json.11.0.2\lib\net45"/>
@@ -18,17 +18,19 @@
     <ROW Property="AI_PROPPATH_FILENAME_PERBUILD_Newtonsoft.Json.dll" Value="Newtonsoft.Json.dll"/>
     <ROW Property="AI_ThemeStyle" Value="aero" MsiKey="AI_ThemeStyle"/>
     <ROW Property="ALLUSERS" Value="1"/>
-    <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
+    <ROW Property="ARPCOMMENTS" Value="The software that lets you control your computer using your assistants (Amazon Alexa or Google Assistant)" ValueLocId="*"/>
+    <ROW Property="ARPCONTACT" Value="https://twitter.com/ACC_HomeAlexa"/>
+    <ROW Property="ARPHELPLINK" Value="https://github.com/AlbertMN/AssistantComputerControl/issues"/>
     <ROW Property="ARPNOMODIFY" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="ARPPRODUCTICON" Value="logoico.exe" Type="8"/>
     <ROW Property="BannerBitmap" Value="banner" MultiBuildValue="DefaultBuild:banner.png" Type="1" MsiKey="BannerBitmap"/>
     <ROW Property="DialogBitmap" Value="dialog" MultiBuildValue="DefaultBuild:dialogbitmap.png" Type="1" MsiKey="DialogBitmap"/>
     <ROW Property="Manufacturer" Value="Albert MN."/>
-    <ROW Property="ProductCode" Value="1033:{7DF2BB2F-E945-4D1D-8D0A-5D3DC10FBC70} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{E9B0F51D-E725-4C20-899F-70CA1538FA43} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="AssistantComputerControl"/>
-    <ROW Property="ProductVersion" Value="1.0.1" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.0.2" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{8E6F4399-B513-420B-8E11-36837A8550EE}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>

AssistantComputerControl/ACC_Updater.cs

@@ -10,8 +10,12 @@ namespace AssistantComputerControl {
     class ACC_Updater {
         private const string releaseJsonUrl = "http://acc.albe.pw/versions/latest_version.php?type=release";
         private const string betaJsonUrl = "http://acc.albe.pw/versions/latest_version.php?type=beta";
-
+        
         public bool Check() {
+            if (MainProgram.isCheckingForUpdate)
+                return false;
+
+            MainProgram.isCheckingForUpdate = true;
             MainProgram.DoDebug("Checking for updates...");
 
             string latestReleaseJson = null;

AssistantComputerControl/AdvancedSettings.cs

@@ -1,6 +1,8 @@
 using Microsoft.WindowsAPICodePack.Dialogs;
 using System;
 using System.Diagnostics;
+using System.IO;
+using System.Reflection;
 using System.Windows.Forms;
 
 namespace AssistantComputerControl {
@@ -21,13 +23,21 @@ void FreakingStopDingSound(Object o, KeyEventArgs e) {
                 }
             }
 
-            actionFolderPath.KeyDown += delegate { MainProgram.SetCheckFolder(actionFolderPath.Text); };
-            actionFolderPath.KeyUp += delegate { MainProgram.SetCheckFolder(actionFolderPath.Text); };
+            actionFolderPath.KeyDown += delegate { pathChanged(); };
+            actionFolderPath.KeyUp += delegate { pathChanged(); };
+
+            void pathChanged()  {
+                if (Directory.Exists(actionFolderPath.Text)) {
+                    MainProgram.SetCheckFolder(actionFolderPath.Text);
+                } else {
+                    MessageBox.Show("Folder does not exist");
+                    actionFolderPath.Text = MainProgram.CheckPath();
+                }
+            }
 
             actionFileExtension.KeyDown += delegate { MainProgram.SetCheckExtension(actionFileExtension.Text); };
             actionFileExtension.KeyUp += delegate { MainProgram.SetCheckExtension(actionFileExtension.Text); };
 
-
             actionFolderPath.Text = MainProgram.CheckPath();
             actionFileExtension.Text = Properties.Settings.Default.ActionFileExtension;
 
@@ -37,11 +47,16 @@ void FreakingStopDingSound(Object o, KeyEventArgs e) {
 
         private void pickFolderBtn_Click(object sender, EventArgs e) {
             CommonOpenFileDialog dialog = new CommonOpenFileDialog() {
-                InitialDirectory = MainProgram.CheckPath(),
+                InitialDirectory = Directory.Exists(MainProgram.CheckPath()) ? MainProgram.CheckPath() : Assembly.GetEntryAssembly().Location,
                 IsFolderPicker = true
             };
             if (dialog.ShowDialog() == CommonFileDialogResult.Ok) {
-                actionFolderPath.Text = dialog.FileName;
+                if (Directory.Exists(dialog.FileName)) {
+                    actionFolderPath.Text = dialog.FileName;
+                } else {
+                    MessageBox.Show("Folder does not exist");
+                }
+                MainProgram.SetCheckFolder(actionFolderPath.Text);
             }
         }
 

AssistantComputerControl/AssistantComputerControl.csproj

@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{404B42F4-E135-4D2F-8FD0-20A590814930}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
+    <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AssistantComputerControl</RootNamespace>
     <AssemblyName>AssistantComputerControl</AssemblyName>

AssistantComputerControl/GettingStarted.cs

@@ -5,7 +5,9 @@
 using System.Data;
 using System.Diagnostics;
 using System.Drawing;
+using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -103,7 +105,7 @@ void FreakingStopDingSound(Object o, KeyEventArgs e) {
                 }
             }
 
-            actionFolderPath.Text = MainProgram.CheckPath();
+            actionFolderPath.Text = Directory.Exists(MainProgram.CheckPath()) ? MainProgram.CheckPath() : Assembly.GetEntryAssembly().Location;
             actionFileExtension.Text = Properties.Settings.Default.ActionFileExtension;
 
             actionFolderPath.KeyDown += delegate { MainProgram.SetCheckFolder(actionFolderPath.Text); };
@@ -280,7 +282,7 @@ private void finalOptionButton_Click(object sender, EventArgs e) {
 
         private void pickFolderBtn_Click(object sender, EventArgs e) {
             CommonOpenFileDialog dialog = new CommonOpenFileDialog() {
-                InitialDirectory = MainProgram.CheckPath(),
+                InitialDirectory = Directory.Exists(MainProgram.CheckPath()) ? MainProgram.CheckPath() : Assembly.GetEntryAssembly().Location,
                 IsFolderPicker = true
             };
             if (dialog.ShowDialog() == CommonFileDialogResult.Ok) {

AssistantComputerControl/MainProgram.cs

@@ -9,15 +9,17 @@
 using System.Net;
 using Newtonsoft.Json;
 using System.Linq;
+using System.Threading;
 
 namespace AssistantComputerControl {
     class MainProgram {
-        public const string softwareVersion = "1.0.1",
-            releaseDate = "2018-07-20 16:59",
+        public const string softwareVersion = "1.0.2",
+            releaseDate = "2018-07-21 21:19",
             appName = "AssistantComputerControl";
         static public bool debug = true,
             unmuteVolumeChange = true,
             isPerformingAction = false,
+            isCheckingForUpdate = false,
 
             testingAction = false;
 
@@ -28,6 +30,8 @@ public enum TestStatus {
             ongoing
         }
 
+        private static FileSystemWatcher watcher;
+
         static public string currentLocationFull = Assembly.GetEntryAssembly().Location,
             defaultActionFolder = CheckPath(),
 
@@ -47,9 +51,13 @@ public enum TestStatus {
         [STAThread]
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
         static void Main(string[] args) {
+            AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
+
             SetupDataFolder();
             if (File.Exists(logFilePath))
                 File.WriteAllText(logFilePath, string.Empty);
+            else
+                CreateLogFile();
 
             //Check if software already runs, if so kill this instance
             if (Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location)).Length > 1) {
@@ -63,12 +71,15 @@ static void Main(string[] args) {
 
             if (Properties.Settings.Default.CheckForUpdates) {
                 if (HasInternet()) {
-                    new ACC_Updater().Check();
+                    new Thread(() => {
+                        new ACC_Updater().Check();
+                    }).Start();
                 } else {
                     DoDebug("Couldn't check for new update as PC does not have access to the internet");
                 }
             }
-            if(File.Exists(Path.Combine(dataFolderLocation, "updated.txt"))) {
+            
+            if (File.Exists(Path.Combine(dataFolderLocation, "updated.txt"))) {
                 File.Delete(Path.Combine(dataFolderLocation, "updated.txt"));
                 new AboutVersion().Show();
             }
@@ -94,20 +105,13 @@ static void Main(string[] args) {
             }
 
             //Delete all old action files
-            foreach (string file in Directory.GetFiles(CheckPath(), "*." + Properties.Settings.Default.ActionFileExtension)) {
-                ClearFile(file);
+            if (Directory.Exists(CheckPath())) {
+                foreach (string file in Directory.GetFiles(CheckPath(), "*." + Properties.Settings.Default.ActionFileExtension)) {
+                    ClearFile(file);
+                }
             }
-            
-            //WATCHER
-            FileSystemWatcher watcher = new FileSystemWatcher() {
-                Path = CheckPath(),
-                NotifyFilter = NotifyFilters.LastAccess | NotifyFilters.LastWrite
-                                   | NotifyFilters.FileName | NotifyFilters.DirectoryName,
-                Filter = "*." + Properties.Settings.Default.ActionFileExtension,
-                EnableRaisingEvents = true
-            };
-            watcher.Changed += new FileSystemEventHandler(ActionChecker.FileFound);
-            //END WATCHER
+
+            SetupListener();
 
             DoDebug("\n[" + messageBoxTitle + "] Initiated. \nListening in: \"" + CheckPath() + "\" for \"." + Properties.Settings.Default.ActionFileExtension + "\" extensions");
 
@@ -138,11 +142,51 @@ static void Main(string[] args) {
             Application.Run();
         }
 
+        private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs args) {
+            Exception e = (Exception)args.ExceptionObject;
+            string errorLogLoc = Path.Combine(dataFolderLocation, "error_log.txt");
+
+            if (!File.Exists(errorLogLoc)) {
+                using (var tw = new StreamWriter(errorLogLoc, true)) {
+                    tw.WriteLine(e);
+                    tw.Close();
+                }
+            }
+
+            File.AppendAllText(errorLogLoc, DateTime.Now.ToString() + ": " + e + Environment.NewLine);
+            if (debug) {
+                Console.WriteLine(e);
+            }
+            MessageBox.Show("An unhandled critical error occurred. Please contact the developer (https://github.com/AlbertMN/AssistantComputerControl/issues)");
+        }
+
+        private static void CreateLogFile() {
+            using (var tw = new StreamWriter(logFilePath, true)) {
+                tw.WriteLine(string.Empty);
+                tw.Close();
+            }
+        }
+
+        public static void SetupListener() {
+            if (Directory.Exists(CheckPath())) {
+                watcher = new FileSystemWatcher() {
+                    Path = CheckPath(),
+                    NotifyFilter = NotifyFilters.LastAccess | NotifyFilters.LastWrite
+                                       | NotifyFilters.FileName | NotifyFilters.DirectoryName,
+                    Filter = "*." + Properties.Settings.Default.ActionFileExtension,
+                    EnableRaisingEvents = true
+                };
+                watcher.Changed += new FileSystemEventHandler(ActionChecker.FileFound);
+            }
+        }
+
         public static void SetCheckFolder(string setTo) {
             SetRegKey("ActionFolder", setTo);
 
             Properties.Settings.Default.ActionFilePath = setTo;
             Properties.Settings.Default.Save();
+
+            SetupListener();
         }
         public static void SetCheckExtension(string setTo) {
             SetRegKey("ActionExtension", setTo);
@@ -151,7 +195,7 @@ public static void SetCheckExtension(string setTo) {
             Properties.Settings.Default.Save();
         }
 
-        private static void SetRegKey(string theKey, string setTo) {
+        public static void SetRegKey(string theKey, string setTo) {
             RegistryKey key = Registry.CurrentUser.OpenSubKey("Software", true);
             if (Registry.GetValue(key.Name + "\\AssistantComputerControl", theKey, null) == null) {
                 key.CreateSubKey("AssistantComputerControl");
@@ -292,11 +336,16 @@ public static string CheckPath() {
         }
 
         public static void DoDebug(string str) {
-            if (str != null && File.Exists(logFilePath)) {
+            try {
+                if (!File.Exists(logFilePath)) {
+                    CreateLogFile();
+                }
                 File.AppendAllText(logFilePath, DateTime.Now.ToString() + ": " + str + Environment.NewLine);
                 if (debug) {
                     Console.WriteLine(str);
                 }
+            } catch (Exception e) {
+                Console.WriteLine("Failed to write to log, exception; " + e);
             }
         }