nuget update + Jira JSessionId auth if password length is exactly 32

Fix branch and issue detection

.semver.txt

@@ -1 +1 @@
-1.0.74
+1.0.91

README.md

@@ -8,8 +8,10 @@
 # Настройки
  - Режим работы:
    - Mercurial - по коммитам в Mercurial, можем определять множественные коммиты в одну задачу (ветку) и пропорционально списывать время.
+   - Git - по коммитам в Git.
    - Jira - выполняем JQL и равномерно распределяем время.
- - Путь до репо (Режим Mercurial) - путь до папки, в которую клонируются исходники.
+ - Путь до репо (Режим Mercurial, Git) - путь до папки, в которую клонируются исходники.
+ - Jira URL - адрес Jira-сервреа.
  - Логин Jira - Логин в Jira (от этого пользователя будем выполнять запросы и вносить время).
  - Пароль Jira - шифруется через DPAPI.
  - Mercurial Name (Режим Mercurial) - обязателен к указанию для режима Mercurial - имя пользователя Mercurial, от которого проходят коммиты (именно UserName, не E-Mail).

src/JiraTimeBot.v3.ncrunchsolution

@@ -0,0 +1,6 @@
+<SolutionConfiguration>
+  <Settings>
+    <AllowParallelTestExecution>True</AllowParallelTestExecution>
+    <SolutionConfigured>True</SolutionConfigured>
+  </Settings>
+</SolutionConfiguration>

src/JiraTimeBot/App.config

@@ -7,11 +7,11 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.1.2.0" newVersion="5.1.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.2.0.0" newVersion="6.2.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -19,7 +19,19 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="RestSharp" publicKeyToken="598062e77f915f75" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-106.11.7.0" newVersion="106.11.7.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

src/JiraTimeBot/Configuration/Settings.cs

@@ -1,9 +1,9 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using Newtonsoft.Json;
 
 namespace JiraTimeBot.Configuration
 {
@@ -12,8 +12,9 @@ namespace JiraTimeBot.Configuration
         public int MinuterPerWorkDay { get; set; }
         public int RoundToMinutes { get; set; }
 
-        public string JiraUrl = "https://myteam.aeroclub.ru";
+        public string JiraUrl { get; set; }
         public bool PullBeforeProcess { get; set; }
+        public bool RemoveManuallyAddedWorklogs { get; set; }
         public string RepositoryPath { get; set; }
         public string MercurialAuthorEmail { get; set; }
         public string JiraUserName { get; set; }
@@ -24,6 +25,7 @@ namespace JiraTimeBot.Configuration
         public string JiraQuery { get; set; }
         public string TimeControlTask { get; set; }
         public int RandomWorkMinutes { get; set; }
+        public string AlternativeEmail { get; set; }
 
         public static Settings LoadAndCheck(Action settingsSource, Action<string> errorMessageReporter)
         {
@@ -138,12 +140,18 @@ namespace JiraTimeBot.Configuration
         }
 
         private static readonly string _settingsFileName = "settings.json";
+
+        public string[] GetRepositories()
+        {
+            return RepositoryPath.Split(';').Select(c => c.Trim()).ToArray();
+        }
     }
 
     public enum WorkType
     {
         Mercurial = 0,
         JiraLogs = 1,
-        GitLogs = 2
+        GitLogs = 2,
+        CVSMixed = 3
     }
 }

src/JiraTimeBot/DI/ContainerBuilder.cs

@@ -2,16 +2,17 @@
 using Autofac.Extras.AggregateService;
 using JiraTimeBot.JiraIntegration;
 using JiraTimeBot.JiraIntegration.Comments;
-using JiraTimeBot.Mercurial;
-using JiraTimeBot.Mercurial.Modifiers;
+using JiraTimeBot.RepositoryProviders;
+using JiraTimeBot.RepositoryProviders.Interfaces;
+using JiraTimeBot.RepositoryProviders.Modifiers;
 using JiraTimeBot.TasksProcessors;
 using JiraTimeBot.TaskTime;
-using JiraTimeBot.UI.Tray;
-using System;
-using System.Windows.Forms;
 using JiraTimeBot.UI;
 using JiraTimeBot.UI.Startup;
+using JiraTimeBot.UI.Tray;
 using JiraTimeBot.Update;
+using System;
+using System.Windows.Forms;
 
 namespace JiraTimeBot.DI
 {
@@ -46,7 +47,7 @@ namespace JiraTimeBot.DI
             _builder.RegisterType<GitLog>().As<IRepositoryLog>().AsSelf();
             _builder.RegisterType<MercurialLog>().As<IRepositoryLog>().AsSelf();
             _builder.RegisterType<JiraCommitEmulator>().As<IRepositoryLog>().AsSelf();
-            _builder.RegisterAggregateService<IAllMercurialProviders>();
+            _builder.RegisterAggregateService<IAllRepositoryProviders>();
 
             _builder.RegisterType<TaskTimeSpread>().As<ITaskTimeSpread>().AsSelf();
             _builder.RegisterType<TaskTimeByCommitsCalculator>().As<ITaskTimeCalculator>().AsSelf();
@@ -60,7 +61,8 @@ namespace JiraTimeBot.DI
 
             _builder.RegisterType<JiraHistory>().AsSelf().As<IJiraHistory>();
 
-            _builder.Register(c => new Job(c.Resolve<IAllMercurialProviders>(), c.Resolve<ITaskTimeCalculator>(), c.Resolve<ILog>())).AsSelf();
+            _builder.Register(c => new Job(c.Resolve<IAllRepositoryProviders>(), c.Resolve<ITaskTimeCalculator>(),
+                c.Resolve<IJiraApi>(), c.Resolve<ILog>())).AsSelf();
 
             _builder.RegisterType<AutoStartUp>().AsSelf().AsImplementedInterfaces();
             _builder.RegisterType<frmSettings>().AsSelf().AsImplementedInterfaces();

src/JiraTimeBot/JiraIntegration/Authentificators/JSessionAuthenticator.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using RestSharp;
+using RestSharp.Authenticators;
+
+namespace JiraTimeBot.JiraIntegration.Authentificators
+{
+    public class JSessionAuthenticator : AuthenticatorBase
+    {
+        public JSessionAuthenticator(string jSessionId) : base(jSessionId)
+        {
+
+        }
+
+        protected override Parameter GetAuthenticationParameter(string token)
+            => new Parameter("JSESSIONID", token, ParameterType.Cookie);
+    }
+}

src/JiraTimeBot/JiraIntegration/IJiraApi.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using Atlassian.Jira;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.TaskTime.Objects;
+
+namespace JiraTimeBot.JiraIntegration
+{
+    public interface IJiraApi
+    {
+        List<Issue> GetIssuesByJQL(string jql, Settings settings, DateTime? date = null, CancellationToken cancellationToken = default);
+        string GetTaskName(string branch, Settings settings);
+        List<Issue> GetWorkloggedIssuesByDate(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default);
+        void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false, CancellationToken cancellationToken = default);
+        List<Worklog> GetManuallyWorklogged(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date, CancellationToken cancellationToken = default);
+    }
+}

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -1,22 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using Atlassian.Jira;
+using Atlassian.Jira;
 using JiraTimeBot.Configuration;
 using JiraTimeBot.JiraIntegration.Comments;
 using JiraTimeBot.TaskTime.Objects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using JiraTimeBot.JiraIntegration.Authentificators;
+using RestSharp.Authenticators;
 
 namespace JiraTimeBot.JiraIntegration
 {
-    public interface IJiraApi
-    {
-        List<Issue> GetIssuesByJQL(string jql, Settings settings, DateTime? date = null, CancellationToken cancellationToken = default);
-        string GetTaskName(string branch, Settings settings);
-        List<Issue> GetWorkloggedIssuesByDate(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default);
-        void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false, CancellationToken cancellationToken = default);
-    }
-
     public class JiraApi : IJiraApi
     {
         private readonly ILog _log;
@@ -30,9 +24,9 @@ namespace JiraTimeBot.JiraIntegration
 
         public string GetTaskName(string branch, Settings settings)
         {
-            var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);
             try
             {
+                var jira = GetClient(settings);
                 var issue = jira.Issues.Queryable.FirstOrDefault(f => f.Key == branch);
                 return issue?.Summary;
             }
@@ -44,7 +38,7 @@ namespace JiraTimeBot.JiraIntegration
 
         public List<Issue> GetIssuesByJQL(string jql, Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
         {
-            var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);
+            var jira = GetClient(settings);
             date = date.GetValueOrDefault(DateTime.Now.Date);
 
             var userName = settings.JiraUserName;
@@ -77,6 +71,28 @@ namespace JiraTimeBot.JiraIntegration
             return GetIssuesByJQL(jql, settings, date, cancellationToken);
         }
 
+        public List<Worklog> GetManuallyWorklogged(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date, CancellationToken cancellationToken = default)
+        {
+            var result = new List<Worklog>();
+            var alreadyLoggedToday = GetWorkloggedIssuesByDate(settings, date);
+            foreach (var issue in alreadyLoggedToday)
+            {
+                if (!taskTimeItems.Any(f => f.Branch.Equals(issue.Key.Value, StringComparison.InvariantCulture)))
+                {
+                    var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
+                    var userWorklogs = workLogs.Where(w =>
+                        w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
+                            StringComparison.InvariantCultureIgnoreCase)).ToList();
+                    foreach (var userWorklog in userWorklogs)
+                    {
+                        result.Add(userWorklog);
+                    }
+                }
+            }
+
+            return result;
+        }
+
         private void RemoveWorklogsAddedByUser(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, CancellationToken cancellationToken = default)
         {
             var alreadyLoggedToday = GetWorkloggedIssuesByDate(settings, date);
@@ -104,10 +120,13 @@ namespace JiraTimeBot.JiraIntegration
         public void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false, CancellationToken cancellationToken = default)
         {
             date = date.GetValueOrDefault(DateTime.Now.Date).Date;
-            var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);
+            var jira = GetClient(settings);
             
-            //Удаляем добавленные вручную пользователем данные.
-            RemoveWorklogsAddedByUser(taskTimeItems, settings, date, dummy, cancellationToken);
+            if (settings.RemoveManuallyAddedWorklogs)
+            {
+                //Удаляем добавленные вручную пользователем данные.
+                RemoveWorklogsAddedByUser(taskTimeItems, settings, date, dummy, cancellationToken);
+            }
 
             foreach (TaskTimeItem taskTimeItem in taskTimeItems)
             {
@@ -155,7 +174,7 @@ namespace JiraTimeBot.JiraIntegration
                         {
                             try
                             {
-                                issue.DeleteWorklogAsync(workLog, WorklogStrategy.RetainRemainingEstimate, token: cancellationToken);
+                                issue.DeleteWorklogAsync(workLog, WorklogStrategy.AutoAdjustRemainingEstimate, token: cancellationToken);
                             }
                             catch (Exception ex)
                             {
@@ -181,7 +200,7 @@ namespace JiraTimeBot.JiraIntegration
                     {
                         try
                         {
-                            workLogToAdd = issue.AddWorklogAsync(workLogToAdd, WorklogStrategy.RetainRemainingEstimate, token: cancellationToken).Result;
+                            workLogToAdd = issue.AddWorklogAsync(workLogToAdd, WorklogStrategy.AutoAdjustRemainingEstimate, token: cancellationToken).Result;
                         }
                         catch (Exception ex)
                         {
@@ -193,5 +212,15 @@ namespace JiraTimeBot.JiraIntegration
                 }
             }
         }
+
+        public Jira GetClient(Settings settings)
+        {
+            var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);
+            if (settings.JiraPassword.Length == 32)
+            {
+                jira.RestClient.RestSharpClient.Authenticator = new JSessionAuthenticator(settings.JiraPassword);
+            }
+            return jira;
+        }
     }
 }

