Возможность автозагрузки

.appveyor.yml

@@ -0,0 +1,34 @@
+version: 1.0.{build}
+image: Visual Studio 2017
+
+init:
+- ps: >-
+    if ($env:APPVEYOR_REPO_TAG -eq "true")
+    {
+      Update-AppveyorBuild -Version "$env:APPVEYOR_REPO_TAG_NAME"
+    }
+    else
+    {
+      Update-AppveyorBuild -Version "dev-$($env:APPVEYOR_REPO_COMMIT.substring(0,7))"
+    }
+
+before_build:
+  - cmd: nuget restore src/JiraTimeBot.sln
+
+build:
+  project: src/JiraTimeBot.sln
+
+after_build:
+- cmd: 7z a JiraTimeBot.zip %APPVEYOR_BUILD_FOLDER%/src/JiraTimeBot/bin/Debug/*
+
+artifacts:
+- path: JiraTimeBot.zip
+  name: JiraTimeBot.zip
+
+deploy:
+- provider: GitHub
+  auth_token:
+    secure: Jg8vtDMtgadXE5uifFSr5y9KNrGAjvFntqnRHzyuVWkssitctTtVq086svS2zXAq
+  artifact: JiraTimeBot.zip
+  on:
+    APPVEYOR_REPO_TAG: true

.semver.txt

@@ -1 +1 @@
-1.0.28
+1.0.34

.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/DI/ContainerBuilder.cs

@@ -9,6 +9,8 @@ using JiraTimeBot.TaskTime;
 using JiraTimeBot.UI.Tray;
 using System;
 using System.Windows.Forms;
+using JiraTimeBot.UI;
+using JiraTimeBot.UI.Startup;
 
 namespace JiraTimeBot.DI
 {
@@ -50,9 +52,12 @@ namespace JiraTimeBot.DI
 
             _builder.RegisterType<JiraDescriptionSource>().AsSelf().As<IJiraDescriptionSource>();
             _builder.RegisterType<JiraApi>().AsSelf().AsImplementedInterfaces();
-
+            
             _builder.Register(c => new Job(c.Resolve<IAllMercurialProviders>(), c.Resolve<ITaskTimeCalculator>(), c.Resolve<ILog>())).AsSelf();
 
+            _builder.RegisterType<AutoStartUp>().AsSelf().AsImplementedInterfaces();
+            _builder.RegisterType<frmSettings>().AsSelf().AsImplementedInterfaces();
+
             var container = _builder.Build();
             return container;
         }

src/JiraTimeBot/JiraTimeBot.csproj

@@ -116,6 +116,8 @@
     <Compile Include="UI\frmSettings.Designer.cs">
       <DependentUpon>frmSettings.cs</DependentUpon>
     </Compile>
+    <Compile Include="UI\Startup\AutoStartUp.cs" />
+    <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

@@ -1,9 +1,8 @@
 using JiraTimeBot.UI;
 using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows.Forms;
+using JiraTimeBot.UI.Tray;
 
 namespace JiraTimeBot
 {
@@ -25,7 +24,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.28")] 
+[assembly: AssemblyVersion("1.0.34")] 
-[assembly: AssemblyFileVersion("1.0.28")] 
+[assembly: AssemblyFileVersion("1.0.34")] 
-[assembly: AssemblyInformationalVersion("1.0.28")] 
+[assembly: AssemblyInformationalVersion("1.0.34")] 

src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using System.Web.UI.WebControls.WebParts;
 using JiraTimeBot.Configuration;
 using JiraTimeBot.Mercurial.Objects;
 using JiraTimeBot.TaskTime.Objects;
@@ -51,7 +50,7 @@ namespace JiraTimeBot.TaskTime
                     Time = TimeSpan.FromMinutes(30),
                     Branch = settings.TimeControlTask,
                     Commits = 1,
-                    Description = "Время на учет задач",
+                    Description = "Ведение учета времени",
                     StartTime = DateTime.Now.Date
                 });
             }

src/JiraTimeBot/UI/Startup/AutoStartUp.cs

@@ -0,0 +1,27 @@
+using System.Windows.Forms;
+using Microsoft.Win32;
+
+namespace JiraTimeBot.UI.Startup
+{
+    public class AutoStartUp
+    {
+        readonly RegistryKey _rkApp = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
+
+        public bool Get()
+        {
+            return _rkApp.GetValue(Application.ProductName) != null;
+        }
+
+        public void Set(bool autoStart)
+        {
+            if (autoStart)
+            {
+                _rkApp.SetValue(Application.ProductName, Application.ExecutablePath);
+            }
+            else
+            {
+                _rkApp.DeleteValue(Application.ProductName, false);
+            }
+        }
+    }
+}

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

@@ -11,6 +11,7 @@ using System.IO.Compression;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using JiraTimeBot.UI.Startup;
 
 // This is the code for your desktop app.
 // Press Ctrl+F5 (or go to Debug > Start Without Debugging) to run your app.
@@ -31,6 +32,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();
@@ -59,7 +70,7 @@ namespace JiraTimeBot.UI
 
             _settingsWindowShow = () =>
             {
-                var frmSettings = new frmSettings();
+                var frmSettings = new frmSettings(_container.Resolve<AutoStartUp>());
                 frmSettings.ShowDialog(this);
             };
             _settingsErrorReporter = msg => MessageBox.Show(msg, "Загрузка настроек", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);;
@@ -92,7 +103,7 @@ namespace JiraTimeBot.UI
 
         private void Form1_Load(object sender, EventArgs e)
         {
-            this.Text = this.Text + " v." + Application.ProductVersion;
+            this.Text = this.Text + " v" + Application.ProductVersion;
 
             PrintStartMessage();
             tmrStart.Enabled = true;
@@ -100,6 +111,7 @@ namespace JiraTimeBot.UI
             if (System.Diagnostics.Debugger.IsAttached)
             {
                 _log.Trace("Приложение запущено в режиме отладки. Отключаю обновление.");
+                //tmrUpdate.Enabled = true;
             }
             else
             {
@@ -190,7 +202,7 @@ namespace JiraTimeBot.UI
 
         private void btnSettings_Click(object sender, EventArgs e)
         {
-            var frm = new frmSettings();
+            var frm = _container.Resolve<frmSettings>();
             frm.ShowDialog();
 
             PrintStartMessage();

src/JiraTimeBot/UI/frmSettings.Designer.cs

@@ -48,6 +48,7 @@
             this.txtJQL = new System.Windows.Forms.TextBox();
             this.label8 = new System.Windows.Forms.Label();
             this.txtTimeControlTask = new System.Windows.Forms.TextBox();
+            this.chkAutostart = new System.Windows.Forms.CheckBox();
             this.SuspendLayout();
             // 
             // label5
@@ -152,7 +153,7 @@
             // chkAddComments
             // 
             this.chkAddComments.AutoSize = true;
-            this.chkAddComments.Location = new System.Drawing.Point(56, 267);
+            this.chkAddComments.Location = new System.Drawing.Point(56, 277);
             this.chkAddComments.Name = "chkAddComments";
             this.chkAddComments.Size = new System.Drawing.Size(133, 17);
             this.chkAddComments.TabIndex = 31;
@@ -161,7 +162,7 @@
             // 
             // btnSave
             // 
-            this.btnSave.Location = new System.Drawing.Point(72, 299);
+            this.btnSave.Location = new System.Drawing.Point(72, 310);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(75, 23);
             this.btnSave.TabIndex = 32;
@@ -223,11 +224,22 @@
             this.txtTimeControlTask.Size = new System.Drawing.Size(99, 20);
             this.txtTimeControlTask.TabIndex = 38;
             // 
+            // chkAutostart
+            // 
+            this.chkAutostart.AutoSize = true;
+            this.chkAutostart.Location = new System.Drawing.Point(56, 254);
+            this.chkAutostart.Name = "chkAutostart";
+            this.chkAutostart.Size = new System.Drawing.Size(96, 17);
+            this.chkAutostart.TabIndex = 40;
+            this.chkAutostart.Text = "Автозагрузка";
+            this.chkAutostart.UseVisualStyleBackColor = true;
+            // 
             // frmSettings
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(243, 334);
+            this.ClientSize = new System.Drawing.Size(243, 342);
+            this.Controls.Add(this.chkAutostart);
             this.Controls.Add(this.label8);
             this.Controls.Add(this.txtTimeControlTask);
             this.Controls.Add(this.label7);
@@ -281,5 +293,6 @@
         private System.Windows.Forms.TextBox txtJQL;
         private System.Windows.Forms.Label label8;
         private System.Windows.Forms.TextBox txtTimeControlTask;
+        private System.Windows.Forms.CheckBox chkAutostart;
     }
 }

src/JiraTimeBot/UI/frmSettings.cs

@@ -1,13 +1,17 @@
 using System;
 using System.Windows.Forms;
 using JiraTimeBot.Configuration;
+using JiraTimeBot.UI.Startup;
 
 namespace JiraTimeBot.UI
 {
     public partial class frmSettings : Form
     {
-        public frmSettings()
+        private readonly AutoStartUp _autoStart;
+
+        public frmSettings(AutoStartUp autoStart)
         {
+            _autoStart = autoStart;
             InitializeComponent();
         }
 
@@ -18,6 +22,8 @@ namespace JiraTimeBot.UI
             {
                 SetSettings(settings);
             }
+
+            chkAutostart.Checked = _autoStart.Get();
         }
 
         private void SetSettings(Settings settings)
@@ -67,6 +73,7 @@ namespace JiraTimeBot.UI
         {
             var settings = ReadSettingsAndLock();
             settings.Save();
+             _autoStart.Set(chkAutostart.Checked);
 
             MessageBox.Show("Настройки сохранены.");
 

src/JiraTimeBot/Update/UpdateChecker.cs

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