Восстанавливаемся при повторном запуске

.semver.txt

@@ -1 +1 @@
-1.0.31
+1.0.33

.travis.yml

@@ -1,19 +0,0 @@
-language: csharp
-solution: src/JiraTimeBot.sln
-  
-before_deploy:
-  - "zip -j JiraTimeBot.zip src/JiraTimeBot/bin/Release/*"
-
-deploy:
-  provider: releases
-  api_key: $GITHUB_OAUTH_TOKEN
-  overwrite: true
-  file: JiraTimeBot.zip
-  skip_cleanup: true
-  on:
-    tags: true
-
-notifications:
-  email:
-    on_success: never
-    on_failure: always

README.md

@@ -1,4 +1,4 @@
-# JiraTimeBot [![Build Status](https://travis-ci.org/monster1025/JiraTimeBot.svg?branch=master)](https://travis-ci.org/monster1025/JiraTimeBot)
+# JiraTimeBot [![Build status](https://ci.appveyor.com/api/projects/status/anmhfvuj4oq84j1f?svg=true)](https://ci.appveyor.com/project/Monster1025/JiraTimeBot)
 Приложение для автоматического добавления Jira Worklog'ов исходя из количества коммитов в ветку.
 
 # Ограничения

src/JiraTimeBot/Configuration/PasswordEncryptionClass.cs

@@ -17,10 +17,10 @@ namespace JiraTimeBot.Configuration
         {
             byte[] entropy = GetEntropy(address + username);
             byte[] pass = Encoding.UTF8.GetBytes(password);
-            byte[] crypted = ProtectedData.Protect(pass, entropy, DataProtectionScope.LocalMachine);
+            byte[] encrypted = ProtectedData.Protect(pass, entropy, DataProtectionScope.LocalMachine);
-            var cryptedBase64 = Convert.ToBase64String(crypted);
+            var encryptedBase64 = Convert.ToBase64String(encrypted);
 
-            return cryptedBase64;
+            return encryptedBase64;
         }
 
         public string Decrypt(string username, string password, string address)
@@ -32,7 +32,7 @@ namespace JiraTimeBot.Configuration
                 pass = ProtectedData.Unprotect(pass, entropy, DataProtectionScope.LocalMachine);
                 return Encoding.UTF8.GetString(pass);
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 return "";
             }

src/JiraTimeBot/JiraTimeBot.csproj

@@ -116,6 +116,7 @@
     <Compile Include="UI\frmSettings.Designer.cs">
       <DependentUpon>frmSettings.cs</DependentUpon>
     </Compile>
+    <Compile Include="UI\Tray\SingleInstance.cs" />
     <Compile Include="UI\Tray\ITrayMenu.cs" />
     <Compile Include="UI\Tray\RestoreFromTray.cs" />
     <Compile Include="UI\Tray\TrayMenu.cs" />

src/JiraTimeBot/Program.cs

@@ -4,6 +4,7 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows.Forms;
+using JiraTimeBot.UI.Tray;
 
 namespace JiraTimeBot
 {
@@ -25,7 +26,7 @@ namespace JiraTimeBot
             }
             else
             {
-                MessageBox.Show("Another instance of the app is already running.");
+                SingleInstance.ShowFirstInstance();
             }
         }
     }

src/JiraTimeBot/Properties/AssemblyInfo.cs

