Исправление падения git-а

Fix branch and issue detection

.semver.txt

@@ -1 +1 @@
-1.0.42
+1.0.93

README.md

@@ -1,5 +1,5 @@
-# JiraTimeBot [![Build status](https://ci.appveyor.com/api/projects/status/anmhfvuj4oq84j1f?svg=true)](https://ci.appveyor.com/project/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.
 
 # Ограничения
  - Предполагается что все Ваши репозитории находятся в одной папке (к которой вы указываете путь в настройках).
@@ -8,16 +8,22 @@
 # Настройки
  - Режим работы:
    - Mercurial - по коммитам в Mercurial, можем определять множественные коммиты в одну задачу (ветку) и пропорционально списывать время.
+   - Git - по коммитам в Git.
    - Jira - выполняем JQL и равномерно распределяем время.
- - Путь до репо (Режим Mercurial) - путь до папки, в которую клонируются исходники.
+ - Путь до репо (Режим Mercurial, Git) - путь до папки, в которую клонируются исходники.
+ - Jira URL - адрес Jira-сервреа.
  - Логин Jira - Логин в Jira (от этого пользователя будем выполнять запросы и вносить время).
- - Пароль Jira - шифруется через DPAPI.
+ - Пароль Jira - шифруется через DPAPI (может быть JSessionID - если длинна = 32 (!)).
  - 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 минут в день на "затраты на учет времени". Должна содержать знак '-'.
  - Время запуска - время автоматического запуска бота. Если была установлена галочка "тестовый прогон" - она будет снята.
- - Добавлять описание (Режим Mercurial) - добавлять ли в описание CommitMessage, если не установлено - добавляются стандартные фразы программистов (типа "написание кода").
+ - Минут в рабочем дне - количество распределяемых минут (оыбчно 8 * 60).
-
+ - Рандомных минут - если > 0, то будет прибавлено рандомное количество минут к рабочему времени (но кратное значению округления).
+ - Добавлять описание (Режим Mercurial) - добавлять ли в описание CommitMessage, если не установлено - описание не заполняются.
+ - Автозагрузка - загружать ли программу при старте ОС.
+ - Делать pull (Режим Mercurial) - делать ли hg pull перед началом обработки (полезно, если изменения делаются Вами не только на текущем ПК).
+ 
 # Скачать
 Скачать актуальную версию можно тут: https://github.com/monster1025/JiraTimeBot/releases/latest

src/JiraTimeBot.Core/Configuration/ISettingsManager.cs

@@ -1,13 +0,0 @@
-using System;
-
-namespace JiraTimeBot.Core.Configuration
-{
-    public interface ISettingsManager
-    {
-        Settings Load();
-        Settings LoadAndCheck(Action settingsSource, Action<string> errorMessageReporter);
-
-        void Save(Settings settings);
-        bool SettingsIsValid(Settings settings, out string message);
-    }
-}

src/JiraTimeBot.Core/Configuration/Settings.cs

@@ -1,31 +0,0 @@
-using System;
-
-namespace JiraTimeBot.Core.Configuration
-{
-    public class Settings
-    {
-        public string JiraUrl = "https://myteam.aeroclub.ru";
-
-        public int MinuterPerWorkDay = 8 * 60;
-        
-        public TimeSpan ActivationTime { get; set; }
-        
-        public bool AddCommentsToWorklog { get; set; }
-        
-        public string JiraPassword { get; set; }
-        
-        public string JiraQuery { get; set; }
-        
-        public string JiraUserName { get; set; }
-        
-        public string MercurialAuthorEmail { get; set; }
-        
-        public string RepositoryPath { get; set; }
-        
-        public int RoundToMinutes { get; set; }
-        
-        public string TimeControlTask { get; set; }
-        
-        public WorkType WorkType { get; set; }
-    }
-}

src/JiraTimeBot.Core/Configuration/WorkType.cs

@@ -1,8 +0,0 @@
-namespace JiraTimeBot.Core.Configuration
-{
-    public enum WorkType
-    {
-        Mercurial = 0,
-        JiraLogs = 1,
-    }
-}

src/JiraTimeBot.Core/ILog.cs

@@ -1,12 +0,0 @@
-using System.ComponentModel;
-
-namespace JiraTimeBot.Core
-{
-    public interface ILog
-    {
-        void Info([Localizable(false)] string message);
-        void Trace([Localizable(false)] string message);
-        void Warn([Localizable(false)] string message);
-        void Error([Localizable(false)] string message);
-    }
-}

src/JiraTimeBot.Core/JiraIntegration/Comments/JiraDescriptionSource.cs

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

src/JiraTimeBot.Core/JiraIntegration/JiraCommitEmulator.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using Atlassian.Jira;
-using JiraTimeBot.Core.Configuration;
-using JiraTimeBot.Core.Mercurial;
-using JiraTimeBot.Core.Mercurial.Objects;
-
-namespace JiraTimeBot.Core.JiraIntegration
-{
-    public class JiraCommitEmulator : IMercurialLog
-    {
-        private readonly ILog _log;
-        private readonly JiraApi _jiraApi;
-
-        public JiraCommitEmulator(ILog log, JiraApi jiraApi)
-        {
-            _log = log;
-            _jiraApi = jiraApi;
-        }
-
-        public List<MercurialCommitItem> GetMercurialLog(Settings settings,
-                                    DateTime? date = null,
-                                    CancellationToken cancellationToken = default(CancellationToken))
-        {
-            date = date.GetValueOrDefault(DateTime.Now.Date);
-            var workTasks = new List<MercurialCommitItem>();
-            var issues = _jiraApi.GetIssuesByJQL(settings.JiraQuery, settings, date, cancellationToken);
-
-            foreach (var issue in issues)
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    return new List<MercurialCommitItem>();
-                }
-                var comments = issue.GetCommentsAsync(cancellationToken).Result?.ToList() ?? new List<Comment>();
-
-                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)
-                    {
-                        workTasks.Add(new MercurialCommitItem
-                        {
-                            Description = issue.Summary,
-                            Time = issue.Updated.GetValueOrDefault(date.Value),
-                            Branch = issue.Key.Value,
-                            FilesAffected = 1
-                        });
-                    }
-                }
-                else
-                {
-                    workTasks.Add(new MercurialCommitItem
-                    {
-                        Description = issue.Summary,
-                        Time = issue.Updated.GetValueOrDefault(date.Value),
-                        Branch = issue.Key.Value,
-                        FilesAffected = 1
-                    });
-                }
-            }
-
-            return workTasks;
-        }
-    }
-}

src/JiraTimeBot.Core/JiraTimeBot.Core.csproj

@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Atlassian.SDK" Version="10.4.0" />
-    <PackageReference Include="Mercurial.Net" Version="1.1.1.607" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
-</Project>

src/JiraTimeBot.Core/Job.cs

@@ -1,99 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using JiraTimeBot.Core.Configuration;
-using JiraTimeBot.Core.Mercurial;
-using JiraTimeBot.Core.Mercurial.Objects;
-using JiraTimeBot.Core.TasksProcessors;
-using JiraTimeBot.Core.TaskTime;
-using JiraTimeBot.Core.TaskTime.Objects;
-
-namespace JiraTimeBot.Core
-{
-    public class Job
-    {
-        private readonly IAllMercurialProviders _mercurialProviders;
-        private readonly ITaskTimeCalculator _taskTimeDiscoverer;
-        private readonly ILog _log;
-
-        public Job(IAllMercurialProviders mercurialProviders, 
-                   ITaskTimeCalculator taskTimeDiscoverer, 
-                   ILog log)
-        {
-            _mercurialProviders = mercurialProviders;
-            _taskTimeDiscoverer = taskTimeDiscoverer;
-            _log = log;
-        }
-
-        public Task DoTheJob(Settings settings, ITasksProcessor tasksProcessor, bool dummyMode, CancellationToken cancellationToken)
-        {
-            _log.Info("Начинаем работу");
-
-            return Task.Run(() => DoTheJobImpl(settings, tasksProcessor, dummyMode, cancellationToken), cancellationToken);
-        }
-        
-        private void DoTheJobImpl(Settings settings, ITasksProcessor tasksProcessor, bool dummyMode, CancellationToken cancellationToken)
-        {
-            int daysDiff = 0;
-            if (tasksProcessor is MeetingProcessor)
-            {
-                daysDiff = -1;
-            }
-
-            var setForDate = DateTime.Now.Date;
-            while (true)
-            {
-                DateTime realDate = DateTime.Now.Date.AddDays(daysDiff);
-
-                if (SetTaskTimesForDateImpl(setForDate, realDate, settings, tasksProcessor, dummyMode, cancellationToken))
-                {
-                    return;
-                }
-
-                _log.Warn($"{realDate:dd.MM.yyyy} вы не сделали ничего полезного =) Использую предыдущий день.");
-                daysDiff--;
-                if (daysDiff < -7)
-                {
-                    _log.Error("Не нашли ни одного коммита за предыдущие 7 дней. Возможно вы в отпуске? Выхожу.");
-                    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)
-        {
-            IMercurialLog mercurial = _mercurialProviders.MercurialLog;
-            if (settings.WorkType == WorkType.JiraLogs)
-            {
-                _log.Info("Использую Jira как источник информации.");
-                mercurial = _mercurialProviders.JiraCommitEmulator;
-            }
-            List<MercurialCommitItem> commits = mercurial.GetMercurialLog(settings, realDate, cancellationToken);
-            List<TaskTimeItem> taskTimes = _taskTimeDiscoverer.CalculateTaskTime(commits, 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.Core/Mercurial/IAllMercurialProviders.cs

@@ -1,10 +0,0 @@
-using JiraTimeBot.Core.JiraIntegration;
-
-namespace JiraTimeBot.Core.Mercurial
-{
-    public interface IAllMercurialProviders
-    {
-        MercurialLog MercurialLog { get; }
-        JiraCommitEmulator JiraCommitEmulator { get; }
-    }
-}

src/JiraTimeBot.Core/Mercurial/IMercurialLog.cs

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

src/JiraTimeBot.Core/Mercurial/MercurialLog.cs

@@ -1,103 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using JiraTimeBot.Core.Configuration;
-using JiraTimeBot.Core.Mercurial.Modifiers;
-using JiraTimeBot.Core.Mercurial.Objects;
-using Mercurial;
-
-namespace JiraTimeBot.Core.Mercurial
-{
-    public class MercurialLog: IMercurialLog
-    {
-        private readonly ILog _log;
-        private readonly ICommitSkipper _commitSkipper;
-        private readonly ITechnicalInfoSkipper _technicalInfoSkipper;
-
-        public MercurialLog(ILog log, ICommitSkipper commitSkipper, ITechnicalInfoSkipper technicalInfoSkipper)
-        {
-            _log = log;
-            _commitSkipper = commitSkipper;
-            _technicalInfoSkipper = technicalInfoSkipper;
-        }
-
-        public List<MercurialCommitItem> GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (string.IsNullOrEmpty(settings.RepositoryPath) || !Directory.Exists(settings.RepositoryPath))
-            {
-                _log.Error("Папка с репо не сушествует.");
-                return new List<MercurialCommitItem>();
-            }
-
-            date = date.GetValueOrDefault(DateTime.Now.Date);
-
-            var workTasks = new List<MercurialCommitItem>();
-            foreach (var repoDirectory in Directory.GetDirectories(settings.RepositoryPath))
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    return new List<MercurialCommitItem>();
-                }
-
-                //var project = new DirectoryInfo(repoDirectory).Name;
-                if (!Directory.Exists(Path.Combine(repoDirectory, ".hg")))
-                {
-                    continue;
-                }
-
-                var repo = new Repository(repoDirectory);
-                var logCommand = new LogCommand
-                {
-                    Date = date,
-                    Users = { settings.MercurialAuthorEmail },
-                    AdditionalArguments = { "--encoding=utf-8"},
-                };
-
-                var log = repo.Log(logCommand);
-
-                foreach (var changeset in log)
-                {
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        return new List<MercurialCommitItem>();
-                    }
-
-                    var commitMessage = FixEncoding(changeset.CommitMessage);
-                    if (_commitSkipper.IsNeedToSkip(changeset.Branch, commitMessage))
-                    {
-                        continue;
-                    }
-                    commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
-
-                    workTasks.Add(new MercurialCommitItem
-                    {
-                        Description = commitMessage,
-                        Branch = changeset.Branch,
-                        Time = changeset.Timestamp,
-                        FilesAffected = changeset.PathActions.Count
-                    });
-                    _log?.Trace($" - Найден changeset: {changeset.Timestamp} - {changeset.Branch} - {changeset.AuthorEmailAddress} - {commitMessage}");
-                }
-            }
-            if (!workTasks.Any())
-            {
-                return new List<MercurialCommitItem>();
-            }
-
-            return workTasks;
-        }
-
-        
-        private string FixEncoding(string source)
-        {
-            //перекодируем сообщение - ибо оно криво забирается в 1252
-            Encoding srcEncodingFormat = Encoding.GetEncoding("windows-1252");
-            byte[] originalByteString = srcEncodingFormat.GetBytes(source);
-            var commitMessage = Encoding.UTF8.GetString(originalByteString);
-            return commitMessage;
-        }
-    }
-}

src/JiraTimeBot.Core/Mercurial/Modifiers/CommitSkipper.cs

@@ -1,24 +0,0 @@
-using System;
-
-namespace JiraTimeBot.Core.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.Core/Mercurial/Modifiers/ITechnicalInfoSkipper.cs

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

src/JiraTimeBot.Core/Mercurial/Objects/MercurialCommitItem.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace JiraTimeBot.Core.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.Core/TaskTime/ITaskTimeCalculator.cs

@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-using JiraTimeBot.Core.Configuration;
-using JiraTimeBot.Core.Mercurial.Objects;
-using JiraTimeBot.Core.TaskTime.Objects;
-
-namespace JiraTimeBot.Core.TaskTime
-{
-    public interface ITaskTimeCalculator
-    {
-        List<TaskTimeItem> CalculateTaskTime(List<MercurialCommitItem> commitItems, 
-                                             Settings settings, 
-                                             CancellationToken cancellationToken = default);
-    }
-}

src/JiraTimeBot.Core/TaskTime/Objects/TaskTimeItem.cs

@@ -1,14 +0,0 @@
-using System;
-
-namespace JiraTimeBot.Core.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; }
-    }
-}

