Skip to content

Commit 93a8c2d

Browse files
AlbertMNAlbertMN
committed
v1.4.0 commit
1 parent 417421e commit 93a8c2d

35 files changed

+349
-53
lines changed

‎Advanced Installer/Advanced Installer-SetupFiles/ACCsetup.exe

10.9 MB
Binary file not shown.

‎Advanced Installer/Advanced Installer-cache/cacheIndex.txt

0 Bytes
Binary file not shown.

‎Advanced Installer/Advanced Installer-cache/part3/ACCsetup1.cab renamed to ‎Advanced Installer/Advanced Installer-cache/part1/ACCsetup1.cab

7.52 MB
Binary file not shown.

‎Advanced Installer/Advanced Installer-cache/part3/output-info.ini renamed to ‎Advanced Installer/Advanced Installer-cache/part1/output-info.ini

13 KB
Binary file not shown.

‎Advanced Installer/Advanced Installer.aip

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
<ROW Property="BannerBitmap" Value="banner" MultiBuildValue="DefaultBuild:banner.png" Type="1" MsiKey="BannerBitmap"/>
4141
<ROW Property="DialogBitmap" Value="dialog" MultiBuildValue="DefaultBuild:dialogbitmap.png" Type="1" MsiKey="DialogBitmap"/>
4242
<ROW Property="Manufacturer" Value="Albert MN."/>
43-
<ROW Property="ProductCode" Value="1033:{CF9594BE-3423-4E99-B739-8B54827E3E96} " Type="16"/>
43+
<ROW Property="ProductCode" Value="1033:{9178F274-C56D-4B98-B32A-B23F434751B3} " Type="16"/>
4444
<ROW Property="ProductLanguage" Value="1033"/>
4545
<ROW Property="ProductName" Value="AssistantComputerControl"/>
46-
<ROW Property="ProductVersion" Value="1.4.0" Type="32"/>
46+
<ROW Property="ProductVersion" Value="1.3.9" Type="32"/>
4747
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
4848
<ROW Property="UpgradeCode" Value="{8E6F4399-B513-420B-8E11-36837A8550EE}"/>
4949
<ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -82,6 +82,7 @@
8282
<ROW Component="ProductInformation" ComponentId="{72E5C433-D45C-45F4-AF47-0DD66CC8E52E}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
8383
<ROW Component="SHORTCUTDIR" ComponentId="{4405308F-0979-4250-8A8D-0622FA7AF17C}" Directory_="SHORTCUTDIR" Attributes="0"/>
8484
<ROW Component="acclogo.png" ComponentId="{17CD3B7D-63BC-4942-A1DE-45745465159E}" Directory_="images_Dir" Attributes="0" KeyPath="ifttt_logo.png" Type="0"/>
85+
<ROW Component="bootstrap.min.old.css" ComponentId="{F90E6855-05C3-439F-9255-E2FF62149BE9}" Directory_="assets_Dir" Attributes="0" KeyPath="bootstrap.min.old.css" Type="0"/>
8586
<ROW Component="dropbox.png" ComponentId="{61A99AF5-F5C9-43FC-9753-1E8B2CE42DB9}" Directory_="cloud_services_Dir" Attributes="0" KeyPath="dropbox.png" Type="0"/>
8687
<ROW Component="getting_started_main.css" ComponentId="{78C894CD-0028-4FFB-9196-873F2B6DDADB}" Directory_="css_Dir" Attributes="0" KeyPath="getting_started_main.css" Type="0"/>
8788
<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 @@
124125
<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"/>
125126
<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"/>
126127
<ROW File="acc_logo.png" Component_="acclogo.png" FileName="acc_logo.png" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\images\acc_logo.png" SelfReg="false"/>
128+
<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"/>
129+
<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"/>
130+
<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"/>
131+
<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"/>
132+
<ROW File="jquery.js" Component_="getting_started_scripts.js" FileName="jquery.js" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\js\jquery.js" SelfReg="false"/>
133+
<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"/>
134+
<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"/>
127135
</COMPONENT>
128136
<COMPONENT cid="caphyon.advinst.msicomp.AppPathsComponent">
129137
<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 @@
253261
<ROW Feature_="MainFeature" Component_="getting_started_scripts.js"/>
254262
<ROW Feature_="MainFeature" Component_="getting_started_main.css"/>
255263
<ROW Feature_="MainFeature" Component_="acclogo.png"/>
264+
<ROW Feature_="MainFeature" Component_="bootstrap.min.old.css"/>
256265
</COMPONENT>
257266
<COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
258267
<ROW Name="logo_ico.exe" SourcePath="..\..\ACC stuff\Images\Icons\logo_ico.ico" Index="0"/>

