Big update and various things (not ready!)

Author: p0358

.gitignore

@@ -230,3 +230,4 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 /.vs/CodeStats/v15/Server/sqlite3
+/.vs/CodeStats/v16/Server/sqlite3

CodeStats.sln

@@ -1,10 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.421
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeStats", "CodeStats\CodeStats.csproj", "{E56F6E12-089C-40ED-BCFD-923E5FA121A1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeStatsUpdater", "CodeStatsUpdater\CodeStatsUpdater.csproj", "{A2A45792-7E19-4C34-9F30-7E7F9F007924}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,8 +23,19 @@ Global
 		{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Release|x64.ActiveCfg = Release|x64
 		{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Release|x64.Build.0 = Release|x64
+		{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Debug|x64.Build.0 = Debug|Any CPU
+		{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Release|x64.ActiveCfg = Release|Any CPU
+		{A2A45792-7E19-4C34-9F30-7E7F9F007924}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {266D351E-5EE6-4F7A-8E9B-91275C9E24A1}
+	EndGlobalSection
 EndGlobal

CodeStats/CodeStats.csproj

@@ -59,17 +59,22 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ConfigFile.cs" />
     <Compile Include="Constants.cs" />
+    <Compile Include="CustomMappingConfig.cs" />
     <Compile Include="Pulse.cs" />
     <Compile Include="Logger.cs" />
     <Compile Include="NativeMethods.cs" />
@@ -110,6 +115,7 @@
     </Compile>
     <Compile Include="PluginInfrastructure\UnmanagedExports.cs" />
     <Compile Include="RunProcess.cs" />
+    <Compile Include="Updater.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Forms\ApiKeyForm.resx">
@@ -129,6 +135,10 @@
     <EmbeddedResource Include="Resources\codestats-16.png" />
     <EmbeddedResource Include="Resources\extension_mapping.json" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="app.manifest" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildProjectDirectory)\PluginInfrastructure\DllExport\NppPlugin.DllExport.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

CodeStats/CodeStatsPackage.cs

@@ -5,6 +5,7 @@
 using System.Drawing;
 using System.IO;
 using System.Net;
+using System.Net.Http;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -74,6 +75,17 @@ internal static void CommandMenuInit()
 
         private static void InitializeAsync()
         {
+            if (System.Net.ServicePointManager.SecurityProtocol != 0)
+            {
+                // If the value is not set to 0 (SystemDefault), disable old protocols and make sure TLS 1.3, 1.2, 1.1 are enabled
+                System.Net.ServicePointManager.SecurityProtocol &= ~SecurityProtocolType.Ssl3;
+                System.Net.ServicePointManager.SecurityProtocol &= ~SecurityProtocolType.Tls;
+                System.Net.ServicePointManager.SecurityProtocol |= (SecurityProtocolType)12288 | SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11;
+            }
+            //System.Net.ServicePointManager.SecurityProtocol = (SecurityProtocolType)0; // SystemDefault, we don't use this since it's supported only since .NET 4.7
+
+            //Updater.RenameTest();
+            //Updater.SignatureVerificationTest();
             try
             {
                 // Delete existing log file to save space
@@ -214,6 +226,11 @@ internal static void SetStatusBarDocType(string str)
 
         public static void OnNotification(ScNotification notification)
         {
+            if (nppStarted && notification.Header.Code == (uint)SciMsg.SCN_MODIFIED)
+            {
+                Logger.Debug("[notification] SCN_MODIFIED, notification code: 0x" + notification.Header.Code.ToString("x"));
+            }
+
             // TODO: NPPN_SHUTDOWN - save unpulsed to config (or do it in plugin unload sequence rather on bottom of this file)
             if (notification.Header.Code == (uint)NppMsg.NPPN_LANGCHANGED) // Does not seem to be triggered?
             {
@@ -261,7 +278,7 @@ public static void OnNotification(ScNotification notification)
             int SC_PERFORMED_USER_AND_SC_MOD_DELETETEXT = (int)SciMsg.SC_PERFORMED_USER | (int)SciMsg.SC_MOD_DELETETEXT;
             if (nppStarted && notification.Header.Code == (uint)SciMsg.SCN_MODIFIED && ((notification.ModificationType & SC_PERFORMED_USER_AND_SC_MOD_DELETETEXT) == SC_PERFORMED_USER_AND_SC_MOD_DELETETEXT))
             {
-                Logger.Debug("[notification] SCN_MODIFIED #2");
+                Logger.Debug("[notification] SCN_MODIFIED #2, notification code: 0x" + notification.Header.Code.ToString("x"));
                 // Looks like we can use this to track deleted stuff once Notepad++ is started and ready
                 // It doesn't trigger on file close either, unlike on open with SC_MOD_INSERTTEXT, so we only use this, and SCN_CHARADDED for inserts
                 // It will skip Ctrl+V if it wasn't pasted on some existing text, but never mind, it is still counting the most we want
@@ -325,7 +342,7 @@ private static void ProcessPulses(object sender, ElapsedEventArgs e)
             });
         }
 
-        private static void ProcessPulses()
+        private static async Task ProcessPulses()
         {
             if ( pulseQueue != null  &&  (  (currentPulse != null && !currentPulse.isEmpty())  ||  !pulseQueue.IsEmpty  )  &&  EnoughTimePassed(DateTime.Now) )
             {
@@ -371,7 +388,8 @@ private static void ProcessPulses()
                         {
                             string json = jsonSerializer.Serialize(result);
                             Logger.Debug("Pulsing " + json);
-                            string HtmlResult = client.UploadString(URL, json);
+                            //string HtmlResult = client.UploadString(URL, json);
+                            string HtmlResult = await client.UploadStringTaskAsync(URL, json);
                             _lastPulse = DateTime.Now;
                             if (!HtmlResult.Contains(@"""ok""") && !HtmlResult.Contains(@"success"))
                             {
@@ -392,8 +410,8 @@ private static void ProcessPulses()
                                         Logger.Error("Could not pulse (error 403). Please make sure you entered a valid API token in Code::Stats settings.", ex);
                                         if (!_hasAlreadyShownInvalidApiTokenMessage) // we want to inform user only once, and if they do not provide the token, let's not bomb him with error each time after they type something
                                         {
-                                            MessageBox.Show("Could not pulse. Please make sure you entered a valid API token in Code::Stats settings.\nAll recorded XP from this session will be lost if you do not provide the correct API token!", "Code::Stats – error 403", MessageBoxButtons.OK, MessageBoxIcon.Error);
                                             _hasAlreadyShownInvalidApiTokenMessage = true;
+                                            MessageBox.Show("Could not pulse. Please make sure you entered a valid API token in Code::Stats settings.\nAll recorded XP from this session will be lost if you do not provide the correct API token!", "Code::Stats – error 403", MessageBoxButtons.OK, MessageBoxIcon.Error);
                                             PromptApiKey();
                                         }
                                     }
@@ -601,7 +619,7 @@ private static void SettingsFormOnConfigSaved(object sender, EventArgs eventArgs
             GetSettings();
         }
 
-        private static void GetSettings()
+        public static void GetSettings()
         {
             _CodeStatsConfigFile.Read();
             ApiKey = _CodeStatsConfigFile.ApiKey;
@@ -627,10 +645,14 @@ private static void SettingsPopup()
 
         public static void ReportStats()
         {
-            var client = new WebClient { Proxy = CodeStatsPackage.GetProxy() };
-            client.Headers[HttpRequestHeader.UserAgent] = Constants.PluginUserAgent;
-            string HtmlResult = client.DownloadString("https://p0358.net/codestats/report.php?pluginver=" + Constants.PluginVersion + "&cid=" + CodeStatsPackage.Guid + "&editorname=" + Constants.EditorName + "&editorver=" + Constants.EditorVersion + "&is64process=" + ProcessorArchitectureHelper.Is64BitProcess.ToString().ToLowerInvariant() + "&is64sys=" + ProcessorArchitectureHelper.Is64BitOperatingSystem.ToString().ToLowerInvariant()); // expected response: ok
-            if (HtmlResult.Contains("ok")) _reportedStats = true;
+            try
+            {
+                var client = new WebClient { Proxy = CodeStatsPackage.GetProxy() };
+                client.Headers[HttpRequestHeader.UserAgent] = Constants.PluginUserAgent;
+                string HtmlResult = client.DownloadString("https://p0358.net/codestats/report.php?pluginver=" + Constants.PluginVersion + "&cid=" + CodeStatsPackage.Guid + "&editorname=" + Constants.EditorName + "&editorver=" + Constants.EditorVersion + "&is64process=" + ProcessorArchitectureHelper.Is64BitProcess.ToString().ToLowerInvariant() + "&is64sys=" + ProcessorArchitectureHelper.Is64BitOperatingSystem.ToString().ToLowerInvariant()); // expected response: ok
+                if (HtmlResult.Contains("ok")) _reportedStats = true;
+            }
+            finally { }
         }
 
         private static string ToUnixEpoch(DateTime date)
@@ -715,8 +737,10 @@ internal static void RecursiveDelete(string folder)
 
         internal static class CoreAssembly
         {
-            static readonly Assembly Reference = typeof(CoreAssembly).Assembly;
+            public static readonly Assembly Reference = typeof(CoreAssembly).Assembly;
             public static readonly Version Version = Reference.GetName().Version;
+            // System.Reflection.Assembly.GetExecutingAssembly().Location
+            public static readonly string Location = Reference.Location;
         }
 
         internal static void PluginCleanUp()

CodeStats/CustomMappingConfig.cs

@@ -0,0 +1,79 @@
+using Kbg.NppPluginNET.PluginInfrastructure;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CodeStats
+{
+    public class CustomMappingConfig
+    {
+        internal string ApiKey { get; set; }
+        internal string ApiUrl { get; set; }
+        internal string Proxy { get; set; }
+        internal bool Stats { get; set; }
+        internal string Guid { get; set; }
+        internal bool Debug { get; set; }
+
+        private readonly string _configFilepath;
+
+        internal CustomMappingConfig()
+        {
+            _configFilepath = GetConfigFilePath();
+            Read();
+        }
+
+        internal void Read()
+        {
+            var ret = new StringBuilder(2083);
+
+            ApiKey = NativeMethods.GetPrivateProfileString("settings", "api_key", "", ret, 2083, _configFilepath) > 0
+                ? ret.ToString()
+                : string.Empty;
+
+            ApiUrl = NativeMethods.GetPrivateProfileString("settings", "api_url", "", ret, 2083, _configFilepath) > 0
+                ? ret.ToString()
+                : string.Empty;
+
+            Proxy = NativeMethods.GetPrivateProfileString("settings", "proxy", "", ret, 2083, _configFilepath) > 0
+                ? ret.ToString()
+                : string.Empty;
+
+            if (NativeMethods.GetPrivateProfileString("settings", "stats", "true", ret, 2083, _configFilepath) > 0)
+            {
+                bool stats;
+                if (bool.TryParse(ret.ToString(), out stats))
+                    Stats = stats;
+            }
+            else
+            {
+                Stats = true;
+            }
+
+            this.Guid = NativeMethods.GetPrivateProfileString("settings", "guid", "", ret, 2083, _configFilepath) > 0
+                ? ret.ToString()
+                : System.Guid.NewGuid().ToString();
+
+            // ReSharper disable once InvertIf
+            if (NativeMethods.GetPrivateProfileString("settings", "debug", "", ret, 2083, _configFilepath) > 0)
+            {
+                bool debug;
+                if (bool.TryParse(ret.ToString(), out debug))
+                    Debug = debug;
+            }
+        }
+
+        static string GetConfigFilePath()
+        {
+            //var homeFolder = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+
+            // get path of plugin configuration
+            StringBuilder sbIniFilePath = new StringBuilder(Win32.MAX_PATH);
+            Win32.SendMessage(PluginBase.nppData._nppHandle, (uint)NppMsg.NPPM_GETPLUGINSCONFIGDIR, Win32.MAX_PATH, sbIniFilePath);
+            string iniFilePath = sbIniFilePath.ToString();
+
+            return Path.Combine(iniFilePath, "CodeStats_custom_extension_mapping.ini");
+        }
+    }
+}