Дополнен алгоритм работы с JIRA-задачами

.semver.txt

@@ -1 +1 @@
-1.0.16
+1.0.23

README.md

@@ -1,7 +1,22 @@
 # JiraTimeBot [![Build Status](https://travis-ci.org/monster1025/JiraTimeBot.svg?branch=master)](https://travis-ci.org/monster1025/JiraTimeBot)
 Приложение для автоматического добавления Jira Worklog'ов исходя из количества коммитов в ветку.
 
-# Предположения
+# Ограничения
  - Предполагается что все Ваши репозитории находятся в одной папке (к которой вы указываете путь в настройках).
  - Предполагается что ветки в JIRA имеют название эквивалентное имени бранча в Mercurial.
 
+# Настройки
+ - Режим работы:
+   - Mercurial - по коммитам в Mercurial, можем определять множественные коммиты в одну задачу (ветку) и пропорционально списывать время.
+   - Jira - выполняем JQL и равномерно распределяем время.
+ - Путь до репо (Режим Mercurial) - путь до папки, в которую клонируются исходники.
+ - Логин Jira - Логин в Jira (от этого пользователя будем выполнять запросы и вносить время).
+ - Пароль Jira - шифруется через DPAPI.
+ - Mercurial Name (Режим Mercurial) - обязателен к указанию для режима Mercurial - имя пользователя Mercurial, от которого проходят коммиты.
+ - Округление времени - Для красоты распределения времени тут устанавливается округление. По умолчанию - 15 минут, получим время 1:15, 0:30 итд. Остаток нераспределенного времени будет внесен в самую долгую задачу или же если это невозможно - количество рабочего времени будет увеличено или уменьшено.
+ - JQL (Режим Jira) - можно задать свой JQL для поиска задачь. Возможные замены: %USER% - Логин Jira, %DATE% дата на которую формируем список. Значнеие по умолчанию: status changed by '%USER%' during ("%DATE%","%DATE%")
+ - Время запуска - время автоматического запуска бота. Если была установлена галочка "тестовый прогон" - она будет снята.
+ - Добавлять описание (Режим Mercurial) - добавлять ли в описание CommitMessage, если не установлено - добавляются стандартные фразы программистов (типа "написание кода").
+ 
+# Скачать
+Скачать актуальную версию можно тут: https://github.com/monster1025/JiraTimeBot/releases/latest

release.cmd

@@ -19,7 +19,7 @@ call tools\SetVersion.cmd %VERSION%
 git add .
 git commit -m "%~1"
 
-git tag -m "Version v%VERSION%" -a v%VERSION%
+git tag -m "Version v%VERSION%: %~1" -a v%VERSION%
 git push origin v%VERSION%
 
 git push

src/JiraTimeBot/Configuration/PasswordEncryptionClass.cs

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

src/JiraTimeBot/Configuration/Settings.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Windows.Forms;
 using Newtonsoft.Json;
 