‎AssistantComputerControl/Actions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -501,8 +501,8 @@ public void WriteOut(string parameter, string line) {
501501

502502
public void KeyShortcut(string parameter) {
503503
/*
504-
* Added by : Joshua Miller
505-
* How to use it :
504+
* Added by: Joshua Miller
505+
* How to use it:
506506
* - To seperate keys please use '+' (to use '+' do {ADD})
507507
* - Things like ctrl will be converted to control key
508508
*/

‎AssistantComputerControl/App.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@
8383
<setting name="LastOpenedDate" serializeAs="String">
8484
<value />
8585
</setting>
86+
<setting name="AutoFileMarginFixer" serializeAs="String">
87+
<value>0</value>
88+
</setting>
8689
</AssistantComputerControl.Properties.Settings>
8790
</userSettings>
8891
<runtime>

‎AssistantComputerControl/AssistantComputerControl.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,9 @@
220220
<ItemGroup>
221221
<None Include="acc_key.snk" />
222222
<None Include="App.config" />
223+
<None Include="ExtraCleanupper.ps1">
224+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
225+
</None>
223226
<None Include="Translations\Danish.json">
224227
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
225228
</None>

‎AssistantComputerControl/AssistantComputerControl.csproj.user

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<ErrorReportUrlHistory>https://github.com/AlbertMN/AssistantComputerControl/issues</ErrorReportUrlHistory>
1010
<FallbackCulture>en-US</FallbackCulture>
1111
<VerifyUploadedFiles>false</VerifyUploadedFiles>
12+
<ProjectView>ProjectFiles</ProjectView>
1213
</PropertyGroup>
1314
<PropertyGroup>
1415
<EnableSecurityDebugging>false</EnableSecurityDebugging>

‎AssistantComputerControl/CleanupService.cs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
using System;
1111
using System.Collections.Generic;
12+
using System.Diagnostics;
1213
using System.IO;
1314
using System.Linq;
1415
using System.Text;
@@ -55,6 +56,33 @@ public void Start() {
5556
} else {
5657
MainProgram.DoDebug("[CLEANUP] Action folder is completely empty");
5758
}
59+
60+
/* Launch a follow-up investigation */
61+
new Thread(() => {
62+
Thread.CurrentThread.IsBackground = true;
63+
64+
void ExtraCleanup() {
65+
MainProgram.DoDebug("[CLEANUP] Running extra cleanup (followup)");
66+
67+
try {
68+
var ps1File = Path.Combine(MainProgram.currentLocation, "ExtraCleanupper.ps1");
69+
70+
Process p = new Process();
71+
p.StartInfo.FileName = "powershell.exe";
72+
p.StartInfo.Arguments = $"-file \"{ps1File}\" \"{Path.Combine(MainProgram.CheckPath(), "*")}\" \"*.{Properties.Settings.Default.ActionFileExtension}\"";
73+
p.StartInfo.UseShellExecute = false;
74+
p.Start();
75+
} catch {
76+
MainProgram.DoDebug("[CLEANUP] Extra checkup failed");
77+
}
78+
}
79+
80+
Thread.Sleep(5000);
81+
ExtraCleanup();
82+
Thread.Sleep(25000);
83+
ExtraCleanup();
84+
}).Start();
85+
5886
isCleaning = false;
5987
}).Start();
6088
}

0 commit comments

Comments
 (0)