Fix-commit

Author: AlbertMN

AssistantComputerControl/AdvancedSettings.Designer.cs

@@ -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>
@@ -163,10 +163,10 @@
     </Compile>
     <Compile Include="MainProgram.cs" />
     <Compile Include="MyPanel.cs" />
-    <Compile Include="AboutVersionWeb\NewVersion.cs">
+    <Compile Include="WebFiles\NewVersion.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="AboutVersionWeb\NewVersion.Designer.cs">
+    <Compile Include="WebFiles\NewVersion.Designer.cs">
       <DependentUpon>NewVersion.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -206,13 +206,13 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="AboutVersionWeb\assets\acc_logo.png">
+    <Content Include="WebFiles\assets\acc_logo.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="AboutVersionWeb\assets\bootstrap.min.css">
+    <Content Include="WebFiles\assets\bootstrap.min.css">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="AboutVersionWeb\index.html">
+    <Content Include="WebFiles\index.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="FodyWeavers.xml" />
@@ -242,7 +242,7 @@
     <EmbeddedResource Include="InstallerClass.resx">
       <DependentUpon>InstallerClass.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="AboutVersionWeb\NewVersion.resx">
+    <EmbeddedResource Include="WebFiles\NewVersion.resx">
       <DependentUpon>NewVersion.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">

AssistantComputerControl/AssistantComputerControl.csproj

@@ -120,6 +120,10 @@
   <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <data name="label17.Text" xml:space="preserve">
+    <value>This software needs a cloud service to function. We natively support Dropbox, Google Drive and OneDrive.
+If you want the easy and recommended install, pick one of the supporter cloud services. Otherwise, choose "expert setup"</value>
+  </data>
   <data name="customSetupInfo.Text" xml:space="preserve">
     <value>This setup is for those who wish more freedom over AssistantComputerControl. 
 As you may (or may not) know, ACC uses a cloud-software like Dropbox to communicate with IFTTT, which handles the assistant command &amp; response.

AssistantComputerControl/GettingStarted.Designer.cs

@@ -1,4 +1,13 @@
-using System;
+/*
+ * AssistantComputerControl
+ * Made by Albert MN.
+ * Updated: v1.1.4, 15-11-2018
+ * 
+ * Use:
+ * - Main class. Starts everything.
+ */
+
+using System;
 using System.IO;
 using System.Diagnostics;
 using System.Reflection;