src/JiraTimeBot/JiraIntegration/JiraHistory.cs

@@ -1,11 +1,9 @@
-using System;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.TaskTime.Objects;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.TaskTime.Objects;
 
 namespace JiraTimeBot.JiraIntegration
 {
@@ -16,7 +14,7 @@ namespace JiraTimeBot.JiraIntegration
                                           CancellationToken cancellationToken = default);
     }
 
-    public class JiraHistory: IJiraHistory
+    public class JiraHistory : IJiraHistory
     {
         private readonly IJiraApi _jiraApi;
 

src/JiraTimeBot/JiraTimeBot.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.2.0.298\build\net46\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.2.0.298\build\net46\LibGit2Sharp.NativeBinaries.props')" />
+  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.2.0.306\build\net46\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.2.0.306\build\net46\LibGit2Sharp.NativeBinaries.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,9 +11,24 @@
     <AssemblyName>JiraTimeBot</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -25,6 +40,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <LangVersion>7.1</LangVersion>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -38,43 +54,59 @@
   <PropertyGroup>
     <ApplicationIcon>app.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>JiraTimeBot.Program</StartupObject>
+  </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Atlassian.Jira, Version=12.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Atlassian.SDK.12.1.0\lib\net452\Atlassian.Jira.dll</HintPath>
+    <Reference Include="Atlassian.Jira, Version=12.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Atlassian.SDK.12.4.0\lib\net452\Atlassian.Jira.dll</HintPath>
     </Reference>
-    <Reference Include="Autofac, Version=5.1.2.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.5.1.2\lib\net461\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=6.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.6.2.0\lib\netstandard2.0\Autofac.dll</HintPath>
     </Reference>
-    <Reference Include="Autofac.Extras.AggregateService, Version=5.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.Extras.AggregateService.5.0.0\lib\netstandard2.0\Autofac.Extras.AggregateService.dll</HintPath>
+    <Reference Include="Autofac.Extras.AggregateService, Version=6.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.Extras.AggregateService.6.0.0\lib\netstandard2.0\Autofac.Extras.AggregateService.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
+      <HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="LibGit2Sharp, Version=0.27.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
-      <HintPath>..\packages\LibGit2Sharp.0.27.0-preview-0034\lib\net46\LibGit2Sharp.dll</HintPath>
+    <Reference Include="LibGit2Sharp, Version=0.26.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
+      <HintPath>..\packages\LibGit2Sharp.0.26.2\lib\net46\LibGit2Sharp.dll</HintPath>
     </Reference>
     <Reference Include="Mercurial.Net, Version=1.1.1.607, Culture=neutral, PublicKeyToken=9e2fabf3af85dba9, processorArchitecture=MSIL">
       <HintPath>..\packages\Mercurial.Net.1.1.1.607\lib\net35-Client\Mercurial.Net.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="RestSharp, Version=106.0.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestSharp.106.10.1\lib\net452\RestSharp.dll</HintPath>
+    <Reference Include="RestSharp, Version=106.11.7.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.106.11.7\lib\net452\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
@@ -96,20 +128,22 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DI\ContainerBuilder.cs" />
+    <Compile Include="JiraIntegration\Authentificators\JSessionAuthenticator.cs" />
     <Compile Include="JiraIntegration\Comments\IJiraDescriptionSource.cs" />
     <Compile Include="JiraIntegration\Comments\JiraDescriptionSource.cs" />
+    <Compile Include="JiraIntegration\IJiraApi.cs" />
     <Compile Include="JiraIntegration\JiraHistory.cs" />
     <Compile Include="Job.cs" />
     <Compile Include="Logger.cs" />
     <Compile Include="Configuration\Settings.cs" />
-    <Compile Include="JiraIntegration\JiraCommitEmulator.cs" />
-    <Compile Include="Mercurial\GitLog.cs" />
-    <Compile Include="Mercurial\IAllMercurialProviders.cs" />
-    <Compile Include="Mercurial\Modifiers\ITechnicalInfoSkipper.cs" />
-    <Compile Include="Mercurial\Modifiers\CommitSkipper.cs" />
-    <Compile Include="Mercurial\Modifiers\ICommitSkipper.cs" />
-    <Compile Include="Mercurial\IRepositoryLog.cs" />
-    <Compile Include="Mercurial\Modifiers\TechnicalInfoSkipper.cs" />
+    <Compile Include="RepositoryProviders\JiraCommitEmulator.cs" />
+    <Compile Include="RepositoryProviders\GitLog.cs" />
+    <Compile Include="RepositoryProviders\Interfaces\IAllVcsProviders.cs" />
+    <Compile Include="RepositoryProviders\Modifiers\ITechnicalInfoSkipper.cs" />
+    <Compile Include="RepositoryProviders\Modifiers\CommitSkipper.cs" />
+    <Compile Include="RepositoryProviders\Modifiers\ICommitSkipper.cs" />
+    <Compile Include="RepositoryProviders\Interfaces\IRepositoryLog.cs" />
+    <Compile Include="RepositoryProviders\Modifiers\TechnicalInfoSkipper.cs" />
     <Compile Include="TasksProcessors\IAllTasksProcessors.cs" />
     <Compile Include="TaskTime\Objects\CommitType.cs" />
     <Compile Include="TaskTime\TaskTimeSpread.cs" />
@@ -120,7 +154,7 @@
       <DependentUpon>frmMain.cs</DependentUpon>
     </Compile>
     <Compile Include="JiraIntegration\JiraApi.cs" />
-    <Compile Include="Mercurial\MercurialLog.cs" />
+    <Compile Include="RepositoryProviders\MercurialLog.cs" />
     <Compile Include="Configuration\PasswordEncryptionClass.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -177,11 +211,24 @@
   <ItemGroup>
     <Content Include="app.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.2.0.298\build\net46\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.2.0.298\build\net46\LibGit2Sharp.NativeBinaries.props'))" />
+    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.2.0.306\build\net46\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.2.0.306\build\net46\LibGit2Sharp.NativeBinaries.props'))" />
   </Target>
 </Project>

src/JiraTimeBot/Job.cs

@@ -1,26 +1,32 @@
-using System;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.RepositoryProviders.Interfaces;
+using JiraTimeBot.TasksProcessors;
+using JiraTimeBot.TaskTime;
+using JiraTimeBot.TaskTime.Objects;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.Mercurial;
-using JiraTimeBot.TasksProcessors;
-using JiraTimeBot.TaskTime;
-using JiraTimeBot.TaskTime.Objects;
+using JiraTimeBot.JiraIntegration;
 
 namespace JiraTimeBot
 {
     class Job
     {
-        private readonly IAllMercurialProviders _mercurialProviders;
+        private readonly IAllRepositoryProviders _repositoryProviders;
         private readonly ITaskTimeCalculator _taskTimeDiscoverer;
+        private readonly IJiraApi _jiraApi;
         private readonly ILog _log;
 
-        public Job(IAllMercurialProviders mercurialProviders, ITaskTimeCalculator taskTimeDiscoverer, ILog log)
+        public Job(IAllRepositoryProviders repositoryProviders, 
+                   ITaskTimeCalculator taskTimeDiscoverer, 
+                   IJiraApi jiraApi, 
+                   ILog log)
         {
-            _mercurialProviders = mercurialProviders;
+            _repositoryProviders = repositoryProviders;
             _taskTimeDiscoverer = taskTimeDiscoverer;
+            _jiraApi = jiraApi;
             _log = log;
         }
 
@@ -31,7 +37,10 @@ namespace JiraTimeBot
             return Task.Run(() => DoTheJobImpl(settings, tasksProcessor, dummyMode, cancellationToken), cancellationToken);
         }
 
-        private void DoTheJobImpl(Settings settings, ITasksProcessor tasksProcessor, bool dummyMode, CancellationToken cancellationToken)
+        private void DoTheJobImpl(Settings settings, 
+                                  ITasksProcessor tasksProcessor, 
+                                  bool dummyMode, 
+                                  CancellationToken cancellationToken)
         {
             int daysDiff = 0;
             if (tasksProcessor is MeetingProcessor)
@@ -70,29 +79,91 @@ namespace JiraTimeBot
             return Task.Run(() => SetTaskTimesForDateImpl(setForDate, realDate, settings, tasksProcessor, dummyMode, cancellationToken), cancellationToken);
         }
 
-        private bool SetTaskTimesForDateImpl(DateTime setForDate, DateTime realDate, Settings settings, ITasksProcessor tasksProcessor, bool dummyMode, CancellationToken cancellationToken)
+        private bool SetTaskTimesForDateImpl(DateTime setForDate,
+                                             DateTime realDate,
+                                             Settings settings,
+                                             ITasksProcessor tasksProcessor,
+                                             bool dummyMode,
+                                             CancellationToken cancellationToken)
         {
-            IRepositoryLog mercurial = _mercurialProviders.MercurialLog;
-            if (settings.WorkType == WorkType.JiraLogs)
+            List<TaskTimeItem> tasks = new List<TaskTimeItem>();
+            if (tasksProcessor is MeetingProcessor)
             {
-                _log.Info("Использую Jira как источник информации.");
-                mercurial = _mercurialProviders.JiraCommitEmulator;
-            }
-            else if (settings.WorkType == WorkType.GitLogs)
-            {
-                _log.Info("Использую Git как источник информации.");
-                mercurial = _mercurialProviders.GitLog;
+                var provider = _repositoryProviders.JiraHistory;
+                tasks = provider.GetDayWorklogs(realDate, settings, cancellationToken);
+                return SetTaskTimesForDate(setForDate, realDate, settings, tasksProcessor, dummyMode, tasks, cancellationToken);
             }
 
-            List<TaskTimeItem> taskTimes;
+            switch (settings.WorkType)
+            {
+                case WorkType.Mercurial:
+                {
+                    var repo = _repositoryProviders.JiraCommitEmulator;
+                    tasks = GetTasksFromRepositories(realDate, settings, new[] {repo});
+                    break;
+                }
+                case WorkType.JiraLogs:
+                {
+                    var repo = _repositoryProviders.JiraCommitEmulator;
+                    tasks = GetTasksFromRepositories(realDate, settings, new[] {repo});
+                    break;
+                }
+                case WorkType.GitLogs:
+                {
+                    var repo = _repositoryProviders.GitLog;
+                    tasks = GetTasksFromRepositories(realDate, settings, new[] {repo});
+                    break;
+                }
+                case WorkType.CVSMixed:
+                {
+                    var repos = new[] {_repositoryProviders.GitLog as IRepositoryLog, _repositoryProviders.MercurialLog};
+                    tasks = GetTasksFromRepositories(realDate, settings, repos);
+                    break;
+                }
+                default:
+                {
+                    return false;
+                }
+            }
+
+            var result = SetTaskTimesForDate(setForDate, realDate, settings, tasksProcessor, dummyMode, tasks, cancellationToken);
+            return result;
+        }
+
+        private List<TaskTimeItem> GetTasksFromRepositories(DateTime realDate, 
+                                                            Settings settings,  
+                                                            IEnumerable<IRepositoryLog> repositories)
+        {
+            var result = new List<TaskTimeItem>();
+            foreach (var repositoryLog in repositories)
+            {
+                foreach (var repoPath in settings.GetRepositories())
+                {
+                    var items = repositoryLog.GetRepositoryLog(settings, repoPath, realDate);
+                    result.AddRange(items);
+                }
+            }
+            return result;
+        }
+
+
+        private bool SetTaskTimesForDate(DateTime setForDate, 
+                                         DateTime realDate, 
+                                         Settings settings, 
+                                         ITasksProcessor tasksProcessor, 
+                                         bool dummyMode, 
+                                         List<TaskTimeItem> taskTimes,
+                                         CancellationToken cancellationToken)
+        {
             if (!(tasksProcessor is MeetingProcessor))
             {
-                List<TaskTimeItem> commits = mercurial.GetRepositoryLog(settings, realDate, cancellationToken);
+                List<TaskTimeItem> commits = taskTimes;
+                ModifyWorktimeByManualLogs(setForDate, settings, cancellationToken, commits);
                 taskTimes = _taskTimeDiscoverer.CalculateTaskTime(commits, settings, cancellationToken);
             }
             else
             {
-                var provider = _mercurialProviders.JiraHistory;
+                var provider = _repositoryProviders.JiraHistory;
                 taskTimes = provider.GetDayWorklogs(realDate, settings, cancellationToken);
             }
 
@@ -111,5 +182,21 @@ namespace JiraTimeBot
             _log.Info("Готово.");
             return true;
         }
+
+        private void ModifyWorktimeByManualLogs(DateTime setForDate, Settings settings, CancellationToken cancellationToken,
+            List<TaskTimeItem> commits)
+        {
+            if (settings.RemoveManuallyAddedWorklogs)
+            {
+                return;
+            }
+
+            //если не удаляем добавленное вручную, то посчитаем сколько там надобавляли и отнимем от рабочего дня
+            var manuallyWorklogged = _jiraApi.GetManuallyWorklogged(commits, settings, setForDate, cancellationToken);
+            if (manuallyWorklogged.Any() && manuallyWorklogged.Sum(f => f.TimeSpentInSeconds) < settings.MinuterPerWorkDay)
+            {
+                settings.MinuterPerWorkDay = (int) (settings.MinuterPerWorkDay - manuallyWorklogged.Sum(f => f.TimeSpentInSeconds));
+            }
+        }
     }
 }

