Skip to content

Commit f6c6a89

Browse files
AlbertMNAlbertMN
committed
Bugfixes and analytics
1 parent f4a5ae0 commit f6c6a89

22 files changed

+400
-294
lines changed

‎ACC Setup Wizard/ACC Setup Wizard.vdproj‎

Lines changed: 42 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -21,43 +21,37 @@
2121
}
2222
"Entry"
2323
{
24-
"MsmKey" = "8:_2E53B3EFBBC07C7EEB2C52971CD80210"
24+
"MsmKey" = "8:_499897E358890A6D11070AA6366E4B98"
2525
"OwnerKey" = "8:_A96B803229FF45BF9AD3EDD3B7A15F2C"
2626
"MsmSig" = "8:_UNDEFINED"
2727
}
2828
"Entry"
2929
{
30-
"MsmKey" = "8:_97B4040D3F4F408CB71F99734FA14A89"
31-
"OwnerKey" = "8:_UNDEFINED"
32-
"MsmSig" = "8:_UNDEFINED"
33-
}
34-
"Entry"
35-
{
36-
"MsmKey" = "8:_A700E82B717011F8D3AD95AF4A8A6B6F"
30+
"MsmKey" = "8:_5A0B551C9B80C03C9CF677BE1F31FFDF"
3731
"OwnerKey" = "8:_A96B803229FF45BF9AD3EDD3B7A15F2C"
3832
"MsmSig" = "8:_UNDEFINED"
3933
}
4034
"Entry"
4135
{
42-
"MsmKey" = "8:_A700E82B717011F8D3AD95AF4A8A6B6F"
43-
"OwnerKey" = "8:_AD54EB9182925DF75999B54A1589B4C1"
36+
"MsmKey" = "8:_97B4040D3F4F408CB71F99734FA14A89"
37+
"OwnerKey" = "8:_UNDEFINED"
4438
"MsmSig" = "8:_UNDEFINED"
4539
}
4640
"Entry"
4741
{
48-
"MsmKey" = "8:_A96B803229FF45BF9AD3EDD3B7A15F2C"
49-
"OwnerKey" = "8:_UNDEFINED"
42+
"MsmKey" = "8:_A3E92D66021FC4F03EE66D478A124A34"
43+
"OwnerKey" = "8:_A96B803229FF45BF9AD3EDD3B7A15F2C"
5044
"MsmSig" = "8:_UNDEFINED"
5145
}
5246
"Entry"
5347
{
54-
"MsmKey" = "8:_AD54EB9182925DF75999B54A1589B4C1"
55-
"OwnerKey" = "8:_A96B803229FF45BF9AD3EDD3B7A15F2C"
48+
"MsmKey" = "8:_A3E92D66021FC4F03EE66D478A124A34"
49+
"OwnerKey" = "8:_5A0B551C9B80C03C9CF677BE1F31FFDF"
5650
"MsmSig" = "8:_UNDEFINED"
5751
}
5852
"Entry"
5953
{
60-
"MsmKey" = "8:_F902D97321FA432F9E8992DBD50CE0D4"
54+
"MsmKey" = "8:_A96B803229FF45BF9AD3EDD3B7A15F2C"
6155
"OwnerKey" = "8:_UNDEFINED"
6256
"MsmSig" = "8:_UNDEFINED"
6357
}
@@ -70,19 +64,19 @@
7064
"Entry"
7165
{
7266
"MsmKey" = "8:_UNDEFINED"
73-
"OwnerKey" = "8:_2E53B3EFBBC07C7EEB2C52971CD80210"
67+
"OwnerKey" = "8:_499897E358890A6D11070AA6366E4B98"
7468
"MsmSig" = "8:_UNDEFINED"
7569
}
7670
"Entry"
7771
{
7872
"MsmKey" = "8:_UNDEFINED"
79-
"OwnerKey" = "8:_AD54EB9182925DF75999B54A1589B4C1"
73+
"OwnerKey" = "8:_5A0B551C9B80C03C9CF677BE1F31FFDF"
8074
"MsmSig" = "8:_UNDEFINED"
8175
}
8276
"Entry"
8377
{
8478
"MsmKey" = "8:_UNDEFINED"
85-
"OwnerKey" = "8:_A700E82B717011F8D3AD95AF4A8A6B6F"
79+
"OwnerKey" = "8:_A3E92D66021FC4F03EE66D478A124A34"
8680
"MsmSig" = "8:_UNDEFINED"
8781
}
8882
"Entry"
@@ -191,20 +185,6 @@
191185
"InstallerClass" = "11:TRUE"
192186
"CustomActionData" = "8:"
193187
}
194-
"{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_6DF34DE0929B4E618854F76FEC25B1BA"
195-
{
196-
"Name" = "8:KillACC.vbs"
197-
"Condition" = "8:"
198-
"Object" = "8:_F902D97321FA432F9E8992DBD50CE0D4"
199-
"FileType" = "3:4"
200-
"InstallAction" = "3:1"
201-
"Arguments" = "8:"
202-
"EntryPoint" = "8:"
203-
"Sequence" = "3:2"
204-
"Identifier" = "8:_5AA25CE0_F327_4F8E_9B98_29897AD3EAB3"
205-
"InstallerClass" = "11:FALSE"
206-
"CustomActionData" = "8:"
207-
}
208188
"{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_9C1C367AB1C741F88C3263475F666C54"
209189
{
210190
"Name" = "8:Primary output from AssistantComputerControl (Active)"
@@ -287,14 +267,14 @@
287267
"IsDependency" = "11:TRUE"
288268
"IsolateTo" = "8:"
289269
}
290-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2E53B3EFBBC07C7EEB2C52971CD80210"
270+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_499897E358890A6D11070AA6366E4B98"
291271
{
292272
"AssemblyRegister" = "3:1"
293273
"AssemblyIsInGAC" = "11:FALSE"
294274
"AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"
295275
"ScatterAssemblies"
296276
{
297-
"_2E53B3EFBBC07C7EEB2C52971CD80210"
277+
"_499897E358890A6D11070AA6366E4B98"
298278
{
299279
"Name" = "8:Newtonsoft.Json.dll"
300280
"Attributes" = "3:512"
@@ -318,40 +298,20 @@
318298
"IsDependency" = "11:TRUE"
319299
"IsolateTo" = "8:"
320300
}
321-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_97B4040D3F4F408CB71F99734FA14A89"
322-
{
323-
"SourcePath" = "8:..\\..\\ACC stuff\\Images\\Regular images\\Installer Banner.png"
324-
"TargetName" = "8:Installer Banner.png"
325-
"Tag" = "8:"
326-
"Folder" = "8:_44B85174C4054CE0B807DB580A4B65ED"
327-
"Condition" = "8:"
328-
"Transitive" = "11:FALSE"
329-
"Vital" = "11:TRUE"
330-
"ReadOnly" = "11:FALSE"
331-
"Hidden" = "11:FALSE"
332-
"System" = "11:FALSE"
333-
"Permanent" = "11:FALSE"
334-
"SharedLegacy" = "11:FALSE"
335-
"PackageAs" = "3:1"
336-
"Register" = "3:1"
337-
"Exclude" = "11:FALSE"
338-
"IsDependency" = "11:FALSE"
339-
"IsolateTo" = "8:"
340-
}
341-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A700E82B717011F8D3AD95AF4A8A6B6F"
301+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5A0B551C9B80C03C9CF677BE1F31FFDF"
342302
{
343303
"AssemblyRegister" = "3:1"
344304
"AssemblyIsInGAC" = "11:FALSE"
345-
"AssemblyAsmDisplayName" = "8:Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
305+
"AssemblyAsmDisplayName" = "8:Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
346306
"ScatterAssemblies"
347307
{
348-
"_A700E82B717011F8D3AD95AF4A8A6B6F"
308+
"_5A0B551C9B80C03C9CF677BE1F31FFDF"
349309
{
350-
"Name" = "8:Microsoft.WindowsAPICodePack.dll"
310+
"Name" = "8:Microsoft.WindowsAPICodePack.Shell.dll"
351311
"Attributes" = "3:512"
352312
}
353313
}
354-
"SourcePath" = "8:Microsoft.WindowsAPICodePack.dll"
314+
"SourcePath" = "8:Microsoft.WindowsAPICodePack.Shell.dll"
355315
"TargetName" = "8:"
356316
"Tag" = "8:"
357317
"Folder" = "8:_44B85174C4054CE0B807DB580A4B65ED"
@@ -369,21 +329,10 @@
369329
"IsDependency" = "11:TRUE"
370330
"IsolateTo" = "8:"
371331
}
372-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AD54EB9182925DF75999B54A1589B4C1"
332+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_97B4040D3F4F408CB71F99734FA14A89"
373333
{
374-
"AssemblyRegister" = "3:1"
375-
"AssemblyIsInGAC" = "11:FALSE"
376-
"AssemblyAsmDisplayName" = "8:Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
377-
"ScatterAssemblies"
378-
{
379-
"_AD54EB9182925DF75999B54A1589B4C1"
380-
{
381-
"Name" = "8:Microsoft.WindowsAPICodePack.Shell.dll"
382-
"Attributes" = "3:512"
383-
}
384-
}
385-
"SourcePath" = "8:Microsoft.WindowsAPICodePack.Shell.dll"
386-
"TargetName" = "8:"
334+
"SourcePath" = "8:..\\..\\ACC stuff\\Images\\Regular images\\Installer Banner.png"
335+
"TargetName" = "8:Installer Banner.png"
387336
"Tag" = "8:"
388337
"Folder" = "8:_44B85174C4054CE0B807DB580A4B65ED"
389338
"Condition" = "8:"
@@ -397,13 +346,24 @@
397346
"PackageAs" = "3:1"
398347
"Register" = "3:1"
399348
"Exclude" = "11:FALSE"
400-
"IsDependency" = "11:TRUE"
349+
"IsDependency" = "11:FALSE"
401350
"IsolateTo" = "8:"
402351
}
403-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F902D97321FA432F9E8992DBD50CE0D4"
352+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A3E92D66021FC4F03EE66D478A124A34"
404353
{
405-
"SourcePath" = "8:..\\..\\ACC stuff\\KillACC.vbs"
406-
"TargetName" = "8:KillACC.vbs"
354+
"AssemblyRegister" = "3:1"
355+
"AssemblyIsInGAC" = "11:FALSE"
356+
"AssemblyAsmDisplayName" = "8:Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
357+
"ScatterAssemblies"
358+
{
359+
"_A3E92D66021FC4F03EE66D478A124A34"
360+
{
361+
"Name" = "8:Microsoft.WindowsAPICodePack.dll"
362+
"Attributes" = "3:512"
363+
}
364+
}
365+
"SourcePath" = "8:Microsoft.WindowsAPICodePack.dll"
366+
"TargetName" = "8:"
407367
"Tag" = "8:"
408368
"Folder" = "8:_44B85174C4054CE0B807DB580A4B65ED"
409369
"Condition" = "8:"
@@ -417,7 +377,7 @@
417377
"PackageAs" = "3:1"
418378
"Register" = "3:1"
419379
"Exclude" = "11:FALSE"
420-
"IsDependency" = "11:FALSE"
380+
"IsDependency" = "11:TRUE"
421381
"IsolateTo" = "8:"
422382
}
423383
}
@@ -487,15 +447,15 @@
487447
{
488448
"Name" = "8:Microsoft Visual Studio"
489449
"ProductName" = "8:AssistantComputerControl"
490-
"ProductCode" = "8:{54243C01-CC84-4079-B1FD-F7672F342065}"
491-
"PackageCode" = "8:{4B98D09F-D089-4251-89FC-E07F024C006F}"
450+
"ProductCode" = "8:{0BF86F08-D584-488B-AE76-F8FB04FC2574}"
451+
"PackageCode" = "8:{05F68A3F-34D7-413F-9403-5760954D84B3}"
492452
"UpgradeCode" = "8:{4A686BBA-7BB3-4C89-B4E3-52234B2549FE}"
493453
"AspNetVersion" = "8:4.0.30319.0"
494454
"RestartWWWService" = "11:FALSE"
495455
"RemovePreviousVersions" = "11:TRUE"
496456
"DetectNewerInstalledVersion" = "11:TRUE"
497457
"InstallAllUsers" = "11:FALSE"
498-
"ProductVersion" = "8:0.3.4"
458+
"ProductVersion" = "8:0.4.0"
499459
"Manufacturer" = "8:Albert MN."
500460
"ARPHELPTELEPHONE" = "8:"
501461
"ARPHELPLINK" = "8:https://github.com/AlbertMN/AssistantComputerControl/issues"
@@ -1047,7 +1007,7 @@
10471007
{
10481008
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_A96B803229FF45BF9AD3EDD3B7A15F2C"
10491009
{
1050-
"SourcePath" = "8:..\\AssistantComputerControl\\obj\\Release\\AssistantComputerControl.exe"
1010+
"SourcePath" = "8:..\\AssistantComputerControl\\obj\\Debug\\AssistantComputerControl.exe"
10511011
"TargetName" = "8:"
10521012
"Tag" = "8:"
10531013
"Folder" = "8:_44B85174C4054CE0B807DB580A4B65ED"

‎AssistantComputerControl/AnalyticsSettings.cs‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
using System;
2+
3+
namespace AssistantComputerControl {
4+
class AnalyticsSettings {
5+
public static readonly string[] actions = new String[12] { //No changing this order!
6+
"shutdown", //0
7+
"restart", //1
8+
"open", //2
9+
"sleep", //3
10+
"lock", //4
11+
"logout", //5
12+
"set_volume", //6
13+
"mute", //7
14+
"previous_song", //8
15+
"play_pause", //9
16+
"next_song", //10
17+
"die" //11
18+
};
19+
20+
public static void SetupArray() {
21+
if (Properties.Settings.Default.TotalActionsExecuted == null) {
22+
Properties.Settings.Default.TotalActionsExecuted = new int[actions.Length - 1];
23+
Properties.Settings.Default.Save();
24+
}
25+
26+
int[] actionsExecuted = Properties.Settings.Default.TotalActionsExecuted;
27+
if (actionsExecuted.Length != actions.Length) {
28+
int i = actionsExecuted.Length - 1;
29+
while (i < actions.Length - 1) {
30+
actionsExecuted[i] = 0;
31+
i++;
32+
}
33+
Properties.Settings.Default.Save();
34+
}
35+
}
36+
37+
public static void PrintAnalytics() {
38+
int i = 0
39+
, totalCount = 0;
40+
if (Properties.Settings.Default.TotalActionsExecuted != null) {
41+
foreach (int count in Properties.Settings.Default.TotalActionsExecuted) {
42+
MainProgram.DoDebug(actions[i] + ": executed " + count + " times");
43+
i++;
44+
45+
totalCount += count;
46+
}
47+
}
48+
49+
MainProgram.DoDebug("\nTotal executions; " + totalCount);
50+
}
51+
52+
public static void AddCount(string action) {
53+
int pos = Array.IndexOf(actions, action);
54+
if (pos > -1) {
55+
Properties.Settings.Default.TotalActionsExecuted[pos]++;
56+
Properties.Settings.Default.Save();
57+
} else {
58+
MainProgram.DoDebug("Could not find action \"" + action + "\" in action-array (analytics)");
59+
}
60+
}
61+
public static void AddCount(int action) {
62+
if (actions[action] != null) {
63+
Properties.Settings.Default.TotalActionsExecuted[action]++;
64+
Properties.Settings.Default.Save();
65+
} else {
66+
MainProgram.DoDebug("Could not find action with index \"" + action + "\" in action-array (analytics)");
67+
}
68+
}
69+
}
70+
}

‎AssistantComputerControl/AssistantComputerControl.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
<Compile Include="AdvancedSettings.Designer.cs">
132132
<DependentUpon>AdvancedSettings.cs</DependentUpon>
133133
</Compile>
134+
<Compile Include="AnalyticsSettings.cs" />
134135
<Compile Include="AudioManager.cs" />
135136
<Compile Include="GettingStarted.cs">
136137
<SubType>Form</SubType>
@@ -154,6 +155,7 @@
154155
<DesignTimeSharedInput>True</DesignTimeSharedInput>
155156
<DependentUpon>Settings.settings</DependentUpon>
156157
</Compile>
158+
<Compile Include="Settings.cs" />
157159
<Compile Include="SettingsForm.cs">
158160
<SubType>Form</SubType>
159161
</Compile>

0 commit comments

Comments
 (0)