v1.4.0 commit

AlbertMN · Feb 29, 2020 · 93a8c2d · 93a8c2d
1 parent 417421e
commit 93a8c2d
Show file tree

Hide file tree

Showing 35 changed files with 349 additions and 53 deletions.
diff --git a/Advanced Installer/Advanced Installer-SetupFiles/ACCsetup.exe b/Advanced Installer/Advanced Installer-SetupFiles/ACCsetup.exe
diff --git a/Advanced Installer/Advanced Installer-cache/cacheIndex.txt b/Advanced Installer/Advanced Installer-cache/cacheIndex.txt
diff --git a/...anced Installer-cache/part3/ACCsetup1.cab → ...anced Installer-cache/part1/ACCsetup1.cab b/...anced Installer-cache/part3/ACCsetup1.cab → ...anced Installer-cache/part1/ACCsetup1.cab
diff --git a/...ced Installer-cache/part3/output-info.ini → ...ced Installer-cache/part1/output-info.ini b/...ced Installer-cache/part3/output-info.ini → ...ced Installer-cache/part1/output-info.ini
diff --git a/Advanced Installer/Advanced Installer.aip b/Advanced Installer/Advanced Installer.aip
@@ -40,10 +40,10 @@
     <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:{CF9594BE-3423-4E99-B739-8B54827E3E96} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{9178F274-C56D-4B98-B32A-B23F434751B3} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="AssistantComputerControl"/>
-    <ROW Property="ProductVersion" Value="1.4.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.3.9" 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="-"/>
@@ -82,6 +82,7 @@
     <ROW Component="ProductInformation" ComponentId="{72E5C433-D45C-45F4-AF47-0DD66CC8E52E}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
     <ROW Component="SHORTCUTDIR" ComponentId="{4405308F-0979-4250-8A8D-0622FA7AF17C}" Directory_="SHORTCUTDIR" Attributes="0"/>
     <ROW Component="acclogo.png" ComponentId="{17CD3B7D-63BC-4942-A1DE-45745465159E}" Directory_="images_Dir" Attributes="0" KeyPath="ifttt_logo.png" Type="0"/>
+    <ROW Component="bootstrap.min.old.css" ComponentId="{F90E6855-05C3-439F-9255-E2FF62149BE9}" Directory_="assets_Dir" Attributes="0" KeyPath="bootstrap.min.old.css" Type="0"/>
     <ROW Component="dropbox.png" ComponentId="{61A99AF5-F5C9-43FC-9753-1E8B2CE42DB9}" Directory_="cloud_services_Dir" Attributes="0" KeyPath="dropbox.png" Type="0"/>
     <ROW Component="getting_started_main.css" ComponentId="{78C894CD-0028-4FFB-9196-873F2B6DDADB}" Directory_="css_Dir" Attributes="0" KeyPath="getting_started_main.css" Type="0"/>
     <ROW Component="getting_started_scripts.js" ComponentId="{F0BCADC8-6DF3-4F83-AF0F-DD2817185372}" Directory_="js_Dir" Attributes="0" KeyPath="getting_started_scripts.js" Type="0"/>
@@ -124,6 +125,13 @@
     <ROW File="languageicon.png" Component_="acclogo.png" FileName="LANGUA~1.PNG|language-icon.png" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\images\language-icon.png" SelfReg="false"/>
     <ROW File="voiceicon.png" Component_="acclogo.png" FileName="VOICE-~1.PNG|voice-icon.png" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\images\voice-icon.png" SelfReg="false"/>
     <ROW File="acc_logo.png" Component_="acclogo.png" FileName="acc_logo.png" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\images\acc_logo.png" SelfReg="false"/>
+    <ROW File="bootstrap.min.old.css" Component_="bootstrap.min.old.css" FileName="BOOTST~1.CSS|bootstrap.min.old.css" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\bootstrap.min.old.css" SelfReg="false"/>
+    <ROW File="bootstrap.min.css" Component_="getting_started_main.css" FileName="BOOTST~1.CSS|bootstrap.min.css" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\css\bootstrap.min.css" SelfReg="false"/>
+    <ROW File="sweetalert2.min.css" Component_="getting_started_main.css" FileName="SWEETA~1.CSS|sweetalert2.min.css" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\css\sweetalert2.min.css" SelfReg="false"/>
+    <ROW File="bootstrap.min.js" Component_="getting_started_scripts.js" FileName="BOOTST~1.JS|bootstrap.min.js" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\js\bootstrap.min.js" SelfReg="false"/>
+    <ROW File="jquery.js" Component_="getting_started_scripts.js" FileName="jquery.js" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\js\jquery.js" SelfReg="false"/>
+    <ROW File="popper.min.js" Component_="getting_started_scripts.js" FileName="POPPER~1.JS|popper.min.js" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\js\popper.min.js" SelfReg="false"/>
+    <ROW File="sweetalert2.min.js" Component_="getting_started_scripts.js" FileName="SWEETA~1.JS|sweetalert2.min.js" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\js\sweetalert2.min.js" SelfReg="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.AppPathsComponent">
     <ROW Name="AI_APPPATH_PERBUILD_AssistantComputerControl.exe" Path="[|AI_PROPPATH_DIR_PERBUILD_AssistantComputerControl.exe]\[|AI_PROPPATH_FILENAME_PERBUILD_AssistantComputerControl.exe]" Type="2" Content="0"/>