src/JiraTimeBot.Core/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -1,141 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using JiraTimeBot.Core.Configuration;
-using JiraTimeBot.Core.Mercurial.Objects;
-using JiraTimeBot.Core.TaskTime.Objects;
-
-namespace JiraTimeBot.Core.TaskTime
-{
-    public class TaskTimeByCommitsCalculator: ITaskTimeCalculator
-    {
-        private readonly ILog _log;
-
-        public TaskTimeByCommitsCalculator(ILog log)
-        {
-            _log = log;
-        }
-
-        public List<TaskTimeItem> CalculateTaskTime(List<MercurialCommitItem> commits,
-                                                    Settings settings,
-                                                    CancellationToken cancellationToken = default)
-        {
-            int minutesPerWorkDay = settings.MinuterPerWorkDay;
-            int remainMinutes = settings.MinuterPerWorkDay;
-            int totalCommitsCount = commits.Count;
-
-            if (!commits.Any())
-            {
-                return new List<TaskTimeItem>();
-            }
-
-            //если кол-во коммитов более чем кол-во интервалов - то уменьшим интервал вдвое.
-            while (totalCommitsCount > (8 * (60.0 / settings.RoundToMinutes)))
-            {
-                settings.RoundToMinutes = (int)RoundTo((decimal)(settings.RoundToMinutes / 2.0), 5);
-                _log.Info($"Слишком много задач - уменьшаю интервал до {settings.RoundToMinutes}.");
-                if (settings.RoundToMinutes == 5)
-                {
-                    break;
-                }
-            }
-
-            List<TaskTimeItem> workTimeItems = new List<TaskTimeItem>();
-            //Если указана задача контроля времени - то спишем туда 30 минут и вычеркнем их из общего рабочего времени.
-            if (!string.IsNullOrEmpty(settings.TimeControlTask))
-            {
-                minutesPerWorkDay = minutesPerWorkDay - 30;
-                workTimeItems.Add(new TaskTimeItem
-                {
-                    Time = TimeSpan.FromMinutes(30),
-                    Branch = settings.TimeControlTask,
-                    Commits = 1,
-                    Description = "Ведение учета времени",
-                    StartTime = DateTime.Now.Date
-                });
-            }
-
-            //Нам нужно раскидать 480 минут в день.
-            foreach (var taskGroup in commits.GroupBy(f => f.Branch).OrderByDescending(f=>f.Count()))
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    return new List<TaskTimeItem>();
-                }
-
-                int currentTaskCommits = taskGroup.Count();
-                int currentTaskTime = (int)RoundTo(minutesPerWorkDay / totalCommitsCount * currentTaskCommits, settings.RoundToMinutes);
-                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())
-            {
-                return new List<TaskTimeItem>();
-            }
-            workTimeItems = workTimeItems.OrderByDescending(f => f.Time).ToList();
-
-            if (remainMinutes != 0)
-            {
-                _log.Trace($"Погрешность распределения времени: {remainMinutes}. Добавляю к первой задаче.");
-            }
-
-            if (workTimeItems.First().Time.TotalMinutes > Math.Abs(remainMinutes) && remainMinutes < 0)
-            {
-                //если переборщили или не достаточно добавили до 8 часов - скорректируем остаток в первой задаче (она самая трудозатратная).
-                workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes);
-            }
-
-            PrintTotal(workTimeItems);
-
-            return workTimeItems;
-        }
-
-        private void PrintTotal(List<TaskTimeItem> workTimeItems)
-        {
-            var totalTime = TimeSpan.Zero;
-            foreach (var workTimeItem in workTimeItems)
-            {
-                totalTime += workTimeItem.Time;
-            }
-
-            _log.Trace($"Итоговое реально проставляемое время: {totalTime}");
-        }
-
-
-        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.Core/TasksProcessors/ITasksProcessor.cs

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

src/JiraTimeBot.Core/TasksProcessors/MeetingProcessor.cs

@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using JiraTimeBot.Core.Configuration;
-using JiraTimeBot.Core.JiraIntegration;
-using JiraTimeBot.Core.TaskTime.Objects;
-
-namespace JiraTimeBot.Core.TasksProcessors
-{
-    public class MeetingProcessor : ITasksProcessor
-    {
-        private readonly ILog _log;
-        private readonly JiraApi _jiraApi;
-
-        public MeetingProcessor(ILog log, JiraApi jiraApi)
-        {
-            _log = log;
-            _jiraApi = jiraApi;
-        }
-
-        public void Process(DateTime setForDate, DateTime realDate, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            _log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам:");
-
-            foreach (var taskTime in taskTimes.OrderByDescending(f => f.Time))
-            {
-                var taskName = _jiraApi.GetTaskName(taskTime.Branch, settings);
-                _log.Trace($" - [{taskTime.Branch}, коммитов {taskTime.Commits}]: {taskName} - {taskTime.Time}");
-            }
-        }
-    }
-}

src/JiraTimeBot.Core/Update/IUpdater.cs

@@ -1,7 +0,0 @@
-namespace JiraTimeBot.Core.Update
-{
-    public interface IUpdater
-    {
-        bool UpdateToNewVersion(bool firstTime);
-    }
-}

src/JiraTimeBot.Ui/App.config

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-    </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.9.1.0" newVersion="4.9.1.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/JiraTimeBot.Ui/App.xaml

@@ -1,8 +0,0 @@
-<Application x:Class="JiraTimeBot.Ui.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             >
-    <Application.Resources>
-         
-    </Application.Resources>
-</Application>

src/JiraTimeBot.Ui/App.xaml.cs

@@ -1,82 +0,0 @@
-using Autofac;
-using JiraTimeBot.UI.Tray;
-using System;
-using System.Threading;
-using System.Windows;
-using System.Windows.Navigation;
-using JiraTimeBot.Core.Configuration;
-using JiraTimeBot.Ui.ViewModels;
-
-
-namespace JiraTimeBot.Ui
-{
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
-    public partial class App : Application
-    {
-        private IContainer _container;
-        
-        private static readonly Mutex Mutex = new Mutex(true, "{5B245110-FD79-4EC9-AF86-A98F29792B9D}");
-
-        public App()
-        {
-            if (Mutex.WaitOne(TimeSpan.Zero, true))
-            {
-                Bootstrapper bootstrapper = new Bootstrapper();
-                _container = bootstrapper.Build();
-                Mutex.ReleaseMutex();
-            }
-            else
-            {
-                Mutex.Dispose();
-                SingleInstance.ShowFirstInstance();
-                this.Shutdown();
-            }
-
-        }
-
-        protected override void OnStartup(StartupEventArgs e)
-        {
-            var settingsManager = _container.Resolve<ISettingsManager>();
-            var settings = settingsManager.Load();
-            var scope = _container.BeginLifetimeScope("Started",
-                                                      builder =>
-                                                      {
-                                                          if (settings != null)
-                                                          {
-                                                              builder.RegisterInstance(settings);
-                                                          }
-                                                          else
-                                                          {
-                                                              builder.RegisterInstance(new Settings());
-                                                          }
-                                                      });
-
-            var appViewModel = scope.Resolve<ApplicationViewModel>();
-            var mainWindow = scope.Resolve<MainWindow>();
-            if (settings == null)
-            {
-                var settingsViewModel = scope.Resolve<SettingsViewModel>();
-                appViewModel.CurrentViewModel = settingsViewModel;
-            }
-            else
-            {
-                var mainViewModel = scope.Resolve<MainPageViewModel>();
-                appViewModel.CurrentViewModel = mainViewModel;
-            }
-
-            
-
-            mainWindow.ShowActivated = true;
-            mainWindow.Show();
-            base.OnStartup(e);
-        }
-
-        /// <inheritdoc />
-        protected override void OnLoadCompleted(NavigationEventArgs e)
-        {
-            base.OnLoadCompleted(e);
-        }
-    }
-}

src/JiraTimeBot.Ui/ApplicationNavigator.cs

@@ -1,34 +0,0 @@
-using System;
-using JiraTimeBot.Ui.ViewModels;
-
-namespace JiraTimeBot.Ui
-{
-    public interface IRegisteredViewModels
-    {
-        Func<SettingsViewModel> Settings { get; set; }
-        Func<MainPageViewModel> MainPage { get; set; }
-    }
-
-    public class ApplicationNavigator : IApplicationNavigator
-    {
-        private readonly ApplicationViewModel _applicationViewModel;
-        private readonly IRegisteredViewModels _viewModels;
-
-        public ApplicationNavigator(ApplicationViewModel applicationViewModel, 
-                                    IRegisteredViewModels viewModels)
-        {
-            _applicationViewModel = applicationViewModel;
-            _viewModels = viewModels;
-        }
-
-        public void NavigateToMain()
-        {
-            _applicationViewModel.CurrentViewModel = _viewModels.MainPage();
-        }
-
-        public void NavigateToSettings()
-        {
-            _applicationViewModel.CurrentViewModel = _viewModels.Settings();
-        }
-    }
-}

src/JiraTimeBot.Ui/Bootstrapper.cs

@@ -1,49 +0,0 @@
-using Autofac;
-using Autofac.Extras.AggregateService;
-using JiraTimeBot.Core.Configuration;
-using JiraTimeBot.Ui.Models;
-using JiraTimeBot.Ui.ViewModels;
-
-namespace JiraTimeBot.Ui
-{
-    public class Bootstrapper
-    {
-        public IContainer Build()
-        {
-            var builder = new ContainerBuilder();
-
-            builder.Register(c =>
-            {
-                var result = new MainWindow();
-                result.DataContext = c.Resolve<ApplicationViewModel>();
-                return result;
-            }).InstancePerLifetimeScope();
-
-            builder.RegisterType<SettingsManager>().As<ISettingsManager>();
-            builder.RegisterType<ApplicationModel>().InstancePerLifetimeScope();
-            builder.RegisterType<SettingsModel>().InstancePerLifetimeScope();
-            builder.RegisterType<MainModel>().InstancePerLifetimeScope();
-
-            builder.RegisterType<ApplicationViewModel>().InstancePerLifetimeScope();
-            builder.RegisterType<MainPageViewModel>().InstancePerLifetimeScope();
-            builder.RegisterType<SettingsViewModel>()
-                   .InstancePerLifetimeScope();
-            
-            builder.RegisterType<MainPage>().InstancePerLifetimeScope();
-            builder.RegisterType<SettingsPage>()
-                   .AsSelf()
-                   .As<IHavePassword>()
-                   .InstancePerLifetimeScope();
-            
-            builder.RegisterAggregateService<IRegisteredViewModels>();
-
-            builder.RegisterType<ApplicationNavigator>()
-                   .As<IApplicationNavigator>()
-                   .InstancePerLifetimeScope();
-
-            var container = builder.Build();
-
-            return container;
-        }
-    }
-}

src/JiraTimeBot.Ui/Commands/RelayCommand'.cs

@@ -1,77 +0,0 @@
-using System;
-using System.Windows.Input;
-
-namespace Aeroclub.CL.ASIA.Application.UI.Wpf.Commands
-{
-    public sealed class RelayCommand<T> : ICommand
-    {
-        private readonly Action<T> _execute;
-
-        private readonly Func<T, bool> _canExecute;
-
-        public RelayCommand(Action<T> execute, Func<T, bool> canExecute = null)
-        {
-            _execute = execute ?? throw new ArgumentNullException(nameof(execute));
-
-            if (canExecute != null)
-            {
-                _canExecute = canExecute;
-            }
-        }
-
-        public event EventHandler CanExecuteChanged
-        {
-            add
-            {
-                if (_canExecute != null)
-                {
-                    CommandManager.RequerySuggested += value;
-                }
-            }
-
-            remove
-            {
-                if (_canExecute != null)
-                {
-                    CommandManager.RequerySuggested -= value;
-                }
-            }
-        }
-
-        public bool CanExecute(object parameter)
-        {
-            if (_canExecute == null)
-            {
-                return true;
-            }
-
-            switch (parameter)
-            {
-                case null:
-                    return _canExecute(default(T));
-                case T variable:
-                    return _canExecute(variable);
-            }
-
-            return false;
-        }
-
-        public void Execute(object parameter)
-        {
-            object val = parameter;
-
-            if (parameter != null && parameter.GetType() != typeof(T))
-            {
-                if (parameter is IConvertible)
-                {
-                    val = Convert.ChangeType(parameter, typeof(T), null);
-                }
-            }
-
-            if (CanExecute(val))
-            {
-                _execute?.Invoke((T) val);
-            }
-        }
-    }
-}

src/JiraTimeBot.Ui/Commands/RelayCommand.cs

