Skip to content

Commit 2e3c51f

Browse files
AlbertMNAlbertMN
committed
Fixed file-edited-margin setting (was bugged for most countries)
1 parent 30bcd28 commit 2e3c51f

12 files changed

+39
-22
lines changed

‎AssistantComputerControl/App.config‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
44
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5-
<section name="HomeComputerControl.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
5+
<section name="HomeComputerControl.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
66
</sectionGroup>
77
</configSections>
88
<appSettings>
99
<!-- DO NOT CHANGE THIS VALUE -->
10-
<add key="config_version" value="0.3" />
10+
<add key="config_version" value="0.3"/>
1111
<!-- [SETTINGS]
1212
You may edit the values within this tag
1313
To reset the config you can simply delete it, and it will auto-generate
1414
Only change the content of the "value" tags.
1515
Config Wiki: https://github.com/AlbertMN/AssistantComputerControl/wiki/Config -->
1616

1717
<!-- Automatically check for updates? -->
18-
<add key="CheckForUpdates" value="true" />
18+
<add key="CheckForUpdates" value="true"/>
1919

2020
<!-- Path of the generated Computer Action file (WITHOUT filename and extension, path only, leave empty for root) -->
21-
<add key="ActionFilePath" value="" />
21+
<add key="ActionFilePath" value=""/>
2222

2323
<!-- Extension of the generated Computer Action file (without path, JUST the bare extension, E.G; txt) -->
24-
<add key="ActionFileExtension" value="txt" />
24+
<add key="ActionFileExtension" value="txt"/>
2525

2626
<!-- The max last-edited datetime of the action-file in *seconds*.
2727
Fx. 30 means the file can be no more than 30 seconds old to make sure we're not using an old file. -->
28-
<add key="FileEditedMargin" value="30" />
28+
<add key="FileEditedMargin" value="30"/>
2929

3030
<!-- Whether the PC should be unmuted when the volume is changed (via. Google Assistant, up or down)
3131
Accepted values: "true" or "false" -->
32-
<add key="UnmuteOnVolumeChange" value="true" />
32+
<add key="UnmuteOnVolumeChange" value="true"/>
3333
</appSettings>
34-
</configuration>
34+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

‎AssistantComputerControl/AssistantComputerControl.csproj‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>AssistantComputerControl</RootNamespace>
1111
<AssemblyName>AssistantComputerControl</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1515
<NuGetPackageImportStamp>
1616
</NuGetPackageImportStamp>
17+
<IsWebBootstrapper>false</IsWebBootstrapper>
1718
<PublishUrl>publish\</PublishUrl>
1819
<Install>true</Install>
1920
<InstallFrom>Disk</InstallFrom>
@@ -24,11 +25,15 @@
2425
<UpdatePeriodically>false</UpdatePeriodically>
2526
<UpdateRequired>false</UpdateRequired>
2627
<MapFileExtensions>true</MapFileExtensions>
28+
<SupportUrl>https://github.com/AlbertMN/AssistantComputerControl/issues</SupportUrl>
29+
<ErrorReportUrl>https://github.com/AlbertMN/AssistantComputerControl/issues</ErrorReportUrl>
30+
<ProductName>Assistant Computer Control</ProductName>
31+
<PublisherName>Albert MN.</PublisherName>
2732
<ApplicationRevision>0</ApplicationRevision>
2833
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
29-
<IsWebBootstrapper>false</IsWebBootstrapper>
3034
<UseApplicationTrust>false</UseApplicationTrust>
3135
<BootstrapperEnabled>true</BootstrapperEnabled>
36+
<TargetFrameworkProfile />
3237
</PropertyGroup>
3338
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3439
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -59,6 +64,9 @@
5964
<PropertyGroup>
6065
<SignManifests>false</SignManifests>
6166
</PropertyGroup>
67+
<PropertyGroup>
68+
<SignAssembly>false</SignAssembly>
69+
</PropertyGroup>
6270
<ItemGroup>
6371
<Reference Include="AudioSwitcher.AudioApi, Version=3.0.0.209, Culture=neutral, PublicKeyToken=fda5729e2db3a64f, processorArchitecture=MSIL">
6472
<HintPath>..\packages\AudioSwitcher.AudioApi.3.0.0\lib\net40\AudioSwitcher.AudioApi.dll</HintPath>

