Еще допилил обновление с подпапками

.appveyor.yml

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

.semver.txt

@@ -1 +1 @@
-1.0.8
+1.0.82

.travis.yml

@@ -1,11 +0,0 @@
-language: csharp
-solution: src/JiraTimeBot.sln
-
-before_deploy: "zip -j JiraTimeBot.zip src/JiraTimeBot/bin/Release/*"
-deploy:
-  provider: releases
-  api_key: $GITHUB_OAUTH_TOKEN
-  file: JiraTimeBot.zip
-  skip_cleanup: true
-  on:
-    tags: true

README.md

@@ -1,7 +1,29 @@
-# JiraTimeBot [![Build Status](https://travis-ci.org/monster1025/JiraTimeBot.svg?branch=master)](https://travis-ci.org/monster1025/JiraTimeBot)
+# JiraTimeBot [![Build status](https://ci.appveyor.com/api/projects/status/anmhfvuj4oq84j1f/branch/master?svg=true)](https://ci.appveyor.com/project/monster1025/jiratimebot/branch/master)
-Приложение для автоматического добавления Jira Worklog'ов исходя из количества коммитов в ветку.
+Приложение для автоматического добавления Jira Worklog'ов исходя из количества коммитов в ветку. Возможна работа по JQL-запросу JIRA.
 
-# Предположения
+# Ограничения
  - Предполагается что все Ваши репозитории находятся в одной папке (к которой вы указываете путь в настройках).
  - Предполагается что ветки в JIRA имеют название эквивалентное имени бранча в Mercurial.
 
+# Настройки
+ - Режим работы:
+   - Mercurial - по коммитам в Mercurial, можем определять множественные коммиты в одну задачу (ветку) и пропорционально списывать время.
+   - Git - по коммитам в Git.
+   - Jira - выполняем JQL и равномерно распределяем время.
+ - Путь до репо (Режим Mercurial, Git) - путь до папки, в которую клонируются исходники.
+ - Jira URL - адрес Jira-сервреа.
+ - Логин Jira - Логин в Jira (от этого пользователя будем выполнять запросы и вносить время).
+ - Пароль Jira - шифруется через DPAPI.
+ - Mercurial Name (Режим Mercurial) - обязателен к указанию для режима Mercurial - имя пользователя Mercurial, от которого проходят коммиты (именно UserName, не E-Mail).
+ - Округление времени - Для красоты распределения времени тут устанавливается округление. По умолчанию - 15 минут, получим время 1:15, 0:30 итд. Остаток нераспределенного времени будет внесен в самую долгую задачу или же если это невозможно - количество рабочего времени будет увеличено или уменьшено.
+ - JQL (Режим Jira) - можно задать свой JQL для поиска задач. Возможные замены: %USER% - Логин Jira, %DATE% дата на которую формируем список. Значнеие по умолчанию: status changed by '%USER%' during ("%DATE%","%DATE%")
+ - Задача "учёта времени" - задача, куда будет списываться по 30 минут в день на "затраты на учет времени". Должна содержать знак '-'.
+ - Время запуска - время автоматического запуска бота. Если была установлена галочка "тестовый прогон" - она будет снята.
+ - Минут в рабочем дне - количество распределяемых минут (оыбчно 8 * 60).
+ - Рандомных минут - если > 0, то будет прибавлено рандомное количество минут к рабочему времени (но кратное значению округления).
+ - Добавлять описание (Режим Mercurial) - добавлять ли в описание CommitMessage, если не установлено - описание не заполняются.
+ - Автозагрузка - загружать ли программу при старте ОС.
+ - Делать pull (Режим Mercurial) - делать ли hg pull перед началом обработки (полезно, если изменения делаются Вами не только на текущем ПК).
+ 
+# Скачать
+Скачать актуальную версию можно тут: https://github.com/monster1025/JiraTimeBot/releases/latest

release.cmd

@@ -14,11 +14,12 @@ set VERSION=%MAJOR:~0,1%.%MINOR:~0,1%.%PATCH1%
 echo %VERSION%>.semver.txt
 echo Updating to %VERSION%
 
+call tools\SetVersion.cmd %VERSION%
 
 git add .
 git commit -m "%~1"
 
-git tag -m "Version v%VERSION%" -a v%VERSION%
+git tag -m "Version v%VERSION%: %~1" -a v%VERSION%
 git push origin v%VERSION%
 
 git push

src/JiraTimeBot/App.config

@@ -10,12 +10,16 @@
         <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="RestSharp" publicKeyToken="598062e77f915f75" culture="neutral" />
+        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-106.6.9.0" newVersion="106.6.9.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.1.2.0" newVersion="5.1.2.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.9.1.0" newVersion="4.9.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+      </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" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

src/JiraTimeBot/Configuration/PasswordEncryptionClass.cs

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

src/JiraTimeBot/Configuration/Settings.cs

@@ -1,19 +1,19 @@
-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 JiraTimeBotForm.Configuration
+namespace JiraTimeBot.Configuration
 {
     public class Settings
     {
-        public int MinuterPerWorkDay = 8 * 60;
+        public int MinuterPerWorkDay { get; set; }
-        public int RountToMinutes { 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 string RepositoryPath { get; set; }
         public string MercurialAuthorEmail { get; set; }
         public string JiraUserName { get; set; }
@@ -22,6 +22,8 @@ namespace JiraTimeBotForm.Configuration
         public bool AddCommentsToWorklog { get; set; }
         public WorkType WorkType { get; set; }
         public string JiraQuery { get; set; }
+        public string TimeControlTask { get; set; }
+        public int RandomWorkMinutes { get; set; }
 
         public static Settings LoadAndCheck(Action settingsSource, Action<string> errorMessageReporter)
         {
@@ -44,7 +46,7 @@ namespace JiraTimeBotForm.Configuration
                 }
 
             } while (!settingsValid);
-            
+
             return settings;
         }
 
@@ -59,9 +61,9 @@ namespace JiraTimeBotForm.Configuration
             var errors = new List<string>();
             message = null;
 
-            if (settings.RountToMinutes == default(int))
+            if (settings.RoundToMinutes == default)
             {
-                errors.Add("Укажите округление времени, например, 10 минут");
+                errors.Add("Укажите округление времени, например, 10 (минут)");
             }
 
             if (string.IsNullOrEmpty(settings.JiraPassword))
@@ -79,6 +81,11 @@ namespace JiraTimeBotForm.Configuration
                 errors.Add("Укажите верный RepositoryPath");
             }
 
+            if (!string.IsNullOrEmpty(settings.TimeControlTask) && !settings.TimeControlTask.Contains("-"))
+            {
+                errors.Add("Укажите верно зажачу контроля времени. Она джолжна содержать знак '-', например, SV-1211");
+            }
+
             var hasErrors = errors.Any();
             if (hasErrors)
             {
@@ -90,7 +97,8 @@ namespace JiraTimeBotForm.Configuration
 
         public static Settings Load()
         {
-            var settingsPath = Path.Combine(Application.UserAppDataPath, _settingsFileName);
+            var configDir = Application.UserAppDataPath.Replace(Application.ProductVersion, "");
+            var settingsPath = Path.Combine(configDir, _settingsFileName);
             if (!File.Exists(settingsPath))
             {
                 return null;
@@ -123,17 +131,19 @@ namespace JiraTimeBotForm.Configuration
             var password = new PasswordEncryptionClass().Encrypt(this.JiraUserName, this.JiraPassword, this.JiraUrl);
             this.JiraPassword = password;
 
-            var settingsPath = Path.Combine(Application.UserAppDataPath, _settingsFileName);
+            var configDir = Application.UserAppDataPath.Replace(Application.ProductVersion, "");
+            var settingsPath = Path.Combine(configDir, _settingsFileName);
             var settingsString = JsonConvert.SerializeObject(this);
             File.WriteAllText(settingsPath, settingsString);
         }
 
-        private static string _settingsFileName = "settings.json";
+        private static readonly string _settingsFileName = "settings.json";
     }
 
     public enum WorkType
     {
         Mercurial = 0,
         JiraLogs = 1,
+        GitLogs = 2
     }
 }

src/JiraTimeBot/DI/ContainerBuilder.cs

@@ -1,16 +1,20 @@
-using System.Windows.Forms;
+using Autofac;
-using Autofac;
 using Autofac.Extras.AggregateService;
-using JiraTimeBotForm.JiraIntegration;
+using JiraTimeBot.JiraIntegration;
-using JiraTimeBotForm.JiraIntegration.Comments;
+using JiraTimeBot.JiraIntegration.Comments;
-using JiraTimeBotForm.Mercurial;
+using JiraTimeBot.RepositoryProviders;
-using JiraTimeBotForm.Mercurial.Modifiers;
+using JiraTimeBot.RepositoryProviders.Interfaces;
-using JiraTimeBotForm.TasksProcessors;
+using JiraTimeBot.RepositoryProviders.Modifiers;
-using JiraTimeBotForm.TaskTime;
+using JiraTimeBot.TasksProcessors;
-using JiraTimeBotForm.UI;
+using JiraTimeBot.TaskTime;
-using JiraTimeBotForm.UI.Tray;
+using JiraTimeBot.UI;
+using JiraTimeBot.UI.Startup;
+using JiraTimeBot.UI.Tray;
+using JiraTimeBot.Update;
+using System;
+using System.Windows.Forms;
 
-namespace JiraTimeBotForm.DI
+namespace JiraTimeBot.DI
 {
     public class Bootstrapper
     {
@@ -22,17 +26,30 @@ namespace JiraTimeBotForm.DI
 
         public IContainer Build(TextBox logTextBox)
         {
-            _builder.Register(f => new Logger(logTextBox)).As<ILog>().AsSelf();
+            _builder.Register(c => logTextBox).AsSelf();
-            
+
+            _builder.Register(f =>
+            {
+                var txt = f.Resolve<TextBox>();
+                return new Logger(message =>
+                {
+                    txt.Invoke(new Action<string>(text => txt.AppendText(text)), message + Environment.NewLine);
+                });
+            }).As<ILog>().AsSelf();
+
             _builder.Register(f => new TrayMenu()).As<ITrayMenu>().AsSelf();
             _builder.Register(c => new CommitSkipper()).As<ICommitSkipper>();
 
+            _builder.RegisterType<Updater>().As<IUpdater>();
+
             _builder.RegisterType<TechnicalInfoSkipper>().As<ITechnicalInfoSkipper>().AsSelf();
 
-            _builder.RegisterType<MercurialLog>().As<IMercurialLog>().AsSelf();
+            _builder.RegisterType<GitLog>().As<IRepositoryLog>().AsSelf();
-            _builder.RegisterType<JiraCommitEmulator>().As<IMercurialLog>().AsSelf();
+            _builder.RegisterType<MercurialLog>().As<IRepositoryLog>().AsSelf();
-            _builder.RegisterAggregateService<IAllMercurialProviders>();
+            _builder.RegisterType<JiraCommitEmulator>().As<IRepositoryLog>().AsSelf();
+            _builder.RegisterAggregateService<IAllRepositoryProviders>();
 
+            _builder.RegisterType<TaskTimeSpread>().As<ITaskTimeSpread>().AsSelf();
             _builder.RegisterType<TaskTimeByCommitsCalculator>().As<ITaskTimeCalculator>().AsSelf();
 
             _builder.RegisterType<WorkLogTasksProcessor>().AsSelf().As<ITasksProcessor>();
@@ -42,7 +59,12 @@ namespace JiraTimeBotForm.DI
             _builder.RegisterType<JiraDescriptionSource>().AsSelf().As<IJiraDescriptionSource>();
             _builder.RegisterType<JiraApi>().AsSelf().AsImplementedInterfaces();
 
-            _builder.Register(c => new Job(c.Resolve<IAllMercurialProviders>(), c.Resolve<ITaskTimeCalculator>(), c.Resolve<ILog>())).AsSelf();
+            _builder.RegisterType<JiraHistory>().AsSelf().As<IJiraHistory>();
+
+            _builder.Register(c => new Job(c.Resolve<IAllRepositoryProviders>(), c.Resolve<ITaskTimeCalculator>(), c.Resolve<ILog>())).AsSelf();
+
+            _builder.RegisterType<AutoStartUp>().AsSelf().AsImplementedInterfaces();
+            _builder.RegisterType<frmSettings>().AsSelf().AsImplementedInterfaces();
 
             var container = _builder.Build();
             return container;

src/JiraTimeBot/JiraIntegration/Comments/IJiraDescriptionSource.cs

@@ -1,9 +1,10 @@
-using JiraTimeBotForm.TaskTime.Objects;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.TaskTime.Objects;
 
-namespace JiraTimeBotForm.JiraIntegration.Comments
+namespace JiraTimeBot.JiraIntegration.Comments
 {
     public interface IJiraDescriptionSource
     {
-        string GetDescription(TaskTimeItem item, bool addCommentsToWorklog);
+        string GetDescription(TaskTimeItem item, bool addCommentsToWorklog, Settings settings);
     }
 }

src/JiraTimeBot/JiraIntegration/Comments/JiraDescriptionSource.cs

@@ -1,26 +1,13 @@
-using System;
+using JiraTimeBot.Configuration;
-using System.Collections.Generic;
+using JiraTimeBot.TaskTime.Objects;
-using System.Linq;
-using JiraTimeBotForm.TaskTime.Objects;
 
-namespace JiraTimeBotForm.JiraIntegration.Comments
+namespace JiraTimeBot.JiraIntegration.Comments
 {
     public class JiraDescriptionSource : IJiraDescriptionSource
     {
-        private readonly List<string> _dummyComments = new List<string>
+        public string GetDescription(TaskTimeItem taskTimeItem, bool addCommentsToWorklog, Settings settings)
         {
-            "Написание кода", "написание кода", "программирование", "реализация задачи", "кодинг", "код + тесты", 
+            return addCommentsToWorklog ? taskTimeItem.Description : "";
-            "кодинг", "написание кода и тестов"
-        };
-
-        public string GetDescription(TaskTimeItem taskTimeItem, bool addCommentsToWorklog)
-        {
-            if (addCommentsToWorklog)
-            {
-                return taskTimeItem.Description;
-            }
-
-            return _dummyComments.OrderBy(f => Guid.NewGuid()).FirstOrDefault();
         }
     }
 }

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -1,15 +1,23 @@
-using System;
+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 Atlassian.Jira;
-using JiraTimeBotForm.Configuration;
-using JiraTimeBotForm.JiraIntegration.Comments;
-using JiraTimeBotForm.TaskTime.Objects;
 
-namespace JiraTimeBotForm.JiraIntegration
+namespace JiraTimeBot.JiraIntegration
 {
-    public class JiraApi
+    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;
         private readonly IJiraDescriptionSource _descriptionSource;
@@ -34,14 +42,13 @@ namespace JiraTimeBotForm.JiraIntegration
             }
         }
 
-        public List<Issue> GetTodayIssues(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
+        public List<Issue> GetIssuesByJQL(string jql, Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
         {
             var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);
             date = date.GetValueOrDefault(DateTime.Now.Date);
 
             var userName = settings.JiraUserName;
 
-            var jql = settings.JiraQuery;
             if (string.IsNullOrEmpty(jql))
             {
                 jql = $"status changed by '%USER%' during (\"%DATE%\",\"%DATE%\")";
@@ -52,8 +59,7 @@ namespace JiraTimeBotForm.JiraIntegration
 
             try
             {
-                List<Issue> affectedIssues =
+                List<Issue> affectedIssues = jira.Issues.GetIssuesFromJqlAsync(jql, 100, 0, cancellationToken).Result.ToList();
-                    jira.Issues.GetIssuesFromJqlAsync(jql, 50, 0, cancellationToken).Result.ToList();
                 return affectedIssues;
             }
             catch (Exception ex)
@@ -63,15 +69,45 @@ namespace JiraTimeBotForm.JiraIntegration
             }
         }
 
-        public void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false)
+        public List<Issue> GetWorkloggedIssuesByDate(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
         {
+            date = date.GetValueOrDefault(DateTime.Now.Date);
+            //var jql = "issueFunction in workLogged(\"on %DATE% by '%USER%'\")";
+            var jql = "worklogAuthor = '%USER%' && worklogDate = \"%DATE%\"";
+            return GetIssuesByJQL(jql, settings, date, cancellationToken);
+        }
+
+        private void RemoveWorklogsAddedByUser(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, CancellationToken cancellationToken = default)
+        {
+            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)
+                    {
+                        _log.Trace($"Удаляю добавленный руками WorkLog для задачи {issue.Key.Value}: {userWorklog.TimeSpent}, {userWorklog.Comment}.");
+
+                        if (!dummy)
+                        {
+                            issue.DeleteWorklogAsync(userWorklog, token: cancellationToken);
+                        }
+                    }
+                }
+            }
+        }
+
+        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);
 