src/JiraTimeBot/Mercurial/IRepositoryLog.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.TaskTime.Objects;
-
-namespace JiraTimeBot.Mercurial
-{
-    public interface IRepositoryLog
-    {
-        List<TaskTimeItem> GetRepositoryLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken));
-    }
-}

src/JiraTimeBot/Mercurial/Modifiers/ITechnicalInfoSkipper.cs

@@ -1,7 +0,0 @@
-namespace JiraTimeBot.Mercurial.Modifiers
-{
-    public interface ITechnicalInfoSkipper
-    {
-        string StripTechnicalInfo(string commitMessage);
-    }
-}

src/JiraTimeBot/Program.cs

@@ -1,8 +1,8 @@
 using JiraTimeBot.UI;
+using JiraTimeBot.UI.Tray;
 using System;
 using System.Threading;
 using System.Windows.Forms;
-using JiraTimeBot.UI.Tray;
 
 namespace JiraTimeBot
 {

src/JiraTimeBot/Properties/AssemblyInfo.cs

@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]           
 [assembly: AssemblyCompany("")]           
 [assembly: AssemblyProduct("JiraTimeBot")]           
-[assembly: AssemblyCopyright("Copyright © 2019")]                                                                 
+[assembly: AssemblyCopyright("Copyright © 2020")]           
 [assembly: AssemblyTrademark("")]           
 [assembly: AssemblyCulture("")]           
 // Setting ComVisible to false makes the types in this assembly not visible                                                                                 
@@ -26,6 +26,6 @@ using System.Runtime.InteropServices;
 //                                                                                 
 // You can specify all the values or you can default the Build and Revision Numbers                                                                                 
 // by using the '*' as shown below:                                                                                 
-[assembly: AssemblyVersion("1.0.74")] 
-[assembly: AssemblyFileVersion("1.0.74")] 
-[assembly: AssemblyInformationalVersion("1.0.74")] 
+[assembly: AssemblyVersion("1.0.91")] 
+[assembly: AssemblyFileVersion("1.0.91")] 
+[assembly: AssemblyInformationalVersion("1.0.91")] 

src/JiraTimeBot/RepositoryProviders/GitLog.cs

@@ -1,17 +1,16 @@
-using System;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.RepositoryProviders.Interfaces;
+using JiraTimeBot.RepositoryProviders.Modifiers;
+using JiraTimeBot.TaskTime.Objects;
+using LibGit2Sharp;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.ServiceModel.Security;
-using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.Mercurial.Modifiers;
-using JiraTimeBot.TaskTime.Objects;
-using LibGit2Sharp;
-using LibGit2Sharp.Handlers;
 