-namespace JiraTimeBotForm.Configuration
+namespace JiraTimeBot.Configuration
 {
     public class Settings
     {

src/JiraTimeBot/DI/ContainerBuilder.cs

@@ -1,16 +1,16 @@
-using System.Windows.Forms;
+using Autofac;
-using Autofac;
 using Autofac.Extras.AggregateService;
-using JiraTimeBotForm.JiraIntegration;
+using JiraTimeBot.JiraIntegration;
-using JiraTimeBotForm.JiraIntegration.Comments;
+using JiraTimeBot.JiraIntegration.Comments;
-using JiraTimeBotForm.Mercurial;
+using JiraTimeBot.Mercurial;
-using JiraTimeBotForm.Mercurial.Modifiers;
+using JiraTimeBot.Mercurial.Modifiers;
-using JiraTimeBotForm.TasksProcessors;
+using JiraTimeBot.TasksProcessors;
-using JiraTimeBotForm.TaskTime;
+using JiraTimeBot.TaskTime;
-using JiraTimeBotForm.UI;
+using JiraTimeBot.UI.Tray;
-using JiraTimeBotForm.UI.Tray;
+using System;
+using System.Windows.Forms;
 
-namespace JiraTimeBotForm.DI
+namespace JiraTimeBot.DI
 {
     public class Bootstrapper
     {
@@ -22,8 +22,17 @@ namespace JiraTimeBotForm.DI
 
         public IContainer Build(TextBox logTextBox)
         {
-            _builder.Register(f => new Logger(logTextBox)).As<ILog>().AsSelf();
+            _builder.Register(c => logTextBox).AsSelf();
-            
+
+            _builder.Register(f =>
+            {
+                var txt = f.Resolve<TextBox>();
+                return new Logger(message =>
+                {
+                    txt.Invoke(new Action<string>(text => txt.AppendText(text)), message + Environment.NewLine);
+                });
+            }).As<ILog>().AsSelf();
+
             _builder.Register(f => new TrayMenu()).As<ITrayMenu>().AsSelf();
             _builder.Register(c => new CommitSkipper()).As<ICommitSkipper>();
 

src/JiraTimeBot/JiraIntegration/Comments/IJiraDescriptionSource.cs

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

src/JiraTimeBot/JiraIntegration/Comments/JiraDescriptionSource.cs

@@ -1,9 +1,10 @@
-using System;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.TaskTime.Objects;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using JiraTimeBotForm.TaskTime.Objects;
 
-namespace JiraTimeBotForm.JiraIntegration.Comments
+namespace JiraTimeBot.JiraIntegration.Comments
 {
     public class JiraDescriptionSource : IJiraDescriptionSource
     {
@@ -13,14 +14,19 @@ namespace JiraTimeBotForm.JiraIntegration.Comments
             "кодинг", "написание кода и тестов"
         };
 
-        public string GetDescription(TaskTimeItem taskTimeItem, bool addCommentsToWorklog)
+        public string GetDescription(TaskTimeItem taskTimeItem, bool addCommentsToWorklog, Settings settings)
         {
             if (addCommentsToWorklog)
             {
                 return taskTimeItem.Description;
             }
 
-            return _dummyComments.OrderBy(f => Guid.NewGuid()).FirstOrDefault();
+            if (settings.WorkType == WorkType.Mercurial)
+            {
+                return _dummyComments.OrderBy(f => Guid.NewGuid()).FirstOrDefault();
+            }
+
+            return "";
         }
     }
 }

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using Atlassian.Jira;
-using JiraTimeBotForm.Configuration;
+using JiraTimeBot.Configuration;
-using JiraTimeBotForm.JiraIntegration.Comments;
+using JiraTimeBot.JiraIntegration.Comments;
-using JiraTimeBotForm.TaskTime.Objects;
+using JiraTimeBot.TaskTime.Objects;
 
-namespace JiraTimeBotForm.JiraIntegration
+namespace JiraTimeBot.JiraIntegration
 {
     public class JiraApi
     {
@@ -34,14 +34,13 @@ namespace JiraTimeBotForm.JiraIntegration
             }
         }
 
-        public List<Issue> GetTodayIssues(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
+        public List<Issue> GetIssuesByJQL(string jql, Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);
             date = date.GetValueOrDefault(DateTime.Now.Date);
 
             var userName = settings.JiraUserName;
 
-            var jql = settings.JiraQuery;
             if (string.IsNullOrEmpty(jql))
             {
                 jql = $"status changed by '%USER%' during (\"%DATE%\",\"%DATE%\")";
@@ -53,7 +52,7 @@ namespace JiraTimeBotForm.JiraIntegration
             try
             {
                 List<Issue> affectedIssues =
-                    jira.Issues.GetIssuesFromJqlAsync(jql, 50, 0, cancellationToken).Result.ToList();
+                    jira.Issues.GetIssuesFromJqlAsync(jql, 100, 0, cancellationToken).Result.ToList();
                 return affectedIssues;
             }
             catch (Exception ex)
@@ -92,26 +91,34 @@ namespace JiraTimeBotForm.JiraIntegration
 
                 var hasTodayWorklog = false;
                 var workLogs = issue.GetWorklogsAsync().Result;
-                foreach (var workLog in workLogs)
+                var userWorklogs = workLogs.Where(w =>
+                    w.CreateDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
+                        StringComparison.InvariantCultureIgnoreCase)).ToList();
+
+                foreach (var workLog in userWorklogs)
                 {
                     var timeSpent = TimeSpan.FromSeconds(workLog.TimeSpentInSeconds);
-                    if (workLog.CreateDate.GetValueOrDefault().Date == date && workLog.Author == settings.JiraUserName)
+                    var timeDiff = Math.Abs((timeSpent - taskTimeItem.Time).TotalMinutes);
+                    if (timeDiff > 1 || userWorklogs.Count > 1)
                     {
-                        var timeDiff = Math.Abs((timeSpent - taskTimeItem.Time).TotalMinutes);
                         if (timeDiff > 1)
                         {
                             _log.Trace($"Время отличается на {timeDiff} минут, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
-                            if (!dummy)
-                            {
-                                issue.DeleteWorklogAsync(workLog);
-                            }
-                            hasTodayWorklog = false;
                         }
                         else
                         {
-                            _log.Trace($"По задаче {taskTimeItem.Branch} уже есть аналогичный worklog. Пропускаю.");
+                            _log.Trace($"Найдено более одного ворклога на задачу, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
-                            hasTodayWorklog = true;
                         }
+                        if (!dummy)
+                        {
+                            issue.DeleteWorklogAsync(workLog);
+                        }
+                        hasTodayWorklog = false;
+                    }
+                    else
+                    {
+                        _log.Trace($"По задаче {taskTimeItem.Branch} уже есть аналогичный worklog. Пропускаю.");
+                        hasTodayWorklog = true;
                     }
                 }
 
@@ -119,7 +126,7 @@ namespace JiraTimeBotForm.JiraIntegration
                 {
                     var timeSpentJira = $"{taskTimeItem.Time.TotalMinutes}m";
 
-                    var comment = _descriptionSource.GetDescription(taskTimeItem, addCommentsToWorklog);
+                    var comment = _descriptionSource.GetDescription(taskTimeItem, addCommentsToWorklog, settings);
 
                     Worklog workLogToAdd = new Worklog(timeSpentJira, date.Value, comment);
                     if (!dummy)

src/JiraTimeBot/JiraIntegration/JiraCommitEmulator.cs

@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
-using JiraTimeBotForm.Configuration;
+using Atlassian.Jira;
-using JiraTimeBotForm.Mercurial;
+using JiraTimeBot.Configuration;
-using JiraTimeBotForm.Mercurial.Objects;
+using JiraTimeBot.Mercurial;
+using JiraTimeBot.Mercurial.Objects;
 
-namespace JiraTimeBotForm.JiraIntegration
+namespace JiraTimeBot.JiraIntegration
 {
     public class JiraCommitEmulator : IMercurialLog
     {
@@ -24,17 +26,52 @@ namespace JiraTimeBotForm.JiraIntegration
         {
             date = date.GetValueOrDefault(DateTime.Now.Date);
             var workTasks = new List<MercurialCommitItem>();
-            var issues = _jiraApi.GetTodayIssues(settings, date, cancellationToken);
+            var issues = _jiraApi.GetIssuesByJQL(settings.JiraQuery, settings, date, cancellationToken);
 
             foreach (var issue in issues)
             {
-                workTasks.Add(new MercurialCommitItem
+                if (cancellationToken.IsCancellationRequested)
                 {
-                    Description = issue.Summary,
+                    return new List<MercurialCommitItem>();
-                    Time = issue.Updated.GetValueOrDefault(date.Value),
+                }
-                    Branch = issue.Key.Value,
+
-                    FilesAffected = 1
+                List<Comment> comments = new List<Comment>();
-                });
+                if (issue.Type?.Name != "Дубликат")
+                {
+                    _log.Trace($"Получаю комментарии по задаче {issue.Key} ({issue.Type?.Name}).");
+                    comments = issue.GetCommentsAsync(cancellationToken).Result?.ToList() ?? new List<Comment>();
+                }
+                else
+                {
+                    _log.Trace($"Пропускаю комментарии по задаче {issue.Key} ({issue.Type?.Name}).");
+                }
+
+                var user = settings.JiraUserName;
+                var userComments = comments.Where(f => f.Author.Equals(user, StringComparison.InvariantCultureIgnoreCase)).ToList();
+
+                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/JiraTimeBot.csproj

@@ -61,6 +61,7 @@
     <Reference Include="System.Core" />
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
     <Reference Include="System.ServiceModel" />

src/JiraTimeBot/Job.cs

@@ -3,14 +3,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using JiraTimeBotForm.Configuration;
+using JiraTimeBot.Configuration;
-using JiraTimeBotForm.Mercurial;
+using JiraTimeBot.Mercurial;
-using JiraTimeBotForm.Mercurial.Objects;
+using JiraTimeBot.Mercurial.Objects;
-using JiraTimeBotForm.TasksProcessors;
+using JiraTimeBot.TasksProcessors;
-using JiraTimeBotForm.TaskTime;
+using JiraTimeBot.TaskTime;
-using JiraTimeBotForm.TaskTime.Objects;
+using JiraTimeBot.TaskTime.Objects;
 
-namespace JiraTimeBotForm
+namespace JiraTimeBot
 {
     class Job
     {

src/JiraTimeBot/Logger.cs

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

src/JiraTimeBot/Mercurial/IAllMercurialProviders.cs

@@ -1,11 +1,6 @@
-using System;
+using JiraTimeBot.JiraIntegration;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using JiraTimeBotForm.JiraIntegration;
 
-namespace JiraTimeBotForm.Mercurial
+namespace JiraTimeBot.Mercurial
 {
     public interface IAllMercurialProviders
     {

src/JiraTimeBot/Mercurial/IMercurialLog.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using JiraTimeBotForm.Configuration;
+using JiraTimeBot.Configuration;
-using JiraTimeBotForm.Mercurial.Objects;
+using JiraTimeBot.Mercurial.Objects;
 
-namespace JiraTimeBotForm.Mercurial
+namespace JiraTimeBot.Mercurial
 {
     public interface IMercurialLog
     {

src/JiraTimeBot/Mercurial/MercurialLog.cs

@@ -4,12 +4,12 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using JiraTimeBotForm.Configuration;
+using JiraTimeBot.Configuration;
-using JiraTimeBotForm.Mercurial.Modifiers;
+using JiraTimeBot.Mercurial.Modifiers;
-using JiraTimeBotForm.Mercurial.Objects;
+using JiraTimeBot.Mercurial.Objects;
 using Mercurial;
 
-namespace JiraTimeBotForm.Mercurial
+namespace JiraTimeBot.Mercurial
 {
     public class MercurialLog: IMercurialLog
     {

src/JiraTimeBot/Mercurial/Modifiers/CommitSkipper.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace JiraTimeBotForm.Mercurial.Modifiers
+namespace JiraTimeBot.Mercurial.Modifiers
 {
     public class CommitSkipper : ICommitSkipper
     {

src/JiraTimeBot/Mercurial/Modifiers/ICommitSkipper.cs

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

src/JiraTimeBot/Mercurial/Modifiers/ITechnicalInfoSkipper.cs

@@ -1,4 +1,4 @@
-namespace JiraTimeBotForm.Mercurial.Modifiers
+namespace JiraTimeBot.Mercurial.Modifiers
 {
     public interface ITechnicalInfoSkipper
     {

src/JiraTimeBot/Mercurial/Modifiers/TechnicalInfoSkipper.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace JiraTimeBotForm.Mercurial.Modifiers
+namespace JiraTimeBot.Mercurial.Modifiers
 {
     public class TechnicalInfoSkipper : ITechnicalInfoSkipper
     {

src/JiraTimeBot/Mercurial/Objects/MercurialCommitItem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace JiraTimeBotForm.Mercurial.Objects
+namespace JiraTimeBot.Mercurial.Objects
 {
     public class MercurialCommitItem
     {

src/JiraTimeBot/Program.cs

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

src/JiraTimeBot/Properties/AssemblyInfo.cs

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

src/JiraTimeBot/TaskTime/ITaskTimeCalculator.cs

@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 using System.Threading;
-using JiraTimeBotForm.Configuration;
+using JiraTimeBot.Configuration;
-using JiraTimeBotForm.Mercurial;
+using JiraTimeBot.Mercurial.Objects;
-using JiraTimeBotForm.Mercurial.Objects;
+using JiraTimeBot.TaskTime.Objects;
-using JiraTimeBotForm.TaskTime.Objects;
 
-namespace JiraTimeBotForm.TaskTime
+namespace JiraTimeBot.TaskTime
 {
     public interface ITaskTimeCalculator
     {

src/JiraTimeBot/TaskTime/Objects/TaskTimeItem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace JiraTimeBotForm.TaskTime.Objects
+namespace JiraTimeBot.TaskTime.Objects
 {
     public class TaskTimeItem
     {

src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -3,12 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using JiraTimeBotForm.Configuration;
+using JiraTimeBot.Configuration;
-using JiraTimeBotForm.Mercurial;
+using JiraTimeBot.Mercurial.Objects;
-using JiraTimeBotForm.Mercurial.Objects;
+using JiraTimeBot.TaskTime.Objects;
-using JiraTimeBotForm.TaskTime.Objects;
 
-namespace JiraTimeBotForm.TaskTime
+namespace JiraTimeBot.TaskTime
 {
     public class TaskTimeByCommitsCalculator: ITaskTimeCalculator
     {
@@ -24,6 +23,17 @@ namespace JiraTimeBotForm.TaskTime
             int remainMinutes = settings.MinuterPerWorkDay;
             int totalCommitsCount = commits.Count;
 
+            //если кол-во коммитов более чем кол-во интервалов - то уменьшим интервал вдвое.
+            while (totalCommitsCount > (8 * (60.0 / settings.RountToMinutes)))
+            {
+                settings.RountToMinutes = (int)RoundTo((decimal)(settings.RountToMinutes / 2.0), 5);
+                _log.Info($"Слишком много задачь - уменьшаю интервал до {settings.RountToMinutes}.");
+                if (settings.RountToMinutes == 5)
+                {
+                    break;
+                }
+            }
+
             List<TaskTimeItem> workTimeItems = new List<TaskTimeItem>();
 
             //Нам нужно раскидать 480 минут в день.
@@ -68,8 +78,11 @@ namespace JiraTimeBotForm.TaskTime
                 _log.Trace($"Погрешность распределения времени: {remainMinutes}. Добавляю к первой задаче.");
             }
 
-            //если переборщили или не достаточно добавили до 8 часов - скореектируем остаток в первой задаче (она самая трудозатратная).
+            if (workTimeItems.First().Time.TotalMinutes > Math.Abs(remainMinutes) && remainMinutes < 0)
-            workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes);
+            {
+                //если переборщили или не достаточно добавили до 8 часов - скореектируем остаток в первой задаче (она самая трудозатратная).
+                workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes);
+            }
 
             return workTimeItems;
         }

src/JiraTimeBot/TasksProcessors/IAllTasksProcessors.cs

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

src/JiraTimeBot/TasksProcessors/ITasksProcessor.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using JiraTimeBotForm.Configuration;
+using JiraTimeBot.Configuration;
-using JiraTimeBotForm.TaskTime.Objects;
+using JiraTimeBot.TaskTime.Objects;
 
-namespace JiraTimeBotForm.TasksProcessors
+namespace JiraTimeBot.TasksProcessors
 {
     interface ITasksProcessor
     {

src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using JiraTimeBotForm.Configuration;
+using JiraTimeBot.Configuration;
-using JiraTimeBotForm.JiraIntegration;
+using JiraTimeBot.JiraIntegration;
-using JiraTimeBotForm.TaskTime.Objects;
+using JiraTimeBot.TaskTime.Objects;
 
-namespace JiraTimeBotForm.TasksProcessors
+namespace JiraTimeBot.TasksProcessors
 {
     public class MeetingProcessor : ITasksProcessor
     {

src/JiraTimeBot/TasksProcessors/WorkLogTasksProcessor.cs

@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
-using JiraTimeBotForm.Configuration;
+using JiraTimeBot.Configuration;
-using JiraTimeBotForm.JiraIntegration;
+using JiraTimeBot.JiraIntegration;
-using JiraTimeBotForm.TaskTime;
+using JiraTimeBot.TaskTime.Objects;
-using JiraTimeBotForm.TaskTime.Objects;
 
-namespace JiraTimeBotForm.TasksProcessors
+namespace JiraTimeBot.TasksProcessors
 {
     public class WorkLogTasksProcessor : ITasksProcessor
     {

src/JiraTimeBot/UI/Tray/ITrayMenu.cs

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

src/JiraTimeBot/UI/Tray/RestoreFromTray.cs

@@ -2,7 +2,7 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
-namespace JiraTimeBotForm.UI.Tray
+namespace JiraTimeBot.UI.Tray
 {
     public static class RestoreFromTray {
         [DllImport( "user32.dll" )]

src/JiraTimeBot/UI/Tray/TrayMenu.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace JiraTimeBotForm.UI.Tray
+namespace JiraTimeBot.UI.Tray
 {
     public class TrayMenu: ITrayMenu
     {

src/JiraTimeBot/UI/frmMain.Designer.cs

@@ -1,4 +1,4 @@
-namespace JiraTimeBotForm.UI
+namespace JiraTimeBot.UI
 {
     partial class frmMain
     {

src/JiraTimeBot/UI/frmMain.cs

@@ -1,20 +1,21 @@
-using System;
+using Autofac;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.DI;
+using JiraTimeBot.TasksProcessors;
+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 Autofac;
-using JiraTimeBotForm.Configuration;
-using JiraTimeBotForm.DI;
-using JiraTimeBotForm.TasksProcessors;
-using JiraTimeBotForm.UI.Tray;
-using JiraTimeBotForm.Update;
 
 // This is the code for your desktop app.
 // Press Ctrl+F5 (or go to Debug > Start Without Debugging) to run your app.
 
-namespace JiraTimeBotForm.UI
+namespace JiraTimeBot.UI
 {
     public partial class frmMain : Form
     {
@@ -95,7 +96,15 @@ namespace JiraTimeBotForm.UI
 
             PrintStartMessage();
             tmrStart.Enabled = true;
-            tmrUpdate.Enabled = true;
+
+            if (System.Diagnostics.Debugger.IsAttached)
+            {
+                _log.Trace("Приложение запущено в режиме отладки. Отключаю обновление.");
+            }
+            else
+            {
+                tmrUpdate.Enabled = true;
+            }
         }
 
         private void PrintStartMessage()
@@ -189,23 +198,90 @@ namespace JiraTimeBotForm.UI
 
         private void tmrUpdate_Tick(object sender, EventArgs e)
         {
-            tmrUpdate.Interval = 8 * 60 * 60 * 1000;
+            try
-
-            var checker = new UpdateChecker();
-            var release = checker.GetRelease();
-            if (release == null)
             {
-                return;
+                tmrUpdate.Interval = 8 * 60 * 60 * 1000;
+
+                var checker = new UpdateChecker();
+                var release = checker.GetRelease();
+                if (release == null)
+                {
+                    return;
+                }
+
+                var gitVersionStr = checker.GetLatestVersion(release);
+                var gitVersion = new Version(gitVersionStr);
+                var appVersion = new Version(Application.ProductVersion);
+
+                if (gitVersion > appVersion)
+                {
+                    var downloadUrl = checker.GetDownloadUrl(release);
+                    _log.Info($"Доступна новая версия: {gitVersion} {downloadUrl}");
+
+                    var success = checker.DownloadFile(downloadUrl, "update.zip");
+                    if (!success)
+                    {
+                        return;
+                    }
+
+                    var result = InstallUpdate(gitVersion, "update.zip");
+                    if (result)
+                    {
+                        //если обновились - отключаем до рестарта
+                        tmrUpdate.Enabled = false;
+                    }
+                }
+                else
+                {
+                    _log.Info($"Вы используете последнюю версию.");
+                }
             }
-
+            catch (Exception ex)
-            var gitVersionStr = checker.GetLatestVersion(release);
-            var gitVersion = new Version(gitVersionStr);
-            var appVersion = new Version(Application.ProductVersion);
-
-            if (gitVersion > appVersion)
             {
-                var downloadUrl = checker.GetDownloadUrl(release);
+                //в процессе обновления ни при каком раскладе мы не должны уложить бота. 
-                _log.Info($"Доступна новая версия: {gitVersion} {downloadUrl}");
+                _log.Error($"Фатальная ошибка в процессе обновления: {ex.Message}");
+            }
+        }
+
+        private bool InstallUpdate(Version gitVersion, string updateFile)
+        {
+            try
+            {
+                _log.Info($"Устанавливаю обновление до версии {gitVersion}.");
+                //Rename he executing file
+                System.IO.FileInfo appFile = new System.IO.FileInfo(System.Reflection.Assembly.GetExecutingAssembly().Location);
+                var bkpDir = Path.Combine(appFile.DirectoryName, "bkp");
+                if (!Directory.Exists(bkpDir))
+                {
+                    Directory.CreateDirectory(bkpDir);
+                }
+
+                using (ZipArchive archive = ZipFile.OpenRead(Path.Combine(appFile.DirectoryName, updateFile)))
+                {
+                    foreach (ZipArchiveEntry entry in archive.Entries)
+                    {
+                        var zipEntryPath = Path.Combine(appFile.DirectoryName, entry.FullName);
+                        if (File.Exists(zipEntryPath))
+                        {
+                            System.IO.FileInfo zipEntryFile = new System.IO.FileInfo(zipEntryPath);
+                            if (File.Exists(bkpDir + "\\" + zipEntryFile.Name))
+                            {
+                                File.Delete(bkpDir + "\\" + zipEntryFile.Name);
+                            }
+                            System.IO.File.Move(zipEntryFile.FullName, bkpDir + "\\" + zipEntryFile.Name);
+                        }
+
+                        entry.ExtractToFile(zipEntryPath);
+                    }
+                }
+
+                _log.Info("Обновление установлено. Перезапустите программу для применения изменений.");
+                return true;
+            }
+            catch (Exception)
+            {
+                _log.Error($"Что-то пошло не так при обновлении.");
+                return false;
             }
         }
     }

src/JiraTimeBot/UI/frmSettings.Designer.cs

@@ -1,4 +1,4 @@
-namespace JiraTimeBotForm.UI
+namespace JiraTimeBot.UI
 {
     partial class frmSettings
     {

src/JiraTimeBot/UI/frmSettings.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Windows.Forms;
-using JiraTimeBotForm.Configuration;
+using JiraTimeBot.Configuration;
 
-namespace JiraTimeBotForm.UI
+namespace JiraTimeBot.UI
 {
     public partial class frmSettings : Form
     {

src/JiraTimeBot/Update/GitHubDataObjects.cs

@@ -1,13 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 
-namespace JiraTimeBotForm.Update
+namespace JiraTimeBot.Update
 {
     public partial class GitHubReleaseResponse
     {

src/JiraTimeBot/Update/UpdateChecker.cs

@@ -1,13 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 
-namespace JiraTimeBotForm.Update
+namespace JiraTimeBot.Update
 {
     class UpdateChecker
     {
@@ -38,12 +35,22 @@ namespace JiraTimeBotForm.Update
             return release;
         }
 
-        public void DownloadFile(string url)
+        public bool DownloadFile(string url, string to)
         {
-            using (var client = new WebClient())
+            try
             {
-                client.Headers.Add("User-Agent", "Mozilla/5.0 (X11; Linux i686; rv:64.0) Gecko/20100101 Firefox/64.0");
+
-                client.DownloadFile(url, "update.zip");
+                using (var client = new WebClient())
+                {
+                    client.Headers.Add("User-Agent",
+                        "Mozilla/5.0 (X11; Linux i686; rv:64.0) Gecko/20100101 Firefox/64.0");
+                    client.DownloadFile(url, to);
+                    return true;
+                }
+            }
+            catch (Exception)
+            {
+                return false;
             }
         }