-            if (date == null)
+            //Удаляем добавленные вручную пользователем данные.
-            {
+            RemoveWorklogsAddedByUser(taskTimeItems, settings, date, dummy, cancellationToken);
-                date = DateTime.Now.Date;
-            }
-            date = date.Value.Date;
 
             foreach (TaskTimeItem taskTimeItem in taskTimeItems)
             {
@@ -80,9 +116,9 @@ namespace JiraTimeBotForm.JiraIntegration
                 {
                     issue = jira.Issues.Queryable.FirstOrDefault(f => f.Key == taskTimeItem.Branch);
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
-
+                    _log.Error($"Ошибка получения задачи из JIRA: {ex.Message} - {ex.InnerException?.Message}");
                 }
                 if (issue == null)
                 {
@@ -91,40 +127,67 @@ namespace JiraTimeBotForm.JiraIntegration
                 }
 
                 var hasTodayWorklog = false;
-                var workLogs = issue.GetWorklogsAsync().Result;
+                var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
-                foreach (var workLog in workLogs)
+                var userWorklogs = workLogs.Where(w =>
+                    w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
+                        StringComparison.InvariantCultureIgnoreCase)).ToList();
+                var comment = _descriptionSource.GetDescription(taskTimeItem, addCommentsToWorklog, settings);
+
+                foreach (var workLog in userWorklogs)
                 {
                     var timeSpent = TimeSpan.FromSeconds(workLog.TimeSpentInSeconds);
-                    if (workLog.CreateDate.GetValueOrDefault().Date == date && workLog.Author == settings.JiraUserName)
+                    var timeDiff = Math.Abs((timeSpent - taskTimeItem.TimeSpent).TotalMinutes);
+                    if (timeDiff > 1 || userWorklogs.Count > 1 || userWorklogs.First().Comment != comment)
                     {
-                        var timeDiff = Math.Abs((timeSpent - taskTimeItem.Time).TotalMinutes);
                         if (timeDiff > 1)
                         {
                             _log.Trace($"Время отличается на {timeDiff} минут, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
-                            if (!dummy)
+                        }
-                            {
+                        else if (userWorklogs.Count > 1)
-                                issue.DeleteWorklogAsync(workLog);
+                        {
-                            }
+                            _log.Trace($"Найдено более одного ворклога на задачу, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
-                            hasTodayWorklog = false;
                         }
                         else
                         {
-                            _log.Trace($"По задаче {taskTimeItem.Branch} уже есть аналогичный worklog. Пропускаю.");
+                            _log.Trace($"Описание отличается, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
-                            hasTodayWorklog = true;
                         }
+                        if (!dummy)
+                        {
+                            try
+                            {
+                                issue.DeleteWorklogAsync(workLog, WorklogStrategy.RetainRemainingEstimate, token: cancellationToken);
+                            }
+                            catch (Exception ex)
+                            {
+                                _log.Error($"Не могу удалить Worklog по задаче {taskTimeItem.Branch}: {ex.Message}.");
+                                continue;
+                            }
+                        }
+                        hasTodayWorklog = false;
+                    }
+                    else
+                    {
+                        _log.Trace($"По задаче {taskTimeItem.Branch} уже есть аналогичный worklog. Пропускаю.");
+                        hasTodayWorklog = true;
                     }
                 }
 
                 if (!hasTodayWorklog)
                 {
-                    var timeSpentJira = $"{taskTimeItem.Time.TotalMinutes}m";
+                    var timeSpentJira = $"{taskTimeItem.TimeSpent.TotalMinutes}m";
-
-                    var comment = _descriptionSource.GetDescription(taskTimeItem, addCommentsToWorklog);
 
                     Worklog workLogToAdd = new Worklog(timeSpentJira, date.Value, comment);
                     if (!dummy)
                     {
-                        workLogToAdd = issue.AddWorklogAsync(workLogToAdd).Result;
+                        try
+                        {
+                            workLogToAdd = issue.AddWorklogAsync(workLogToAdd, WorklogStrategy.RetainRemainingEstimate, token: cancellationToken).Result;
+                        }
+                        catch (Exception ex)
+                        {
+                            _log.Error($"Не могу добавить Worklog по задаче {taskTimeItem.Branch}: {ex.Message} ({ex.InnerException?.Message}).");
+                            continue;
+                        }
                     }
                     _log.Trace($"Добавили Worklog для {taskTimeItem.Branch}: {workLogToAdd.Author} {workLogToAdd.CreateDate}: {workLogToAdd.TimeSpent}");
                 }

src/JiraTimeBot/JiraIntegration/JiraCommitEmulator.cs

@@ -1,13 +1,16 @@
-using System;
+using Atlassian.Jira;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.RepositoryProviders.Interfaces;
+using JiraTimeBot.TaskTime.Objects;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
-using JiraTimeBotForm.Configuration;
-using JiraTimeBotForm.Mercurial;
-using JiraTimeBotForm.Mercurial.Objects;
 
-namespace JiraTimeBotForm.JiraIntegration
+
+namespace JiraTimeBot.JiraIntegration
 {
-    public class JiraCommitEmulator : IMercurialLog
+    public class JiraCommitEmulator : IRepositoryLog
     {
         private readonly ILog _log;
         private readonly JiraApi _jiraApi;
@@ -18,23 +21,56 @@ namespace JiraTimeBotForm.JiraIntegration
             _jiraApi = jiraApi;
         }
 
-        public List<MercurialCommitItem> GetMercurialLog(Settings settings,
+        public List<TaskTimeItem> GetRepositoryLog(Settings settings,
                                     DateTime? date = null,
                                     CancellationToken cancellationToken = default(CancellationToken))
         {
             date = date.GetValueOrDefault(DateTime.Now.Date);
-            var workTasks = new List<MercurialCommitItem>();
+            var workTasks = new List<TaskTimeItem>();
-            var issues = _jiraApi.GetTodayIssues(settings, date, cancellationToken);
+            var issues = _jiraApi.GetIssuesByJQL(settings.JiraQuery, settings, date, cancellationToken);
 
             foreach (var issue in issues)
             {
-                workTasks.Add(new MercurialCommitItem
+                if (cancellationToken.IsCancellationRequested)
                 {
-                    Description = issue.Summary,
+                    return new List<TaskTimeItem>();
-                    Time = issue.Updated.GetValueOrDefault(date.Value),
+                }
-                    Branch = issue.Key.Value,
+                var comments = issue.GetCommentsAsync(cancellationToken).Result?.ToList() ?? new List<Comment>();
-                    FilesAffected = 1
+
-                });
+                var user = settings.JiraUserName;
+                //user = "Zoya.Aleksandridi";
+                var userComments = comments.Where(f => f.Author.Equals(user, StringComparison.InvariantCultureIgnoreCase)).ToList();
+                _log.Trace($"Получены комментарии по задаче {issue.Key} ({issue.Type?.Name}): {userComments.Count}.");
+
+                if (userComments.Any())
+                {
+                    foreach (var comment in userComments.OrderBy(f => f.CreatedDate))
+                    {
+                        var item = new TaskTimeItem(issue.Key.Value,
+                            issue.Summary,
+                            issue.Project,
+                            issue.Updated.GetValueOrDefault(date.Value),
+                            TimeSpan.Zero,
+                            1,
+                            1,
+                            "",
+                            CommitType.Task);
+                        workTasks.Add(item);
+                    }
+                }
+                else
+                {
+                    var item = new TaskTimeItem(issue.Key.Value,
+                        issue.Summary,
+                        issue.Project,
+                        issue.Updated.GetValueOrDefault(date.Value),
+                        TimeSpan.Zero,
+                        1,
+                        1,
+                        "",
+                        CommitType.Task);
+                    workTasks.Add(item);
+                }
             }
 
             return workTasks;

src/JiraTimeBot/JiraIntegration/JiraHistory.cs

@@ -0,0 +1,66 @@
+using JiraTimeBot.Configuration;
+using JiraTimeBot.TaskTime.Objects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+namespace JiraTimeBot.JiraIntegration
+{
+    public interface IJiraHistory
+    {
+        List<TaskTimeItem> GetDayWorklogs(DateTime date,
+                                          Settings settings,
+                                          CancellationToken cancellationToken = default);
+    }
+
+    public class JiraHistory : IJiraHistory
+    {
+        private readonly IJiraApi _jiraApi;
+
+        public JiraHistory(IJiraApi jiraApi)
+        {
+            _jiraApi = jiraApi;
+        }
+
+        public List<TaskTimeItem> GetDayWorklogs(DateTime date,
+                                                 Settings settings,
+                                                 CancellationToken cancellationToken = default)
+        {
+            var tasks = _jiraApi.GetIssuesByJQL("worklogDate = \"%DATE%\" and worklogAuthor='%USER%'", settings, date, cancellationToken);
+            List<TaskTimeItem> resultItems = new List<TaskTimeItem>();
+            foreach (var issue in tasks)
+            {
+                var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
+                var user = settings.JiraUserName;
+                var userWorklogs = workLogs.Where(w =>
+                    w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(user,
+                        StringComparison.InvariantCultureIgnoreCase)).ToList();
+                if (!userWorklogs.Any())
+                {
+                    continue;
+                }
+
+                var firstWorklog = userWorklogs.First();
+
+                var description = string.Join(Environment.NewLine, userWorklogs.Select(f => f.Comment).Distinct());
+                var totalTime = TimeSpan.FromSeconds(userWorklogs.Sum(f => f.TimeSpentInSeconds));
+                var startDate = firstWorklog?.CreateDate ?? date;
+                var commits = userWorklogs.Sum(f => f.Comment.Count(c => c == '\n'));
+                if (commits == 0)
+                {
+                    commits = 1;
+                }
+                var taskType = CommitType.Task;
+                if (description.Contains("Подготовка и публикация"))
+                {
+                    taskType = CommitType.Release;
+                }
+
+                resultItems.Add(new TaskTimeItem(issue.Key.Value, description, issue.Project, startDate, totalTime, commits, 1, "", taskType));
+            }
+
+            return resultItems;
+        }
+    }
+}

src/JiraTimeBot/JiraTimeBot.csproj

@@ -1,16 +1,34 @@
 <?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.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>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{F3B89316-C38C-4CE6-9D88-0B1373CFBA1A}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>JiraTimeBotForm</RootNamespace>
+    <RootNamespace>JiraTimeBot</RootNamespace>
-    <AssemblyName>JiraTimeBotForm</AssemblyName>
+    <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>
@@ -21,6 +39,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>7.1</LangVersion>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -34,39 +54,53 @@
   <PropertyGroup>
     <ApplicationIcon>app.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>JiraTimeBot.Program</StartupObject>
+  </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Atlassian.Jira, Version=10.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Atlassian.Jira, Version=12.1.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Atlassian.SDK.10.4.0\lib\net452\Atlassian.Jira.dll</HintPath>
+      <HintPath>..\packages\Atlassian.SDK.12.1.1\lib\net452\Atlassian.Jira.dll</HintPath>
     </Reference>
-    <Reference Include="Autofac, Version=4.9.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+    <Reference Include="Autofac, Version=5.1.2.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.9.1\lib\net45\Autofac.dll</HintPath>
+      <HintPath>..\packages\Autofac.5.1.2\lib\net461\Autofac.dll</HintPath>
     </Reference>
-    <Reference Include="Autofac.Extras.AggregateService, Version=4.1.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+    <Reference Include="Autofac.Extras.AggregateService, Version=5.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.Extras.AggregateService.4.1.0\lib\net45\Autofac.Extras.AggregateService.dll</HintPath>
+      <HintPath>..\packages\Autofac.Extras.AggregateService.5.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.0.0\lib\net45\Castle.Core.dll</HintPath>
+      <HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
+    </Reference>
+    <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>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="RestSharp, Version=106.0.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.11\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\RestSharp.106.10.1\lib\net452\RestSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="RestSharp, Version=106.6.9.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestSharp.106.6.9\lib\net452\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <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>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
     <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
@@ -83,17 +117,21 @@
     <Compile Include="DI\ContainerBuilder.cs" />
     <Compile Include="JiraIntegration\Comments\IJiraDescriptionSource.cs" />
     <Compile Include="JiraIntegration\Comments\JiraDescriptionSource.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\IAllMercurialProviders.cs" />
+    <Compile Include="RepositoryProviders\GitLog.cs" />
-    <Compile Include="Mercurial\Modifiers\ITechnicalInfoSkipper.cs" />
+    <Compile Include="RepositoryProviders\Interfaces\IAllVcsProviders.cs" />
-    <Compile Include="Mercurial\Modifiers\CommitSkipper.cs" />
+    <Compile Include="RepositoryProviders\Modifiers\ITechnicalInfoSkipper.cs" />
-    <Compile Include="Mercurial\Modifiers\ICommitSkipper.cs" />
+    <Compile Include="RepositoryProviders\Modifiers\CommitSkipper.cs" />
-    <Compile Include="Mercurial\IMercurialLog.cs" />
+    <Compile Include="RepositoryProviders\Modifiers\ICommitSkipper.cs" />
-    <Compile Include="Mercurial\Modifiers\TechnicalInfoSkipper.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" />
     <Compile Include="UI\frmMain.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -101,8 +139,7 @@
       <DependentUpon>frmMain.cs</DependentUpon>
     </Compile>
     <Compile Include="JiraIntegration\JiraApi.cs" />
-    <Compile Include="Mercurial\Objects\MercurialCommitItem.cs" />
+    <Compile Include="RepositoryProviders\MercurialLog.cs" />
-    <Compile Include="Mercurial\MercurialLog.cs" />
     <Compile Include="Configuration\PasswordEncryptionClass.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -118,9 +155,14 @@
     <Compile Include="UI\frmSettings.Designer.cs">
       <DependentUpon>frmSettings.cs</DependentUpon>
     </Compile>
+    <Compile Include="UI\Startup\AutoStartUp.cs" />
+    <Compile Include="UI\Tray\SingleInstance.cs" />
     <Compile Include="UI\Tray\ITrayMenu.cs" />
     <Compile Include="UI\Tray\RestoreFromTray.cs" />
     <Compile Include="UI\Tray\TrayMenu.cs" />
+    <Compile Include="Update\GitHubDataObjects.cs" />
+    <Compile Include="Update\IUpdater.cs" />
+    <Compile Include="Update\Updater.cs" />
     <EmbeddedResource Include="UI\frmMain.resx">
       <DependentUpon>frmMain.cs</DependentUpon>
     </EmbeddedResource>
@@ -132,6 +174,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <EmbeddedResource Include="UI\frmSettings.resx">
       <DependentUpon>frmSettings.cs</DependentUpon>
@@ -153,5 +196,23 @@
   <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>
   <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.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,24 +1,23 @@
-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 JiraTimeBotForm.Configuration;
-using JiraTimeBotForm.Mercurial;
-using JiraTimeBotForm.Mercurial.Objects;
-using JiraTimeBotForm.TasksProcessors;
-using JiraTimeBotForm.TaskTime;
-using JiraTimeBotForm.TaskTime.Objects;
 
-namespace JiraTimeBotForm
+namespace JiraTimeBot
 {
     class Job
     {
-        private readonly IAllMercurialProviders _mercurialProviders;
+        private readonly IAllRepositoryProviders _mercurialProviders;
         private readonly ITaskTimeCalculator _taskTimeDiscoverer;
         private readonly ILog _log;
 
-        public Job(IAllMercurialProviders mercurialProviders, ITaskTimeCalculator taskTimeDiscoverer, ILog log)
+        public Job(IAllRepositoryProviders mercurialProviders, ITaskTimeCalculator taskTimeDiscoverer, ILog log)
         {
             _mercurialProviders = mercurialProviders;
             _taskTimeDiscoverer = taskTimeDiscoverer;
@@ -40,43 +39,77 @@ namespace JiraTimeBotForm
                 daysDiff = -1;
             }
 
+            var setForDate = DateTime.Now.Date;
             while (true)
             {
-                DateTime date = DateTime.Now.Date.AddDays(daysDiff);
+                DateTime realDate = DateTime.Now.Date.AddDays(daysDiff);
 
-                IMercurialLog mercurial = _mercurialProviders.MercurialLog;
+                if (SetTaskTimesForDateImpl(setForDate, realDate, settings, tasksProcessor, dummyMode, cancellationToken))
-                if (settings.WorkType == WorkType.JiraLogs)
                 {
-                    _log.Info("Использую Jira как источник информации.");
+                    return;
-                    mercurial = _mercurialProviders.JiraCommitEmulator;
                 }
-                List<MercurialCommitItem> commits = mercurial.GetMercurialLog(settings, date, cancellationToken);
-                List<TaskTimeItem> taskTimes = _taskTimeDiscoverer.CalculateTaskTime(commits, settings, cancellationToken);
-
                 if (cancellationToken.IsCancellationRequested)
                 {
                     return;
                 }
 
-                if (!taskTimes.Any())
+                _log.Warn($"{realDate:dd.MM.yyyy} вы не сделали ничего полезного =) Использую предыдущий день.");
+                daysDiff--;
+                if (daysDiff < -7)
                 {
-                    _log.Warn($"{date:dd.MM.yyyy} вы не сделали ничего полезного =) Использую предыдущий день.");
+                    _log.Error("Не нашли ни одного коммита за предыдущие 7 дней. Возможно вы в отпуске? Выхожу.");
-                    daysDiff--;
+                    return;
-                    if (daysDiff < -7)
-                    {
-                        _log.Error("Не нашли ни одного коммита за предыдущие 7 дней. Возможно вы в отпуске? Выхожу.");
-                        return;
-                    }
-
-                    continue;
                 }
-
-                tasksProcessor.Process(date, taskTimes, settings, dummyMode);
-
-                _log.Info("Готово.");
-                return;
             }
         }
 
+        public Task SetTaskTimesForDate(DateTime setForDate, DateTime realDate, Settings settings, ITasksProcessor tasksProcessor, bool dummyMode, CancellationToken cancellationToken)
+        {
+            _log.Info("Начинаем работу");
+
+            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)
+        {
+            IRepositoryLog mercurial = _mercurialProviders.MercurialLog;
+            if (settings.WorkType == WorkType.JiraLogs)
+            {
+                _log.Info("Использую Jira как источник информации.");
+                mercurial = _mercurialProviders.JiraCommitEmulator;
+            }
+            else if (settings.WorkType == WorkType.GitLogs)
+            {
+                _log.Info("Использую Git как источник информации.");
+                mercurial = _mercurialProviders.GitLog;
+            }
+
+            List<TaskTimeItem> taskTimes;
+            if (!(tasksProcessor is MeetingProcessor))
+            {
+                List<TaskTimeItem> commits = mercurial.GetRepositoryLog(settings, realDate, cancellationToken);
+                taskTimes = _taskTimeDiscoverer.CalculateTaskTime(commits, settings, cancellationToken);
+            }
+            else
+            {
+                var provider = _mercurialProviders.JiraHistory;
+                taskTimes = provider.GetDayWorklogs(realDate, settings, cancellationToken);
+            }
+
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return false;
+            }
+
+            if (!taskTimes.Any())
+            {
+                return false;
+            }
+
+            tasksProcessor.Process(setForDate, realDate, taskTimes, settings, dummyMode, cancellationToken);
+
+            _log.Info("Готово.");
+            return true;
+        }
     }
 }

src/JiraTimeBot/Logger.cs

@@ -1,29 +1,23 @@
 using System;
 using System.ComponentModel;
-using System.Windows.Forms;
 
-namespace JiraTimeBotForm
+namespace JiraTimeBot
 {
     public class Logger : ILog
     {
-        private readonly TextBox _txt;
+        private readonly Action<string> _logAction;
-        private readonly AppendLog _safeAppender;
 
-        public Logger(TextBox txt)
+        public Logger(Action<string> logAction)
         {
-            _txt = txt;
+            _logAction = logAction;
-            _safeAppender = text => _txt.AppendText(text);
-
         }
 
         private void AppendText(string message)
         {
             message = $"{DateTime.Now:HH:mm} {message}";
-            _txt.Invoke(_safeAppender, message + Environment.NewLine);
+            _logAction(message);
         }
 
-        private delegate void AppendLog(string text);
-
         public void Info([Localizable(false)] string message)
         {
             AppendText(message);

src/JiraTimeBot/Mercurial/IAllMercurialProviders.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using JiraTimeBotForm.JiraIntegration;
-
-namespace JiraTimeBotForm.Mercurial
-{
-    public interface IAllMercurialProviders
-    {
-        MercurialLog MercurialLog { get; }
-        JiraCommitEmulator JiraCommitEmulator { get; }
-    }
-}

src/JiraTimeBot/Mercurial/IMercurialLog.cs

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

src/JiraTimeBot/Mercurial/Modifiers/CommitSkipper.cs

@@ -1,24 +0,0 @@
-using System;
-
-namespace JiraTimeBotForm.Mercurial.Modifiers
-{
-    public class CommitSkipper : ICommitSkipper
-    {
-        public bool IsNeedToSkip(string branch, string commitMessage)
-        {
-            if (!branch.Contains("-"))
-            {
-                return true;
-            }
-
-            //Пропускаем Close и Merge коммиты
-            if (commitMessage.StartsWith($"Close {branch} ", StringComparison.InvariantCultureIgnoreCase) ||
-                commitMessage.StartsWith($"Merge with ", StringComparison.InvariantCultureIgnoreCase))
-            {
-                return true;
-            }
-
-            return false;
-        }
-    }
-}

src/JiraTimeBot/Mercurial/Modifiers/ITechnicalInfoSkipper.cs

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

src/JiraTimeBot/Mercurial/Objects/MercurialCommitItem.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace JiraTimeBotForm.Mercurial.Objects
-{
-    public class MercurialCommitItem
-    {
-        public string Description { get; set; }
-        public string Branch { get; set; }
-        public DateTime Time { get; set; }
-        public int FilesAffected { get; set; }
-    }
-}

src/JiraTimeBot/Program.cs

@@ -1,45 +1,31 @@
-using System;
+using JiraTimeBot.UI;
-using System.Diagnostics;
+using JiraTimeBot.UI.Tray;
+using System;
+using System.Threading;
 using System.Windows.Forms;
-using JiraTimeBotForm.UI;
 
-namespace JiraTimeBotForm
+namespace JiraTimeBot
 {
     static class Program
     {
+        private static readonly Mutex Mutex = new Mutex(true, "{44426B3E-B901-4792-ACEA-1385D79DBAD1}");
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
         [STAThread]
         static void Main()
         {
-            if (PriorProcess() != null)
+            if (Mutex.WaitOne(TimeSpan.Zero, true))
             {
-
+                Application.EnableVisualStyles();
-                MessageBox.Show("Another instance of the app is already running.");
+                Application.SetCompatibleTextRenderingDefault(false);
-                return;
+                Application.Run(new frmMain());
+                Mutex.ReleaseMutex();
             }
-            
+            else
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new frmMain());
-        }
-
-        public static Process PriorProcess()
-            // Returns a System.Diagnostics.Process pointing to
-            // a pre-existing process with the same name as the
-            // current one, if any; or null if the current process
-            // is unique.
-        {
-            Process curr = Process.GetCurrentProcess();
-            Process[] procs = Process.GetProcessesByName(curr.ProcessName);
-            foreach (Process p in procs)
             {
-                if ((p.Id != curr.Id) &&
+                SingleInstance.ShowFirstInstance();
-                    (p.MainModule.FileName == curr.MainModule.FileName))
-                    return p;
             }
-            return null;
         }
     }
 }

src/JiraTimeBot/Properties/AssemblyInfo.cs

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

src/JiraTimeBot/Properties/Resources.Designer.cs

@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace JiraTimeBotForm.Properties
+namespace JiraTimeBot.Properties {
-{
+    using System;
-
+    
-
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,51 +19,43 @@ namespace JiraTimeBotForm.Properties
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
+    internal class Resources {
-    {
+        
-
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
+        internal Resources() {
-        {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
+        internal static global::System.Resources.ResourceManager ResourceManager {
-        {
+            get {
-            get
+                if (object.ReferenceEquals(resourceMan, null)) {
-            {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("JiraTimeBot.Properties.Resources", typeof(Resources).Assembly);
-                if ((resourceMan == null))
-                {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("JiraTimeBotForm.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
+        internal static global::System.Globalization.CultureInfo Culture {
-        {
+            get {
-            get
-            {
                 return resourceCulture;
             }
-            set
+            set {
-            {
                 resourceCulture = value;
             }
         }

src/JiraTimeBot/Properties/Settings.Designer.cs

@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -8,21 +8,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace JiraTimeBotForm.Properties
+namespace JiraTimeBot.Properties {
-{
+    
-
+    
-
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-    {
+        
-
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
+        
-        public static Settings Default
+        public static Settings Default {
-        {
+            get {
-            get
-            {
                 return defaultInstance;
             }
         }

src/JiraTimeBot/RepositoryProviders/GitLog.cs

@@ -0,0 +1,194 @@
+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.Threading;
+
+namespace JiraTimeBot.RepositoryProviders
+{
+    public class GitLog : IRepositoryLog
+    {
+        private readonly ILog _log;
+        private readonly ICommitSkipper _commitSkipper;
+        private readonly ITechnicalInfoSkipper _technicalInfoSkipper;
+
+        public GitLog(ILog log, ICommitSkipper commitSkipper, ITechnicalInfoSkipper technicalInfoSkipper)
+        {
+            _log = log;
+            _commitSkipper = commitSkipper;
+            _technicalInfoSkipper = technicalInfoSkipper;
+        }
+
+        public List<TaskTimeItem> GetRepositoryLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
+        {
+            if (string.IsNullOrEmpty(settings.RepositoryPath) || !Directory.Exists(settings.RepositoryPath))
+            {
+                _log.Error("Папка с репо не сушествует.");
+                return new List<TaskTimeItem>();
+            }
+
+            date = date.GetValueOrDefault(DateTime.Now.Date);
+
+            var workTasks = new List<TaskTimeItem>();
+            foreach (var repoDirectory in Directory.GetDirectories(settings.RepositoryPath))
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return new List<TaskTimeItem>();
+                }
+
+                //var project = new DirectoryInfo(repoDirectory).Name;
+                if (!Directory.Exists(Path.Combine(repoDirectory, ".git")))
+                {
+                    continue;
+                }
+
+                var directoryInfo = new DirectoryInfo(repoDirectory);
+
+
+                var repo = new LibGit2Sharp.Repository(repoDirectory);
+
+                if (settings.PullBeforeProcess)
+                {
+                    try
+                    {
+                        // Credential information to fetch
+                        LibGit2Sharp.PullOptions options = new LibGit2Sharp.PullOptions();
+                        options.FetchOptions = new FetchOptions();
+
+                        // User information to create a merge commit
+                        var signature = new LibGit2Sharp.Signature(new Identity("MERGE_USER_NAME", "MERGE_USER_EMAIL"), DateTimeOffset.Now);
+
+                        // Pull
+                        Commands.Pull(repo, signature, options);
+                    }
+                    catch (Exception ex)
+                    {
+                        _log?.Trace($" - Не получается сделать pull для репозитория: {directoryInfo.Name} - {ex.Message}");
+                    }
+                }
+
+                var allCommits = new List<Commit>();
+
+                var reflog = repo.Refs.Log(repo.Refs.Head);
+                foreach (var reflogItem in reflog)
+                {
+                    if (reflogItem.Committer.When.Date != date.Value.Date || reflogItem.Committer.Email != settings.MercurialAuthorEmail)
+                    {
+                        continue;
+                    }
+
+                    var commit = repo.Lookup<LibGit2Sharp.Commit>(reflogItem.To.Sha);
+                    if (commit != null && allCommits.All(f => f.Sha != commit.Sha))
+                    {
+                        allCommits.Add(commit);
+                    }
+                }
+
+                foreach (Commit commit in allCommits)
+                {
+                    if (cancellationToken.IsCancellationRequested)
+                    {
+                        return new List<TaskTimeItem>();
+                    }
+                    if (commit.Author.When.DateTime.Date != date.Value.Date || commit.Author.Email != settings.MercurialAuthorEmail)
+                    {
+                        continue;
+                    }
+
+                    var branch = ListBranchesContaininingCommit(repo, commit.Sha).Select(f => f.FriendlyName)
+                        .Where(f => f.Contains("-") && !f.Contains("/")).Distinct().FirstOrDefault();
+                    if (branch == null)
+                    {
+                        continue;
+                    }
+
+                    var commitMessage = commit.MessageShort;
+                    commitMessage = _technicalInfoSkipper.StripBranchPrefix(branch, commitMessage);
+
+                    if (_commitSkipper.IsNeedToSkip(branch, commitMessage))
+                    {
+                        continue;
+                    }
+
+                    commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
+                    var files = FilesToMerge(commit, repo);
+
+                    var task = new TaskTimeItem(branch,
+                        commitMessage,
+                        directoryInfo.Name,
+                        commit.Committer.When.DateTime,
+                        TimeSpan.Zero,
+                        1,
+                        files.Length, //changeset.PathActions.Count,
+                        "",
+                        GetCommitType(branch));
+                    workTasks.Add(task);
+
+                    _log?.Trace($" - Найден commit: {commit.Committer.When.DateTime} - {branch} - {commit.Author.Email} - {commitMessage}");
+                }
+            }
+            if (!workTasks.Any())
+            {
+                return new List<TaskTimeItem>();
+            }
+
+            return workTasks;
+        }
+
+        private CommitType GetCommitType(string branch)
+        {
+            return branch.StartsWith("release") ? CommitType.Release : CommitType.Task;
+        }
+
+        public String[] FilesToMerge(Commit commit, Repository repo)
+        {
+            var fileList = new List<String>();
+            foreach (var parent in commit.Parents)
+            {
+                foreach (TreeEntryChanges change in repo.Diff.Compare<TreeChanges>(parent.Tree, commit.Tree))
+                {
+                    fileList.Add(change.Path);
+                }
+            }
+            return fileList.ToArray();
+        }
+
+        private IEnumerable<Branch> ListBranchesContaininingCommit(Repository repo, string commitSha)
+        {
+            bool directBranchHasBeenFound = false;
+            foreach (var branch in repo.Branches)
+            {
+                if (branch.Tip.Sha != commitSha)
+                {
+                    continue;
+                }
+
+                directBranchHasBeenFound = true;
+                yield return branch;
+            }
+
+            if (directBranchHasBeenFound)
+            {
+                yield break;
+            }
+
+            foreach (var branch in repo.Branches)
+            {
+                var commits = repo.Commits.QueryBy(new CommitFilter { IncludeReachableFrom = branch }).Where(c => c.Sha == commitSha);
+
+                if (!commits.Any())
+                {
+                    continue;
+                }
+
+                yield return branch;
+            }
+        }
+    }
+}

src/JiraTimeBot/RepositoryProviders/Interfaces/IAllVcsProviders.cs

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

src/JiraTimeBot/RepositoryProviders/Interfaces/IRepositoryLog.cs

@@ -0,0 +1,13 @@
+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, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken));
+    }
+}

src/JiraTimeBot/RepositoryProviders/MercurialLog.cs

@@ -1,17 +1,18 @@
-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.Text;
 using System.Threading;
-using JiraTimeBotForm.Configuration;
-using JiraTimeBotForm.Mercurial.Modifiers;
-using JiraTimeBotForm.Mercurial.Objects;
-using Mercurial;
 
-namespace JiraTimeBotForm.Mercurial
+namespace JiraTimeBot.RepositoryProviders
 {
-    public class MercurialLog: IMercurialLog
+    public class MercurialLog : IRepositoryLog
     {
         private readonly ILog _log;
         private readonly ICommitSkipper _commitSkipper;
@@ -24,22 +25,22 @@ namespace JiraTimeBotForm.Mercurial
             _technicalInfoSkipper = technicalInfoSkipper;
         }
 
-        public List<MercurialCommitItem> GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
+        public List<TaskTimeItem> GetRepositoryLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrEmpty(settings.RepositoryPath) || !Directory.Exists(settings.RepositoryPath))
             {
                 _log.Error("Папка с репо не сушествует.");
-                return new List<MercurialCommitItem>();
+                return new List<TaskTimeItem>();
             }
 
             date = date.GetValueOrDefault(DateTime.Now.Date);
 
-            var workTasks = new List<MercurialCommitItem>();
+            var workTasks = new List<TaskTimeItem>();
             foreach (var repoDirectory in Directory.GetDirectories(settings.RepositoryPath))
             {
                 if (cancellationToken.IsCancellationRequested)
                 {
-                    return new List<MercurialCommitItem>();
+                    return new List<TaskTimeItem>();
                 }
 
                 //var project = new DirectoryInfo(repoDirectory).Name;
@@ -48,12 +49,27 @@ namespace JiraTimeBotForm.Mercurial
                     continue;
                 }
 
+                var directoryInfo = new DirectoryInfo(repoDirectory);
+
                 var repo = new Repository(repoDirectory);
+
+                if (settings.PullBeforeProcess)
+                {
+                    try
+                    {
+                        repo.Pull();
+                    }
+                    catch (Exception ex)
+                    {
+                        _log?.Trace($" - Не получается сделать pull для репозитория: {directoryInfo.Name} - {ex.Message}");
+                    }
+                }
+
                 var logCommand = new LogCommand
                 {
                     Date = date,
                     Users = { settings.MercurialAuthorEmail },
-                    AdditionalArguments = { "--encoding=utf-8"},
+                    AdditionalArguments = { "--encoding=utf-8" },
                 };
 
                 var log = repo.Log(logCommand);
@@ -62,7 +78,7 @@ namespace JiraTimeBotForm.Mercurial
                 {
                     if (cancellationToken.IsCancellationRequested)
                     {
-                        return new List<MercurialCommitItem>();
+                        return new List<TaskTimeItem>();
                     }
 
                     var commitMessage = FixEncoding(changeset.CommitMessage);
@@ -72,25 +88,47 @@ namespace JiraTimeBotForm.Mercurial
                     }
                     commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
 
-                    workTasks.Add(new MercurialCommitItem
+                    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))
                     {
-                        Description = commitMessage,
+                        var description = task.Description;
-                        Branch = changeset.Branch,
+                        if (description.Contains("\n"))
-                        Time = changeset.Timestamp,
+                        {
-                        FilesAffected = changeset.PathActions.Count
+                            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}");
                 }
             }
             if (!workTasks.Any())
             {
-                return new List<MercurialCommitItem>();
+                return new List<TaskTimeItem>();
             }
 
             return workTasks;
         }
 
-        
+        private CommitType GetCommitType(string branch)
+        {
+            return branch.StartsWith("release") ? CommitType.Release : CommitType.Task;
+        }
+
         private string FixEncoding(string source)
         {
             //перекодируем сообщение - ибо оно криво забирается в 1252

src/JiraTimeBot/RepositoryProviders/Modifiers/CommitSkipper.cs

@@ -0,0 +1,31 @@
+using System;
+
+namespace JiraTimeBot.RepositoryProviders.Modifiers
+{
+    public class CommitSkipper : ICommitSkipper
+    {
+        public bool IsNeedToSkip(string branch, string commitMessage)
+        {
+            if (branch.StartsWith("release") && commitMessage.StartsWith("Merge with", StringComparison.InvariantCultureIgnoreCase))
+            {
+                return false;
+            }
+
+            if (!branch.Contains("-"))
+            {
+                return true;
+            }
+
+            //Пропускаем 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;
+            }
+
+            return false;
+        }
+    }
+}

src/JiraTimeBot/RepositoryProviders/Modifiers/ICommitSkipper.cs

@@ -1,4 +1,4 @@
-namespace JiraTimeBotForm.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 JiraTimeBotForm.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,14 +1,12 @@
-using System.Collections.Generic;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.TaskTime.Objects;
+using System.Collections.Generic;
 using System.Threading;
-using JiraTimeBotForm.Configuration;
-using JiraTimeBotForm.Mercurial;
-using JiraTimeBotForm.Mercurial.Objects;
-using JiraTimeBotForm.TaskTime.Objects;
 
-namespace JiraTimeBotForm.TaskTime
+namespace JiraTimeBot.TaskTime
 {
     public interface ITaskTimeCalculator
     {
-        List<TaskTimeItem> CalculateTaskTime(List<MercurialCommitItem> commitItems, Settings settings, CancellationToken cancellationToken = default(CancellationToken));
+        List<TaskTimeItem> CalculateTaskTime(List<TaskTimeItem> commitItems, Settings settings, CancellationToken cancellationToken = default(CancellationToken));
     }
 }

src/JiraTimeBot/TaskTime/Objects/CommitType.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace JiraTimeBot.TaskTime.Objects
+{
+    [Flags]
+    public enum CommitType
+    {
+        Task = 1,
+        Release = 2
+    }
+}

src/JiraTimeBot/TaskTime/Objects/TaskTimeItem.cs

@@ -1,15 +1,39 @@
 using System;
 
-namespace JiraTimeBotForm.TaskTime.Objects
+namespace JiraTimeBot.TaskTime.Objects
 {
     public class TaskTimeItem
     {
         public string Description { get; set; }
         public string Branch { get; set; }
-        public TimeSpan Time { get; set; }
-        public int Commits { get; set; }
-
         public DateTime StartTime { get; set; }
-        public DateTime EndTime { get; set; }
+        public TimeSpan TimeSpent { get; set; }
+        public int Commits { get; set; }
+        public int FilesAffected { get; set; }
+        public CommitType Type { get; set; }
+        public string Project { get; set; }
+        public string ReleaseVersion { get; set; }
+
+        public TaskTimeItem(string branch, string description, string project, DateTime startTime, TimeSpan timeSpent, int commits,
+                            int filesAffected = 1, string releaseVersion = "", CommitType type = CommitType.Task)
+        {
+            Branch = branch;
+            Description = description;
+            Project = project;
+            Commits = commits;
+            TimeSpent = timeSpent;
+            StartTime = startTime;
+            FilesAffected = filesAffected;
+            ReleaseVersion = releaseVersion;
+            Type = type;
+        }
+
+        public void MergeWith(TaskTimeItem toMerge)
+        {
+            Commits += toMerge.Commits;
+            TimeSpent += toMerge.TimeSpent;
+            Description += "\r\n" + toMerge.Description;
+            Type |= toMerge.Type;
+        }
     }
 }

src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -1,80 +1,142 @@
-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 JiraTimeBotForm.Configuration;
-using JiraTimeBotForm.Mercurial;
-using JiraTimeBotForm.Mercurial.Objects;
-using JiraTimeBotForm.TaskTime.Objects;
 
-namespace JiraTimeBotForm.TaskTime
+namespace JiraTimeBot.TaskTime
 {
-    public class TaskTimeByCommitsCalculator: ITaskTimeCalculator
+    public class TaskTimeByCommitsCalculator : ITaskTimeCalculator
     {
         private readonly ILog _log;
+        private readonly ITaskTimeSpread _spreadHelper;
 
-        public TaskTimeByCommitsCalculator(ILog log)
+        public TaskTimeByCommitsCalculator(ILog log, ITaskTimeSpread spreadHelper)
         {
             _log = log;
+            _spreadHelper = spreadHelper;
         }
 
-        public List<TaskTimeItem> CalculateTaskTime(List<MercurialCommitItem> commits, Settings settings, CancellationToken cancellationToken = default(CancellationToken))
+        public List<TaskTimeItem> CalculateTaskTime(List<TaskTimeItem> commits, Settings settings, CancellationToken cancellationToken = default(CancellationToken))
         {
-            int remainMinutes = settings.MinuterPerWorkDay;
+            int minutesPerWorkDay = settings.MinuterPerWorkDay + GetRandomMinutes(settings);
+            int workHours = (settings.MinuterPerWorkDay / 60);
             int totalCommitsCount = commits.Count;
+            var taskCommits = commits.Where(f => f.Type == CommitType.Task).ToList();
+            var releaseCommits = commits.Where(f => f.Type == CommitType.Release).ToList();
 
-            List<TaskTimeItem> workTimeItems = new List<TaskTimeItem>();
+            if (cancellationToken.IsCancellationRequested)
-
-            //Нам нужно раскидать 480 минут в день.
-            foreach (var taskGroup in commits.GroupBy(f => f.Branch).OrderByDescending(f=>f.Count()))
             {
-                if (cancellationToken.IsCancellationRequested)
+                return new List<TaskTimeItem>();
-                {
-                    return new List<TaskTimeItem>();
-                }
-
-                int currentTaskCommits = taskGroup.Count();
-                int currentTaskTime = (int)RoundTo(settings.MinuterPerWorkDay / totalCommitsCount * currentTaskCommits, settings.RountToMinutes);
-                remainMinutes = remainMinutes - currentTaskTime;
-
-                var orderedTasks = taskGroup.OrderBy(f => f.Time).ToArray();
-                StringBuilder sb = new StringBuilder();
-                foreach (var task in orderedTasks)
-                {
-                    sb.AppendLine($"- {task.Description}");
-                }
-
-                var taskTimeItem = new TaskTimeItem
-                {
-                    Branch = taskGroup.Key,
-                    Time = TimeSpan.FromMinutes(currentTaskTime),
-                    Commits = taskGroup.Count(),
-                    Description = sb.ToString(),
-
-                    StartTime = orderedTasks.First().Time,
-                    EndTime = orderedTasks.Last().Time
-                };
-
-                workTimeItems.Add(taskTimeItem);
             }
-            if (!workTimeItems.Any())
+            if (!commits.Any())
             {
                 return new List<TaskTimeItem>();
             }
 
+            FixTooBigInterval(settings, workHours, totalCommitsCount);
+
+            int remainMinutes = minutesPerWorkDay;
+
+            var workTimeItems = new List<TaskTimeItem>();
+            var timeControlTask = GetTimeControlTask(settings.TimeControlTask);
+            if (timeControlTask != null)
+            {
+                workTimeItems.Add(timeControlTask);
+                remainMinutes -= (int)timeControlTask.TimeSpent.TotalMinutes;
+            }
+
+            if (releaseCommits.Any())
+            {
+                var releaseTasks = _spreadHelper.SpreadTime(releaseCommits, 30, 1);
+                workTimeItems.AddRange(releaseTasks);
+                remainMinutes -= releaseTasks.Sum(f => (int)f.TimeSpent.TotalMinutes);
+            }
+
+            var workTasks = _spreadHelper.SpreadTime(taskCommits, remainMinutes, settings.RoundToMinutes);
+            foreach (var workTask in workTasks)
+            {
+                TaskTimeItem existingItem = workTimeItems.FirstOrDefault(f => f.Branch == workTask.Branch);
+                if (existingItem != null)
+                {
+                    existingItem.MergeWith(workTask);
+                    continue;
+                }
+
+                workTimeItems.Add(workTask);
+            }
+            workTimeItems = workTimeItems.OrderByDescending(f => f.TimeSpent).ToList();
+
+            remainMinutes = minutesPerWorkDay - (int)workTimeItems.Sum(f => f.TimeSpent.TotalMinutes);
             if (remainMinutes != 0)
             {
                 _log.Trace($"Погрешность распределения времени: {remainMinutes}. Добавляю к первой задаче.");
             }
+            if ((workTimeItems.First().TimeSpent.TotalMinutes > Math.Abs(remainMinutes) && remainMinutes < 0) || remainMinutes > 0)
+            {
+                //если переборщили или не достаточно добавили до 8 часов - скореектируем остаток в первой задаче (она самая трудозатратная).
+                workTimeItems.First().TimeSpent += TimeSpan.FromMinutes(remainMinutes);
+            }
 
-            //если переборщили или не достаточно добавили до 8 часов - скореектируем остаток в первой задаче (она самая трудозатратная).
+            PrintTotal(workTimeItems);
-            workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes);
 
-            return workTimeItems;
+            return workTimeItems.OrderByDescending(f => f.TimeSpent).ToList();
         }
 
 
+        private TaskTimeItem GetTimeControlTask(string timeControlTask, int minutes = 30)
+        {
+            //Если указана задача контроля времени - то спишем туда 30 минут и вычеркнем их из общего рабочего времени.
+            if (!string.IsNullOrEmpty(timeControlTask))
+            {
+                return new TaskTimeItem(timeControlTask,
+                    "Ведение учета времени",
+                    "Service",
+                    DateTime.Now,
+                    TimeSpan.FromMinutes(minutes),
+                    1,
+                    1,
+                    "",
+                    CommitType.Task);
+            }
+
+            return null;
+        }
+
+        private void FixTooBigInterval(Settings settings, int workHours, int totalCommitsCount)
+        {
+            //если кол-во коммитов более чем кол-во интервалов - то уменьшим интервал вдвое.
+            while (totalCommitsCount > (workHours * (60.0 / settings.RoundToMinutes)))
+            {
+                settings.RoundToMinutes = (int)RoundTo((decimal)(settings.RoundToMinutes / 2.0), 5);
+                _log.Info($"Слишком много задач - уменьшаю интервал до {settings.RoundToMinutes}.");
+                if (settings.RoundToMinutes == 5)
+                {
+                    break;
+                }
+            }
+        }
+
+        private int GetRandomMinutes(Settings settings)
+        {
+            var rand = new Random();
+            int randomIntervals = settings.RandomWorkMinutes / settings.RoundToMinutes;
+            int randomMinutes = rand.Next(0, randomIntervals + 1) * settings.RoundToMinutes;
+            return randomMinutes;
+        }
+
+        private void PrintTotal(List<TaskTimeItem> workTimeItems)
+        {
+            var totalTime = TimeSpan.Zero;
+            foreach (var workTimeItem in workTimeItems)
+            {
+                totalTime += workTimeItem.TimeSpent;
+            }
+
+            _log.Trace($"Итоговое реально проставляемое время: {totalTime}");
+        }
+
 
         private decimal RoundTo(decimal value, decimal to = 15, bool up = true)
         {

src/JiraTimeBot/TaskTime/TaskTimeSpread.cs

@@ -0,0 +1,68 @@
+using JiraTimeBot.TaskTime.Objects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace JiraTimeBot.TaskTime
+{
+    public interface ITaskTimeSpread
+    {
+        List<TaskTimeItem> SpreadTime(List<TaskTimeItem> source,
+                                      int minutes,
+                                      int roundToMinutes,
+                                      bool roundUp = false,
+                                      bool appendTime = true);
+    }
+    public class TaskTimeSpread : ITaskTimeSpread
+    {
+        public List<TaskTimeItem> SpreadTime(List<TaskTimeItem> source, int minutes, int roundToMinutes, bool roundUp = false, bool appendTime = true)
+        {
+            List<TaskTimeItem> newList = new List<TaskTimeItem>();
+
+            //Нам нужно раскидать 480 минут в день.
+            foreach (var taskGroup in source.GroupBy(f => f.Branch).OrderByDescending(f => f.Count()))
+            {
+                int currentTaskCommits = taskGroup.Count();
+                int currentTaskTime = (int)RoundTo(minutes / source.Count * currentTaskCommits, roundToMinutes, roundUp);
+
+                var orderedTasks = taskGroup.OrderBy(f => f.StartTime).ToArray();
+                StringBuilder sb = new StringBuilder();
+                foreach (var taskDescription in orderedTasks.Select(f => f.Description).Distinct())
+                {
+                    sb.AppendLine($"- {taskDescription}");
+                }
+
+                var timeSpent = appendTime
+                    ? TimeSpan.FromMinutes(taskGroup.Sum(f => f.TimeSpent.TotalMinutes)) +
+                      TimeSpan.FromMinutes(currentTaskTime)
+                    : TimeSpan.FromMinutes(currentTaskTime);
+
+                var taskTimeItem = new TaskTimeItem(
+                    taskGroup.Key,
+                    sb.ToString(),
+                    taskGroup.First().Project,
+                    taskGroup.Min(f => f.StartTime),
+                    timeSpent,
+                    taskGroup.Sum(f => f.Commits),
+                    taskGroup.Sum(f => f.FilesAffected),
+                    taskGroup.First().ReleaseVersion,
+                    taskGroup.First().Type);
+
+                newList.Add(taskTimeItem);
+            }
+
+            return newList;
+        }
+
+        private decimal RoundTo(decimal value, decimal to = 15, bool up = true)
+        {
+            if ((value % to) == 0)
+                return value;
+            if (up)
+                return (value - (value % to) + to);
+
+            return (value - (value % to));
+        }
+    }
+}

src/JiraTimeBot/TasksProcessors/IAllTasksProcessors.cs

@@ -1,4 +1,4 @@
-namespace JiraTimeBotForm.TasksProcessors
+namespace JiraTimeBot.TasksProcessors
 {
     public interface IAllTasksProcessors
     {

src/JiraTimeBot/TasksProcessors/ITasksProcessor.cs

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

src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs

@@ -1,11 +1,12 @@
-using System;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.JiraIntegration;
+using JiraTimeBot.TaskTime.Objects;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using JiraTimeBotForm.Configuration;
+using System.Threading;
-using JiraTimeBotForm.JiraIntegration;
-using JiraTimeBotForm.TaskTime.Objects;
 
-namespace JiraTimeBotForm.TasksProcessors
+namespace JiraTimeBot.TasksProcessors
 {
     public class MeetingProcessor : ITasksProcessor
     {
@@ -18,14 +19,23 @@ namespace JiraTimeBotForm.TasksProcessors
             _jiraApi = jiraApi;
         }
 
-        public void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode)
+        public void Process(DateTime setForDate, DateTime realDate, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default(CancellationToken))
         {
-            _log.Trace($"На реальную дату {date:dd.MM.yyyy} распределение по задачам:");
+            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.OrderByDescending(f => f.Time))
+            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.Time}");
+                _log.Trace($" - [{taskTime.Branch}, коммитов {taskTime.Commits}]: {taskName} - {taskTime.TimeSpent}");
+            }
+
+            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 description = release.First().Description.Replace(Environment.NewLine, "");
+                _log.Trace($" - [Release, задач {release.Count()}]: {description} - {TimeSpan.FromMinutes(sum)}");
             }
         }
     }

src/JiraTimeBot/TasksProcessors/WorkLogTasksProcessor.cs

@@ -1,11 +1,11 @@
-using System;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.JiraIntegration;
+using JiraTimeBot.TaskTime.Objects;
+using System;
 using System.Collections.Generic;
-using JiraTimeBotForm.Configuration;
+using System.Threading;
-using JiraTimeBotForm.JiraIntegration;
-using JiraTimeBotForm.TaskTime;
-using JiraTimeBotForm.TaskTime.Objects;
 
-namespace JiraTimeBotForm.TasksProcessors
+namespace JiraTimeBot.TasksProcessors
 {
     public class WorkLogTasksProcessor : ITasksProcessor
     {
@@ -18,15 +18,15 @@ namespace JiraTimeBotForm.TasksProcessors
             _jiraApi = jiraApi;
         }
 
-        public void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode)
+        public void Process(DateTime setForDate, DateTime realDate, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default(CancellationToken))
         {
-            _log.Trace($"На реальную дату {date:dd.MM.yyyy} распределение по задачам:");
+            _log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам:");
             foreach (var taskTime in taskTimes)
             {
-                _log.Trace($"- {taskTime.Branch} (коммитов {taskTime.Commits}): {taskTime.Time}");
+                _log.Trace($"- {taskTime.Branch} (коммитов {taskTime.Commits}): {taskTime.TimeSpent}");
             }
 
-            _jiraApi.SetTodayWorklog(taskTimes, settings, dummy: dummyMode, addCommentsToWorklog: settings.AddCommentsToWorklog);
+            _jiraApi.SetTodayWorklog(taskTimes, settings, date: setForDate, dummy: dummyMode, addCommentsToWorklog: settings.AddCommentsToWorklog, cancellationToken: cancellationToken);
         }
     }
 }

src/JiraTimeBot/UI/Startup/AutoStartUp.cs

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

src/JiraTimeBot/UI/Tray/ITrayMenu.cs

@@ -1,6 +1,6 @@
 using System.Windows.Forms;
 
-namespace JiraTimeBotForm.UI.Tray
+namespace JiraTimeBot.UI.Tray
 {
     public interface ITrayMenu
     {

src/JiraTimeBot/UI/Tray/RestoreFromTray.cs

@@ -2,15 +2,16 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
-namespace JiraTimeBotForm.UI.Tray
+namespace JiraTimeBot.UI.Tray
 {
-    public static class RestoreFromTray {
+    public static class RestoreFromTray
-        [DllImport( "user32.dll" )]
+    {
-        private static extern int ShowWindow( IntPtr hWnd, uint Msg );
+        [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

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

src/JiraTimeBot/UI/Tray/TrayMenu.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Windows.Forms;
 
-namespace JiraTimeBotForm.UI.Tray
+namespace JiraTimeBot.UI.Tray
 {
-    public class TrayMenu: ITrayMenu
+    public class TrayMenu : ITrayMenu
     {
-        private NotifyIcon  _trayIcon;
+        private NotifyIcon _trayIcon;
 
         public NotifyIcon Create(frmMain form)
         {
@@ -14,8 +14,8 @@ namespace JiraTimeBotForm.UI.Tray
 
             _trayIcon = new NotifyIcon
             {
-                Text = "JiraTimeBot", 
+                Text = "JiraTimeBot",
-                Icon = form.Icon, 
+                Icon = form.Icon,
                 ContextMenu = trayMenu,
                 Visible = false,
                 Tag = form
@@ -43,8 +43,8 @@ namespace JiraTimeBotForm.UI.Tray
 
         private void btnTray_Click(object sender, EventArgs e)
         {
-            var icon = (NotifyIcon) sender;
+            var icon = (NotifyIcon)sender;
-            var form = (frmMain) icon.Tag;
+            var form = (frmMain)icon.Tag;
             form.Visible = true;
             form.Activate();
             form.BringToFront();

src/JiraTimeBot/UI/frmMain.Designer.cs

@@ -1,4 +1,4 @@
-namespace JiraTimeBotForm.UI
+namespace JiraTimeBot.UI
 {
     partial class frmMain
     {
@@ -30,36 +30,25 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
-            this.txtLog = new System.Windows.Forms.TextBox();
-            this.btnStart = new System.Windows.Forms.Button();
             this.ntfyIcon = new System.Windows.Forms.NotifyIcon(this.components);
             this.tmrStart = new System.Windows.Forms.Timer(this.components);
-            this.txtDummyMode = new System.Windows.Forms.CheckBox();
+            this.tmrUpdate = new System.Windows.Forms.Timer(this.components);
-            this.btnMeeting = new System.Windows.Forms.Button();
+            this.tlpControls = new System.Windows.Forms.TableLayoutPanel();
+            this.txtLog = new System.Windows.Forms.TextBox();
+            this.panel2 = new System.Windows.Forms.Panel();
             this.btnCancel = new System.Windows.Forms.Button();
+            this.btnMeeting = new System.Windows.Forms.Button();
+            this.txtDummyMode = new System.Windows.Forms.CheckBox();
+            this.btnStart = new System.Windows.Forms.Button();
+            this.pnlTopControls = new System.Windows.Forms.Panel();
+            this.btnDoForDate = new System.Windows.Forms.Button();
+            this.dteForDay = new System.Windows.Forms.DateTimePicker();
             this.btnSettings = new System.Windows.Forms.Button();
+            this.tlpControls.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.pnlTopControls.SuspendLayout();
             this.SuspendLayout();
             // 
-            // txtLog
-            // 
-            this.txtLog.Location = new System.Drawing.Point(132, 16);
-            this.txtLog.Multiline = true;
-            this.txtLog.Name = "txtLog";
-            this.txtLog.ReadOnly = true;
-            this.txtLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-            this.txtLog.Size = new System.Drawing.Size(596, 294);
-            this.txtLog.TabIndex = 11;
-            // 
-            // btnStart
-            // 
-            this.btnStart.Location = new System.Drawing.Point(12, 229);
-            this.btnStart.Name = "btnStart";
-            this.btnStart.Size = new System.Drawing.Size(114, 23);
-            this.btnStart.TabIndex = 12;
-            this.btnStart.Text = "Проставить время";
-            this.btnStart.UseVisualStyleBackColor = true;
-            this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
-            // 
             // ntfyIcon
             // 
             this.ntfyIcon.Text = "notifyIcon1";
@@ -70,43 +59,133 @@
             this.tmrStart.Interval = 1500;
             this.tmrStart.Tick += new System.EventHandler(this.tmrStart_Tick);
             // 
-            // txtDummyMode
+            // tmrUpdate
             // 
-            this.txtDummyMode.AutoSize = true;
+            this.tmrUpdate.Interval = 1000;
-            this.txtDummyMode.Location = new System.Drawing.Point(12, 206);
+            this.tmrUpdate.Tick += new System.EventHandler(this.tmrUpdate_Tick);
-            this.txtDummyMode.Name = "txtDummyMode";
-            this.txtDummyMode.Size = new System.Drawing.Size(114, 17);
-            this.txtDummyMode.TabIndex = 13;
-            this.txtDummyMode.Text = "Тестовый прогон";
-            this.txtDummyMode.UseVisualStyleBackColor = true;
             // 
-            // btnMeeting
+            // tlpControls
             // 
-            this.btnMeeting.Location = new System.Drawing.Point(12, 258);
+            this.tlpControls.ColumnCount = 2;
-            this.btnMeeting.Name = "btnMeeting";
+            this.tlpControls.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 150F));
-            this.btnMeeting.Size = new System.Drawing.Size(114, 23);
+            this.tlpControls.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.btnMeeting.TabIndex = 14;
+            this.tlpControls.Controls.Add(this.txtLog, 2, 0);
-            this.btnMeeting.Text = "Митинг";
+            this.tlpControls.Controls.Add(this.panel2, 0, 1);
-            this.btnMeeting.UseVisualStyleBackColor = true;
+            this.tlpControls.Controls.Add(this.pnlTopControls, 0, 0);
-            this.btnMeeting.Click += new System.EventHandler(this.btnMeeting_Click);
+            this.tlpControls.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tlpControls.Location = new System.Drawing.Point(0, 0);
+            this.tlpControls.Name = "tlpControls";
+            this.tlpControls.RowCount = 2;
+            this.tlpControls.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tlpControls.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 200F));
+            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
+            // 
+            this.txtLog.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtLog.Location = new System.Drawing.Point(153, 3);
+            this.txtLog.Multiline = true;
+            this.txtLog.Name = "txtLog";
+            this.txtLog.ReadOnly = true;
+            this.tlpControls.SetRowSpan(this.txtLog, 2);
+            this.txtLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            this.txtLog.Size = new System.Drawing.Size(603, 410);
+            this.txtLog.TabIndex = 27;
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.btnCancel);
+            this.panel2.Controls.Add(this.btnMeeting);
+            this.panel2.Controls.Add(this.txtDummyMode);
+            this.panel2.Controls.Add(this.btnStart);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel2.Location = new System.Drawing.Point(3, 288);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(144, 125);
+            this.panel2.TabIndex = 25;
             // 
             // btnCancel
             // 
             this.btnCancel.Enabled = false;
-            this.btnCancel.Location = new System.Drawing.Point(12, 287);
+            this.btnCancel.Location = new System.Drawing.Point(15, 91);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Size = new System.Drawing.Size(114, 23);
-            this.btnCancel.TabIndex = 15;
+            this.btnCancel.TabIndex = 19;
             this.btnCancel.Text = "Отменить операцию";
             this.btnCancel.UseVisualStyleBackColor = true;
             this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
             // 
+            // btnMeeting
+            // 
+            this.btnMeeting.Location = new System.Drawing.Point(15, 62);
+            this.btnMeeting.Name = "btnMeeting";
+            this.btnMeeting.Size = new System.Drawing.Size(114, 23);
+            this.btnMeeting.TabIndex = 18;
+            this.btnMeeting.Text = "Митинг";
+            this.btnMeeting.UseVisualStyleBackColor = true;
+            this.btnMeeting.Click += new System.EventHandler(this.btnMeeting_Click);
+            // 
+            // txtDummyMode
+            // 
+            this.txtDummyMode.AutoSize = true;
+            this.txtDummyMode.Location = new System.Drawing.Point(15, 10);
+            this.txtDummyMode.Name = "txtDummyMode";
+            this.txtDummyMode.Size = new System.Drawing.Size(114, 17);
+            this.txtDummyMode.TabIndex = 17;
+            this.txtDummyMode.Text = "Тестовый прогон";
+            this.txtDummyMode.UseVisualStyleBackColor = true;
+            // 
+            // btnStart
+            // 
+            this.btnStart.Location = new System.Drawing.Point(15, 33);
+            this.btnStart.Name = "btnStart";
+            this.btnStart.Size = new System.Drawing.Size(114, 23);
+            this.btnStart.TabIndex = 16;
+            this.btnStart.Text = "Проставить время";
+            this.btnStart.UseVisualStyleBackColor = true;
+            this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
+            // 
+            // pnlTopControls
+            // 
+            this.pnlTopControls.Controls.Add(this.btnDoForDate);
+            this.pnlTopControls.Controls.Add(this.dteForDay);
+            this.pnlTopControls.Controls.Add(this.btnSettings);
+            this.pnlTopControls.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlTopControls.Location = new System.Drawing.Point(3, 3);
+            this.pnlTopControls.Name = "pnlTopControls";
+            this.pnlTopControls.Size = new System.Drawing.Size(144, 125);
+            this.pnlTopControls.TabIndex = 24;
+            // 
+            // btnDoForDate
+            // 
+            this.btnDoForDate.Location = new System.Drawing.Point(15, 84);
+            this.btnDoForDate.Name = "btnDoForDate";
+            this.btnDoForDate.Size = new System.Drawing.Size(114, 36);
+            this.btnDoForDate.TabIndex = 25;
+            this.btnDoForDate.Text = "Проставить на дату";
+            this.btnDoForDate.UseVisualStyleBackColor = true;
+            this.btnDoForDate.Click += new System.EventHandler(this.btnDoForDate_Click);
+            // 
+            // dteForDay
+            // 
+            this.dteForDay.CustomFormat = "dd.MM.yyyy";
+            this.dteForDay.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+            this.dteForDay.Location = new System.Drawing.Point(15, 57);
+            this.dteForDay.MinDate = new System.DateTime(2019, 1, 1, 0, 0, 0, 0);
+            this.dteForDay.Name = "dteForDay";
+            this.dteForDay.ShowUpDown = true;
+            this.dteForDay.Size = new System.Drawing.Size(114, 20);
+            this.dteForDay.TabIndex = 24;
+            // 
             // btnSettings
             // 
-            this.btnSettings.Location = new System.Drawing.Point(12, 16);
+            this.btnSettings.Location = new System.Drawing.Point(15, 4);
             this.btnSettings.Name = "btnSettings";
             this.btnSettings.Size = new System.Drawing.Size(114, 23);
-            this.btnSettings.TabIndex = 16;
+            this.btnSettings.TabIndex = 23;
             this.btnSettings.Text = "Настройки";
             this.btnSettings.UseVisualStyleBackColor = true;
             this.btnSettings.Click += new System.EventHandler(this.btnSettings_Click);
@@ -115,35 +194,41 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(740, 320);
+            this.ClientSize = new System.Drawing.Size(759, 416);
-            this.Controls.Add(this.btnSettings);
+            this.Controls.Add(this.tlpControls);
-            this.Controls.Add(this.btnCancel);
-            this.Controls.Add(this.btnMeeting);
-            this.Controls.Add(this.txtDummyMode);
-            this.Controls.Add(this.btnStart);
-            this.Controls.Add(this.txtLog);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(2);
+            this.MinimumSize = new System.Drawing.Size(775, 455);
             this.Name = "frmMain";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "Бот логирования времени";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmMain_FormClosing);
             this.Load += new System.EventHandler(this.Form1_Load);
             this.Resize += new System.EventHandler(this.frmMain_Resize);
+            this.tlpControls.ResumeLayout(false);
+            this.tlpControls.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            this.panel2.PerformLayout();
+            this.pnlTopControls.ResumeLayout(false);
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
         #endregion
-        private System.Windows.Forms.TextBox txtLog;
-        private System.Windows.Forms.Button btnStart;
         private System.Windows.Forms.NotifyIcon ntfyIcon;
         private System.Windows.Forms.Timer tmrStart;
-        private System.Windows.Forms.CheckBox txtDummyMode;
+        private System.Windows.Forms.Timer tmrUpdate;
-        private System.Windows.Forms.Button btnMeeting;
+        private System.Windows.Forms.TableLayoutPanel tlpControls;
-        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.Panel pnlTopControls;
+        private System.Windows.Forms.Button btnDoForDate;
+        private System.Windows.Forms.DateTimePicker dteForDay;
         private System.Windows.Forms.Button btnSettings;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.Button btnMeeting;
+        private System.Windows.Forms.CheckBox txtDummyMode;
+        private System.Windows.Forms.Button btnStart;
+        private System.Windows.Forms.TextBox txtLog;
     }
 }
 

src/JiraTimeBot/UI/frmMain.cs

@@ -1,19 +1,20 @@
-using System;
+using Autofac;
+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.Net.Configuration;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using Autofac;
-using JiraTimeBotForm.Configuration;
-using JiraTimeBotForm.DI;
-using JiraTimeBotForm.TasksProcessors;
-using JiraTimeBotForm.UI.Tray;
 
 // This is the code for your desktop app.
 // Press Ctrl+F5 (or go to Debug > Start Without Debugging) to run your app.
 
-namespace JiraTimeBotForm.UI
+namespace JiraTimeBot.UI
 {
     public partial class frmMain : Form
     {
@@ -27,6 +28,19 @@ namespace JiraTimeBotForm.UI
         private Settings _settings;
         private readonly Action _settingsWindowShow;
         private readonly Action<string> _settingsErrorReporter;
+        private bool _updateChecked;
+
+        protected override void WndProc(ref Message message)
+        {
+            if (message.Msg == SingleInstance.WM_SHOWFIRSTINSTANCE)
+            {
+                this.Show();
+                this.WindowState = FormWindowState.Normal;
+                _trayIcon.Hide();
+            }
+
+            base.WndProc(ref message);
+        }
 
         private CancellationTokenSource GetTokenSource()
         {
@@ -52,15 +66,16 @@ namespace JiraTimeBotForm.UI
             _log = _container.Resolve<ILog>();
             _tasksProcessors = _container.Resolve<IAllTasksProcessors>();
 
-            _controls = new Control[] { txtDummyMode, btnStart, btnMeeting, btnSettings };
+            _controls = new Control[] {txtDummyMode, btnStart, btnMeeting, btnSettings, dteForDay, btnDoForDate};
 
             _settingsWindowShow = () =>
             {
-                var frmSettings = new frmSettings();
+                var frmSettings = new frmSettings(_container.Resolve<AutoStartUp>());
                 frmSettings.ShowDialog(this);
             };
-
+            _settingsErrorReporter = msg =>
-            _settingsErrorReporter = msg => MessageBox.Show(msg, "Загрузка настроек", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);;
+                MessageBox.Show(msg, "Загрузка настроек", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            ;
         }
 
         private void frmMain_FormClosing(object sender, FormClosingEventArgs e)
@@ -71,7 +86,7 @@ namespace JiraTimeBotForm.UI
         public Settings ReadSettingsAndLock()
         {
             _settings = Settings.LoadAndCheck(_settingsWindowShow, _settingsErrorReporter);
-            
+
             LockUnlock(false);
 
             return _settings;
@@ -90,14 +105,27 @@ namespace JiraTimeBotForm.UI
 
         private void Form1_Load(object sender, EventArgs e)
         {
+            this.Text = this.Text + " v" + Application.ProductVersion;
+
             PrintStartMessage();
             tmrStart.Enabled = true;
+
+            if (System.Diagnostics.Debugger.IsAttached)
+            {
+                _log.Trace("Приложение запущено в режиме отладки. Отключаю обновление.");
+                //tmrUpdate.Enabled = true;
+            }
+            else
+            {
+                tmrUpdate.Enabled = true;
+            }
         }
 
         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)
@@ -106,7 +134,8 @@ namespace JiraTimeBotForm.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);
@@ -147,11 +176,13 @@ namespace JiraTimeBotForm.UI
                 if (txtDummyMode.Checked)
                 {
                     _log.Info("Выключаем режим Тестового прогона");
+                    txtDummyMode.Checked = false;
                 }
 
                 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);
@@ -164,12 +195,13 @@ namespace JiraTimeBotForm.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);
         }
-        
+
         private void btnCancel_Click(object sender, EventArgs e)
         {
             _tokenSource.Cancel();
@@ -177,10 +209,57 @@ namespace JiraTimeBotForm.UI
 
         private void btnSettings_Click(object sender, EventArgs e)
         {
-            var frm = new frmSettings();
+            var frm = _container.Resolve<frmSettings>();
             frm.ShowDialog();
 
             PrintStartMessage();
         }
+
+        private void tmrUpdate_Tick(object sender, EventArgs e)
+        {
+            try
+            {
+                var firstTime = !_updateChecked;
+                _updateChecked = true;
+                tmrUpdate.Interval = 1 * 60 * 60 * 1000;
+
+                var updater = _container.Resolve<IUpdater>();
+                if (updater.UpdateToNewVersion(firstTime))
+                {
+                    //если обновились - отключаем до рестарта
+                    tmrUpdate.Enabled = false;
+                    var result = MessageBox.Show($"Приложение обновлено до новой версии. Перезапустить сейчас?",
+                        "Обновление",
+                        MessageBoxButtons.YesNo,
+                        MessageBoxIcon.Warning);
+                    if (result == DialogResult.Yes)
+                    {
+                        updater.SelfRestart();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                //в процессе обновления ни при каком раскладе мы не должны уложить бота. 
+                _log.Error($"Фатальная ошибка в процессе обновления: {ex.Message}");
+            }
+        }
+
+        private async void btnDoForDate_Click(object sender, EventArgs e)
+        {
+            var settings = ReadSettingsAndLock();
+
+            using (_tokenSource = GetTokenSource())
+            {
+                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/frmMain.resx

@@ -123,6 +123,9 @@
   <metadata name="tmrStart.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>113, 17</value>
   </metadata>
+  <metadata name="tmrUpdate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>209, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

src/JiraTimeBot/UI/frmSettings.Designer.cs

@@ -1,4 +1,4 @@
-namespace JiraTimeBotForm.UI
+namespace JiraTimeBot.UI
 {
     partial class frmSettings
     {
@@ -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();
@@ -46,12 +44,24 @@
             this.label6 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
             this.txtJQL = new System.Windows.Forms.TextBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.txtTimeControlTask = new System.Windows.Forms.TextBox();
+            this.chkAutostart = new System.Windows.Forms.CheckBox();
+            this.lblWorkDay = new System.Windows.Forms.Label();
+            this.txtWorkDayDuration = new System.Windows.Forms.TextBox();
+            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.SuspendLayout();
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(7, 153);
+            this.label5.Location = new System.Drawing.Point(33, 175);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(100, 13);
             this.label5.TabIndex = 28;
@@ -59,40 +69,25 @@
             // 
             // txtRoundTo
             // 
-            this.txtRoundTo.Location = new System.Drawing.Point(109, 150);
+            this.txtRoundTo.Location = new System.Drawing.Point(133, 169);
             this.txtRoundTo.Name = "txtRoundTo";
             this.txtRoundTo.Size = new System.Drawing.Size(100, 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(27, 48);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(76, 13);
-            this.label4.TabIndex = 26;
-            this.label4.Text = "Путь до репо:";
-            // 
-            // txtRepoPath
-            // 
-            this.txtRepoPath.Location = new System.Drawing.Point(109, 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(21, 127);
+            this.label2.Location = new System.Drawing.Point(47, 149);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(82, 13);
             this.label2.TabIndex = 24;
             this.label2.Text = "Mercurial name:";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.TopRight;
             // 
             // txtMercurialEmail
             // 
-            this.txtMercurialEmail.Location = new System.Drawing.Point(109, 124);
+            this.txtMercurialEmail.Location = new System.Drawing.Point(133, 146);
             this.txtMercurialEmail.Name = "txtMercurialEmail";
             this.txtMercurialEmail.Size = new System.Drawing.Size(100, 20);
             this.txtMercurialEmail.TabIndex = 23;
@@ -100,7 +95,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(36, 100);
+            this.label1.Location = new System.Drawing.Point(62, 122);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(71, 13);
             this.label1.TabIndex = 22;
@@ -108,7 +103,7 @@
             // 
             // txtJiraPassword
             // 
-            this.txtJiraPassword.Location = new System.Drawing.Point(109, 97);
+            this.txtJiraPassword.Location = new System.Drawing.Point(133, 119);
             this.txtJiraPassword.Name = "txtJiraPassword";
             this.txtJiraPassword.PasswordChar = '*';
             this.txtJiraPassword.Size = new System.Drawing.Size(100, 20);
@@ -117,7 +112,7 @@
             // lbl1
             // 
             this.lbl1.AutoSize = true;
-            this.lbl1.Location = new System.Drawing.Point(43, 74);
+            this.lbl1.Location = new System.Drawing.Point(69, 96);
             this.lbl1.Name = "lbl1";
             this.lbl1.Size = new System.Drawing.Size(64, 13);
             this.lbl1.TabIndex = 20;
@@ -125,7 +120,7 @@
             // 
             // txtJiraLogin
             // 
-            this.txtJiraLogin.Location = new System.Drawing.Point(109, 71);
+            this.txtJiraLogin.Location = new System.Drawing.Point(133, 93);
             this.txtJiraLogin.Name = "txtJiraLogin";
             this.txtJiraLogin.Size = new System.Drawing.Size(100, 20);
             this.txtJiraLogin.TabIndex = 19;
@@ -133,7 +128,7 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(16, 206);
+            this.label3.Location = new System.Drawing.Point(41, 254);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(91, 13);
             this.label3.TabIndex = 30;
@@ -142,7 +137,7 @@
             // actTime
             // 
             this.actTime.Format = System.Windows.Forms.DateTimePickerFormat.Time;
-            this.actTime.Location = new System.Drawing.Point(109, 202);
+            this.actTime.Location = new System.Drawing.Point(133, 250);
             this.actTime.Name = "actTime";
             this.actTime.Size = new System.Drawing.Size(100, 20);
             this.actTime.TabIndex = 29;
@@ -150,7 +145,7 @@
             // chkAddComments
             // 
             this.chkAddComments.AutoSize = true;
-            this.chkAddComments.Location = new System.Drawing.Point(46, 242);
+            this.chkAddComments.Location = new System.Drawing.Point(65, 366);
             this.chkAddComments.Name = "chkAddComments";
             this.chkAddComments.Size = new System.Drawing.Size(133, 17);
             this.chkAddComments.TabIndex = 31;
@@ -159,7 +154,7 @@
             // 
             // btnSave
             // 
-            this.btnSave.Location = new System.Drawing.Point(61, 276);
+            this.btnSave.Location = new System.Drawing.Point(86, 412);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(75, 23);
             this.btnSave.TabIndex = 32;
@@ -173,8 +168,9 @@
             this.cboWorkType.FormattingEnabled = true;
             this.cboWorkType.Items.AddRange(new object[] {
             "Mercurial",
-            "Jira"});
+            "Jira",
-            this.cboWorkType.Location = new System.Drawing.Point(109, 18);
+            "Git"});
+            this.cboWorkType.Location = new System.Drawing.Point(133, 18);
             this.cboWorkType.Name = "cboWorkType";
             this.cboWorkType.Size = new System.Drawing.Size(99, 21);
             this.cboWorkType.TabIndex = 34;
@@ -183,7 +179,7 @@
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(18, 21);
+            this.label6.Location = new System.Drawing.Point(44, 21);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(85, 13);
             this.label6.TabIndex = 35;
@@ -192,7 +188,7 @@
             // label7
             // 
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(74, 179);
+            this.label7.Location = new System.Drawing.Point(100, 201);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(29, 13);
             this.label7.TabIndex = 37;
@@ -200,16 +196,128 @@
             // 
             // txtJQL
             // 
-            this.txtJQL.Location = new System.Drawing.Point(109, 176);
+            this.txtJQL.Location = new System.Drawing.Point(133, 198);
             this.txtJQL.Name = "txtJQL";
             this.txtJQL.Size = new System.Drawing.Size(99, 20);
             this.txtJQL.TabIndex = 36;
             // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(-2, 228);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(133, 13);
+            this.label8.TabIndex = 39;
+            this.label8.Text = "Задача \"учёта времени\":";
+            // 
+            // txtTimeControlTask
+            // 
+            this.txtTimeControlTask.Location = new System.Drawing.Point(133, 224);
+            this.txtTimeControlTask.Name = "txtTimeControlTask";
+            this.txtTimeControlTask.Size = new System.Drawing.Size(99, 20);
+            this.txtTimeControlTask.TabIndex = 38;
+            // 
+            // chkAutostart
+            // 
+            this.chkAutostart.AutoSize = true;
+            this.chkAutostart.Location = new System.Drawing.Point(65, 343);
+            this.chkAutostart.Name = "chkAutostart";
+            this.chkAutostart.Size = new System.Drawing.Size(96, 17);
+            this.chkAutostart.TabIndex = 40;
+            this.chkAutostart.Text = "Автозагрузка";
+            this.chkAutostart.UseVisualStyleBackColor = true;
+            // 
+            // lblWorkDay
+            // 
+            this.lblWorkDay.AutoSize = true;
+            this.lblWorkDay.Location = new System.Drawing.Point(15, 280);
+            this.lblWorkDay.Name = "lblWorkDay";
+            this.lblWorkDay.Size = new System.Drawing.Size(117, 13);
+            this.lblWorkDay.TabIndex = 42;
+            this.lblWorkDay.Text = "Минут в рабочем дне:";
+            // 
+            // txtWorkDayDuration
+            // 
+            this.txtWorkDayDuration.Location = new System.Drawing.Point(133, 276);
+            this.txtWorkDayDuration.Name = "txtWorkDayDuration";
+            this.txtWorkDayDuration.Size = new System.Drawing.Size(99, 20);
+            this.txtWorkDayDuration.TabIndex = 41;
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(30, 306);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(101, 13);
+            this.label9.TabIndex = 44;
+            this.label9.Text = "Рандомных минут:";
+            // 
+            // txtRandomMinutes
+            // 
+            this.txtRandomMinutes.Location = new System.Drawing.Point(133, 302);
+            this.txtRandomMinutes.Name = "txtRandomMinutes";
+            this.txtRandomMinutes.Size = new System.Drawing.Size(99, 20);
+            this.txtRandomMinutes.TabIndex = 43;
+            // 
+            // chkPullBeforeProcess
+            // 
+            this.chkPullBeforeProcess.AutoSize = true;
+            this.chkPullBeforeProcess.Location = new System.Drawing.Point(65, 389);
+            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(133, 45);
+            this.txtRepoPath.Name = "txtRepoPath";
+            this.txtRepoPath.Size = new System.Drawing.Size(100, 20);
+            this.txtRepoPath.TabIndex = 25;
+            // 
+            // 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;
+            // 
+            // lblJiraUrl
+            // 
+            this.lblJiraUrl.AutoSize = true;
+            this.lblJiraUrl.Location = new System.Drawing.Point(53, 72);
+            this.lblJiraUrl.Name = "lblJiraUrl";
+            this.lblJiraUrl.Size = new System.Drawing.Size(76, 13);
+            this.lblJiraUrl.TabIndex = 47;
+            this.lblJiraUrl.Text = "Путь до репо:";
+            this.lblJiraUrl.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            // 
+            // txtJiraUrl
+            // 
+            this.txtJiraUrl.Location = new System.Drawing.Point(133, 69);
+            this.txtJiraUrl.Name = "txtJiraUrl";
+            this.txtJiraUrl.Size = new System.Drawing.Size(100, 20);
+            this.txtJiraUrl.TabIndex = 46;
+            // 
             // frmSettings
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(220, 311);
+            this.ClientSize = new System.Drawing.Size(243, 442);
+            this.Controls.Add(this.lblJiraUrl);
+            this.Controls.Add(this.txtJiraUrl);
+            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);
@@ -243,8 +351,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;
@@ -259,5 +365,17 @@
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.Label label7;
         private System.Windows.Forms.TextBox txtJQL;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.TextBox txtTimeControlTask;
+        private System.Windows.Forms.CheckBox chkAutostart;
+        private System.Windows.Forms.Label lblWorkDay;
+        private System.Windows.Forms.TextBox txtWorkDayDuration;
+        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;
     }
 }

src/JiraTimeBot/UI/frmSettings.cs

@@ -1,13 +1,17 @@
-using System;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.UI.Startup;
+using System;
 using System.Windows.Forms;
-using JiraTimeBotForm.Configuration;
 
-namespace JiraTimeBotForm.UI
+namespace JiraTimeBot.UI
 {
     public partial class frmSettings : Form
     {
-        public frmSettings()
+        private readonly AutoStartUp _autoStart;
+
+        public frmSettings(AutoStartUp autoStart)
         {
+            _autoStart = autoStart;
             InitializeComponent();
         }
 
@@ -18,21 +22,28 @@ namespace JiraTimeBotForm.UI
             {
                 SetSettings(settings);
             }
+
+            chkAutostart.Checked = _autoStart.Get();
         }
 
         private void SetSettings(Settings settings)
         {
+            txtJiraUrl.Text = settings.JiraUrl;
             txtJiraLogin.Text = settings.JiraUserName;
             txtJiraPassword.Text = settings.JiraPassword;
             txtMercurialEmail.Text = settings.MercurialAuthorEmail;
             txtRepoPath.Text = settings.RepositoryPath;
             actTime.Text = settings.ActivationTime.ToString("hh\\:mm\\:ss");
-            //txtDummyMode.Checked = settings.DummyMode;
             chkAddComments.Checked = settings.AddCommentsToWorklog;
-            txtRoundTo.Text = settings.RountToMinutes.ToString();
+            txtRoundTo.Text = settings.RoundToMinutes.ToString();
-            cboWorkType.SelectedIndex = (int) settings.WorkType;
+            cboWorkType.SelectedIndex = (int)settings.WorkType;
+            txtTimeControlTask.Text = settings.TimeControlTask;
             txtJQL.Text = settings.JiraQuery;
-            txtJQL.Enabled = settings.WorkType == WorkType.JiraLogs;
+            txtWorkDayDuration.Text = settings.MinuterPerWorkDay.ToString();
+            txtRandomMinutes.Text = settings.RandomWorkMinutes.ToString();
+            chkPullBeforeProcess.Checked = settings.PullBeforeProcess;
+
+            cboWorkType_SelectedIndexChanged(null, null);
         }
 
         public Settings ReadSettingsAndLock()
@@ -41,21 +52,33 @@ namespace JiraTimeBotForm.UI
             {
                 roundTo = 15;
             }
+            if (!int.TryParse(txtWorkDayDuration.Text, out var minuterPerWorkDay))
+            {
+                minuterPerWorkDay = 8 * 60;
+            }
+            if (!int.TryParse(txtRandomMinutes.Text, out var randomWorkMinutes))
+            {
+                randomWorkMinutes = 0;
+            }
 
             var settings = new Settings
             {
+                JiraUrl = txtJiraUrl.Text,
                 JiraUserName = txtJiraLogin.Text,
                 JiraPassword = txtJiraPassword.Text,
                 MercurialAuthorEmail = txtMercurialEmail.Text,
                 ActivationTime = TimeSpan.Parse(actTime.Text),
                 RepositoryPath = txtRepoPath.Text,
-                //DummyMode = txtDummyMode.Checked,
                 AddCommentsToWorklog = chkAddComments.Checked,
-                RountToMinutes = roundTo,
+                RoundToMinutes = roundTo,
-                WorkType = (WorkType) cboWorkType.SelectedIndex,
+                WorkType = (WorkType)cboWorkType.SelectedIndex,
                 JiraQuery = txtJQL.Text,
+                TimeControlTask = txtTimeControlTask.Text,
+                MinuterPerWorkDay = minuterPerWorkDay,
+                RandomWorkMinutes = randomWorkMinutes,
+                PullBeforeProcess = chkPullBeforeProcess.Checked
             };
-            
+
             //LockUnlock(false);
 
             return settings;
@@ -65,6 +88,7 @@ namespace JiraTimeBotForm.UI
         {
             var settings = ReadSettingsAndLock();
             settings.Save();
+            _autoStart.Set(chkAutostart.Checked);
 
             MessageBox.Show("Настройки сохранены.");
 
@@ -80,6 +104,7 @@ namespace JiraTimeBotForm.UI
         private void cboWorkType_SelectedIndexChanged(object sender, EventArgs e)
         {
             txtJQL.Enabled = (cboWorkType.SelectedIndex == 1);
+            txtRepoPath.Enabled = (cboWorkType.SelectedIndex == 0 || cboWorkType.SelectedIndex == 2);
         }
     }
 }

src/JiraTimeBot/UI/frmSettings.resx

@@ -117,7 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="cboWorkType.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

src/JiraTimeBot/Update/GitHubDataObjects.cs

@@ -0,0 +1,161 @@
+using Newtonsoft.Json;
+using System;
+
+namespace JiraTimeBot.Update
+{
+    public partial class GitHubReleaseResponse
+    {
+        [JsonProperty("url")]
+        public Uri Url { get; set; }
+
+        [JsonProperty("assets_url")]
+        public Uri AssetsUrl { get; set; }
+
+        [JsonProperty("upload_url")]
+        public string UploadUrl { get; set; }
+
+        [JsonProperty("html_url")]
+        public Uri HtmlUrl { get; set; }
+
+        [JsonProperty("id")]
+        public long Id { get; set; }
+
+        [JsonProperty("node_id")]
+        public string NodeId { get; set; }
+
+        [JsonProperty("tag_name")]
+        public string TagName { get; set; }
+
+        [JsonProperty("target_commitish")]
+        public string TargetCommitish { get; set; }
+
+        [JsonProperty("name")]
+        public object Name { get; set; }
+
+        [JsonProperty("draft")]
+        public bool Draft { get; set; }
+
+        [JsonProperty("author")]
+        public Author Author { get; set; }
+
+        [JsonProperty("prerelease")]
+        public bool Prerelease { get; set; }
+
+        [JsonProperty("created_at")]
+        public DateTimeOffset CreatedAt { get; set; }
+
+        [JsonProperty("published_at")]
+        public DateTimeOffset PublishedAt { get; set; }
+
+        [JsonProperty("assets")]
+        public Asset[] Assets { get; set; }
+
+        [JsonProperty("tarball_url")]
+        public Uri TarballUrl { get; set; }
+
+        [JsonProperty("zipball_url")]
+        public Uri ZipballUrl { get; set; }
+
+        [JsonProperty("body")]
+        public object Body { get; set; }
+    }
+
+    public partial class Asset
+    {
+        [JsonProperty("url")]
+        public Uri Url { get; set; }
+
+        [JsonProperty("id")]
+        public long Id { get; set; }
+
+        [JsonProperty("node_id")]
+        public string NodeId { get; set; }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("label")]
+        public string Label { get; set; }
+
+        [JsonProperty("uploader")]
+        public Author Uploader { get; set; }
+
+        [JsonProperty("content_type")]
+        public string ContentType { get; set; }
+
+        [JsonProperty("state")]
+        public string State { get; set; }
+
+        [JsonProperty("size")]
+        public long Size { get; set; }
+
+        [JsonProperty("download_count")]
+        public long DownloadCount { get; set; }
+
+        [JsonProperty("created_at")]
+        public DateTimeOffset CreatedAt { get; set; }
+
+        [JsonProperty("updated_at")]
+        public DateTimeOffset UpdatedAt { get; set; }
+
+        [JsonProperty("browser_download_url")]
+        public Uri BrowserDownloadUrl { get; set; }
+    }
+
+    public partial class Author
+    {
+        [JsonProperty("login")]
+        public string Login { get; set; }
+
+        [JsonProperty("id")]
+        public long Id { get; set; }
+
+        [JsonProperty("node_id")]
+        public string NodeId { get; set; }
+
+        [JsonProperty("avatar_url")]
+        public Uri AvatarUrl { get; set; }
+
+        [JsonProperty("gravatar_id")]
+        public string GravatarId { get; set; }
+
+        [JsonProperty("url")]
+        public Uri Url { get; set; }
+
+        [JsonProperty("html_url")]
+        public Uri HtmlUrl { get; set; }
+
+        [JsonProperty("followers_url")]
+        public Uri FollowersUrl { get; set; }
+
+        [JsonProperty("following_url")]
+        public string FollowingUrl { get; set; }
+
+        [JsonProperty("gists_url")]
+        public string GistsUrl { get; set; }
+
+        [JsonProperty("starred_url")]
+        public string StarredUrl { get; set; }
+
+        [JsonProperty("subscriptions_url")]
+        public Uri SubscriptionsUrl { get; set; }
+
+        [JsonProperty("organizations_url")]
+        public Uri OrganizationsUrl { get; set; }
+
+        [JsonProperty("repos_url")]
+        public Uri ReposUrl { get; set; }
+
+        [JsonProperty("events_url")]
+        public string EventsUrl { get; set; }
+
+        [JsonProperty("received_events_url")]
+        public Uri ReceivedEventsUrl { get; set; }
+
+        [JsonProperty("type")]
+        public string Type { get; set; }
+
+        [JsonProperty("site_admin")]
+        public bool SiteAdmin { get; set; }
+    }
+}

src/JiraTimeBot/Update/IUpdater.cs

@@ -0,0 +1,8 @@
+namespace JiraTimeBot.Update
+{
+    internal interface IUpdater
+    {
+        bool UpdateToNewVersion(bool firstTime);
+        void SelfRestart();
+    }
+}

src/JiraTimeBot/Update/Updater.cs

@@ -0,0 +1,203 @@
+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;
+
+namespace JiraTimeBot.Update
+{
+    public class Updater : IUpdater
+    {
+        private readonly ILog _log;
+        private double _downloadPercent = 0;
+
+        public Updater(ILog log)
+        {
+            _log = log;
+        }
+
+        private const string GithubUser = "monster1025";
+        private const string GithubRepo = "JiraTimeBot";
+
+        public string GetLatestVersion(GitHubReleaseResponse release)
+        {
+            var version = release?.TagName?.TrimStart('v');
+            return version;
+        }
+
+        public string GetDownloadUrl(GitHubReleaseResponse release)
+        {
+            var downloadUrl = release?.Assets?.FirstOrDefault()?.BrowserDownloadUrl?.ToString();
+            return downloadUrl ?? "";
+        }
+
+        public GitHubReleaseResponse GetRelease()
+        {
+            var latestReleasePage = Get($"https://api.github.com/repos/{GithubUser}/{GithubRepo}/releases/latest");
+            if (string.IsNullOrEmpty(latestReleasePage))
+            {
+                return null;
+            }
+
+            var release = JsonConvert.DeserializeObject<GitHubReleaseResponse>(latestReleasePage);
+            return release;
+        }
+
+        public bool UpdateToNewVersion(bool firstTime)
+        {
+            var release = GetRelease();
+            if (release == null)
+            {
+                return false;
+            }
+
+            var gitVersionStr = GetLatestVersion(release);
+            var gitVersion = new Version(gitVersionStr);
+            var appVersion = new Version(Application.ProductVersion);
+
+            if (gitVersion > appVersion)
+            {
+                var downloadUrl = GetDownloadUrl(release);
+                _log.Info($"Доступна новая версия: {gitVersion} {downloadUrl}");
+
+                var success = DownloadFile(downloadUrl, "update.zip");
+                if (!success)
+                {
+                    return false;
+                }
+
+                var result = InstallUpdate(gitVersion, "update.zip");
+                if (result)
+                {
+                    return true;
+                }
+
+                return false;
+            }
+
+            if (firstTime)
+            {
+                _log.Info($"Вы используете актуальную версию.");
+            }
+
+            return false;
+        }
+
+        public bool InstallUpdate(Version gitVersion, string updateFile)
+        {
+            try
+            {
+                _log.Info($"Устанавливаю обновление до версии {gitVersion}.");
+
+                var appFile = new FileInfo(System.Reflection.Assembly.GetExecutingAssembly().Location);
+                var bkpDir = Path.Combine(appFile.DirectoryName, "bkp");
+
+                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")))
+                {
+                    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)))
+                {
+                    archive.ExtractToDirectory(appFile.DirectoryName);
+                }
+
+                _log.Info("Обновление установлено. Перезапустите программу для применения изменений.");
+                return true;
+            }
+            catch (Exception ex)
+            {
+                _log.Error($"Что-то пошло не так при обновлении {ex.Message}: {ex.StackTrace}.");
+                return false;
+            }
+        }
+
+        public void SelfRestart()
+        {
+            var name = Application.ExecutablePath;
+            ProcessStartInfo startInfo = new ProcessStartInfo
+            {
+                Arguments = "/C choice /C Y /N /D Y /T 1 & \"" + name + "\"",
+                WindowStyle = ProcessWindowStyle.Hidden,
+                CreateNoWindow = true,
+                FileName = "cmd.exe"
+            };
+            Process.Start(startInfo);
+            Application.Exit();
+        }
+
+
+        private bool DownloadFile(string url, string to)
+        {
+            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.DownloadProgressChanged += ClientOnDownloadProgressChanged;
+                    client.DownloadFileAsync(new Uri(url), to);
+                    
+                    while (client.IsBusy) { Application.DoEvents(); }
+                    
+                    return true;
+                }
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+        }
+
+        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);
+                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 (Stream stream = response.GetResponseStream())
+                using (StreamReader reader = new StreamReader(stream))
+                {
+                    return reader.ReadToEnd();
+                }
+            }
+            catch (Exception)
+            {
+                return "";
+            }
+        }
+    }
+}

src/JiraTimeBot/packages.config

@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Atlassian.SDK" version="10.4.0" targetFramework="net461" />
+  <package id="Atlassian.SDK" version="12.1.1" targetFramework="net461" />
-  <package id="Autofac" version="4.9.1" targetFramework="net461" />
+  <package id="Autofac" version="5.1.2" targetFramework="net461" />
-  <package id="Autofac.Extras.AggregateService" version="4.1.0" targetFramework="net461" />
+  <package id="Autofac.Extras.AggregateService" version="5.0.0" targetFramework="net461" />
-  <package id="Castle.Core" version="4.0.0" targetFramework="net461" />
+  <package id="Castle.Core" version="4.4.0" 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="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net461" />
-  <package id="NLog" version="4.5.11" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
-  <package id="RestSharp" version="106.6.9" 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="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net461" />
 </packages>

tools/SetVersion.cmd

@@ -0,0 +1,47 @@
+@echo off
+setlocal enabledelayedexpansion
+
+if [%1] == [] GOTO :USAGE
+set version=%1
+set fileversion=%1
+set informationalversion=%1
+
+if [%2] NEQ [] SET fileversion=%2
+if [%3] NEQ [] SET informationalversion=%3
+
+echo Setting assembly version information
+
+for /F "delims=" %%f in ('dir /s /b Assemblyinfo.cs') do (
+    echo ^> %%f
+
+    pushd %%~dpf
+
+    for /F "usebackq delims=" %%g in ("AssemblyInfo.cs") do (
+        set ln=%%g
+        set skip=0
+
+        if "!ln:AssemblyVersion=!" NEQ "!ln!" set skip=1
+        if "!ln:AssemblyFileVersion=!" NEQ "!ln!" set skip=1
+        if "!ln:AssemblyInformationalVersion=!" NEQ "!ln!" set skip=1
+
+        if !skip!==0 echo !ln! >> AssemblyInfo.cs.versioned
+    )
+
+    echo [assembly: AssemblyVersion^("%version%"^)] >> AssemblyInfo.cs.versioned
+    echo [assembly: AssemblyFileVersion^("%fileversion%"^)] >> AssemblyInfo.cs.versioned
+    echo [assembly: AssemblyInformationalVersion^("%informationalversion%"^)] >> AssemblyInfo.cs.versioned
+
+    copy /y AssemblyInfo.cs AssemblyInfo.cs.orig
+    move /y AssemblyInfo.cs.versioned AssemblyInfo.cs
+
+    popd
+)
+echo Done^^!
+
+GOTO:EOF
+
+:USAGE
+echo Usage:
+echo.
+echo SetVersion.bat Version [FileVersion] [InformationalVersion]
+echo.