@@ -1,55 +0,0 @@
-using System;
-using System.Windows.Input;
-
-namespace Aeroclub.CL.ASIA.Application.UI.Wpf.Commands
-{
-    public sealed class RelayCommand : ICommand
-    {
-        private readonly Action _execute;
-
-        private readonly Func<object, bool> _canExecute;
-
-        public RelayCommand(Action execute, Func<object, bool> canExecute = null)
-        {
-            _execute = execute ?? throw new ArgumentNullException(nameof(execute));
-            _canExecute = canExecute;
-        }
-
-        public event EventHandler CanExecuteChanged
-        {
-            add
-            {
-                if (_canExecute != null)
-                {
-                    CommandManager.RequerySuggested += value;
-                }
-            }
-
-            remove
-            {
-                if (_canExecute != null)
-                {
-                    CommandManager.RequerySuggested -= value;
-                }
-            }
-        }
-
-        public void RaiseCanExecuteChanged()
-        {
-            CommandManager.InvalidateRequerySuggested();
-        }
-
-        public bool CanExecute(object parameter)
-        {
-            return _canExecute == null || _canExecute(parameter);
-        }
-
-        public void Execute(object parameter = default(object))
-        {
-            if (CanExecute(parameter))
-            {
-                _execute();
-            }
-        }
-    }
-}

src/JiraTimeBot.Ui/Commands/RelayCommandAsync'.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
-
-namespace Aeroclub.CL.ASIA.Application.UI.Wpf.Commands
-{
-    public class RelayCommandAsync<T> : ICommand
-    {
-        private readonly Func<T, Task> _executedMethod;
-        private readonly Func<T, bool> _canExecuteMethod;
-
-        public event EventHandler CanExecuteChanged;
-
-        public RelayCommandAsync(Func<T, Task> execute, Func<T, bool> canExecute = null)
-        {
-            _executedMethod = execute;
-            _canExecuteMethod = canExecute;
-        }
-
-        public bool CanExecute(object parameter) => _canExecuteMethod == null || _canExecuteMethod((T)parameter);
-        public async void Execute(object parameter) => await _executedMethod((T)parameter).ConfigureAwait(true);
-        public void OnCanExecuteChanged() => CanExecuteChanged?.Invoke(this, EventArgs.Empty);
-    }
-}

src/JiraTimeBot.Ui/IApplicationNavigator.cs

@@ -1,8 +0,0 @@
-namespace JiraTimeBot.Ui
-{
-    public interface IApplicationNavigator
-    {
-        void NavigateToMain();
-        void NavigateToSettings();
-    }
-}

src/JiraTimeBot.Ui/JiraTimeBot.Ui.csproj

@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <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>{C3B7A833-B919-4299-A318-74B96544437E}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>JiraTimeBot.Ui</RootNamespace>
-    <AssemblyName>JiraTimeBot.Ui</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-    <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>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Autofac, Version=4.9.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.9.1\lib\net45\Autofac.dll</HintPath>
-    </Reference>
-    <Reference Include="Autofac.Extras.AggregateService, Version=4.1.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.Extras.AggregateService.4.1.0\lib\net45\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>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
-    </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="Styles.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\MainPage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ApplicationNavigator.cs" />
-    <Compile Include="Bootstrapper.cs" />
-    <Compile Include="Commands\RelayCommand%27.cs" />
-    <Compile Include="Commands\RelayCommand.cs" />
-    <Compile Include="Commands\RelayCommandAsync%27.cs" />
-    <Compile Include="IApplicationNavigator.cs" />
-    <Compile Include="Models\ApplicationModel.cs" />
-    <Compile Include="Models\IModel.cs" />
-    <Compile Include="Models\MainModel.cs" />
-    <Compile Include="Models\SettingsModel.cs" />
-    <Compile Include="Properties\Annotations.cs" />
-    <Compile Include="ViewModels\ApplicationViewModel.cs" />
-    <Compile Include="ViewModels\MainPageViewModel.cs" />
-    <Compile Include="ViewModels\SettingsViewModel.cs" />
-    <Compile Include="ViewModels\ViewModelBase.cs" />
-    <Compile Include="Views\MainPage.xaml.cs">
-      <DependentUpon>MainPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="Views\SettingsPage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Views\SettingsPage.xaml.cs">
-      <DependentUpon>SettingsPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <SplashScreen Include="Splash.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="app.ico">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\JiraTimeBot.Core\JiraTimeBot.Core.csproj">
-      <Project>{35D8A11F-05F8-408D-A37D-0EECD96FA67A}</Project>
-      <Name>JiraTimeBot.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\JiraTimeBot\JiraTimeBot.csproj">
-      <Project>{f3b89316-c38c-4ce6-9d88-0b1373cfba1a}</Project>
-      <Name>JiraTimeBot</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

src/JiraTimeBot.Ui/Models/ApplicationModel.cs

@@ -1,10 +0,0 @@
-namespace JiraTimeBot.Ui.Models
-{
-    public class ApplicationModel : IModel
-    {
-        /// <inheritdoc />
-        public ApplicationModel()
-        {
-        }
-    }
-}

src/JiraTimeBot.Ui/Models/IModel.cs

@@ -1,27 +0,0 @@
-using JiraTimeBot.Ui.Annotations;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-
-namespace JiraTimeBot.Ui.Models
-{
-    public interface IModel
-    {
-        
-    }
-
-    public interface INotifyModel : IModel, INotifyPropertyChanged
-    {
-
-    }
-
-    public abstract class NotifyModelBase : INotifyModel
-    {
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        [NotifyPropertyChangedInvocator]
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-    }
-}

src/JiraTimeBot.Ui/Models/MainModel.cs

@@ -1,7 +0,0 @@
-namespace JiraTimeBot.Ui.Models
-{
-    public class MainModel : IModel
-    {
-        
-    }
-}

src/JiraTimeBot.Ui/Models/SettingsModel.cs

@@ -1,91 +0,0 @@
-using System;
-using JiraTimeBot.Core.Configuration;
-
-namespace JiraTimeBot.Ui.Models
-{
-    //Proxy model of settings
-    public class SettingsModel : IModel
-    {
-        private readonly Settings _settings;
-
-        /// <inheritdoc />
-        public SettingsModel(Settings settings)
-        {
-            _settings = settings;
-        }
-
-        public Settings Settings => _settings;
-
-        public string JiraUrl
-        {
-            get => _settings.JiraUrl;
-            set => _settings.JiraUrl = value;
-        }
-
-        public int MinuterPerWorkDay
-        {
-            get => _settings.MinuterPerWorkDay;
-            set => _settings.MinuterPerWorkDay = value;
-        }
-
-        public TimeSpan ActivationTime
-        {
-            get => _settings.ActivationTime;
-            set => _settings.ActivationTime = value;
-        }
-
-        public bool AddCommentsToWorklog
-        {
-            get => _settings.AddCommentsToWorklog;
-            set => _settings.AddCommentsToWorklog = value;
-        }
-
-        public string JiraPassword
-        {
-            get => _settings.JiraPassword;
-            set => _settings.JiraPassword = value;
-        }
-
-        public string JiraQuery
-        {
-            get => _settings.JiraPassword;
-            set => _settings.JiraQuery = value;
-        }
-
-        public string JiraUserName
-        {
-            get => _settings.JiraUserName;
-            set => _settings.JiraUserName = value;
-        }
-
-        public string MercurialAuthorEmail
-        {
-            get => _settings.MercurialAuthorEmail;
-            set => _settings.MercurialAuthorEmail = value;
-        }
-
-        public string RepositoryPath
-        {
-            get => _settings.RepositoryPath;
-            set => _settings.RepositoryPath = value;
-        }
-
-        public int RoundToMinutes
-        {
-            get => _settings.RoundToMinutes;
-            set => _settings.RoundToMinutes = value;
-        }
-
-        public string TimeControlTask
-        {
-            get => _settings.TimeControlTask;
-            set => _settings.TimeControlTask = value;
-        }
-
-        public WorkType WorkType
-        {
-            get => _settings.WorkType;
-            set => _settings.WorkType = value;
-        }
-    }
-}

src/JiraTimeBot.Ui/Properties/AssemblyInfo.cs

@@ -1,55 +0,0 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("JiraTimeBot.Ui")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("JiraTimeBot.Ui")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
-[assembly: AssemblyTrademark("")]
-[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
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                                     //(used if a resource is not found in the page,
-                                     // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                              //(used if a resource is not found in the page,
-                                              // app, or any theme specific resource dictionaries)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

src/JiraTimeBot.Ui/Properties/Resources.Designer.cs

@@ -1,71 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace JiraTimeBot.Ui.Properties
-{
-
-
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // 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.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    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()
-        {
-        }
-
-        /// <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
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("JiraTimeBot.Ui.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
-        {
-            get
-            {
-                return resourceCulture;
-            }
-            set
-            {
-                resourceCulture = value;
-            }
-        }
-    }
-}

src/JiraTimeBot.Ui/Properties/Resources.resx

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

src/JiraTimeBot.Ui/Properties/Settings.Designer.cs

@@ -1,30 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace JiraTimeBot.Ui.Properties
-{
-
-
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    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
-        {
-            get
-            {
-                return defaultInstance;
-            }
-        }
-    }
-}

src/JiraTimeBot.Ui/Properties/Settings.settings

@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>

src/JiraTimeBot.Ui/Styles.xaml

@@ -1,33 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:JiraTimeBot.Ui"
-                    xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit">
-    <Style TargetType="Button">
-        <Setter Property="Margin" Value="5" />
-    </Style>
-
-    <Style TargetType="CheckBox">
-        <Setter Property="Margin" Value="5" />
-    </Style>
-
-    <Style TargetType="DatePicker">
-        <Setter Property="Margin" Value="5" />
-    </Style>
-    
-    <Style TargetType="TextBox">
-        <Setter Property="Margin" Value="5" />
-    </Style>
-
-    <Style TargetType="PasswordBox">
-        <Setter Property="Margin" Value="5" />
-    </Style>
-
-    <Style TargetType="xctk:DateTimePicker">
-        <Setter Property="Margin" Value="5" />
-    </Style>
-
-    <Style TargetType="ComboBox">
-        <Setter Property="Margin" Value="5" />
-    </Style>
-    
-</ResourceDictionary>

src/JiraTimeBot.Ui/ViewModels/ApplicationViewModel.cs

@@ -1,23 +0,0 @@
-using JiraTimeBot.Ui.Models;
-
-namespace JiraTimeBot.Ui.ViewModels
-{
-    public class ApplicationViewModel : ViewModelBase<ApplicationModel>
-    {
-        private ViewModelBase _currentViewModel;
-
-        public ApplicationViewModel(ApplicationModel model) : base(model)
-        {
-        }
-
-        public ViewModelBase CurrentViewModel
-        {
-            get => _currentViewModel;
-            set
-            {
-                _currentViewModel = value;
-                OnPropertyChanged();
-            }
-        }
-    }
-}

src/JiraTimeBot.Ui/ViewModels/MainPageViewModel.cs