-namespace JiraTimeBot.Mercurial
+namespace JiraTimeBot.RepositoryProviders
 {
     public class GitLog : IRepositoryLog
     {
@@ -26,9 +25,9 @@ namespace JiraTimeBot.Mercurial
             _technicalInfoSkipper = technicalInfoSkipper;
         }
 
-        public List<TaskTimeItem> GetRepositoryLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
+        public List<TaskTimeItem> GetRepositoryLog(Settings settings, string currentRepository, DateTime? date = null, CancellationToken cancellationToken = default)
         {
-            if (string.IsNullOrEmpty(settings.RepositoryPath) || !Directory.Exists(settings.RepositoryPath))
+            if (string.IsNullOrEmpty(currentRepository) || !Directory.Exists(currentRepository))
             {
                 _log.Error("Папка с репо не сушествует.");
                 return new List<TaskTimeItem>();
@@ -37,7 +36,7 @@ namespace JiraTimeBot.Mercurial
             date = date.GetValueOrDefault(DateTime.Now.Date);
 
             var workTasks = new List<TaskTimeItem>();
-            foreach (var repoDirectory in Directory.GetDirectories(settings.RepositoryPath))
+            foreach (var repoDirectory in Directory.GetDirectories(currentRepository, ".git", SearchOption.AllDirectories))
             {
                 if (cancellationToken.IsCancellationRequested)
                 {
@@ -45,16 +44,15 @@ namespace JiraTimeBot.Mercurial
                 }
 
                 //var project = new DirectoryInfo(repoDirectory).Name;
-                if (!Directory.Exists(Path.Combine(repoDirectory, ".git")))
+                var repoRootDirectory = repoDirectory.Replace(".git", "");
+                var directoryInfo = new DirectoryInfo(repoRootDirectory);
+                if (!directoryInfo.Exists)
                 {
                     continue;
                 }
 
-                var directoryInfo = new DirectoryInfo(repoDirectory);
-
-                
-                var repo = new LibGit2Sharp.Repository(repoDirectory);
 
+                var repo = new LibGit2Sharp.Repository(repoRootDirectory);
                 if (settings.PullBeforeProcess)
                 {
                     try
@@ -80,7 +78,14 @@ namespace JiraTimeBot.Mercurial
                 var reflog = repo.Refs.Log(repo.Refs.Head);
                 foreach (var reflogItem in reflog)
                 {
-                    if (reflogItem.Committer.When.Date != date || reflogItem.Committer.Email != settings.MercurialAuthorEmail)
+
+                    var dateMatch = date.Value.Date == reflogItem.Committer.When.Date;
+                    var committerEmail = reflogItem.Committer.Email;
+
+                    var userMatch = committerEmail.Equals(settings.MercurialAuthorEmail, StringComparison.CurrentCultureIgnoreCase)
+                                    || committerEmail.Equals(settings.AlternativeEmail, StringComparison.CurrentCultureIgnoreCase);
+
+                    if (!dateMatch || !userMatch)
                     {
                         continue;
                     }
@@ -98,23 +103,39 @@ namespace JiraTimeBot.Mercurial
                     {
                         return new List<TaskTimeItem>();
                     }
-                    if (commit.Author.When.DateTime.Date != date || commit.Author.Email != settings.MercurialAuthorEmail)
+
+                    var userMatch = commit.Author.Email.Equals(settings.MercurialAuthorEmail, StringComparison.CurrentCultureIgnoreCase)
+                                    || commit.Author.Email.Equals(settings.AlternativeEmail, StringComparison.CurrentCultureIgnoreCase);
+
+
+                    if (commit.Author.When.DateTime.Date != date.Value.Date 
+                        || !userMatch)
                     {
                         continue;
                     }
 
-                    var branch = ListBranchesContaininingCommit(repo, commit.Sha).Select(f => f.FriendlyName)
-                        .Where(f => f.Contains("-") && !f.Contains("/")).Distinct().FirstOrDefault();
+                    var regex = new Regex("[a-zA-Z0-9]{1,4}-[0-9]{1,6}");
+                    var branch = ListBranchesContainsCommit(repo, commit.Sha)
+                                 .Select(f => f.FriendlyName)
+                                 .FirstOrDefault(f => regex.IsMatch(f));
+                                 
+
+                        //.Where(f => f.Contains("-") && !f.Contains("/")).Distinct().FirstOrDefault();
                     if (branch == null)
                     {
                         continue;
                     }
 
+                    branch = regex.Match(branch).Value;
+
                     var commitMessage = commit.MessageShort;
+                    commitMessage = _technicalInfoSkipper.StripBranchPrefix(branch, commitMessage);
+
                     if (_commitSkipper.IsNeedToSkip(branch, commitMessage))
                     {
                         continue;
                     }
+
                     commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
                     var files = FilesToMerge(commit, repo);
 
@@ -158,7 +179,7 @@ namespace JiraTimeBot.Mercurial
             return fileList.ToArray();
         }
 
-        private IEnumerable<Branch> ListBranchesContaininingCommit(Repository repo, string commitSha)
+        private IEnumerable<Branch> ListBranchesContainsCommit(Repository repo, string commitSha)
         {
             bool directBranchHasBeenFound = false;
             foreach (var branch in repo.Branches)

src/JiraTimeBot/RepositoryProviders/Interfaces/IAllVcsProviders.cs

@@ -1,12 +1,15 @@
 using JiraTimeBot.JiraIntegration;
 
-namespace JiraTimeBot.Mercurial
+namespace JiraTimeBot.RepositoryProviders.Interfaces
 {
-    public interface IAllMercurialProviders
+    public interface IAllRepositoryProviders
     {
         MercurialLog MercurialLog { get; }
+        
         GitLog GitLog { get; }
+        
         JiraCommitEmulator JiraCommitEmulator { get; }
+        
         IJiraHistory JiraHistory { get; }
     }
 }

src/JiraTimeBot/RepositoryProviders/Interfaces/IRepositoryLog.cs

@@ -0,0 +1,16 @@
+using JiraTimeBot.Configuration;
+using JiraTimeBot.TaskTime.Objects;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+namespace JiraTimeBot.RepositoryProviders.Interfaces
+{
+    public interface IRepositoryLog
+    {
+        List<TaskTimeItem> GetRepositoryLog(Settings settings, 
+                                            string currentRepository,
+                                            DateTime? date = null, 
+                                            CancellationToken cancellationToken = default(CancellationToken));
+    }
+}

src/JiraTimeBot/RepositoryProviders/JiraCommitEmulator.cs

@@ -4,11 +4,11 @@ using System.Linq;
 using System.Threading;
 using Atlassian.Jira;
 using JiraTimeBot.Configuration;
-using JiraTimeBot.Mercurial;
+using JiraTimeBot.JiraIntegration;
+using JiraTimeBot.RepositoryProviders.Interfaces;
 using JiraTimeBot.TaskTime.Objects;
 
-
-namespace JiraTimeBot.JiraIntegration
+namespace JiraTimeBot.RepositoryProviders
 {
     public class JiraCommitEmulator : IRepositoryLog
     {
@@ -22,8 +22,9 @@ namespace JiraTimeBot.JiraIntegration
         }
 
         public List<TaskTimeItem> GetRepositoryLog(Settings settings,
-                                    DateTime? date = null,
-                                    CancellationToken cancellationToken = default(CancellationToken))
+                                                   string currentRepository,
+                                                   DateTime? date = null,
+                                                   CancellationToken cancellationToken = default(CancellationToken))
         {
             date = date.GetValueOrDefault(DateTime.Now.Date);
             var workTasks = new List<TaskTimeItem>();
@@ -44,7 +45,7 @@ namespace JiraTimeBot.JiraIntegration
 
                 if (userComments.Any())
                 {
-                    foreach (var comment in userComments.OrderBy(f=>f.CreatedDate))
+                    foreach (var comment in userComments.OrderBy(f => f.CreatedDate))
                     {
                         var item = new TaskTimeItem(issue.Key.Value,
                             issue.Summary,

src/JiraTimeBot/RepositoryProviders/MercurialLog.cs

@@ -1,17 +1,20 @@
-using System;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.RepositoryProviders.Interfaces;
+using JiraTimeBot.RepositoryProviders.Modifiers;
+using JiraTimeBot.TaskTime.Objects;
+using Mercurial;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.ServiceModel.Channels;
 using System.Text;
 using System.Threading;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.Mercurial.Modifiers;
-using JiraTimeBot.TaskTime.Objects;
-using Mercurial;
+using System.Windows.Forms;
 
-namespace JiraTimeBot.Mercurial
+namespace JiraTimeBot.RepositoryProviders
 {
-    public class MercurialLog: IRepositoryLog
+    public class MercurialLog : IRepositoryLog
     {
         private readonly ILog _log;
         private readonly ICommitSkipper _commitSkipper;
@@ -24,9 +27,9 @@ namespace JiraTimeBot.Mercurial
             _technicalInfoSkipper = technicalInfoSkipper;
         }
 
-        public List<TaskTimeItem> GetRepositoryLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
+        public List<TaskTimeItem> GetRepositoryLog(Settings settings, string currentRepository, DateTime? date = null, CancellationToken cancellationToken = default)
         {
-            if (string.IsNullOrEmpty(settings.RepositoryPath) || !Directory.Exists(settings.RepositoryPath))
+            if (string.IsNullOrEmpty(currentRepository) || !Directory.Exists(currentRepository))
             {
                 _log.Error("Папка с репо не сушествует.");
                 return new List<TaskTimeItem>();
@@ -35,7 +38,7 @@ namespace JiraTimeBot.Mercurial
             date = date.GetValueOrDefault(DateTime.Now.Date);
 
             var workTasks = new List<TaskTimeItem>();
-            foreach (var repoDirectory in Directory.GetDirectories(settings.RepositoryPath))
+            foreach (var repoDirectory in Directory.GetDirectories(currentRepository))
             {
                 if (cancellationToken.IsCancellationRequested)
                 {
@@ -68,52 +71,61 @@ namespace JiraTimeBot.Mercurial
                 {
                     Date = date,
                     Users = { settings.MercurialAuthorEmail },
-                    AdditionalArguments = { "--encoding=utf-8"},
+                    AdditionalArguments = { "--encoding=utf-8" },
                 };
 
-                var log = repo.Log(logCommand);
-
-                foreach (var changeset in log)
+                try
                 {
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        return new List<TaskTimeItem>();
-                    }
+                    var log = repo.Log(logCommand);
 
-                    var commitMessage = FixEncoding(changeset.CommitMessage);
-                    if (_commitSkipper.IsNeedToSkip(changeset.Branch, commitMessage))
+                    foreach (var changeset in log)
                     {
-                        continue;
-                    }
-                    commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
-
-                    var task = new TaskTimeItem(changeset.Branch,
-                        commitMessage,
-                        directoryInfo.Name,
-                        changeset.Timestamp,
-                        TimeSpan.Zero,
-                        1,
-                        changeset.PathActions.Count, 
-                        "",
-                        GetCommitType(changeset.Branch));
-
-                    if (task.Type == CommitType.Release && task.Description.StartsWith("Merge with", StringComparison.CurrentCultureIgnoreCase))
-                    {
-                        var description = task.Description;
-                        if (description.Contains("\n"))
+                        if (cancellationToken.IsCancellationRequested)
                         {
-                            description = description.Split('\n')[0];
+                            return new List<TaskTimeItem>();
                         }
-                        var branch = description.Replace("Merge with", "").Replace(" ", "");
-                        var release = task.Branch.Replace("release", "");
 
-                        task.Branch = branch;
-                        task.Description = $"Подготовка и публикация версии {task.Project} {release}.";
-                        task.ReleaseVersion = release;
+                        var commitMessage = FixEncoding(changeset.CommitMessage);
+                        if (_commitSkipper.IsNeedToSkip(changeset.Branch, commitMessage))
+                        {
+                            continue;
+                        }
+                        commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
+
+                        var task = new TaskTimeItem(changeset.Branch,
+                            commitMessage,
+                            directoryInfo.Name,
+                            changeset.Timestamp,
+                            TimeSpan.Zero,
+                            1,
+                            changeset.PathActions.Count,
+                            "",
+                            GetCommitType(changeset.Branch));
+
+                        if (task.Type == CommitType.Release && task.Description.StartsWith("Merge with", StringComparison.CurrentCultureIgnoreCase))
+                        {
+                            var description = task.Description;
+                            if (description.Contains("\n"))
+                            {
+                                description = description.Split('\n')[0];
+                            }
+                            var branch = description.Replace("Merge with", "").Replace(" ", "");
+                            var release = task.Branch.Replace("release", "");
+
+                            task.Branch = branch;
+                            task.Description = $"Подготовка и публикация версии {task.Project} {release}.";
+                            task.ReleaseVersion = release;
+                        }
+                        workTasks.Add(task);
+                        _log?.Trace($" - Найден changeset: {changeset.Timestamp} - {changeset.Branch} - {changeset.AuthorEmailAddress} - {commitMessage}");
                     }
-                    workTasks.Add(task);
-                    _log?.Trace($" - Найден changeset: {changeset.Timestamp} - {changeset.Branch} - {changeset.AuthorEmailAddress} - {commitMessage}");
                 }
+                catch (Exception e)
+                {
+                    MessageBox.Show($"Oops something went wrong in repo {repoDirectory}");
+                    throw;
+                }
+
             }
             if (!workTasks.Any())
             {

src/JiraTimeBot/RepositoryProviders/Modifiers/CommitSkipper.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace JiraTimeBot.Mercurial.Modifiers
+namespace JiraTimeBot.RepositoryProviders.Modifiers
 {
     public class CommitSkipper : ICommitSkipper
     {
@@ -19,6 +19,7 @@ namespace JiraTimeBot.Mercurial.Modifiers
             //Пропускаем Close и Merge коммиты
             if (commitMessage.StartsWith($"Close {branch}", StringComparison.InvariantCultureIgnoreCase) ||
                 commitMessage.StartsWith($"Merge with", StringComparison.InvariantCultureIgnoreCase) ||
+                commitMessage.StartsWith($"Merged", StringComparison.InvariantCultureIgnoreCase) ||
                 commitMessage.StartsWith($"Merge branch", StringComparison.InvariantCultureIgnoreCase))
             {
                 return true;

src/JiraTimeBot/RepositoryProviders/Modifiers/ICommitSkipper.cs

@@ -1,4 +1,4 @@
-namespace JiraTimeBot.Mercurial.Modifiers
+namespace JiraTimeBot.RepositoryProviders.Modifiers
 {
     public interface ICommitSkipper
     {

src/JiraTimeBot/RepositoryProviders/Modifiers/ITechnicalInfoSkipper.cs

@@ -0,0 +1,8 @@
+namespace JiraTimeBot.RepositoryProviders.Modifiers
+{
+    public interface ITechnicalInfoSkipper
+    {
+        string StripBranchPrefix(string branch, string commitMessage);
+        string StripTechnicalInfo(string commitMessage);
+    }
+}

src/JiraTimeBot/RepositoryProviders/Modifiers/TechnicalInfoSkipper.cs

@@ -1,9 +1,26 @@
-using System.Text;
+using System;
+using System.Text;
 
-namespace JiraTimeBot.Mercurial.Modifiers
+namespace JiraTimeBot.RepositoryProviders.Modifiers
 {
     public class TechnicalInfoSkipper : ITechnicalInfoSkipper
     {
+        public string StripBranchPrefix(string branch, string commitMessage)
+        {
+            if (commitMessage.StartsWith(branch, StringComparison.InvariantCultureIgnoreCase))
+            {
+                return commitMessage.TrimStart(branch.ToCharArray()).Trim();
+            }
+
+            var quotedBranch = $"[{branch}]";
+            if (commitMessage.StartsWith(quotedBranch, StringComparison.InvariantCultureIgnoreCase))
+            {
+                return commitMessage.TrimStart(quotedBranch.ToCharArray()).Trim();
+            }
+
+            return commitMessage;
+        }
+
         public string StripTechnicalInfo(string commitMessage)
         {
             if (!commitMessage.Contains("Signed-by:"))

src/JiraTimeBot/TaskTime/ITaskTimeCalculator.cs

@@ -1,8 +1,7 @@
-using System.Collections.Generic;
-using System.Threading;
-using JiraTimeBot.Configuration;
-
+using JiraTimeBot.Configuration;
 using JiraTimeBot.TaskTime.Objects;
+using System.Collections.Generic;
+using System.Threading;
 
 namespace JiraTimeBot.TaskTime
 {

src/JiraTimeBot/TaskTime/Objects/CommitType.cs

@@ -3,7 +3,8 @@
 namespace JiraTimeBot.TaskTime.Objects
 {
     [Flags]
-    public enum CommitType {
+    public enum CommitType
+    {
         Task = 1,
         Release = 2
     }

src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -1,15 +1,13 @@
-using System;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.TaskTime.Objects;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
-using JiraTimeBot.Configuration;
-
-using JiraTimeBot.TaskTime.Objects;
 
 namespace JiraTimeBot.TaskTime
 {
-    public class TaskTimeByCommitsCalculator: ITaskTimeCalculator
+    public class TaskTimeByCommitsCalculator : ITaskTimeCalculator
     {
         private readonly ILog _log;
         private readonly ITaskTimeSpread _spreadHelper;
@@ -53,7 +51,7 @@ namespace JiraTimeBot.TaskTime
             {
                 var releaseTasks = _spreadHelper.SpreadTime(releaseCommits, 30, 1);
                 workTimeItems.AddRange(releaseTasks);
-                remainMinutes -= releaseTasks.Sum(f=>(int)f.TimeSpent.TotalMinutes);
+                remainMinutes -= releaseTasks.Sum(f => (int)f.TimeSpent.TotalMinutes);
             }
 
             var workTasks = _spreadHelper.SpreadTime(taskCommits, remainMinutes, settings.RoundToMinutes);
@@ -70,7 +68,7 @@ namespace JiraTimeBot.TaskTime
             }
             workTimeItems = workTimeItems.OrderByDescending(f => f.TimeSpent).ToList();
 
-            remainMinutes = minutesPerWorkDay - (int) workTimeItems.Sum(f => f.TimeSpent.TotalMinutes);
+            remainMinutes = minutesPerWorkDay - (int)workTimeItems.Sum(f => f.TimeSpent.TotalMinutes);
             if (remainMinutes != 0)
             {
                 _log.Trace($"Погрешность распределения времени: {remainMinutes}. Добавляю к первой задаче.");
@@ -83,7 +81,7 @@ namespace JiraTimeBot.TaskTime
 
             PrintTotal(workTimeItems);
 
-            return workTimeItems.OrderByDescending(f=>f.TimeSpent).ToList();
+            return workTimeItems.OrderByDescending(f => f.TimeSpent).ToList();
         }
 
 
@@ -111,7 +109,7 @@ namespace JiraTimeBot.TaskTime
             //если кол-во коммитов более чем кол-во интервалов - то уменьшим интервал вдвое.
             while (totalCommitsCount > (workHours * (60.0 / settings.RoundToMinutes)))
             {
-                settings.RoundToMinutes = (int) RoundTo((decimal) (settings.RoundToMinutes / 2.0), 5);
+                settings.RoundToMinutes = (int)RoundTo((decimal)(settings.RoundToMinutes / 2.0), 5);
                 _log.Info($"Слишком много задач - уменьшаю интервал до {settings.RoundToMinutes}.");
                 if (settings.RoundToMinutes == 5)
                 {

src/JiraTimeBot/TaskTime/TaskTimeSpread.cs

@@ -1,8 +1,8 @@
-using System;
+using JiraTimeBot.TaskTime.Objects;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using JiraTimeBot.TaskTime.Objects;
 
 namespace JiraTimeBot.TaskTime
 {
@@ -14,7 +14,7 @@ namespace JiraTimeBot.TaskTime
                                       bool roundUp = false,
                                       bool appendTime = true);
     }
-    public class TaskTimeSpread: ITaskTimeSpread
+    public class TaskTimeSpread : ITaskTimeSpread
     {
         public List<TaskTimeItem> SpreadTime(List<TaskTimeItem> source, int minutes, int roundToMinutes, bool roundUp = false, bool appendTime = true)
         {
@@ -28,7 +28,7 @@ namespace JiraTimeBot.TaskTime
 
                 var orderedTasks = taskGroup.OrderBy(f => f.StartTime).ToArray();
                 StringBuilder sb = new StringBuilder();
-                foreach (var taskDescription in orderedTasks.Select(f=>f.Description).Distinct())
+                foreach (var taskDescription in orderedTasks.Select(f => f.Description).Distinct())
                 {
                     sb.AppendLine($"- {taskDescription}");
                 }

src/JiraTimeBot/TasksProcessors/ITasksProcessor.cs

@@ -1,13 +1,18 @@
-using System;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.TaskTime.Objects;
+using System;
 using System.Collections.Generic;
 using System.Threading;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.TaskTime.Objects;
 
 namespace JiraTimeBot.TasksProcessors
 {
     interface ITasksProcessor
     {
-        void Process(DateTime setForDate, DateTime realDate, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default(CancellationToken));
+        void Process(DateTime setForDate, 
+                     DateTime realDate, 
+                     List<TaskTimeItem> taskTimes, 
+                     Settings settings, 
+                     bool dummyMode, 
+                     CancellationToken cancellationToken = default);
     }
 }

src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs

@@ -1,10 +1,10 @@
-using System;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.JiraIntegration;
+using JiraTimeBot.TaskTime.Objects;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.JiraIntegration;
-using JiraTimeBot.TaskTime.Objects;
 
 namespace JiraTimeBot.TasksProcessors
 {
@@ -24,16 +24,16 @@ namespace JiraTimeBot.TasksProcessors
             var totalTime = TimeSpan.FromSeconds(taskTimes.Sum(f => f.TimeSpent.TotalSeconds));
             _log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам ({totalTime:hh':'mm':'ss}):");
 
-            foreach (var taskTime in taskTimes.Where(f=>f.Type.HasFlag(CommitType.Task)).OrderByDescending(f => f.TimeSpent))
+            foreach (var taskTime in taskTimes.Where(f => f.Type.HasFlag(CommitType.Task)).OrderByDescending(f => f.TimeSpent))
             {
                 var taskName = _jiraApi.GetTaskName(taskTime.Branch, settings);
                 _log.Trace($" - [{taskTime.Branch}, коммитов {taskTime.Commits}]: {taskName} - {taskTime.TimeSpent}");
             }
 
-            var releases = taskTimes.Where(f => f.Type.HasFlag(CommitType.Release)).GroupBy(f=>f.Description);
+            var releases = taskTimes.Where(f => f.Type.HasFlag(CommitType.Release)).GroupBy(f => f.Description);
             foreach (var release in releases)
             {
-                var sum = release.Sum(f => (int) f.TimeSpent.TotalMinutes);
+                var sum = release.Sum(f => (int)f.TimeSpent.TotalMinutes);
                 var description = release.First().Description.Replace(Environment.NewLine, "");
                 _log.Trace($" - [Release, задач {release.Count()}]: {description} - {TimeSpan.FromMinutes(sum)}");
             }

src/JiraTimeBot/TasksProcessors/WorkLogTasksProcessor.cs

@@ -1,9 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using JiraTimeBot.Configuration;
+using JiraTimeBot.Configuration;
 using JiraTimeBot.JiraIntegration;
 using JiraTimeBot.TaskTime.Objects;
+using System;
+using System.Collections.Generic;
+using System.Threading;
 
 namespace JiraTimeBot.TasksProcessors
 {

src/JiraTimeBot/UI/Startup/AutoStartUp.cs

@@ -1,5 +1,5 @@
-using System.Windows.Forms;
-using Microsoft.Win32;
+using Microsoft.Win32;
+using System.Windows.Forms;
 
 namespace JiraTimeBot.UI.Startup
 {

src/JiraTimeBot/UI/Tray/RestoreFromTray.cs

@@ -4,13 +4,14 @@ using System.Windows.Forms;
 
 namespace JiraTimeBot.UI.Tray
 {
-    public static class RestoreFromTray {
-        [DllImport( "user32.dll" )]
-        private static extern int ShowWindow( IntPtr hWnd, uint Msg );
+    public static class RestoreFromTray
+    {
+        [DllImport("user32.dll")]
+        private static extern int ShowWindow(IntPtr hWnd, uint Msg);
 
         private const uint SW_RESTORE = 0x09;
 
-        public static void Restore( this Form form )
+        public static void Restore(this Form form)
         {
             if (form.WindowState == FormWindowState.Minimized)
             {

src/JiraTimeBot/UI/Tray/SingleInstance.cs

@@ -19,7 +19,8 @@ namespace JiraTimeBot.UI.Tray
             get
             {
                 object[] attributes = Assembly.GetEntryAssembly().GetCustomAttributes(typeof(System.Runtime.InteropServices.GuidAttribute), false);
-                if (attributes.Length == 0) {
+                if (attributes.Length == 0)
+                {
                     return string.Empty;
                 }
                 return ((GuidAttribute)attributes[0]).Value;

src/JiraTimeBot/UI/Tray/TrayMenu.cs

@@ -3,9 +3,9 @@ using System.Windows.Forms;
 
 namespace JiraTimeBot.UI.Tray
 {
-    public class TrayMenu: ITrayMenu
+    public class TrayMenu : ITrayMenu
     {
-        private NotifyIcon  _trayIcon;
+        private NotifyIcon _trayIcon;
 
         public NotifyIcon Create(frmMain form)
         {
@@ -43,8 +43,8 @@ namespace JiraTimeBot.UI.Tray
 
         private void btnTray_Click(object sender, EventArgs e)
         {
-            var icon = (NotifyIcon) sender;
-            var form = (frmMain) icon.Tag;
+            var icon = (NotifyIcon)sender;
+            var form = (frmMain)icon.Tag;
             form.Visible = true;
             form.Activate();
             form.BringToFront();

src/JiraTimeBot/UI/frmMain.Designer.cs

@@ -81,6 +81,7 @@
             this.tlpControls.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
             this.tlpControls.Size = new System.Drawing.Size(759, 416);
             this.tlpControls.TabIndex = 19;
+            this.tlpControls.Paint += new System.Windows.Forms.PaintEventHandler(this.tlpControls_Paint);
             // 
             // txtLog
             // 

src/JiraTimeBot/UI/frmMain.cs

@@ -2,16 +2,14 @@
 using JiraTimeBot.Configuration;
 using JiraTimeBot.DI;
 using JiraTimeBot.TasksProcessors;
+using JiraTimeBot.UI.Startup;
 using JiraTimeBot.UI.Tray;
 using JiraTimeBot.Update;
 using System;
 using System.Collections.Generic;
-using System.IO;
-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.
@@ -34,11 +32,13 @@ namespace JiraTimeBot.UI
 
         protected override void WndProc(ref Message message)
         {
-            if (message.Msg == SingleInstance.WM_SHOWFIRSTINSTANCE) {
+            if (message.Msg == SingleInstance.WM_SHOWFIRSTINSTANCE)
+            {
                 this.Show();
                 this.WindowState = FormWindowState.Normal;
                 _trayIcon.Hide();
             }
+
             base.WndProc(ref message);
         }
 
@@ -66,14 +66,16 @@ namespace JiraTimeBot.UI
             _log = _container.Resolve<ILog>();
             _tasksProcessors = _container.Resolve<IAllTasksProcessors>();
 
-            _controls = new Control[] { txtDummyMode, btnStart, btnMeeting, btnSettings, dteForDay, btnDoForDate };
+            _controls = new Control[] {txtDummyMode, btnStart, btnMeeting, btnSettings, dteForDay, btnDoForDate};
 
             _settingsWindowShow = () =>
             {
                 var frmSettings = new frmSettings(_container.Resolve<AutoStartUp>());
                 frmSettings.ShowDialog(this);
             };
-            _settingsErrorReporter = msg => MessageBox.Show(msg, "Загрузка настроек", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);;
+            _settingsErrorReporter = msg =>
+                MessageBox.Show(msg, "Загрузка настроек", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            ;
         }
 
         private void frmMain_FormClosing(object sender, FormClosingEventArgs e)
@@ -122,7 +124,8 @@ namespace JiraTimeBot.UI
         private void PrintStartMessage()
         {
             _settings = Settings.LoadAndCheck(_settingsWindowShow, _settingsErrorReporter);
-            _log.Info($"Загружен бот для {_settings.JiraUserName}, Режим: {_settings.WorkType.ToString()}, работаем в {_settings.RepositoryPath}");
+            _log.Info(
+                $"Загружен бот для {_settings.JiraUserName}, Режим: {_settings.WorkType.ToString()}, работаем в {_settings.RepositoryPath}");
         }
 
         private async void btnStart_Click(object sender, EventArgs e)
@@ -131,7 +134,10 @@ namespace JiraTimeBot.UI
 
             using (_tokenSource = GetTokenSource())
             {
-                await _job.DoTheJob(settings, _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked, _tokenSource.Token); 
+                await _job.DoTheJob(settings, 
+                                    _tasksProcessors.WorkLogTasksProcessor, 
+                                    txtDummyMode.Checked,
+                                    _tokenSource.Token);
             }
 
             LockUnlock(true);
@@ -177,7 +183,10 @@ namespace JiraTimeBot.UI
 
                 using (var tokenSource = GetTokenSource())
                 {
-                    await _job.DoTheJob(settings, _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked, tokenSource.Token);
+                    await _job.DoTheJob(settings, 
+                                        _tasksProcessors.WorkLogTasksProcessor, 
+                                        txtDummyMode.Checked,
+                                        tokenSource.Token);
                 }
 
                 LockUnlock(true);
@@ -190,7 +199,8 @@ namespace JiraTimeBot.UI
 
             using (_tokenSource = GetTokenSource())
             {
-                await _job.DoTheJob(settings, _tasksProcessors.MeetingProcessor, txtDummyMode.Checked, _tokenSource.Token);
+                await _job.DoTheJob(settings, _tasksProcessors.MeetingProcessor, txtDummyMode.Checked,
+                    _tokenSource.Token);
             }
 
             LockUnlock(true);
@@ -245,11 +255,15 @@ namespace JiraTimeBot.UI
 
             using (_tokenSource = GetTokenSource())
             {
-                await _job.SetTaskTimesForDate(dteForDay.Value, dteForDay.Value, settings, _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked, _tokenSource.Token);
+                await _job.SetTaskTimesForDate(dteForDay.Value, dteForDay.Value, settings,
+                    _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked, _tokenSource.Token);
             }
 
             LockUnlock(true);
+        }
 
+        private void tlpControls_Paint(object sender, PaintEventArgs e)
+        {
         }
     }
 }

src/JiraTimeBot/UI/frmSettings.Designer.cs

@@ -30,8 +30,6 @@
         {
             this.label5 = new System.Windows.Forms.Label();
             this.txtRoundTo = new System.Windows.Forms.TextBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.txtRepoPath = new System.Windows.Forms.TextBox();
             this.label2 = new System.Windows.Forms.Label();
             this.txtMercurialEmail = new System.Windows.Forms.TextBox();
             this.label1 = new System.Windows.Forms.Label();
@@ -54,105 +52,110 @@
             this.label9 = new System.Windows.Forms.Label();
             this.txtRandomMinutes = new System.Windows.Forms.TextBox();
             this.chkPullBeforeProcess = new System.Windows.Forms.CheckBox();
+            this.txtRepoPath = new System.Windows.Forms.TextBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.lblJiraUrl = new System.Windows.Forms.Label();
+            this.txtJiraUrl = new System.Windows.Forms.TextBox();
+            this.chkRemoveManuallyAddedWorklogs = new System.Windows.Forms.CheckBox();
+            this.tbAlternateEmail = new System.Windows.Forms.TextBox();
+            this.label10 = new System.Windows.Forms.Label();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.tableLayoutPanel1.SuspendLayout();
             this.SuspendLayout();
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(33, 153);
+            this.label5.Dock = System.Windows.Forms.DockStyle.Right;
+            this.label5.Location = new System.Drawing.Point(36, 185);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(100, 13);
+            this.label5.Size = new System.Drawing.Size(100, 26);
             this.label5.TabIndex = 28;
             this.label5.Text = "Округл. времени*:";
+            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // txtRoundTo
             // 
-            this.txtRoundTo.Location = new System.Drawing.Point(133, 150);
+            this.txtRoundTo.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtRoundTo.Location = new System.Drawing.Point(142, 188);
             this.txtRoundTo.Name = "txtRoundTo";
-            this.txtRoundTo.Size = new System.Drawing.Size(100, 20);
+            this.txtRoundTo.Size = new System.Drawing.Size(180, 20);
             this.txtRoundTo.TabIndex = 27;
             this.txtRoundTo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtRoundTo_KeyPress);
             // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(53, 48);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(76, 13);
-            this.label4.TabIndex = 26;
-            this.label4.Text = "Путь до репо:";
-            this.label4.TextAlign = System.Drawing.ContentAlignment.TopRight;
-            // 
-            // txtRepoPath
-            // 
-            this.txtRepoPath.Location = new System.Drawing.Point(133, 45);
-            this.txtRepoPath.Name = "txtRepoPath";
-            this.txtRepoPath.Size = new System.Drawing.Size(100, 20);
-            this.txtRepoPath.TabIndex = 25;
-            // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(47, 127);
+            this.label2.Dock = System.Windows.Forms.DockStyle.Right;
+            this.label2.Location = new System.Drawing.Point(54, 159);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(82, 13);
+            this.label2.Size = new System.Drawing.Size(82, 26);
             this.label2.TabIndex = 24;
             this.label2.Text = "Mercurial name:";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // txtMercurialEmail
             // 
-            this.txtMercurialEmail.Location = new System.Drawing.Point(133, 124);
+            this.txtMercurialEmail.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtMercurialEmail.Location = new System.Drawing.Point(142, 162);
             this.txtMercurialEmail.Name = "txtMercurialEmail";
-            this.txtMercurialEmail.Size = new System.Drawing.Size(100, 20);
+            this.txtMercurialEmail.Size = new System.Drawing.Size(180, 20);
             this.txtMercurialEmail.TabIndex = 23;
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(62, 100);
+            this.label1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.label1.Location = new System.Drawing.Point(65, 133);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(71, 13);
+            this.label1.Size = new System.Drawing.Size(71, 26);
             this.label1.TabIndex = 22;
             this.label1.Text = "Пароль Jira*:";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // txtJiraPassword
             // 
-            this.txtJiraPassword.Location = new System.Drawing.Point(133, 97);
+            this.txtJiraPassword.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtJiraPassword.Location = new System.Drawing.Point(142, 136);
             this.txtJiraPassword.Name = "txtJiraPassword";
             this.txtJiraPassword.PasswordChar = '*';
-            this.txtJiraPassword.Size = new System.Drawing.Size(100, 20);
+            this.txtJiraPassword.Size = new System.Drawing.Size(180, 20);
             this.txtJiraPassword.TabIndex = 21;
             // 
             // lbl1
             // 
             this.lbl1.AutoSize = true;
-            this.lbl1.Location = new System.Drawing.Point(69, 74);
+            this.lbl1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.lbl1.Location = new System.Drawing.Point(72, 107);
             this.lbl1.Name = "lbl1";
-            this.lbl1.Size = new System.Drawing.Size(64, 13);
+            this.lbl1.Size = new System.Drawing.Size(64, 26);
             this.lbl1.TabIndex = 20;
             this.lbl1.Text = "Логин Jira*:";
+            this.lbl1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // txtJiraLogin
             // 
-            this.txtJiraLogin.Location = new System.Drawing.Point(133, 71);
+            this.txtJiraLogin.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtJiraLogin.Location = new System.Drawing.Point(142, 110);
             this.txtJiraLogin.Name = "txtJiraLogin";
-            this.txtJiraLogin.Size = new System.Drawing.Size(100, 20);
+            this.txtJiraLogin.Size = new System.Drawing.Size(180, 20);
             this.txtJiraLogin.TabIndex = 19;
             // 
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(41, 232);
+            this.label3.Dock = System.Windows.Forms.DockStyle.Right;
+            this.label3.Location = new System.Drawing.Point(45, 263);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(91, 13);
+            this.label3.Size = new System.Drawing.Size(91, 26);
             this.label3.TabIndex = 30;
             this.label3.Text = "Время запуска*:";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // actTime
             // 
             this.actTime.Format = System.Windows.Forms.DateTimePickerFormat.Time;
-            this.actTime.Location = new System.Drawing.Point(133, 228);
+            this.actTime.Location = new System.Drawing.Point(142, 266);
             this.actTime.Name = "actTime";
             this.actTime.Size = new System.Drawing.Size(100, 20);
             this.actTime.TabIndex = 29;
@@ -160,7 +163,7 @@
             // chkAddComments
             // 
             this.chkAddComments.AutoSize = true;
-            this.chkAddComments.Location = new System.Drawing.Point(65, 336);
+            this.chkAddComments.Location = new System.Drawing.Point(328, 30);
             this.chkAddComments.Name = "chkAddComments";
             this.chkAddComments.Size = new System.Drawing.Size(133, 17);
             this.chkAddComments.TabIndex = 31;
@@ -169,7 +172,7 @@
             // 
             // btnSave
             // 
-            this.btnSave.Location = new System.Drawing.Point(86, 382);
+            this.btnSave.Location = new System.Drawing.Point(328, 344);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(75, 23);
             this.btnSave.TabIndex = 32;
@@ -184,17 +187,18 @@
             this.cboWorkType.Items.AddRange(new object[] {
             "Mercurial",
             "Jira",
-            "Git"});
-            this.cboWorkType.Location = new System.Drawing.Point(133, 18);
+            "Git",
+            "CvsMixed"});
+            this.cboWorkType.Location = new System.Drawing.Point(142, 3);
             this.cboWorkType.Name = "cboWorkType";
-            this.cboWorkType.Size = new System.Drawing.Size(99, 21);
+            this.cboWorkType.Size = new System.Drawing.Size(180, 21);
             this.cboWorkType.TabIndex = 34;
             this.cboWorkType.SelectedIndexChanged += new System.EventHandler(this.cboWorkType_SelectedIndexChanged);
             // 
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(44, 21);
+            this.label6.Location = new System.Drawing.Point(3, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(85, 13);
             this.label6.TabIndex = 35;
@@ -203,39 +207,45 @@
             // label7
             // 
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(100, 179);
+            this.label7.Dock = System.Windows.Forms.DockStyle.Right;
+            this.label7.Location = new System.Drawing.Point(107, 211);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(29, 13);
+            this.label7.Size = new System.Drawing.Size(29, 26);
             this.label7.TabIndex = 37;
             this.label7.Text = "JQL:";
+            this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // txtJQL
             // 
-            this.txtJQL.Location = new System.Drawing.Point(133, 176);
+            this.txtJQL.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtJQL.Location = new System.Drawing.Point(142, 214);
             this.txtJQL.Name = "txtJQL";
-            this.txtJQL.Size = new System.Drawing.Size(99, 20);
+            this.txtJQL.Size = new System.Drawing.Size(180, 20);
             this.txtJQL.TabIndex = 36;
             // 
             // label8
             // 
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(-2, 206);
+            this.label8.Dock = System.Windows.Forms.DockStyle.Right;
+            this.label8.Location = new System.Drawing.Point(3, 237);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(133, 13);
+            this.label8.Size = new System.Drawing.Size(133, 26);
             this.label8.TabIndex = 39;
             this.label8.Text = "Задача \"учёта времени\":";
+            this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // txtTimeControlTask
             // 
-            this.txtTimeControlTask.Location = new System.Drawing.Point(133, 202);
+            this.txtTimeControlTask.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtTimeControlTask.Location = new System.Drawing.Point(142, 240);
             this.txtTimeControlTask.Name = "txtTimeControlTask";
-            this.txtTimeControlTask.Size = new System.Drawing.Size(99, 20);
+            this.txtTimeControlTask.Size = new System.Drawing.Size(180, 20);
             this.txtTimeControlTask.TabIndex = 38;
             // 
             // chkAutostart
             // 
             this.chkAutostart.AutoSize = true;
-            this.chkAutostart.Location = new System.Drawing.Point(65, 313);
+            this.chkAutostart.Location = new System.Drawing.Point(328, 3);
             this.chkAutostart.Name = "chkAutostart";
             this.chkAutostart.Size = new System.Drawing.Size(96, 17);
             this.chkAutostart.TabIndex = 40;
@@ -245,82 +255,190 @@
             // lblWorkDay
             // 
             this.lblWorkDay.AutoSize = true;
-            this.lblWorkDay.Location = new System.Drawing.Point(15, 258);
+            this.lblWorkDay.Dock = System.Windows.Forms.DockStyle.Right;
+            this.lblWorkDay.Location = new System.Drawing.Point(19, 289);
             this.lblWorkDay.Name = "lblWorkDay";
-            this.lblWorkDay.Size = new System.Drawing.Size(117, 13);
+            this.lblWorkDay.Size = new System.Drawing.Size(117, 26);
             this.lblWorkDay.TabIndex = 42;
             this.lblWorkDay.Text = "Минут в рабочем дне:";
+            this.lblWorkDay.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // txtWorkDayDuration
             // 
-            this.txtWorkDayDuration.Location = new System.Drawing.Point(133, 254);
+            this.txtWorkDayDuration.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtWorkDayDuration.Location = new System.Drawing.Point(142, 292);
             this.txtWorkDayDuration.Name = "txtWorkDayDuration";
-            this.txtWorkDayDuration.Size = new System.Drawing.Size(99, 20);
+            this.txtWorkDayDuration.Size = new System.Drawing.Size(180, 20);
             this.txtWorkDayDuration.TabIndex = 41;
             // 
             // label9
             // 
             this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(30, 284);
+            this.label9.Dock = System.Windows.Forms.DockStyle.Right;
+            this.label9.Location = new System.Drawing.Point(35, 315);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(101, 13);
+            this.label9.Size = new System.Drawing.Size(101, 26);
             this.label9.TabIndex = 44;
             this.label9.Text = "Рандомных минут:";
+            this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // txtRandomMinutes
             // 
-            this.txtRandomMinutes.Location = new System.Drawing.Point(133, 280);
+            this.txtRandomMinutes.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtRandomMinutes.Location = new System.Drawing.Point(142, 318);
             this.txtRandomMinutes.Name = "txtRandomMinutes";
-            this.txtRandomMinutes.Size = new System.Drawing.Size(99, 20);
+            this.txtRandomMinutes.Size = new System.Drawing.Size(180, 20);
             this.txtRandomMinutes.TabIndex = 43;
             // 
             // chkPullBeforeProcess
             // 
             this.chkPullBeforeProcess.AutoSize = true;
-            this.chkPullBeforeProcess.Location = new System.Drawing.Point(65, 359);
+            this.chkPullBeforeProcess.Location = new System.Drawing.Point(328, 110);
             this.chkPullBeforeProcess.Name = "chkPullBeforeProcess";
             this.chkPullBeforeProcess.Size = new System.Drawing.Size(83, 17);
             this.chkPullBeforeProcess.TabIndex = 45;
             this.chkPullBeforeProcess.Text = "Делать pull";
             this.chkPullBeforeProcess.UseVisualStyleBackColor = true;
             // 
+            // txtRepoPath
+            // 
+            this.txtRepoPath.Location = new System.Drawing.Point(142, 30);
+            this.txtRepoPath.Multiline = true;
+            this.txtRepoPath.Name = "txtRepoPath";
+            this.txtRepoPath.Size = new System.Drawing.Size(180, 48);
+            this.txtRepoPath.TabIndex = 25;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label4.Location = new System.Drawing.Point(3, 27);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(133, 54);
+            this.label4.TabIndex = 26;
+            this.label4.Text = "Путь до репо:";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // lblJiraUrl
+            // 
+            this.lblJiraUrl.AutoSize = true;
+            this.lblJiraUrl.Dock = System.Windows.Forms.DockStyle.Right;
+            this.lblJiraUrl.Location = new System.Drawing.Point(85, 81);
+            this.lblJiraUrl.Name = "lblJiraUrl";
+            this.lblJiraUrl.Size = new System.Drawing.Size(51, 26);
+            this.lblJiraUrl.TabIndex = 47;
+            this.lblJiraUrl.Text = "Jira URL:";
+            this.lblJiraUrl.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // txtJiraUrl
+            // 
+            this.txtJiraUrl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtJiraUrl.Location = new System.Drawing.Point(142, 84);
+            this.txtJiraUrl.Name = "txtJiraUrl";
+            this.txtJiraUrl.Size = new System.Drawing.Size(180, 20);
+            this.txtJiraUrl.TabIndex = 46;
+            // 
+            // chkRemoveManuallyAddedWorklogs
+            // 
+            this.chkRemoveManuallyAddedWorklogs.AutoSize = true;
+            this.chkRemoveManuallyAddedWorklogs.Location = new System.Drawing.Point(328, 84);
+            this.chkRemoveManuallyAddedWorklogs.Name = "chkRemoveManuallyAddedWorklogs";
+            this.chkRemoveManuallyAddedWorklogs.Size = new System.Drawing.Size(155, 17);
+            this.chkRemoveManuallyAddedWorklogs.TabIndex = 48;
+            this.chkRemoveManuallyAddedWorklogs.Text = "Удалять \"ручные записи\"";
+            this.chkRemoveManuallyAddedWorklogs.UseVisualStyleBackColor = true;
+            // 
+            // tbAlternateEmail
+            // 
+            this.tbAlternateEmail.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tbAlternateEmail.Location = new System.Drawing.Point(142, 344);
+            this.tbAlternateEmail.Name = "tbAlternateEmail";
+            this.tbAlternateEmail.Size = new System.Drawing.Size(180, 20);
+            this.tbAlternateEmail.TabIndex = 49;
+            // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.Dock = System.Windows.Forms.DockStyle.Right;
+            this.label10.Location = new System.Drawing.Point(13, 341);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(123, 29);
+            this.label10.TabIndex = 50;
+            this.label10.Text = "Дополнительный Email";
+            this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.AutoSize = true;
+            this.tableLayoutPanel1.ColumnCount = 3;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel1.Controls.Add(this.label10, 0, 12);
+            this.tableLayoutPanel1.Controls.Add(this.chkPullBeforeProcess, 2, 3);
+            this.tableLayoutPanel1.Controls.Add(this.chkRemoveManuallyAddedWorklogs, 2, 2);
+            this.tableLayoutPanel1.Controls.Add(this.chkAddComments, 2, 1);
+            this.tableLayoutPanel1.Controls.Add(this.cboWorkType, 1, 0);
+            this.tableLayoutPanel1.Controls.Add(this.chkAutostart, 2, 0);
+            this.tableLayoutPanel1.Controls.Add(this.tbAlternateEmail, 1, 12);
+            this.tableLayoutPanel1.Controls.Add(this.label6, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label9, 0, 11);
+            this.tableLayoutPanel1.Controls.Add(this.lblJiraUrl, 0, 2);
+            this.tableLayoutPanel1.Controls.Add(this.txtRandomMinutes, 1, 11);
+            this.tableLayoutPanel1.Controls.Add(this.txtRepoPath, 1, 1);
+            this.tableLayoutPanel1.Controls.Add(this.lblWorkDay, 0, 10);
+            this.tableLayoutPanel1.Controls.Add(this.txtJiraUrl, 1, 2);
+            this.tableLayoutPanel1.Controls.Add(this.txtWorkDayDuration, 1, 10);
+            this.tableLayoutPanel1.Controls.Add(this.label4, 0, 1);
+            this.tableLayoutPanel1.Controls.Add(this.label3, 0, 9);
+            this.tableLayoutPanel1.Controls.Add(this.label8, 0, 8);
+            this.tableLayoutPanel1.Controls.Add(this.actTime, 1, 9);
+            this.tableLayoutPanel1.Controls.Add(this.txtJiraLogin, 1, 3);
+            this.tableLayoutPanel1.Controls.Add(this.txtTimeControlTask, 1, 8);
+            this.tableLayoutPanel1.Controls.Add(this.label7, 0, 7);
+            this.tableLayoutPanel1.Controls.Add(this.txtJiraPassword, 1, 4);
+            this.tableLayoutPanel1.Controls.Add(this.txtJQL, 1, 7);
+            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 4);
+            this.tableLayoutPanel1.Controls.Add(this.txtMercurialEmail, 1, 5);
+            this.tableLayoutPanel1.Controls.Add(this.label2, 0, 5);
+            this.tableLayoutPanel1.Controls.Add(this.label5, 0, 6);
+            this.tableLayoutPanel1.Controls.Add(this.txtRoundTo, 1, 6);
+            this.tableLayoutPanel1.Controls.Add(this.lbl1, 0, 3);
+            this.tableLayoutPanel1.Controls.Add(this.btnSave, 2, 12);
+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            this.tableLayoutPanel1.RowCount = 13;
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(486, 370);
+            this.tableLayoutPanel1.TabIndex = 51;
+            // 
             // frmSettings
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(243, 414);
-            this.Controls.Add(this.chkPullBeforeProcess);
-            this.Controls.Add(this.label9);
-            this.Controls.Add(this.txtRandomMinutes);
-            this.Controls.Add(this.lblWorkDay);
-            this.Controls.Add(this.txtWorkDayDuration);
-            this.Controls.Add(this.chkAutostart);
-            this.Controls.Add(this.label8);
-            this.Controls.Add(this.txtTimeControlTask);
-            this.Controls.Add(this.label7);
-            this.Controls.Add(this.txtJQL);
-            this.Controls.Add(this.label6);
-            this.Controls.Add(this.cboWorkType);
-            this.Controls.Add(this.btnSave);
-            this.Controls.Add(this.chkAddComments);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.actTime);
-            this.Controls.Add(this.label5);
-            this.Controls.Add(this.txtRoundTo);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.txtRepoPath);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.txtMercurialEmail);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.txtJiraPassword);
-            this.Controls.Add(this.lbl1);
-            this.Controls.Add(this.txtJiraLogin);
+            this.ClientSize = new System.Drawing.Size(486, 372);
+            this.Controls.Add(this.tableLayoutPanel1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
             this.MaximizeBox = false;
             this.Name = "frmSettings";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "Настройки";
             this.Load += new System.EventHandler(this.frmSettings_Load);
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.tableLayoutPanel1.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -330,8 +448,6 @@
 
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.TextBox txtRoundTo;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.TextBox txtRepoPath;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.TextBox txtMercurialEmail;
         private System.Windows.Forms.Label label1;
@@ -354,5 +470,13 @@
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.TextBox txtRandomMinutes;
         private System.Windows.Forms.CheckBox chkPullBeforeProcess;
+        private System.Windows.Forms.TextBox txtRepoPath;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label lblJiraUrl;
+        private System.Windows.Forms.TextBox txtJiraUrl;
+        private System.Windows.Forms.CheckBox chkRemoveManuallyAddedWorklogs;
+        private System.Windows.Forms.TextBox tbAlternateEmail;
+        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
     }
 }

src/JiraTimeBot/UI/frmSettings.cs

@@ -1,7 +1,7 @@
-using System;
-using System.Windows.Forms;
-using JiraTimeBot.Configuration;
+using JiraTimeBot.Configuration;
 using JiraTimeBot.UI.Startup;
+using System;
+using System.Windows.Forms;
 
 namespace JiraTimeBot.UI
 {
@@ -28,6 +28,7 @@ namespace JiraTimeBot.UI
 
         private void SetSettings(Settings settings)
         {
+            txtJiraUrl.Text = settings.JiraUrl;
             txtJiraLogin.Text = settings.JiraUserName;
             txtJiraPassword.Text = settings.JiraPassword;
             txtMercurialEmail.Text = settings.MercurialAuthorEmail;
@@ -35,13 +36,14 @@ namespace JiraTimeBot.UI
             actTime.Text = settings.ActivationTime.ToString("hh\\:mm\\:ss");
             chkAddComments.Checked = settings.AddCommentsToWorklog;
             txtRoundTo.Text = settings.RoundToMinutes.ToString();
-            cboWorkType.SelectedIndex = (int) settings.WorkType;
+            cboWorkType.SelectedIndex = (int)settings.WorkType;
             txtTimeControlTask.Text = settings.TimeControlTask;
             txtJQL.Text = settings.JiraQuery;
             txtWorkDayDuration.Text = settings.MinuterPerWorkDay.ToString();
             txtRandomMinutes.Text = settings.RandomWorkMinutes.ToString();
             chkPullBeforeProcess.Checked = settings.PullBeforeProcess;
-
+            chkRemoveManuallyAddedWorklogs.Checked = settings.RemoveManuallyAddedWorklogs;
+            tbAlternateEmail.Text = settings.AlternativeEmail;
             cboWorkType_SelectedIndexChanged(null, null);
         }
 
@@ -62,6 +64,7 @@ namespace JiraTimeBot.UI
 
             var settings = new Settings
             {
+                JiraUrl = txtJiraUrl.Text,
                 JiraUserName = txtJiraLogin.Text,
                 JiraPassword = txtJiraPassword.Text,
                 MercurialAuthorEmail = txtMercurialEmail.Text,
@@ -69,12 +72,14 @@ namespace JiraTimeBot.UI
                 RepositoryPath = txtRepoPath.Text,
                 AddCommentsToWorklog = chkAddComments.Checked,
                 RoundToMinutes = roundTo,
-                WorkType = (WorkType) cboWorkType.SelectedIndex,
+                WorkType = (WorkType)cboWorkType.SelectedIndex,
                 JiraQuery = txtJQL.Text,
                 TimeControlTask = txtTimeControlTask.Text,
                 MinuterPerWorkDay = minuterPerWorkDay,
                 RandomWorkMinutes = randomWorkMinutes,
-                PullBeforeProcess = chkPullBeforeProcess.Checked
+                PullBeforeProcess = chkPullBeforeProcess.Checked,
+                RemoveManuallyAddedWorklogs = chkRemoveManuallyAddedWorklogs.Checked,
+                AlternativeEmail = tbAlternateEmail.Text
             };
 
             //LockUnlock(false);
@@ -86,7 +91,7 @@ namespace JiraTimeBot.UI
         {
             var settings = ReadSettingsAndLock();
             settings.Save();
-             _autoStart.Set(chkAutostart.Checked);
+            _autoStart.Set(chkAutostart.Checked);
 
             MessageBox.Show("Настройки сохранены.");
 
@@ -102,7 +107,9 @@ namespace JiraTimeBot.UI
         private void cboWorkType_SelectedIndexChanged(object sender, EventArgs e)
         {
             txtJQL.Enabled = (cboWorkType.SelectedIndex == 1);
-            txtRepoPath.Enabled = (cboWorkType.SelectedIndex == 0 || cboWorkType.SelectedIndex == 2);
+            txtRepoPath.Enabled = (cboWorkType.SelectedIndex == 0 
+                                   || cboWorkType.SelectedIndex == 2
+                                   || cboWorkType.SelectedIndex == 3);
         }
     }
 }

src/JiraTimeBot/Update/GitHubDataObjects.cs

@@ -1,5 +1,5 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
+using System;
 
 namespace JiraTimeBot.Update
 {

src/JiraTimeBot/Update/IUpdater.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace JiraTimeBot.Update
+namespace JiraTimeBot.Update
 {
     internal interface IUpdater
     {

src/JiraTimeBot/Update/Updater.cs

@@ -1,17 +1,19 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Net;
+using System.Threading.Tasks;
 using System.Windows.Forms;
-using Newtonsoft.Json;
 
 namespace JiraTimeBot.Update
 {
     public class Updater : IUpdater
     {
         private readonly ILog _log;
+        private double _downloadPercent = 0;
 
         public Updater(ILog log)
         {
@@ -81,6 +83,7 @@ namespace JiraTimeBot.Update
             {
                 _log.Info($"Вы используете актуальную версию.");
             }
+
             return false;
         }
 
@@ -89,46 +92,51 @@ namespace JiraTimeBot.Update
             try
             {
                 _log.Info($"Устанавливаю обновление до версии {gitVersion}.");
-                //Rename he executing file
-                System.IO.FileInfo appFile = new System.IO.FileInfo(System.Reflection.Assembly.GetExecutingAssembly().Location);
+
+                var appFile = new FileInfo(System.Reflection.Assembly.GetExecutingAssembly().Location);
                 var bkpDir = Path.Combine(appFile.DirectoryName, "bkp");
-                if (!Directory.Exists(bkpDir))
+
+                if (Directory.Exists(bkpDir))
+                    Directory.Delete(bkpDir, true);
+                _log.Info($"Создаю директорию {bkpDir}.");
+                Directory.CreateDirectory(bkpDir);
+
+                //забэкапим все папки
+                foreach (var dir in Directory.GetDirectories(appFile.DirectoryName).Where(f=>!f.EndsWith("bkp")))
                 {
-                    Directory.CreateDirectory(bkpDir);
+                    var dirName = new DirectoryInfo(dir);
+                    var bkpDirPath = Path.Combine(bkpDir, dirName.Name);
+                    if (Directory.Exists(bkpDirPath))
+                        Directory.Delete(bkpDirPath, true);
+                    Directory.Move(dir, bkpDirPath);
+                }
+                //и файлы
+                foreach (var file in Directory.GetFiles(appFile.DirectoryName).Where(f=>!f.EndsWith("update.zip")))
+                {
+                    File.Move(file, Path.Combine(bkpDir, new FileInfo(file).Name));
                 }
 
+                //распакуем архив
                 using (ZipArchive archive = ZipFile.OpenRead(Path.Combine(appFile.DirectoryName, updateFile)))
                 {
-                    foreach (ZipArchiveEntry entry in archive.Entries)
-                    {
-                        var zipEntryPath = Path.Combine(appFile.DirectoryName, entry.FullName);
-                        if (File.Exists(zipEntryPath))
-                        {
-                            System.IO.FileInfo zipEntryFile = new System.IO.FileInfo(zipEntryPath);
-                            if (File.Exists(bkpDir + "\\" + zipEntryFile.Name))
-                            {
-                                File.Delete(bkpDir + "\\" + zipEntryFile.Name);
-                            }
-                            System.IO.File.Move(zipEntryFile.FullName, bkpDir + "\\" + zipEntryFile.Name);
-                        }
-
-                        entry.ExtractToFile(zipEntryPath);
-                    }
+                    archive.ExtractToDirectory(appFile.DirectoryName);
                 }
 
                 _log.Info("Обновление установлено. Перезапустите программу для применения изменений.");
                 return true;
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-                _log.Error($"Что-то пошло не так при обновлении.");
+                _log.Error($"Что-то пошло не так при обновлении {ex.Message}: {ex.StackTrace}.");
                 return false;
             }
         }
+
         public void SelfRestart()
         {
             var name = Application.ExecutablePath;
-            ProcessStartInfo startInfo = new ProcessStartInfo {
+            ProcessStartInfo startInfo = new ProcessStartInfo
+            {
                 Arguments = "/C choice /C Y /N /D Y /T 1 & \"" + name + "\"",
                 WindowStyle = ProcessWindowStyle.Hidden,
                 CreateNoWindow = true,
@@ -143,12 +151,15 @@ namespace JiraTimeBot.Update
         {
             try
             {
-
                 using (var client = new WebClient())
                 {
                     client.Headers.Add("User-Agent",
                         "Mozilla/5.0 (X11; Linux i686; rv:64.0) Gecko/20100101 Firefox/64.0");
-                    client.DownloadFile(url, to);
+                    client.DownloadProgressChanged += ClientOnDownloadProgressChanged;
+                    client.DownloadFileAsync(new Uri(url), to);
+                    
+                    while (client.IsBusy) { Application.DoEvents(); }
+                    
                     return true;
                 }
             }
@@ -158,15 +169,25 @@ namespace JiraTimeBot.Update
             }
         }
 
+        private void ClientOnDownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
+        {
+            var percent = Math.Truncate(e.BytesReceived / (double)e.TotalBytesToReceive * 100);
+            if (Math.Abs(_downloadPercent - percent) >= 10)
+            {
+                _log.Info($"Downloaded: {percent}%");
+                _downloadPercent = percent;
+            }
+        }
+
         private string Get(string uri)
         {
             try
             {
-                HttpWebRequest request = (HttpWebRequest) WebRequest.Create(uri);
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri);
                 request.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
                 request.UserAgent = "Mozilla/5.0 (X11; Linux i686; rv:64.0) Gecko/20100101 Firefox/64.0";
 
-                using (HttpWebResponse response = (HttpWebResponse) request.GetResponse())
+                using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
                 using (Stream stream = response.GetResponseStream())
                 using (StreamReader reader = new StreamReader(stream))
                 {

src/JiraTimeBot/packages.config

@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Atlassian.SDK" version="12.1.0" targetFramework="net461" />
-  <package id="Autofac" version="5.1.2" targetFramework="net461" />
-  <package id="Autofac.Extras.AggregateService" version="5.0.0" targetFramework="net461" />
-  <package id="Castle.Core" version="4.4.0" targetFramework="net461" />
-  <package id="LibGit2Sharp" version="0.27.0-preview-0034" targetFramework="net461" />
-  <package id="LibGit2Sharp.NativeBinaries" version="2.0.298" targetFramework="net461" />
+  <package id="Atlassian.SDK" version="12.4.0" targetFramework="net461" />
+  <package id="Autofac" version="6.2.0" targetFramework="net461" />
+  <package id="Autofac.Extras.AggregateService" version="6.0.0" targetFramework="net461" />
+  <package id="Castle.Core" version="4.4.1" targetFramework="net461" />
+  <package id="LibGit2Sharp" version="0.26.2" targetFramework="net461" />
+  <package id="LibGit2Sharp.NativeBinaries" version="2.0.306" targetFramework="net461" />
   <package id="Mercurial.Net" version="1.1.1.607" targetFramework="net461" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
-  <package id="RestSharp" version="106.10.1" targetFramework="net461" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net461" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
+  <package id="RestSharp" version="106.11.7" targetFramework="net461" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.7.1" targetFramework="net461" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net461" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net461" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net461" />
 </packages>