‎AssistantComputerControl/actionChecker.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static public void FileFound(object source, FileSystemEventArgs e) {
8282
string action;
8383
string parameter = null;
8484

85-
if (lastModified.AddSeconds(MainProgram.fileEditedSecondMargin) > DateTime.UtcNow) {
85+
if (lastModified.AddSeconds(MainProgram.fileEditedSecondMargin) > DateTime.Now) {
8686
//If file has been modified recently - check for action
8787
MainProgram.DoDebug("File modified within the last " + MainProgram.fileEditedSecondMargin + " seconds...");
8888

@@ -278,7 +278,7 @@ static public void FileFound(object source, FileSystemEventArgs e) {
278278
MainProgram.DoDebug("\nSUCCESS: " + successMessage + "\n");
279279
}
280280
} else {
281-
MainProgram.DoDebug("No action set within the last " + MainProgram.fileEditedSecondMargin + " seconds");
281+
MainProgram.DoDebug("No action set within the last " + MainProgram.fileEditedSecondMargin + " seconds. File last edited; " + lastModified + ". PC time; " + DateTime.Now);
282282
MainProgram.errorMessage = "No action set lately";
283283
}
284284
} else {

‎AssistantComputerControl/bin/Debug/AssistantComputerControl.exe.config‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
44
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5-
<section name="HomeComputerControl.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
5+
<section name="HomeComputerControl.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
66
</sectionGroup>
77
</configSections>
88
<appSettings>
99
<!-- DO NOT CHANGE THIS VALUE -->
10-
<add key="config_version" value="0.3" />
10+
<add key="config_version" value="0.3"/>
1111
<!-- [SETTINGS]
1212
You may edit the values within this tag
1313
To reset the config you can simply delete it, and it will auto-generate
1414
Only change the content of the "value" tags.
1515
Config Wiki: https://github.com/AlbertMN/AssistantComputerControl/wiki/Config -->
1616

1717
<!-- Automatically check for updates? -->
18-
<add key="CheckForUpdates" value="true" />
18+
<add key="CheckForUpdates" value="true"/>
1919

2020
<!-- Path of the generated Computer Action file (WITHOUT filename and extension, path only, leave empty for root) -->
21-
<add key="ActionFilePath" value="" />
21+
<add key="ActionFilePath" value=""/>
2222

2323
<!-- Extension of the generated Computer Action file (without path, JUST the bare extension, E.G; txt) -->
24-
<add key="ActionFileExtension" value="txt" />
24+
<add key="ActionFileExtension" value="txt"/>
2525

2626
<!-- The max last-edited datetime of the action-file in *seconds*.
2727
Fx. 30 means the file can be no more than 30 seconds old to make sure we're not using an old file. -->
28-
<add key="FileEditedMargin" value="30" />
28+
<add key="FileEditedMargin" value="30"/>
2929

3030
<!-- Whether the PC should be unmuted when the volume is changed (via. Google Assistant, up or down)
3131
Accepted values: "true" or "false" -->
32-
<add key="UnmuteOnVolumeChange" value="true" />
32+
<add key="UnmuteOnVolumeChange" value="true"/>
3333
</appSettings>
34-
</configuration>
34+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

‎AssistantComputerControl/bin/Debug/AssistantComputerControl.pdb‎

0 Bytes
Binary file not shown.

‎AssistantComputerControl/obj/Debug/AssistantComputerControl.csproj.FileListAbsolute.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,12 @@ C:\Users\alber\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComput
2929
C:\Users\alber\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\bin\Debug\AssistantComputerControl.exe
3030
C:\Users\alber\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\bin\Debug\AssistantComputerControl.pdb
3131
C:\Users\alber\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\obj\Debug\AssistantComputerControl.csproj.CoreCompileInputs.cache
32+
C:\Users\Albert\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\bin\Debug\AssistantComputerControl.exe.config
33+
C:\Users\Albert\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\bin\Debug\AssistantComputerControl.exe
34+
C:\Users\Albert\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\bin\Debug\AssistantComputerControl.pdb
35+
C:\Users\Albert\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\obj\Debug\AssistantComputerControl.csprojResolveAssemblyReference.cache
36+
C:\Users\Albert\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\obj\Debug\AssistantComputerControl.Properties.Resources.resources
37+
C:\Users\Albert\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\obj\Debug\AssistantComputerControl.csproj.GenerateResource.cache
38+
C:\Users\Albert\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\obj\Debug\AssistantComputerControl.csproj.CoreCompileInputs.cache
39+
C:\Users\Albert\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\obj\Debug\AssistantComputerControl.exe
40+
C:\Users\Albert\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\obj\Debug\AssistantComputerControl.pdb

‎AssistantComputerControl/obj/Debug/AssistantComputerControl.csprojResolveAssemblyReference.cache‎

62.9 KB
Binary file not shown.

‎AssistantComputerControl/obj/Debug/AssistantComputerControl.exe‎

0 Bytes
Binary file not shown.

‎AssistantComputerControl/obj/Debug/AssistantComputerControl.exe.tmp‎

0 Bytes
Binary file not shown.

‎AssistantComputerControl/obj/Debug/AssistantComputerControl.pdb‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)