@@ -1,58 +0,0 @@
-using Aeroclub.CL.ASIA.Application.UI.Wpf.Commands;
-using JiraTimeBot.Ui.Models;
-using System;
-
-namespace JiraTimeBot.Ui.ViewModels
-{
-    public class MainPageViewModel : ViewModelBase<MainModel>
-    {
-        private readonly IApplicationNavigator _navigator;
-        private DateTime _selectedDate;
-
-        public MainPageViewModel(MainModel model, IApplicationNavigator navigator) : base(model)
-        {
-            _navigator = navigator;
-            SelectedDate = DateTime.Today;
-            OpenSettingsCommand = new RelayCommand(NavigateToSettings);
-            SetTimeCommand = new RelayCommand(SetTime);
-            ShowMeetingInfoCommand = new RelayCommand(ShowMeeting);
-            CancelCommand = new RelayCommand(Cancel);
-        }
-
-        private void Cancel()
-        {
-        }
-
-        private void ShowMeeting()
-        {
-        }
-
-        private void SetTime()
-        {
-            
-        }
-
-        public RelayCommand OpenSettingsCommand { get; set; }
-
-        public DateTime SelectedDate
-        {
-            get => _selectedDate;
-            set
-            {
-                _selectedDate = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public RelayCommand SetTimeCommand { get; set; }
-
-        public RelayCommand ShowMeetingInfoCommand { get; set; }
-
-        public RelayCommand CancelCommand { get; set; }
-
-        private void NavigateToSettings()
-        {
-            _navigator.NavigateToSettings();
-        }
-    }
-}

src/JiraTimeBot.Ui/ViewModels/SettingsViewModel.cs

@@ -1,75 +0,0 @@
-using Aeroclub.CL.ASIA.Application.UI.Wpf.Commands;
-using JiraTimeBot.Ui.Models;
-using System;
-using System.Collections.ObjectModel;
-using System.Linq;
-using JiraTimeBot.Core.Configuration;
-
-namespace JiraTimeBot.Ui.ViewModels
-{
-    public class SettingsViewModel : ViewModelBase<SettingsModel>
-    {
-        private readonly ISettingsManager _settingsManager;
-        private readonly IHavePassword _passwordAccessor;
-        private readonly IApplicationNavigator _navigator;
-
-        public SettingsViewModel(SettingsModel model, 
-                                 ISettingsManager settingsManager,
-                                 IHavePassword passwordAccessor,
-                                 IApplicationNavigator navigator) : base(model)
-        {
-            _settingsManager = settingsManager;
-            _passwordAccessor = passwordAccessor;
-            _navigator = navigator;
-            SaveSettingsCommand = new RelayCommand(SaveSettings);
-            var workModes = Enum.GetValues(typeof(WorkType));
-            WorkModes = new ObservableCollection<WorkType>(workModes.OfType<WorkType>());
-        }
-
-        public RelayCommand SaveSettingsCommand { get; set; }
-
-        public ObservableCollection<WorkType> WorkModes { get; set; }
-
-        public WorkType CurrentWorkType
-        {
-            get => Model.WorkType;
-            set
-            {
-                Model.WorkType = value;
-                OnPropertyChanged();
-            } 
-        }
-
-        public string RepositoryPath
-        {
-            get => Model.RepositoryPath;
-            set
-            {
-                Model.RepositoryPath = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public string JiraLogin
-        {
-            get => Model.JiraUserName;
-            set
-            {
-                Model.JiraUserName = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private void SaveSettings()
-        {
-            if(!_settingsManager.SettingsIsValid(Model.Settings, out string msg))
-            {
-                return;
-            }
-
-            Model.JiraPassword = _passwordAccessor.GetPassword();
-            _settingsManager.Save(Model.Settings);
-            _navigator.NavigateToMain();
-        }
-    }
-}

src/JiraTimeBot.Ui/ViewModels/ViewModelBase.cs

@@ -1,29 +0,0 @@
-using JiraTimeBot.Ui.Annotations;
-using JiraTimeBot.Ui.Models;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-
-namespace JiraTimeBot.Ui.ViewModels
-{
-    public abstract class ViewModelBase : INotifyPropertyChanged
-    {
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        [NotifyPropertyChangedInvocator]
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-    }
-
-    public abstract class ViewModelBase<T> : ViewModelBase where T : IModel
-    {
-        // ReSharper disable once MemberCanBePrivate.Global
-        protected T Model { get; }
-
-        protected ViewModelBase(T model)
-        {
-            Model = model;
-        }
-    }
-}

src/JiraTimeBot.Ui/Views/MainPage.xaml

@@ -1,52 +0,0 @@
-<UserControl x:Class="JiraTimeBot.Ui.MainPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:JiraTimeBot.Ui"
-      xmlns:viewModels="clr-namespace:JiraTimeBot.Ui.ViewModels"
-      xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-      mc:Ignorable="d" 
-      d:DataContext="{d:DesignInstance viewModels:MainPageViewModel}" >
-    <UserControl.Resources>
-        <ResourceDictionary Source="../Styles.xaml"/>
-    </UserControl.Resources>
-    <Grid Margin="5">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*"/>
-        </Grid.ColumnDefinitions>
-        <Grid Grid.Row="0" Grid.Column="0">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <StackPanel Grid.Row="0" 
-                        Orientation="Vertical">
-                <Button Content="Настройки" Command="{Binding Path=OpenSettingsCommand}" />
-                <xctk:DateTimePicker AutoCloseCalendar="True" 
-                                     Format="ShortDate"
-                                     Value="{Binding Path=SelectedDate}" 
-                                     Kind="Local"  />
-                <!--<DatePicker  IsTodayHighlighted="True" SelectedDate="{Binding Path=SelectedDate}" />-->
-                <Button>
-                    <TextBlock TextWrapping="Wrap" TextAlignment="Center" Text="Проставить на дату" />
-                </Button>
-            </StackPanel>
-            <StackPanel Grid.Row="2">
-                <CheckBox>Тестовый прогон</CheckBox>
-                <Button Content="Проставить время" Command="{Binding Path=SetTimeCommand}"/>
-                <Button Content="Митинг" Command="{Binding Path=ShowMeetingInfoCommand}"/>
-                <Button Content="Отменить" Command="{Binding Path=CancelCommand}"/>
-            </StackPanel>
-        </Grid>
-
-        <TextBox Grid.Row="0" Grid.Column="1"
-                 IsReadOnly="True"
-                 Width="400"
-                 Height="300"
-                 ></TextBox>
-
-    </Grid>
-</UserControl>

src/JiraTimeBot.Ui/Views/MainPage.xaml.cs

@@ -1,13 +0,0 @@
-namespace JiraTimeBot.Ui
-{
-    /// <summary>
-    /// Interaction logic for MainPage.xaml
-    /// </summary>
-    public partial class MainPage
-    {
-        public MainPage()
-        {
-            InitializeComponent();
-        }
-    }
-}

src/JiraTimeBot.Ui/Views/MainWindow.xaml

@@ -1,29 +0,0 @@
-<Window x:Class="JiraTimeBot.Ui.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:viewModels="clr-namespace:JiraTimeBot.Ui.ViewModels"
-        xmlns:ui="clr-namespace:JiraTimeBot.Ui"
-        mc:Ignorable="d"
-        SizeToContent="WidthAndHeight"
-        d:DataContext="{d:DesignInstance viewModels:ApplicationViewModel}"
-        Title="ApplicationWindow"
-        Icon="../app.ico"
-        ShowInTaskbar="True" 
-        ResizeMode="NoResize"
-        d:DesignWidth="517.579" d:DesignHeight="260.977"
-        >
-    <Window.Resources>
-        <DataTemplate DataType="{x:Type viewModels:MainPageViewModel}">
-            <ui:MainPage />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type viewModels:SettingsViewModel}">
-            <ui:SettingsPage/>
-        </DataTemplate>
-    </Window.Resources>
-    <Grid>
-        <ContentControl Content="{Binding Path=CurrentViewModel}" />
-    </Grid>
-    
-</Window>

src/JiraTimeBot.Ui/Views/MainWindow.xaml.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Drawing;
-using System.Windows;
-using System.Windows.Forms;
-
-namespace JiraTimeBot.Ui
-{
-    /// <summary>
-    /// Interaction logic for MainWindow.xaml
-    /// </summary>
-    public partial class MainWindow
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-
-            NotifyIcon trayIcon = new System.Windows.Forms.NotifyIcon();
-            trayIcon.Icon = new Icon("app.ico");
-            trayIcon.Visible = true;
-            trayIcon.DoubleClick += (sender, args) =>
-            {
-                Show();
-                ShowInTaskbar = true;
-                WindowState = WindowState.Normal;
-            };
-        }
-
-        protected override void OnStateChanged(EventArgs e)
-        {
-            if (WindowState == WindowState.Minimized)
-            {
-                ShowInTaskbar = false;
-                Hide();
-            }
-            base.OnStateChanged(e);
-        }
-    }
-}

src/JiraTimeBot.Ui/Views/SettingsPage.xaml

@@ -1,120 +0,0 @@
-<UserControl x:Class="JiraTimeBot.Ui.SettingsPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:JiraTimeBot.Ui"
-      xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-      xmlns:viewModels="clr-namespace:JiraTimeBot.Ui.ViewModels"
-      mc:Ignorable="d" 
-      d:DataContext="{d:DesignInstance viewModels:SettingsViewModel}"
-      >
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary>
-                    <Style TargetType="TextBlock">
-                        <Setter Property="VerticalAlignment" Value="Center"></Setter>
-                    </Style>
-                </ResourceDictionary>
-                <ResourceDictionary Source="../Styles.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </UserControl.Resources>
-    <Grid Width="250" Margin="5">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="20px"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-        <TextBlock Grid.Row="0" Grid.Column="0"
-                   Text="Режим работы" />
-
-        <ComboBox Grid.Row="0" Grid.Column="1" 
-                  ItemsSource="{Binding Path=WorkModes}"
-                  SelectedItem="{Binding Path=CurrentWorkType}"
-                  >
-        </ComboBox>
-
-        <TextBlock Grid.Row="1" Grid.Column="0"
-                   Text="Путь до репо" />
-        
-        <TextBox Grid.Row="1" Grid.Column="1" 
-                 Text="{Binding Path=RepositoryPath}"
-                 />
-
-        <TextBlock Grid.Row="2" Grid.Column="0"
-                   Text="Логин Jira" />
-        
-        <TextBox Grid.Row="2" Grid.Column="1"
-                 Text="{Binding Path=JiraLogin}"
-                 />
-
-        <TextBlock Grid.Row="3" Grid.Column="0"
-                   Text="Пароль Jira" />
-
-        <PasswordBox Name="PBox" Grid.Row="3" Grid.Column="1"
-                                          
-                     />
-
-        <TextBlock Grid.Row="4" Grid.Column="0"
-                   Text="Mercurial Name" />
-
-        <TextBox Grid.Row="4" Grid.Column="1" />
-
-        <TextBlock Grid.Row="5" Grid.Column="0"
-                   Text="Округл. Времени" />
-
-        <TextBox Grid.Row="5" Grid.Column="1" />
-
-        <TextBlock Grid.Row="6" Grid.Column="0"
-                   Text="JQL" />
-
-        <TextBox Grid.Row="6" Grid.Column="1" />
-
-        <TextBlock Grid.Row="7" Grid.Column="0"
-                   Text="Задача учета времени" />
-
-        <TextBox Grid.Row="7" Grid.Column="1" />
-
-        <TextBlock Grid.Row="8" Grid.Column="0"
-                   Text="Время запуска" 
-                   
-                   />
-        
-        <xctk:DateTimePicker Grid.Row="8" Grid.Column="1"
-                             Format="ShortTime"
-                             ShowDropDownButton="False"
-                             TimePickerAllowSpin="True"
-                             TimePickerShowButtonSpinner="True"
-                             TimePickerVisibility="Visible"
-                             />
-        <StackPanel Grid.Row="9" Grid.Column="0" Grid.ColumnSpan="2"
-                    HorizontalAlignment="Center"
-                    Orientation="Vertical"
-                    >
-
-            <CheckBox Content="Автозагрузка" />
-        
-            <CheckBox Content="Добавлять описание" />
-        </StackPanel>
-        <Button Grid.Row="11" Grid.Column="0" Grid.ColumnSpan="2" 
-                Command="{Binding Path=SaveSettingsCommand}"
-                Content="Сохранить"/>
-
-
-    </Grid>
-</UserControl>

src/JiraTimeBot.Ui/Views/SettingsPage.xaml.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Windows.Controls;
-
-namespace JiraTimeBot.Ui
-{
-    public interface IHavePassword
-    {
-        string GetPassword();
-        void SetPassword(string password);
-    }
-    
-    /// <summary>
-    /// Interaction logic for SettingsPage.xaml
-    /// </summary>
-    public partial class SettingsPage : IHavePassword
-    {
-        public SettingsPage()
-        {
-            InitializeComponent();
-        }
-
-        public string GetPassword()
-        {
-            return PBox.Password;
-        }
-
-        public void SetPassword(string password)
-        {
-            PBox.Password = password;
-        }
-    }
-}

src/JiraTimeBot.Ui/packages.config

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Autofac" version="4.9.1" targetFramework="net472" />
-  <package id="Autofac.Extras.AggregateService" version="4.1.0" targetFramework="net472" />
-  <package id="Castle.Core" version="4.0.0" targetFramework="net472" />
-  <package id="Extended.Wpf.Toolkit" version="3.5.0" targetFramework="net472" />
-</packages>

src/JiraTimeBot.sln

@@ -1,14 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
+# Visual Studio 15
-VisualStudioVersion = 16.0.28729.10
+VisualStudioVersion = 15.0.28307.421
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiraTimeBot", "JiraTimeBot\JiraTimeBot.csproj", "{F3B89316-C38C-4CE6-9D88-0B1373CFBA1A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiraTimeBot.Ui", "JiraTimeBot.Ui\JiraTimeBot.Ui.csproj", "{C3B7A833-B919-4299-A318-74B96544437E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiraTimeBot.Core", "JiraTimeBot.Core\JiraTimeBot.Core.csproj", "{35D8A11F-05F8-408D-A37D-0EECD96FA67A}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -19,14 +15,6 @@ Global
 		{F3B89316-C38C-4CE6-9D88-0B1373CFBA1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F3B89316-C38C-4CE6-9D88-0B1373CFBA1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F3B89316-C38C-4CE6-9D88-0B1373CFBA1A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C3B7A833-B919-4299-A318-74B96544437E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3B7A833-B919-4299-A318-74B96544437E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C3B7A833-B919-4299-A318-74B96544437E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C3B7A833-B919-4299-A318-74B96544437E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35D8A11F-05F8-408D-A37D-0EECD96FA67A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35D8A11F-05F8-408D-A37D-0EECD96FA67A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35D8A11F-05F8-408D-A37D-0EECD96FA67A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35D8A11F-05F8-408D-A37D-0EECD96FA67A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/JiraTimeBot.sln.DotSettings

@@ -1,4 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=JiraTimeBot_002EUi_002EAnnotations/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jira/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Worklog/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/JiraTimeBot/App.config

@@ -1,22 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<configuration>
+<configuration>
-    <startup> 
+    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
-    </startup>
+    </startup>
-  <runtime>
+  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
+      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
-      </dependentAssembly>
+      </dependentAssembly>
-      <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-6.2.0.0" newVersion="6.2.0.0" />
-      </dependentAssembly>
+      </dependentAssembly>
-      <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>
-    </assemblyBinding>
+      <dependentAssembly>
-  </runtime>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-</configuration>
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="RestSharp" publicKeyToken="598062e77f915f75" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-106.11.7.0" newVersion="106.11.7.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

src/JiraTimeBot/Configuration/PasswordEncryptionClass.cs

@@ -2,7 +2,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace JiraTimeBot.Core.Encryption
+namespace JiraTimeBot.Configuration
 {
     public class PasswordEncryptionClass
     {

src/JiraTimeBot/Configuration/Settings.cs

@@ -1,50 +1,33 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using JiraTimeBot.Core.Encryption;
-using Newtonsoft.Json;
 
-namespace JiraTimeBot.Core.Configuration
+namespace JiraTimeBot.Configuration
 {
-    public class SettingsManager : ISettingsManager
+    public class Settings
     {
-        private static string _settingsFileName = "settings.json";
+        public int MinuterPerWorkDay { get; set; }
+        public int RoundToMinutes { get; set; }
 
-        public Settings Load()
+        public string JiraUrl { get; set; }
-        {
+        public bool PullBeforeProcess { get; set; }
-            var configDir = Application.UserAppDataPath.Replace(Application.ProductVersion, "");
+        public bool RemoveManuallyAddedWorklogs { get; set; }
-            var settingsPath = Path.Combine(configDir, _settingsFileName);
+        public string RepositoryPath { get; set; }
-            if (!File.Exists(settingsPath))
+        public string MercurialAuthorEmail { get; set; }
-            {
+        public string JiraUserName { get; set; }
-                return null;
+        public string JiraPassword { get; set; }
-            }
+        public TimeSpan ActivationTime { get; set; }
+        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 string AlternativeEmail { get; set; }
 
-            var settingsText = File.ReadAllText(settingsPath);
+        public static Settings LoadAndCheck(Action settingsSource, Action<string> errorMessageReporter)
-
-            Settings settings;
-
-            try
-            {
-                settings = JsonConvert.DeserializeObject<Settings>(settingsText);
-                if (settings == null)
-                {
-                    return null;
-                }
-                var password = new PasswordEncryptionClass().Decrypt(settings.JiraUserName, settings.JiraPassword, settings.JiraUrl);
-                settings.JiraPassword = password;
-            }
-            catch (JsonReaderException)
-            {
-                return null;
-            }
-
-            return settings;
-        }
-
-
-        public Settings LoadAndCheck(Action settingsSource, Action<string> errorMessageReporter)
         {
             Settings settings;
             bool settingsValid;
@@ -69,17 +52,7 @@ namespace JiraTimeBot.Core.Configuration
             return settings;
         }
 
-        public void Save(Settings settings)
+        private static bool SettingsIsValid(Settings settings, out string message)
-        {
-            var password = new PasswordEncryptionClass().Encrypt(settings.JiraUserName, settings.JiraPassword, settings.JiraUrl);
-            settings.JiraPassword = password;
-
-            var configDir = Application.UserAppDataPath.Replace(Application.ProductVersion, "");
-            var settingsPath = Path.Combine(configDir, _settingsFileName);
-            var settingsString = JsonConvert.SerializeObject(settings);
-            File.WriteAllText(settingsPath, settingsString);
-        }
-        public bool SettingsIsValid(Settings settings, out string message)
         {
             if (settings == null)
             {
@@ -90,7 +63,7 @@ namespace JiraTimeBot.Core.Configuration
             var errors = new List<string>();
             message = null;
 
-            if (settings.RoundToMinutes == default(int))
+            if (settings.RoundToMinutes == default)
             {
                 errors.Add("Укажите округление времени, например, 10 (минут)");
             }
@@ -124,5 +97,61 @@ namespace JiraTimeBot.Core.Configuration
             return !hasErrors;
         }
 
+        public static Settings Load()
+        {
+            var configDir = Application.UserAppDataPath.Replace(Application.ProductVersion, "");
+            var settingsPath = Path.Combine(configDir, _settingsFileName);
+            if (!File.Exists(settingsPath))
+            {
+                return null;
+            }
+
+            var settingsText = File.ReadAllText(settingsPath);
+
+            Settings settings;
+
+            try
+            {
+                settings = JsonConvert.DeserializeObject<Settings>(settingsText);
+                if (settings == null)
+                {
+                    return null;
+                }
+                var password = new PasswordEncryptionClass().Decrypt(settings.JiraUserName, settings.JiraPassword, settings.JiraUrl);
+                settings.JiraPassword = password;
+            }
+            catch (JsonReaderException)
+            {
+                return null;
+            }
+
+            return settings;
+        }
+
+        public void Save()
+        {
+            var password = new PasswordEncryptionClass().Encrypt(this.JiraUserName, this.JiraPassword, this.JiraUrl);
+            this.JiraPassword = password;
+
+            var configDir = Application.UserAppDataPath.Replace(Application.ProductVersion, "");
+            var settingsPath = Path.Combine(configDir, _settingsFileName);
+            var settingsString = JsonConvert.SerializeObject(this);
+            File.WriteAllText(settingsPath, settingsString);
+        }
+
+        private static readonly string _settingsFileName = "settings.json";
+
+        public string[] GetRepositories()
+        {
+            return RepositoryPath.Split(';').Select(c => c.Trim()).ToArray();
+        }
     }
-}
+
+    public enum WorkType
+    {
+        Mercurial = 0,
+        JiraLogs = 1,
+        GitLogs = 2,
+        CVSMixed = 3
+    }
+}

src/JiraTimeBot/DI/ContainerBuilder.cs

@@ -1,20 +1,18 @@
 using Autofac;
 using Autofac.Extras.AggregateService;
+using JiraTimeBot.JiraIntegration;
+using JiraTimeBot.JiraIntegration.Comments;
+using JiraTimeBot.RepositoryProviders;
+using JiraTimeBot.RepositoryProviders.Interfaces;
+using JiraTimeBot.RepositoryProviders.Modifiers;
+using JiraTimeBot.TasksProcessors;
+using JiraTimeBot.TaskTime;
+using JiraTimeBot.UI;
+using JiraTimeBot.UI.Startup;
 using JiraTimeBot.UI.Tray;
+using JiraTimeBot.Update;
 using System;
 using System.Windows.Forms;
-using JiraTimeBot.Core;
-using JiraTimeBot.Core.Configuration;
-using JiraTimeBot.Core.JiraIntegration;
-using JiraTimeBot.Core.JiraIntegration.Comments;
-using JiraTimeBot.Core.Mercurial;
-using JiraTimeBot.Core.Mercurial.Modifiers;
-using JiraTimeBot.Core.StartUp;
-using JiraTimeBot.Core.TasksProcessors;
-using JiraTimeBot.Core.TaskTime;
-using JiraTimeBot.Core.Update;
-using JiraTimeBot.Core.Update.Update;
-using JiraTimeBot.UI;
 
 namespace JiraTimeBot.DI
 {
@@ -46,10 +44,12 @@ namespace JiraTimeBot.DI
 
             _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>();
@@ -58,12 +58,14 @@ namespace JiraTimeBot.DI
 
             _builder.RegisterType<JiraDescriptionSource>().AsSelf().As<IJiraDescriptionSource>();
             _builder.RegisterType<JiraApi>().AsSelf().AsImplementedInterfaces();
-            
+
-            _builder.Register(c => new Job(c.Resolve<IAllMercurialProviders>(), c.Resolve<ITaskTimeCalculator>(), c.Resolve<ILog>())).AsSelf();
+            _builder.RegisterType<JiraHistory>().AsSelf().As<IJiraHistory>();
+
+            _builder.Register(c => new Job(c.Resolve<IAllRepositoryProviders>(), c.Resolve<ITaskTimeCalculator>(),
+                c.Resolve<IJiraApi>(), c.Resolve<ILog>())).AsSelf();
 
             _builder.RegisterType<AutoStartUp>().AsSelf().AsImplementedInterfaces();
             _builder.RegisterType<frmSettings>().AsSelf().AsImplementedInterfaces();
-            _builder.RegisterType<SettingsManager>().AsSelf().AsImplementedInterfaces().SingleInstance();
 
             var container = _builder.Build();
             return container;

src/JiraTimeBot/JiraIntegration/Authentificators/JSessionAuthenticator.cs

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

src/JiraTimeBot/JiraIntegration/Comments/IJiraDescriptionSource.cs

@@ -1,7 +1,7 @@
-using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Configuration;
-using JiraTimeBot.Core.TaskTime.Objects;
+using JiraTimeBot.TaskTime.Objects;
 
-namespace JiraTimeBot.Core.JiraIntegration.Comments
+namespace JiraTimeBot.JiraIntegration.Comments
 {
     public interface IJiraDescriptionSource
     {

src/JiraTimeBot/JiraIntegration/Comments/JiraDescriptionSource.cs

@@ -0,0 +1,13 @@
+using JiraTimeBot.Configuration;
+using JiraTimeBot.TaskTime.Objects;
+
+namespace JiraTimeBot.JiraIntegration.Comments
+{
+    public class JiraDescriptionSource : IJiraDescriptionSource
+    {
+        public string GetDescription(TaskTimeItem taskTimeItem, bool addCommentsToWorklog, Settings settings)
+        {
+            return addCommentsToWorklog ? taskTimeItem.Description : "";
+        }
+    }
+}

src/JiraTimeBot/JiraIntegration/IJiraApi.cs

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

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -1,15 +1,17 @@
-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 JiraTimeBot.JiraIntegration.Authentificators;
-using JiraTimeBot.Core.Configuration;
+using RestSharp.Authenticators;
-using JiraTimeBot.Core.JiraIntegration.Comments;
-using JiraTimeBot.Core.TaskTime.Objects;
 
-namespace JiraTimeBot.Core.JiraIntegration
+namespace JiraTimeBot.JiraIntegration
 {
-    public class JiraApi
+    public class JiraApi : IJiraApi
     {
         private readonly ILog _log;
         private readonly IJiraDescriptionSource _descriptionSource;
@@ -22,9 +24,9 @@ namespace JiraTimeBot.Core.JiraIntegration
 
         public string GetTaskName(string branch, Settings settings)
         {
-            var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);
             try
             {
+                var jira = GetClient(settings);
                 var issue = jira.Issues.Queryable.FirstOrDefault(f => f.Key == branch);
                 return issue?.Summary;
             }
@@ -34,9 +36,9 @@ namespace JiraTimeBot.Core.JiraIntegration
             }
         }
 
-        public List<Issue> GetIssuesByJQL(string jql, 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);
+            var jira = GetClient(settings);
             date = date.GetValueOrDefault(DateTime.Now.Date);
 
             var userName = settings.JiraUserName;
@@ -51,8 +53,7 @@ namespace JiraTimeBot.Core.JiraIntegration
 
             try
             {
-                List<Issue> affectedIssues =
+                List<Issue> affectedIssues = jira.Issues.GetIssuesFromJqlAsync(jql, 100, 0, cancellationToken).Result.ToList();
-                    jira.Issues.GetIssuesFromJqlAsync(jql, 100, 0, cancellationToken).Result.ToList();
                 return affectedIssues;
             }
             catch (Exception ex)
@@ -62,14 +63,37 @@ namespace JiraTimeBot.Core.JiraIntegration
             }
         }
 
-        public List<Issue> GetWorkloggedIssuesByDate(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
+        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 = "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(CancellationToken))
+        public List<Worklog> GetManuallyWorklogged(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date, CancellationToken cancellationToken = default)
+        {
+            var result = new List<Worklog>();
+            var alreadyLoggedToday = GetWorkloggedIssuesByDate(settings, date);
+            foreach (var issue in alreadyLoggedToday)
+            {
+                if (!taskTimeItems.Any(f => f.Branch.Equals(issue.Key.Value, StringComparison.InvariantCulture)))
+                {
+                    var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
+                    var userWorklogs = workLogs.Where(w =>
+                        w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
+                            StringComparison.InvariantCultureIgnoreCase)).ToList();
+                    foreach (var userWorklog in userWorklogs)
+                    {
+                        result.Add(userWorklog);
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        private void RemoveWorklogsAddedByUser(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, CancellationToken cancellationToken = default)
         {
             var alreadyLoggedToday = GetWorkloggedIssuesByDate(settings, date);
             foreach (var issue in alreadyLoggedToday)
@@ -78,7 +102,7 @@ namespace JiraTimeBot.Core.JiraIntegration
                 {
                     var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
                     var userWorklogs = workLogs.Where(w =>
-                        w.CreateDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
+                        w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
                             StringComparison.InvariantCultureIgnoreCase)).ToList();
                     foreach (var userWorklog in userWorklogs)
                     {
@@ -93,13 +117,16 @@ namespace JiraTimeBot.Core.JiraIntegration
             }
         }
 
-        public void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false, CancellationToken cancellationToken = default(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);
+            var jira = GetClient(settings);
-
+            
-            //Удаляем добавленные вручную пользователем данные.
+            if (settings.RemoveManuallyAddedWorklogs)
-            RemoveWorklogsAddedByUser(taskTimeItems, settings, date, dummy, cancellationToken);
+            {
+                //Удаляем добавленные вручную пользователем данные.
+                RemoveWorklogsAddedByUser(taskTimeItems, settings, date, dummy, cancellationToken);
+            }
 
             foreach (TaskTimeItem taskTimeItem in taskTimeItems)
             {
@@ -108,9 +135,9 @@ namespace JiraTimeBot.Core.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)
                 {
@@ -128,7 +155,7 @@ namespace JiraTimeBot.Core.JiraIntegration
                 foreach (var workLog in userWorklogs)
                 {
                     var timeSpent = TimeSpan.FromSeconds(workLog.TimeSpentInSeconds);
-                    var timeDiff = Math.Abs((timeSpent - taskTimeItem.Time).TotalMinutes);
+                    var timeDiff = Math.Abs((timeSpent - taskTimeItem.TimeSpent).TotalMinutes);
                     if (timeDiff > 1 || userWorklogs.Count > 1 || userWorklogs.First().Comment != comment)
                     {
                         if (timeDiff > 1)
@@ -145,7 +172,15 @@ namespace JiraTimeBot.Core.JiraIntegration
                         }
                         if (!dummy)
                         {
-                            issue.DeleteWorklogAsync(workLog, token: cancellationToken);
+                            try
+                            {
+                                issue.DeleteWorklogAsync(workLog, WorklogStrategy.AutoAdjustRemainingEstimate, token: cancellationToken);
+                            }
+                            catch (Exception ex)
+                            {
+                                _log.Error($"Не могу удалить Worklog по задаче {taskTimeItem.Branch}: {ex.Message}.");
+                                continue;
+                            }
                         }
                         hasTodayWorklog = false;
                     }
@@ -158,16 +193,34 @@ namespace JiraTimeBot.Core.JiraIntegration
 
                 if (!hasTodayWorklog)
                 {
-                    var timeSpentJira = $"{taskTimeItem.Time.TotalMinutes}m";
+                    var timeSpentJira = $"{taskTimeItem.TimeSpent.TotalMinutes}m";
 
                     Worklog workLogToAdd = new Worklog(timeSpentJira, date.Value, comment);
                     if (!dummy)
                     {
-                        workLogToAdd = issue.AddWorklogAsync(workLogToAdd, token: cancellationToken).Result;
+                        try
+                        {
+                            workLogToAdd = issue.AddWorklogAsync(workLogToAdd, WorklogStrategy.AutoAdjustRemainingEstimate, 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}");
                 }
             }
         }
+
+        public Jira GetClient(Settings settings)
+        {
+            var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);
+            if (settings.JiraPassword.Length == 32)
+            {
+                jira.RestClient.RestSharpClient.Authenticator = new JSessionAuthenticator(settings.JiraPassword);
+            }
+            return jira;
+        }
     }
 }

src/JiraTimeBot/JiraIntegration/JiraHistory.cs

@@ -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,143 +1,234 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.2.0.306\build\net46\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.2.0.306\build\net46\LibGit2Sharp.NativeBinaries.props')" />
-  <PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+  <PropertyGroup>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <ProjectGuid>{F3B89316-C38C-4CE6-9D88-0B1373CFBA1A}</ProjectGuid>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <OutputType>WinExe</OutputType>
+    <ProjectGuid>{F3B89316-C38C-4CE6-9D88-0B1373CFBA1A}</ProjectGuid>
-    <RootNamespace>JiraTimeBot</RootNamespace>
+    <OutputType>WinExe</OutputType>
-    <AssemblyName>JiraTimeBot</AssemblyName>
+    <RootNamespace>JiraTimeBot</RootNamespace>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <AssemblyName>JiraTimeBot</AssemblyName>
-    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
-  </PropertyGroup>
+    <NuGetPackageImportStamp>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    </NuGetPackageImportStamp>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PublishUrl>publish\</PublishUrl>
-    <DebugSymbols>true</DebugSymbols>
+    <Install>true</Install>
-    <DebugType>full</DebugType>
+    <InstallFrom>Disk</InstallFrom>
-    <Optimize>false</Optimize>
+    <UpdateEnabled>false</UpdateEnabled>
-    <OutputPath>bin\Debug\</OutputPath>
+    <UpdateMode>Foreground</UpdateMode>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <UpdateInterval>7</UpdateInterval>
-    <ErrorReport>prompt</ErrorReport>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <WarningLevel>4</WarningLevel>
+    <UpdatePeriodically>false</UpdatePeriodically>
-  </PropertyGroup>
+    <UpdateRequired>false</UpdateRequired>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <MapFileExtensions>true</MapFileExtensions>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ApplicationRevision>0</ApplicationRevision>
-    <DebugType>pdbonly</DebugType>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <Optimize>true</Optimize>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <OutputPath>bin\Release\</OutputPath>
+    <UseApplicationTrust>false</UseApplicationTrust>
-    <DefineConstants>TRACE</DefineConstants>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
-    <WarningLevel>4</WarningLevel>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
+    <PlatformTarget>AnyCPU</PlatformTarget>
-  <PropertyGroup>
+    <DebugSymbols>true</DebugSymbols>
-    <ApplicationIcon>app.ico</ApplicationIcon>
+    <DebugType>full</DebugType>
-  </PropertyGroup>
+    <Optimize>false</Optimize>
-  <ItemGroup>
+    <OutputPath>bin\Debug\</OutputPath>
-    <Reference Include="Atlassian.Jira, Version=10.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
-      <HintPath>..\packages\Atlassian.SDK.10.4.0\lib\net452\Atlassian.Jira.dll</HintPath>
+    <ErrorReport>prompt</ErrorReport>
-    </Reference>
+    <WarningLevel>4</WarningLevel>
-    <Reference Include="Autofac, Version=4.9.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+    <LangVersion>7.1</LangVersion>
-      <HintPath>..\packages\Autofac.4.9.1\lib\net45\Autofac.dll</HintPath>
+    <Prefer32Bit>false</Prefer32Bit>
-    </Reference>
+  </PropertyGroup>
-    <Reference Include="Autofac.Extras.AggregateService, Version=4.1.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-      <HintPath>..\packages\Autofac.Extras.AggregateService.4.1.0\lib\net45\Autofac.Extras.AggregateService.dll</HintPath>
+    <PlatformTarget>AnyCPU</PlatformTarget>
-    </Reference>
+    <DebugType>pdbonly</DebugType>
-    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+    <Optimize>true</Optimize>
-      <HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
+    <OutputPath>bin\Release\</OutputPath>
-    </Reference>
+    <DefineConstants>TRACE</DefineConstants>
-    <Reference Include="Mercurial.Net, Version=1.1.1.607, Culture=neutral, PublicKeyToken=9e2fabf3af85dba9, processorArchitecture=MSIL">
+    <ErrorReport>prompt</ErrorReport>
-      <HintPath>..\packages\Mercurial.Net.1.1.1.607\lib\net35-Client\Mercurial.Net.dll</HintPath>
+    <WarningLevel>4</WarningLevel>
-    </Reference>
+  </PropertyGroup>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+  <PropertyGroup>
-      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <ApplicationIcon>app.ico</ApplicationIcon>
-    </Reference>
+  </PropertyGroup>
-    <Reference Include="RestSharp, Version=106.6.9.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+  <PropertyGroup>
-      <HintPath>..\packages\RestSharp.106.6.9\lib\net452\RestSharp.dll</HintPath>
+    <StartupObject>JiraTimeBot.Program</StartupObject>
-    </Reference>
+  </PropertyGroup>
-    <Reference Include="System" />
+  <ItemGroup>
-    <Reference Include="System.Configuration" />
+    <Reference Include="Atlassian.Jira, Version=12.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-    <Reference Include="System.Core" />
+      <HintPath>..\packages\Atlassian.SDK.12.4.0\lib\net452\Atlassian.Jira.dll</HintPath>
-    <Reference Include="System.DirectoryServices" />
+    </Reference>
-    <Reference Include="System.IO.Compression" />
+    <Reference Include="Autofac, Version=6.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-    <Reference Include="System.IO.Compression.FileSystem" />
+      <HintPath>..\packages\Autofac.6.2.0\lib\netstandard2.0\Autofac.dll</HintPath>
-    <Reference Include="System.Runtime.Serialization" />
+    </Reference>
-    <Reference Include="System.Security" />
+    <Reference Include="Autofac.Extras.AggregateService, Version=6.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-    <Reference Include="System.ServiceModel" />
+      <HintPath>..\packages\Autofac.Extras.AggregateService.6.0.0\lib\netstandard2.0\Autofac.Extras.AggregateService.dll</HintPath>
-    <Reference Include="System.Transactions" />
+    </Reference>
-    <Reference Include="System.Web" />
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-    <Reference Include="System.Xml.Linq" />
+      <HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
-    <Reference Include="System.Data.DataSetExtensions" />
+    </Reference>
-    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="LibGit2Sharp, Version=0.26.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
-    <Reference Include="System.Data" />
+      <HintPath>..\packages\LibGit2Sharp.0.26.2\lib\net46\LibGit2Sharp.dll</HintPath>
-    <Reference Include="System.Deployment" />
+    </Reference>
-    <Reference Include="System.Drawing" />
+    <Reference Include="Mercurial.Net, Version=1.1.1.607, Culture=neutral, PublicKeyToken=9e2fabf3af85dba9, processorArchitecture=MSIL">
-    <Reference Include="System.Net.Http" />
+      <HintPath>..\packages\Mercurial.Net.1.1.1.607\lib\net35-Client\Mercurial.Net.dll</HintPath>
-    <Reference Include="System.Windows.Forms" />
+    </Reference>
-    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-  </ItemGroup>
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-  <ItemGroup>
+    </Reference>
-    <Compile Include="DI\ContainerBuilder.cs" />
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-    <Compile Include="Logger.cs" />
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    <Compile Include="UI\frmMain.cs">
+    </Reference>
-      <SubType>Form</SubType>
+    <Reference Include="RestSharp, Version=106.11.7.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
-    </Compile>
+      <HintPath>..\packages\RestSharp.106.11.7\lib\net452\RestSharp.dll</HintPath>
-    <Compile Include="UI\frmMain.Designer.cs">
+    </Reference>
-      <DependentUpon>frmMain.cs</DependentUpon>
+    <Reference Include="System" />
-    </Compile>
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-    <Compile Include="Program.cs" />
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    </Reference>
-    <Compile Include="UI\frmSettings.cs">
+    <Reference Include="System.ComponentModel.Composition" />
-      <SubType>Form</SubType>
+    <Reference Include="System.Configuration" />
-    </Compile>
+    <Reference Include="System.Core" />
-    <Compile Include="UI\frmSettings.Designer.cs">
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <DependentUpon>frmSettings.cs</DependentUpon>
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Compile>
+    </Reference>
-    <Compile Include="UI\Tray\SingleInstance.cs" />
+    <Reference Include="System.DirectoryServices" />
-    <Compile Include="UI\Tray\ITrayMenu.cs" />
+    <Reference Include="System.IO.Compression" />
-    <Compile Include="UI\Tray\RestoreFromTray.cs" />
+    <Reference Include="System.IO.Compression.FileSystem" />
-    <Compile Include="UI\Tray\TrayMenu.cs" />
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-    <EmbeddedResource Include="UI\frmMain.resx">
+      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
-      <DependentUpon>frmMain.cs</DependentUpon>
+    </Reference>
-    </EmbeddedResource>
+    <Reference Include="System.Numerics" />
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </Reference>
-      <SubType>Designer</SubType>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-    </EmbeddedResource>
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    <Compile Include="Properties\Resources.Designer.cs">
+    </Reference>
-      <AutoGen>True</AutoGen>
+    <Reference Include="System.Runtime.Serialization" />
-      <DependentUpon>Resources.resx</DependentUpon>
+    <Reference Include="System.Security" />
-      <DesignTime>True</DesignTime>
+    <Reference Include="System.ServiceModel" />
-    </Compile>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-    <EmbeddedResource Include="UI\frmSettings.resx">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-      <DependentUpon>frmSettings.cs</DependentUpon>
+    </Reference>
-    </EmbeddedResource>
+    <Reference Include="System.Transactions" />
-    <None Include="packages.config" />
+    <Reference Include="System.Web" />
-    <None Include="Properties\Settings.settings">
+    <Reference Include="System.Xml.Linq" />
-      <Generator>SettingsSingleFileGenerator</Generator>
+    <Reference Include="System.Data.DataSetExtensions" />
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    <Reference Include="Microsoft.CSharp" />
-    </None>
+    <Reference Include="System.Data" />
-    <Compile Include="Properties\Settings.Designer.cs">
+    <Reference Include="System.Deployment" />
-      <AutoGen>True</AutoGen>
+    <Reference Include="System.Drawing" />
-      <DependentUpon>Settings.settings</DependentUpon>
+    <Reference Include="System.Net.Http" />
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    <Reference Include="System.Windows.Forms" />
-    </Compile>
+    <Reference Include="System.Xml" />
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <None Include="App.config" />
+    <Compile Include="DI\ContainerBuilder.cs" />
-  </ItemGroup>
+    <Compile Include="JiraIntegration\Authentificators\JSessionAuthenticator.cs" />
-  <ItemGroup>
+    <Compile Include="JiraIntegration\Comments\IJiraDescriptionSource.cs" />
-    <Content Include="app.ico" />
+    <Compile Include="JiraIntegration\Comments\JiraDescriptionSource.cs" />
-  </ItemGroup>
+    <Compile Include="JiraIntegration\IJiraApi.cs" />
-  <ItemGroup>
+    <Compile Include="JiraIntegration\JiraHistory.cs" />
-    <ProjectReference Include="..\JiraTimeBot.Core\JiraTimeBot.Core.csproj">
+    <Compile Include="Job.cs" />
-      <Project>{35D8A11F-05F8-408D-A37D-0EECD96FA67A}</Project>
+    <Compile Include="Logger.cs" />
-      <Name>JiraTimeBot.Core</Name>
+    <Compile Include="Configuration\Settings.cs" />
-    </ProjectReference>
+    <Compile Include="RepositoryProviders\JiraCommitEmulator.cs" />
-  </ItemGroup>
+    <Compile Include="RepositoryProviders\GitLog.cs" />
-  <ItemGroup />
+    <Compile Include="RepositoryProviders\Interfaces\IAllVcsProviders.cs" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+    <Compile Include="RepositoryProviders\Modifiers\ITechnicalInfoSkipper.cs" />
+    <Compile Include="RepositoryProviders\Modifiers\CommitSkipper.cs" />
+    <Compile Include="RepositoryProviders\Modifiers\ICommitSkipper.cs" />
+    <Compile Include="RepositoryProviders\Interfaces\IRepositoryLog.cs" />
+    <Compile Include="RepositoryProviders\Modifiers\TechnicalInfoSkipper.cs" />
+    <Compile Include="TasksProcessors\IAllTasksProcessors.cs" />
+    <Compile Include="TaskTime\Objects\CommitType.cs" />
+    <Compile Include="TaskTime\TaskTimeSpread.cs" />
+    <Compile Include="UI\frmMain.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="UI\frmMain.Designer.cs">
+      <DependentUpon>frmMain.cs</DependentUpon>
+    </Compile>
+    <Compile Include="JiraIntegration\JiraApi.cs" />
+    <Compile Include="RepositoryProviders\MercurialLog.cs" />
+    <Compile Include="Configuration\PasswordEncryptionClass.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TasksProcessors\ITasksProcessor.cs" />
+    <Compile Include="TasksProcessors\MeetingProcessor.cs" />
+    <Compile Include="TasksProcessors\WorkLogTasksProcessor.cs" />
+    <Compile Include="TaskTime\ITaskTimeCalculator.cs" />
+    <Compile Include="TaskTime\TaskTimeByCommitsCalculator.cs" />
+    <Compile Include="TaskTime\Objects\TaskTimeItem.cs" />
+    <Compile Include="UI\frmSettings.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <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>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <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>
+    </EmbeddedResource>
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="app.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.2.0.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

@@ -0,0 +1,202 @@
+using JiraTimeBot.Configuration;
+using JiraTimeBot.RepositoryProviders.Interfaces;
+using JiraTimeBot.TasksProcessors;
+using JiraTimeBot.TaskTime;
+using JiraTimeBot.TaskTime.Objects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using JiraTimeBot.JiraIntegration;
+
+namespace JiraTimeBot
+{
+    class Job
+    {
+        private readonly IAllRepositoryProviders _repositoryProviders;
+        private readonly ITaskTimeCalculator _taskTimeDiscoverer;
+        private readonly IJiraApi _jiraApi;
+        private readonly ILog _log;
+
+        public Job(IAllRepositoryProviders repositoryProviders, 
+                   ITaskTimeCalculator taskTimeDiscoverer, 
+                   IJiraApi jiraApi, 
+                   ILog log)
+        {
+            _repositoryProviders = repositoryProviders;
+            _taskTimeDiscoverer = taskTimeDiscoverer;
+            _jiraApi = jiraApi;
+            _log = log;
+        }
+
+        public Task DoTheJob(Settings settings, ITasksProcessor tasksProcessor, bool dummyMode, CancellationToken cancellationToken)
+        {
+            _log.Info("Начинаем работу");
+
+            return Task.Run(() => DoTheJobImpl(settings, tasksProcessor, dummyMode, cancellationToken), cancellationToken);
+        }
+
+        private void DoTheJobImpl(Settings settings, 
+                                  ITasksProcessor tasksProcessor, 
+                                  bool dummyMode, 
+                                  CancellationToken cancellationToken)
+        {
+            int daysDiff = 0;
+            if (tasksProcessor is MeetingProcessor)
+            {
+                daysDiff = -1;
+            }
+
+            var setForDate = DateTime.Now.Date;
+            while (true)
+            {
+                DateTime realDate = DateTime.Now.Date.AddDays(daysDiff);
+
+                if (SetTaskTimesForDateImpl(setForDate, realDate, settings, tasksProcessor, dummyMode, cancellationToken))
+                {
+                    return;
+                }
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
+
+                _log.Warn($"{realDate:dd.MM.yyyy} вы не сделали ничего полезного =) Использую предыдущий день.");
+                daysDiff--;
+                if (daysDiff < -7)
+                {
+                    _log.Error("Не нашли ни одного коммита за предыдущие 7 дней. Возможно вы в отпуске? Выхожу.");
+                    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)
+        {
+            List<TaskTimeItem> tasks = new List<TaskTimeItem>();
+            if (tasksProcessor is MeetingProcessor)
+            {
+                var provider = _repositoryProviders.JiraHistory;
+                tasks = provider.GetDayWorklogs(realDate, settings, cancellationToken);
+                return SetTaskTimesForDate(setForDate, realDate, settings, tasksProcessor, dummyMode, tasks, cancellationToken);
+            }
+
+            switch (settings.WorkType)
+            {
+                case WorkType.Mercurial:
+                {
+                    var repo = _repositoryProviders.JiraCommitEmulator;
+                    tasks = GetTasksFromRepositories(realDate, settings, new[] {repo});
+                    break;
+                }
+                case WorkType.JiraLogs:
+                {
+                    var repo = _repositoryProviders.JiraCommitEmulator;
+                    tasks = GetTasksFromRepositories(realDate, settings, new[] {repo});
+                    break;
+                }
+                case WorkType.GitLogs:
+                {
+                    var repo = _repositoryProviders.GitLog;
+                    tasks = GetTasksFromRepositories(realDate, settings, new[] {repo});
+                    break;
+                }
+                case WorkType.CVSMixed:
+                {
+                    var repos = new[] {_repositoryProviders.GitLog as IRepositoryLog, _repositoryProviders.MercurialLog};
+                    tasks = GetTasksFromRepositories(realDate, settings, repos);
+                    break;
+                }
+                default:
+                {
+                    return false;
+                }
+            }
+
+            var result = SetTaskTimesForDate(setForDate, realDate, settings, tasksProcessor, dummyMode, tasks, cancellationToken);
+            return result;
+        }
+
+        private List<TaskTimeItem> GetTasksFromRepositories(DateTime realDate, 
+                                                            Settings settings,  
+                                                            IEnumerable<IRepositoryLog> repositories)
+        {
+            var result = new List<TaskTimeItem>();
+            foreach (var repositoryLog in repositories)
+            {
+                foreach (var repoPath in settings.GetRepositories())
+                {
+                    var items = repositoryLog.GetRepositoryLog(settings, repoPath, realDate);
+                    result.AddRange(items);
+                }
+            }
+            return result;
+        }
+
+
+        private bool SetTaskTimesForDate(DateTime setForDate, 
+                                         DateTime realDate, 
+                                         Settings settings, 
+                                         ITasksProcessor tasksProcessor, 
+                                         bool dummyMode, 
+                                         List<TaskTimeItem> taskTimes,
+                                         CancellationToken cancellationToken)
+        {
+            if (!(tasksProcessor is MeetingProcessor))
+            {
+                List<TaskTimeItem> commits = taskTimes;
+                ModifyWorktimeByManualLogs(setForDate, settings, cancellationToken, commits);
+                taskTimes = _taskTimeDiscoverer.CalculateTaskTime(commits, settings, cancellationToken);
+            }
+            else
+            {
+                var provider = _repositoryProviders.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;
+        }
+
+        private void ModifyWorktimeByManualLogs(DateTime setForDate, Settings settings, CancellationToken cancellationToken,
+            List<TaskTimeItem> commits)
+        {
+            if (settings.RemoveManuallyAddedWorklogs)
+            {
+                return;
+            }
+
+            //если не удаляем добавленное вручную, то посчитаем сколько там надобавляли и отнимем от рабочего дня
+            var manuallyWorklogged = _jiraApi.GetManuallyWorklogged(commits, settings, setForDate, cancellationToken);
+            if (manuallyWorklogged.Any() && manuallyWorklogged.Sum(f => f.TimeSpentInSeconds) < settings.MinuterPerWorkDay)
+            {
+                settings.MinuterPerWorkDay = (int) (settings.MinuterPerWorkDay - manuallyWorklogged.Sum(f => f.TimeSpentInSeconds));
+            }
+        }
+    }
+}

src/JiraTimeBot/Logger.cs

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using JiraTimeBot.Core;
 
 namespace JiraTimeBot
 {
@@ -39,4 +38,12 @@ namespace JiraTimeBot
             AppendText(message);
         }
     }
+
+    public interface ILog
+    {
+        void Info([Localizable(false)] string message);
+        void Trace([Localizable(false)] string message);
+        void Warn([Localizable(false)] string message);
+        void Error([Localizable(false)] string message);
+    }
 }

src/JiraTimeBot/Properties/AssemblyInfo.cs

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

src/JiraTimeBot/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace JiraTimeBot.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", "16.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 {

src/JiraTimeBot/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace JiraTimeBot.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.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 {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

src/JiraTimeBot/RepositoryProviders/GitLog.cs

@@ -0,0 +1,222 @@
+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.Text.RegularExpressions;
+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, string currentRepository, DateTime? date = null, CancellationToken cancellationToken = default)
+        {
+            if (string.IsNullOrEmpty(currentRepository) || !Directory.Exists(currentRepository))
+            {
+                _log.Error("Папка с репо не сушествует.");
+                return new List<TaskTimeItem>();
+            }
+
+            date = date.GetValueOrDefault(DateTime.Now.Date);
+
+            var workTasks = new List<TaskTimeItem>();
+            foreach (var repoDirectory in Directory.GetDirectories(currentRepository, ".git", SearchOption.AllDirectories))
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return new List<TaskTimeItem>();
+                }
+
+                //var project = new DirectoryInfo(repoDirectory).Name;
+                var repoRootDirectory = repoDirectory.Replace(".git", "");
+                var directoryInfo = new DirectoryInfo(repoRootDirectory);
+                if (!directoryInfo.Exists)
+                {
+                    continue;
+                }
+
+
+                var repo = new LibGit2Sharp.Repository(repoRootDirectory);
+                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)
+                {
+
+                    var dateMatch = date.Value.Date == reflogItem.Committer.When.Date;
+                    var committerEmail = reflogItem.Committer.Email;
+
+                    var userMatch = committerEmail.Equals(settings.MercurialAuthorEmail, StringComparison.CurrentCultureIgnoreCase)
+                                    || committerEmail.Equals(settings.AlternativeEmail, StringComparison.CurrentCultureIgnoreCase);
+
+                    if (!dateMatch || !userMatch)
+                    {
+                        continue;
+                    }
+
+                    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>();
+                    }
+
+                    var userMatch = commit.Author.Email.Equals(settings.MercurialAuthorEmail, StringComparison.CurrentCultureIgnoreCase)
+                                    || commit.Author.Email.Equals(settings.AlternativeEmail, StringComparison.CurrentCultureIgnoreCase);
+
+
+                    if (commit.Author.When.DateTime.Date != date.Value.Date 
+                        || !userMatch)
+                    {
+                        continue;
+                    }
+
+                    var regex = new Regex("[a-zA-Z0-9]{1,4}-[0-9]{1,6}");
+                    var branch = ListBranchesContainsCommit(repo, commit.Sha)
+                                 .Select(f => f.FriendlyName)
+                                 .FirstOrDefault(f => regex.IsMatch(f));
+                                 
+
+                        //.Where(f => f.Contains("-") && !f.Contains("/")).Distinct().FirstOrDefault();
+                    if (branch == null)
+                    {
+                        continue;
+                    }
+
+                    branch = regex.Match(branch).Value;
+
+                    var commitMessage = commit.MessageShort;
+                    commitMessage = _technicalInfoSkipper.StripBranchPrefix(branch, commitMessage);
+
+                    if (_commitSkipper.IsNeedToSkip(branch, commitMessage))
+                    {
+                        continue;
+                    }
+
+                    commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
+                    var files = FilesToMerge(commit, repo);
+
+                    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> ListBranchesContainsCommit(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)
+            {
+                List<Commit> commits = new List<Commit>();
+                try
+                {
+                    commits = repo.Commits.QueryBy(new CommitFilter {IncludeReachableFrom = branch}).Where(c => c.Sha == commitSha).ToList();
+                }
+                catch (Exception)
+                {
+                    continue;
+                }
+
+                if (!commits.Any())
+                {
+                    continue;
+                }
+
+                yield return branch;
+            }
+        }
+    }
+}

src/JiraTimeBot/RepositoryProviders/Interfaces/IAllVcsProviders.cs

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

src/JiraTimeBot/RepositoryProviders/JiraCommitEmulator.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Atlassian.Jira;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.JiraIntegration;
+using JiraTimeBot.RepositoryProviders.Interfaces;
+using JiraTimeBot.TaskTime.Objects;
+
+namespace JiraTimeBot.RepositoryProviders
+{
+    public class JiraCommitEmulator : IRepositoryLog
+    {
+        private readonly ILog _log;
+        private readonly JiraApi _jiraApi;
+
+        public JiraCommitEmulator(ILog log, JiraApi jiraApi)
+        {
+            _log = log;
+            _jiraApi = jiraApi;
+        }
+
+        public List<TaskTimeItem> GetRepositoryLog(Settings settings,
+                                                   string currentRepository,
+                                                   DateTime? date = null,
+                                                   CancellationToken cancellationToken = default(CancellationToken))
+        {
+            date = date.GetValueOrDefault(DateTime.Now.Date);
+            var workTasks = new List<TaskTimeItem>();
+            var issues = _jiraApi.GetIssuesByJQL(settings.JiraQuery, settings, date, cancellationToken);
+
+            foreach (var issue in issues)
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return new List<TaskTimeItem>();
+                }
+                var comments = issue.GetCommentsAsync(cancellationToken).Result?.ToList() ?? new List<Comment>();
+
+                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/RepositoryProviders/MercurialLog.cs

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

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 JiraTimeBot.Core.Mercurial.Modifiers
+namespace JiraTimeBot.RepositoryProviders.Modifiers
 {
     public interface ICommitSkipper
     {

src/JiraTimeBot/RepositoryProviders/Modifiers/ITechnicalInfoSkipper.cs

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

src/JiraTimeBot/RepositoryProviders/Modifiers/TechnicalInfoSkipper.cs

@@ -1,9 +1,26 @@
-using System.Text;
+using System;
+using System.Text;
 
-namespace JiraTimeBot.Core.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

@@ -0,0 +1,12 @@
+using JiraTimeBot.Configuration;
+using JiraTimeBot.TaskTime.Objects;
+using System.Collections.Generic;
+using System.Threading;
+
+namespace JiraTimeBot.TaskTime
+{
+    public interface ITaskTimeCalculator
+    {
+        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

@@ -0,0 +1,39 @@
+using System;
+
+namespace JiraTimeBot.TaskTime.Objects
+{
+    public class TaskTimeItem
+    {
+        public string Description { get; set; }
+        public string Branch { get; set; }
+        public DateTime StartTime { 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

@@ -0,0 +1,151 @@
+using JiraTimeBot.Configuration;
+using JiraTimeBot.TaskTime.Objects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+namespace JiraTimeBot.TaskTime
+{
+    public class TaskTimeByCommitsCalculator : ITaskTimeCalculator
+    {
+        private readonly ILog _log;
+        private readonly ITaskTimeSpread _spreadHelper;
+
+        public TaskTimeByCommitsCalculator(ILog log, ITaskTimeSpread spreadHelper)
+        {
+            _log = log;
+            _spreadHelper = spreadHelper;
+        }
+
+        public List<TaskTimeItem> CalculateTaskTime(List<TaskTimeItem> commits, Settings settings, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            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();
+
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return new List<TaskTimeItem>();
+            }
+            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);
+            }
+
+            PrintTotal(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)
+        {
+            if ((value % to) == 0)
+                return value;
+            if (up)
+                return (value - (value % to) + to);
+
+            return (value - (value % to));
+        }
+    }
+}

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 JiraTimeBot.Core.TasksProcessors
+namespace JiraTimeBot.TasksProcessors
 {
     public interface IAllTasksProcessors
     {

src/JiraTimeBot/TasksProcessors/ITasksProcessor.cs

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

src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs

@@ -0,0 +1,42 @@
+using JiraTimeBot.Configuration;
+using JiraTimeBot.JiraIntegration;
+using JiraTimeBot.TaskTime.Objects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+namespace JiraTimeBot.TasksProcessors
+{
+    public class MeetingProcessor : ITasksProcessor
+    {
+        private readonly ILog _log;
+        private readonly JiraApi _jiraApi;
+
+        public MeetingProcessor(ILog log, JiraApi jiraApi)
+        {
+            _log = log;
+            _jiraApi = jiraApi;
+        }
+
+        public void Process(DateTime setForDate, DateTime realDate, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            var totalTime = TimeSpan.FromSeconds(taskTimes.Sum(f => f.TimeSpent.TotalSeconds));
+            _log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам ({totalTime:hh':'mm':'ss}):");
+
+            foreach (var taskTime in taskTimes.Where(f => f.Type.HasFlag(CommitType.Task)).OrderByDescending(f => f.TimeSpent))
+            {
+                var taskName = _jiraApi.GetTaskName(taskTime.Branch, settings);
+                _log.Trace($" - [{taskTime.Branch}, коммитов {taskTime.Commits}]: {taskName} - {taskTime.TimeSpent}");
+            }
+
+            var releases = taskTimes.Where(f => f.Type.HasFlag(CommitType.Release)).GroupBy(f => f.Description);
+            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 System.Threading;
-using JiraTimeBot.Core.Configuration;
-using JiraTimeBot.Core.JiraIntegration;
-using JiraTimeBot.Core.TaskTime.Objects;
 
-namespace JiraTimeBot.Core.TasksProcessors
+namespace JiraTimeBot.TasksProcessors
 {
     public class WorkLogTasksProcessor : ITasksProcessor
     {
@@ -23,7 +23,7 @@ namespace JiraTimeBot.Core.TasksProcessors
             _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, date: setForDate, dummy: dummyMode, addCommentsToWorklog: settings.AddCommentsToWorklog, cancellationToken: cancellationToken);

src/JiraTimeBot/UI/Startup/AutoStartUp.cs

@@ -1,7 +1,7 @@
-using System.Windows.Forms;
+using Microsoft.Win32;
-using Microsoft.Win32;
+using System.Windows.Forms;
 
-namespace JiraTimeBot.Core.StartUp
+namespace JiraTimeBot.UI.Startup
 {
     public class AutoStartUp
     {

src/JiraTimeBot/UI/Tray/RestoreFromTray.cs

@@ -4,13 +4,14 @@ using System.Windows.Forms;
 
 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

@@ -4,31 +4,32 @@ using System.Runtime.InteropServices;
 
 namespace JiraTimeBot.UI.Tray
 {
-    public static class SingleInstance
+    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) {
+                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

@@ -3,9 +3,9 @@ using System.Windows.Forms;
 
 namespace JiraTimeBot.UI.Tray
 {
-    public class TrayMenu: ITrayMenu
+    public class TrayMenu : ITrayMenu
     {
-        private NotifyIcon  _trayIcon;
+        private NotifyIcon _trayIcon;
 
         public NotifyIcon Create(frmMain form)
         {
@@ -14,8 +14,8 @@ namespace JiraTimeBot.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 JiraTimeBot.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

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

src/JiraTimeBot/UI/frmMain.cs

@@ -1,19 +1,15 @@
 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.IO;
-using System.IO.Compression;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using JiraTimeBot.Core;
-using JiraTimeBot.Core.Configuration;
-using JiraTimeBot.Core.StartUp;
-using JiraTimeBot.Core.TasksProcessors;
-using JiraTimeBot.Core.Update;
-using JiraTimeBot.Core.Update.Update;
 
 // This is the code for your desktop app.
 // Press Ctrl+F5 (or go to Debug > Start Without Debugging) to run your app.
@@ -36,11 +32,13 @@ namespace JiraTimeBot.UI
 
         protected override void WndProc(ref Message message)
         {
-            if (message.Msg == SingleInstance.WM_SHOWFIRSTINSTANCE) {
+            if (message.Msg == SingleInstance.WM_SHOWFIRSTINSTANCE)
+            {
                 this.Show();
                 this.WindowState = FormWindowState.Normal;
                 _trayIcon.Hide();
             }
+
             base.WndProc(ref message);
         }
 
@@ -68,14 +66,16 @@ namespace JiraTimeBot.UI
             _log = _container.Resolve<ILog>();
             _tasksProcessors = _container.Resolve<IAllTasksProcessors>();
 
-            _controls = new Control[] { txtDummyMode, btnStart, btnMeeting, btnSettings, dteForDay, btnDoForDate };
+            _controls = new Control[] {txtDummyMode, btnStart, btnMeeting, btnSettings, dteForDay, btnDoForDate};
 
             _settingsWindowShow = () =>
             {
-                var frmSettings = new frmSettings(_container.Resolve<AutoStartUp>(), _container.Resolve<ISettingsManager>());
+                var frmSettings = new frmSettings(_container.Resolve<AutoStartUp>());
                 frmSettings.ShowDialog(this);
             };
-            _settingsErrorReporter = msg => MessageBox.Show(msg, "Загрузка настроек", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);;
+            _settingsErrorReporter = msg =>
+                MessageBox.Show(msg, "Загрузка настроек", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            ;
         }
 
         private void frmMain_FormClosing(object sender, FormClosingEventArgs e)
@@ -85,10 +85,8 @@ namespace JiraTimeBot.UI
 
         public Settings ReadSettingsAndLock()
         {
-            var settingsManager = _container.Resolve<ISettingsManager>();
+            _settings = Settings.LoadAndCheck(_settingsWindowShow, _settingsErrorReporter);
 
-            _settings = settingsManager.LoadAndCheck(_settingsWindowShow, _settingsErrorReporter);
-            
             LockUnlock(false);
 
             return _settings;
@@ -125,9 +123,9 @@ namespace JiraTimeBot.UI
 
         private void PrintStartMessage()
         {
-            var settingsManager = _container.Resolve<ISettingsManager>();
+            _settings = Settings.LoadAndCheck(_settingsWindowShow, _settingsErrorReporter);
-            _settings = settingsManager.LoadAndCheck(_settingsWindowShow, _settingsErrorReporter);
+            _log.Info(
-            _log.Info($"Загружен бот для {_settings.JiraUserName}, Режим: {_settings.WorkType.ToString()}, работаем в {_settings.RepositoryPath}");
+                $"Загружен бот для {_settings.JiraUserName}, Режим: {_settings.WorkType.ToString()}, работаем в {_settings.RepositoryPath}");
         }
 
         private async void btnStart_Click(object sender, EventArgs e)
@@ -136,7 +134,10 @@ namespace JiraTimeBot.UI
 
             using (_tokenSource = GetTokenSource())
             {
-                await _job.DoTheJob(settings, _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked, _tokenSource.Token); 
+                await _job.DoTheJob(settings, 
+                                    _tasksProcessors.WorkLogTasksProcessor, 
+                                    txtDummyMode.Checked,
+                                    _tokenSource.Token);
             }
 
             LockUnlock(true);
@@ -177,11 +178,15 @@ namespace JiraTimeBot.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);
@@ -194,12 +199,13 @@ namespace JiraTimeBot.UI
 
             using (_tokenSource = GetTokenSource())
             {
-                await _job.DoTheJob(settings, _tasksProcessors.MeetingProcessor, txtDummyMode.Checked, _tokenSource.Token);
+                await _job.DoTheJob(settings, _tasksProcessors.MeetingProcessor, txtDummyMode.Checked,
+                    _tokenSource.Token);
             }
 
             LockUnlock(true);
         }
-        
+
         private void btnCancel_Click(object sender, EventArgs e)
         {
             _tokenSource.Cancel();
@@ -226,6 +232,14 @@ namespace JiraTimeBot.UI
                 {
                     //если обновились - отключаем до рестарта
                     tmrUpdate.Enabled = false;
+                    var result = MessageBox.Show($"Приложение обновлено до новой версии. Перезапустить сейчас?",
+                        "Обновление",
+                        MessageBoxButtons.YesNo,
+                        MessageBoxIcon.Warning);
+                    if (result == DialogResult.Yes)
+                    {
+                        updater.SelfRestart();
+                    }
                 }
             }
             catch (Exception ex)
@@ -241,11 +255,15 @@ namespace JiraTimeBot.UI
 
             using (_tokenSource = GetTokenSource())
             {
-                await _job.SetTaskTimesForDate(dteForDay.Value, dteForDay.Value, settings, _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked, _tokenSource.Token);
+                await _job.SetTaskTimesForDate(dteForDay.Value, dteForDay.Value, settings,
+                    _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked, _tokenSource.Token);
             }
 
             LockUnlock(true);
+        }
 
+        private void tlpControls_Paint(object sender, PaintEventArgs e)
+        {
         }
     }
-}
+}

src/JiraTimeBot/UI/frmSettings.Designer.cs

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

src/JiraTimeBot/UI/frmSettings.cs

@@ -1,25 +1,23 @@
-using System;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.UI.Startup;
+using System;
 using System.Windows.Forms;
-using JiraTimeBot.Core.Configuration;
-using JiraTimeBot.Core.StartUp;
 
 namespace JiraTimeBot.UI
 {
     public partial class frmSettings : Form
     {
         private readonly AutoStartUp _autoStart;
-        private readonly ISettingsManager _settingsManager;
 
-        public frmSettings(AutoStartUp autoStart, ISettingsManager settingsManager)
+        public frmSettings(AutoStartUp autoStart)
         {
             _autoStart = autoStart;
-            _settingsManager = settingsManager;
             InitializeComponent();
         }
 
         private void frmSettings_Load(object sender, EventArgs e)
         {
-            var settings = _settingsManager.Load();
+            var settings = Settings.Load();
             if (settings != null)
             {
                 SetSettings(settings);
@@ -30,6 +28,7 @@ namespace JiraTimeBot.UI
 
         private void SetSettings(Settings settings)
         {
+            txtJiraUrl.Text = settings.JiraUrl;
             txtJiraLogin.Text = settings.JiraUserName;
             txtJiraPassword.Text = settings.JiraPassword;
             txtMercurialEmail.Text = settings.MercurialAuthorEmail;
@@ -37,10 +36,14 @@ namespace JiraTimeBot.UI
             actTime.Text = settings.ActivationTime.ToString("hh\\:mm\\:ss");
             chkAddComments.Checked = settings.AddCommentsToWorklog;
             txtRoundTo.Text = settings.RoundToMinutes.ToString();
-            cboWorkType.SelectedIndex = (int) settings.WorkType;
+            cboWorkType.SelectedIndex = (int)settings.WorkType;
             txtTimeControlTask.Text = settings.TimeControlTask;
             txtJQL.Text = settings.JiraQuery;
-
+            txtWorkDayDuration.Text = settings.MinuterPerWorkDay.ToString();
+            txtRandomMinutes.Text = settings.RandomWorkMinutes.ToString();
+            chkPullBeforeProcess.Checked = settings.PullBeforeProcess;
+            chkRemoveManuallyAddedWorklogs.Checked = settings.RemoveManuallyAddedWorklogs;
+            tbAlternateEmail.Text = settings.AlternativeEmail;
             cboWorkType_SelectedIndexChanged(null, null);
         }
 
@@ -50,9 +53,18 @@ namespace JiraTimeBot.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,
@@ -60,9 +72,14 @@ namespace JiraTimeBot.UI
                 RepositoryPath = txtRepoPath.Text,
                 AddCommentsToWorklog = chkAddComments.Checked,
                 RoundToMinutes = roundTo,
-                WorkType = (WorkType) cboWorkType.SelectedIndex,
+                WorkType = (WorkType)cboWorkType.SelectedIndex,
                 JiraQuery = txtJQL.Text,
                 TimeControlTask = txtTimeControlTask.Text,
+                MinuterPerWorkDay = minuterPerWorkDay,
+                RandomWorkMinutes = randomWorkMinutes,
+                PullBeforeProcess = chkPullBeforeProcess.Checked,
+                RemoveManuallyAddedWorklogs = chkRemoveManuallyAddedWorklogs.Checked,
+                AlternativeEmail = tbAlternateEmail.Text
             };
 
             //LockUnlock(false);
@@ -73,8 +90,8 @@ namespace JiraTimeBot.UI
         private void btnSave_Click(object sender, EventArgs e)
         {
             var settings = ReadSettingsAndLock();
-            _settingsManager.Save(settings);
+            settings.Save();
-             _autoStart.Set(chkAutostart.Checked);
+            _autoStart.Set(chkAutostart.Checked);
 
             MessageBox.Show("Настройки сохранены.");
 
@@ -90,7 +107,9 @@ namespace JiraTimeBot.UI
         private void cboWorkType_SelectedIndexChanged(object sender, EventArgs e)
         {
             txtJQL.Enabled = (cboWorkType.SelectedIndex == 1);
-            txtRepoPath.Enabled = (cboWorkType.SelectedIndex == 0);
+            txtRepoPath.Enabled = (cboWorkType.SelectedIndex == 0 
+                                   || cboWorkType.SelectedIndex == 2
+                                   || cboWorkType.SelectedIndex == 3);
         }
     }
 }