@@ -1,31 +1,31 @@
-using System.Reflection;                      
+using System.Reflection;                        
-using System.Runtime.InteropServices;                      
+using System.Runtime.InteropServices;                        
-// General Information about an assembly is controlled through the following                      
+// General Information about an assembly is controlled through the following                        
-// set of attributes. Change these attribute values to modify the information                      
+// set of attributes. Change these attribute values to modify the information                        
-// associated with an assembly.                      
+// associated with an assembly.                        
-[assembly: AssemblyTitle("JiraTimeBot")]                      
+[assembly: AssemblyTitle("JiraTimeBot")]                        
-[assembly: AssemblyDescription("")]                      
+[assembly: AssemblyDescription("")]                        
-[assembly: AssemblyConfiguration("")]                      
+[assembly: AssemblyConfiguration("")]                        
-[assembly: AssemblyCompany("")]                      
+[assembly: AssemblyCompany("")]                        
-[assembly: AssemblyProduct("JiraTimeBot")]                      
+[assembly: AssemblyProduct("JiraTimeBot")]                        
-[assembly: AssemblyCopyright("Copyright © 2019")]                      
+[assembly: AssemblyCopyright("Copyright © 2019")]                        
-[assembly: AssemblyTrademark("")]                      
+[assembly: AssemblyTrademark("")]                        
-[assembly: AssemblyCulture("")]                      
+[assembly: AssemblyCulture("")]                        
-// Setting ComVisible to false makes the types in this assembly not visible                      
+// Setting ComVisible to false makes the types in this assembly not visible                        
-// to COM components.  If you need to access a type in this assembly from                      
+// to COM components.  If you need to access a type in this assembly from                        
-// COM, set the ComVisible attribute to true on that type.                      
+// COM, set the ComVisible attribute to true on that type.                        
-[assembly: ComVisible(false)]                      
+[assembly: ComVisible(false)]                        
-// The following GUID is for the ID of the typelib if this project is exposed to COM                      
+// The following GUID is for the ID of the typelib if this project is exposed to COM                        
-[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]                      
+[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]                        
-// Version information for an assembly consists of the following four values:                      
+// Version information for an assembly consists of the following four values:                        
-//                      
+//                        
-//      Major Version                      
+//      Major Version                        
-//      Minor Version                      
+//      Minor Version                        
-//      Build Number                      
+//      Build Number                        
-//      Revision                      
+//      Revision                        
-//                      
+//                        
-// You can specify all the values or you can default the Build and Revision Numbers                      
+// You can specify all the values or you can default the Build and Revision Numbers                        
-// by using the '*' as shown below:                      
+// by using the '*' as shown below:                        
-[assembly: AssemblyVersion("1.0.31")] 
+[assembly: AssemblyVersion("1.0.33")] 
-[assembly: AssemblyFileVersion("1.0.31")] 
+[assembly: AssemblyFileVersion("1.0.33")] 
-[assembly: AssemblyInformationalVersion("1.0.31")] 
+[assembly: AssemblyInformationalVersion("1.0.33")] 

src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -51,7 +51,7 @@ namespace JiraTimeBot.TaskTime
                     Time = TimeSpan.FromMinutes(30),
                     Branch = settings.TimeControlTask,
                     Commits = 1,
-                    Description = "Время на учет задач",
+                    Description = "Ведение учета времени",
                     StartTime = DateTime.Now.Date
                 });
             }

src/JiraTimeBot/UI/Tray/SingleInstance.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+namespace JiraTimeBot.UI.Tray
+{
+    static class SingleInstance
+    {
+        public static readonly int WM_SHOWFIRSTINSTANCE = RegisterWindowMessage($"WM_SHOWFIRSTINSTANCE|{AssemblyGuid}");
+        
+        public static void ShowFirstInstance()
+        {
+            const int HWND_BROADCAST = 0xffff;
+            PostMessage((IntPtr)HWND_BROADCAST, WM_SHOWFIRSTINSTANCE, IntPtr.Zero, IntPtr.Zero);
+        }
+        
+        public static string AssemblyGuid
+        {
+            get
+            {
+                object[] attributes = Assembly.GetEntryAssembly().GetCustomAttributes(typeof(System.Runtime.InteropServices.GuidAttribute), false);
+                if (attributes.Length == 0) {
+                    return string.Empty;
+                }
+                return ((GuidAttribute)attributes[0]).Value;
+            }
+        }
+        
+        [DllImport("user32")]
+        public static extern int RegisterWindowMessage(string message);
+	
+        [DllImport("user32")]
+        public static extern bool PostMessage(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam);
+    }
+}

src/JiraTimeBot/UI/frmMain.cs

@@ -31,6 +31,16 @@ namespace JiraTimeBot.UI
         private readonly Action<string> _settingsErrorReporter;
         private bool _updateChecked;
 
+        protected override void WndProc(ref Message message)
+        {
+            if (message.Msg == SingleInstance.WM_SHOWFIRSTINSTANCE) {
+                this.Show();
+                this.WindowState = FormWindowState.Normal;
+                _trayIcon.Hide();
+            }
+            base.WndProc(ref message);
+        }
+
         private CancellationTokenSource GetTokenSource()
         {
             var tokenSource = new CancellationTokenSource();
@@ -100,6 +110,7 @@ namespace JiraTimeBot.UI
             if (System.Diagnostics.Debugger.IsAttached)
             {
                 _log.Trace("Приложение запущено в режиме отладки. Отключаю обновление.");
+                //tmrUpdate.Enabled = true;
             }
             else
             {

src/JiraTimeBot/Update/UpdateChecker.cs

@@ -69,7 +69,7 @@ namespace JiraTimeBot.Update
                     return reader.ReadToEnd();
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 return "";
             }