@@ -253,6 +261,7 @@
     <ROW Feature_="MainFeature" Component_="getting_started_scripts.js"/>
     <ROW Feature_="MainFeature" Component_="getting_started_main.css"/>
     <ROW Feature_="MainFeature" Component_="acclogo.png"/>
+    <ROW Feature_="MainFeature" Component_="bootstrap.min.old.css"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
     <ROW Name="logo_ico.exe" SourcePath="..\..\ACC stuff\Images\Icons\logo_ico.ico" Index="0"/>

diff --git a/AssistantComputerControl/Actions.cs b/AssistantComputerControl/Actions.cs
@@ -501,8 +501,8 @@ public void WriteOut(string parameter, string line) {
 
         public void KeyShortcut(string parameter) {
             /*
-             * Added by : Joshua Miller
-             * How to use it :
+             * Added by: Joshua Miller
+             * How to use it:
              *  - To seperate keys please use '+' (to use '+' do {ADD})
              *  - Things like ctrl will be converted to control key
              */

diff --git a/AssistantComputerControl/App.config b/AssistantComputerControl/App.config
@@ -83,6 +83,9 @@
       <setting name="LastOpenedDate" serializeAs="String">
         <value />
       </setting>
+      <setting name="AutoFileMarginFixer" serializeAs="String">
+        <value>0</value>
+      </setting>
     </AssistantComputerControl.Properties.Settings>
   </userSettings>
   <runtime>

diff --git a/AssistantComputerControl/AssistantComputerControl.csproj b/AssistantComputerControl/AssistantComputerControl.csproj
@@ -220,6 +220,9 @@
   <ItemGroup>
     <None Include="acc_key.snk" />
     <None Include="App.config" />
+    <None Include="ExtraCleanupper.ps1">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Translations\Danish.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

diff --git a/AssistantComputerControl/AssistantComputerControl.csproj.user b/AssistantComputerControl/AssistantComputerControl.csproj.user
@@ -9,6 +9,7 @@
     <ErrorReportUrlHistory>https://github.com/AlbertMN/AssistantComputerControl/issues</ErrorReportUrlHistory>
     <FallbackCulture>en-US</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
   <PropertyGroup>
     <EnableSecurityDebugging>false</EnableSecurityDebugging>

diff --git a/AssistantComputerControl/CleanupService.cs b/AssistantComputerControl/CleanupService.cs
@@ -9,6 +9,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -55,6 +56,33 @@ public void Start() {
                 } else {
                     MainProgram.DoDebug("[CLEANUP] Action folder is completely empty");
                 }
+
+                /* Launch a follow-up investigation */
+                new Thread(() => {
+                    Thread.CurrentThread.IsBackground = true;
+
+                    void ExtraCleanup() {
+                        MainProgram.DoDebug("[CLEANUP] Running extra cleanup (followup)");
+
+                        try {
+                            var ps1File = Path.Combine(MainProgram.currentLocation, "ExtraCleanupper.ps1");
+
+                            Process p = new Process();
+                            p.StartInfo.FileName = "powershell.exe";
+                            p.StartInfo.Arguments = $"-file \"{ps1File}\" \"{Path.Combine(MainProgram.CheckPath(), "*")}\" \"*.{Properties.Settings.Default.ActionFileExtension}\"";
+                            p.StartInfo.UseShellExecute = false;
+                            p.Start();
+                        } catch {
+                            MainProgram.DoDebug("[CLEANUP] Extra checkup failed");
+                        }
+                    }
+
+                    Thread.Sleep(5000);
+                    ExtraCleanup();
+                    Thread.Sleep(25000);
+                    ExtraCleanup();
+                }).Start();
+
                 isCleaning = false;
             }).Start();
         }

diff --git a/AssistantComputerControl/ExtraCleanupper.ps1 b/AssistantComputerControl/ExtraCleanupper.ps1
@@ -0,0 +1 @@
+Remove-Item -path $args[0] -include $args[1]
diff --git a/AssistantComputerControl/MainProgram.cs b/AssistantComputerControl/MainProgram.cs
@@ -1,7 +1,7 @@
 /*
  * AssistantComputerControl
  * Made by Albert MN.
- * Updated: v1.4.0, 19-01-2020
+ * Updated: v1.4.0, 29-02-2020
  * 
  * Use:
  * - Main class. Starts everything.
@@ -26,11 +26,11 @@
 namespace AssistantComputerControl {
     class MainProgram {
         public const string softwareVersion = "1.4.0",
-            releaseDate = "2020-01-19 00:44:00", //YYYY-MM-DD H:i:s - otherwise it gives an error
+            releaseDate = "2020-03-01 00:00:00", //YYYY-MM-DD H:i:s - otherwise it gives an error
             appName = "AssistantComputerControl",
 
             sentryToken = "super_secret";
-
+            
 
         static public bool debug = true,
             unmuteVolumeChange = true,

diff --git a/AssistantComputerControl/Properties/Settings.Designer.cs b/AssistantComputerControl/Properties/Settings.Designer.cs
diff --git a/AssistantComputerControl/Properties/Settings.settings b/AssistantComputerControl/Properties/Settings.settings
@@ -80,5 +80,8 @@
     <Setting Name="LastOpenedDate" Type="System.DateTime" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="AutoFileMarginFixer" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
   </Settings>
 </SettingsFile>