@@ -14,8 +23,8 @@
 
 namespace AssistantComputerControl {
     class MainProgram {
-        public const string softwareVersion = "1.1.3",
-            releaseDate = "2018-11-12 20:30:00", //YYYY-MM-DD H:i:s - otherwise it gives an error
+        public const string softwareVersion = "1.1.4",
+            releaseDate = "2018-12-13 20:30:00", //YYYY-MM-DD H:i:s - otherwise it gives an error
             appName = "AssistantComputerControl";
         static public bool debug = true,
             unmuteVolumeChange = true,
@@ -113,6 +122,8 @@ void ActualMain() {
                     }
                 }
 
+                Application.EnableVisualStyles();
+
                 DoDebug("[ACC begun (v" + softwareVersion + ")]");
                 AnalyticsSettings.SetupAnalytics();
 
@@ -167,7 +178,6 @@ void ActualMain() {
 
                 DoDebug("\n[" + messageBoxTitle + "] Initiated. \nListening in: \"" + CheckPath() + "\" for \"." + Properties.Settings.Default.ActionFileExtension + "\" extensions");
 
-                Application.EnableVisualStyles();
                 sysIcon.TrayIcon.Icon = Properties.Resources.ACC_icon;
 
                 RegistryKey key = Registry.CurrentUser.OpenSubKey("Software", true);

AssistantComputerControl/GettingStarted.resx

@@ -1,4 +1,13 @@
-using System;
+/*
+ * AssistantComputerControl
+ * Made by Albert MN.
+ * Updated: v1.1.4, 13-12-2018
+ * 
+ * Use:
+ * - Settings Form
+ */
+
+using System;
 using System.Diagnostics;
 using System.Threading;
 using System.Windows.Forms;
@@ -10,6 +19,7 @@ public partial class SettingsForm : Form {
 
         public SettingsForm() {
             InitializeComponent();
+
             versionInfo.Text = "Version " + MainProgram.softwareVersion;
 
             computerName.KeyDown += new KeyEventHandler(FreakingStopDingSound);

AssistantComputerControl/MainProgram.cs

@@ -1,4 +1,13 @@
-using System;
+/*
+ * AssistantComputerControl
+ * Made by Albert MN.
+ * Updated: v1.1.3, 15-11-2018
+ * 
+ * Use:
+ * - Checks and execute action files
+ */
+
+using System;
 using System.IO;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
@@ -10,7 +19,6 @@
 namespace AssistantComputerControl {
     class ActionChecker {
         private static string successMessage = "";
-        private static List<string> inProgressFileNames = new List<string>();
 
         //Logout
         [DllImport("user32.dll", SetLastError = true)]
@@ -85,7 +93,7 @@ static public void FileFound(object source, FileSystemEventArgs e) {
         static public void ProcessFile(string file) {
             string originalFileName = file;
 
-            if (!File.Exists(file)/* || inProgressFileNames.Contains(file) || file.Contains("in_progress")*/) {
+            if (!File.Exists(file)) {
                 return;
             }
             DateTime lastModified = File.GetCreationTime(file);
@@ -103,51 +111,21 @@ static public void ProcessFile(string file) {
                 MainProgram.DoDebug("Local time: " + DateTime.Now.ToString());
                 return;
             }
-            inProgressFileNames.Add(originalFileName);
 
             MainProgram.DoDebug("\n[ -- DOING ACTION(S) -- ]");
             MainProgram.DoDebug(" - " + file);
             MainProgram.DoDebug(" - File exists, checking the content...");
 
             try {
-                Thread.Sleep(200);
+                //Thread.Sleep(200);
                 File.SetAttributes(file, FileAttributes.Hidden);
             } catch {
                 //
             }
 
-            /*while (FileInUse(file));
-            string newFileName = Path.Combine(MainProgram.CheckPath(), "in_progress_" + Guid.NewGuid().ToString("n").Substring(0, 8) + "." + Properties.Settings.Default.ActionFileExtension);
-            inProgressFileNames.Add(newFileName);
-            try {
-                File.Move(file, newFileName);
-                MainProgram.DoDebug(" - File moved");
-            } catch {
-                //File in use
-                inProgressFileNames.Remove(file);
-                inProgressFileNames.Remove(originalFileName);
-                MainProgram.DoDebug(" - Can't move file - used by another process, ignoring");
-
-                try {
-                    Thread.Sleep(200);
-                    File.SetAttributes(file, FileAttributes.Hidden);
-                } catch {
-                    //
-                }
-
-                return;
-            }
-            file = newFileName;
-            while (File.Exists(originalFileName));
-            while (!File.Exists(file)) ;*/
-
             if (new FileInfo(file).Length != 0) {
-                //string line = Regex.Replace(File.ReadAllText(file), @"\t|\n|\r", "");
                 string fullContent = Regex.Replace(File.ReadAllText(file), @"\t|\r", "");
                 MainProgram.DoDebug(" - Read complete, content: " + fullContent);
-
-                //MainProgram.ClearFile(file);
-                //while (File.Exists(file)) ;
                 File.SetAttributes(file, FileAttributes.Hidden);
 
                 using (StringReader reader = new StringReader(fullContent)) {
@@ -172,8 +150,6 @@ static public void ProcessFile(string file) {
 
 
             MainProgram.DoDebug("[ -- DONE -- ]");
-            inProgressFileNames.Remove(file);
-            inProgressFileNames.Remove(originalFileName);
 
             if (MainProgram.errorMessage.Length != 0) {
                 MessageBox.Show(MainProgram.errorMessage, "Error | " + MainProgram.messageBoxTitle);