Добавлен рекурсивный поиск .git директорий.

Докинул try catch, ибо иногда падал и было непонятно на каком репозитории

.semver.txt

@@ -1 +1 @@
-1.0.82
+1.0.84

src/JiraTimeBot.v3.ncrunchsolution

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

src/JiraTimeBot/Configuration/Settings.cs

@@ -14,6 +14,7 @@ namespace JiraTimeBot.Configuration
 
         public string JiraUrl { get; set; }
         public bool PullBeforeProcess { get; set; }
+        public bool RemoveManuallyAddedWorklogs { get; set; }
         public string RepositoryPath { get; set; }
         public string MercurialAuthorEmail { get; set; }
         public string JiraUserName { get; set; }

src/JiraTimeBot/DI/ContainerBuilder.cs

@@ -61,7 +61,8 @@ namespace JiraTimeBot.DI
 
             _builder.RegisterType<JiraHistory>().AsSelf().As<IJiraHistory>();
 
-            _builder.Register(c => new Job(c.Resolve<IAllRepositoryProviders>(), c.Resolve<ITaskTimeCalculator>(), c.Resolve<ILog>())).AsSelf();
+            _builder.Register(c => new Job(c.Resolve<IAllRepositoryProviders>(), c.Resolve<ITaskTimeCalculator>(),
+                c.Resolve<IJiraApi>(), c.Resolve<ILog>())).AsSelf();
 
             _builder.RegisterType<AutoStartUp>().AsSelf().AsImplementedInterfaces();
             _builder.RegisterType<frmSettings>().AsSelf().AsImplementedInterfaces();

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -15,6 +15,7 @@ namespace JiraTimeBot.JiraIntegration
         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);
     }
 
     public class JiraApi : IJiraApi
@@ -77,6 +78,28 @@ namespace JiraTimeBot.JiraIntegration
             return GetIssuesByJQL(jql, settings, date, cancellationToken);
         }
 
+        public List<Worklog> GetManuallyWorklogged(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date, CancellationToken cancellationToken = default)
+        {
+            var result = new List<Worklog>();
+            var alreadyLoggedToday = GetWorkloggedIssuesByDate(settings, date);
+            foreach (var issue in alreadyLoggedToday)
+            {
+                if (!taskTimeItems.Any(f => f.Branch.Equals(issue.Key.Value, StringComparison.InvariantCulture)))
+                {
+                    var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
+                    var userWorklogs = workLogs.Where(w =>
+                        w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
+                            StringComparison.InvariantCultureIgnoreCase)).ToList();
+                    foreach (var userWorklog in userWorklogs)
+                    {
+                        result.Add(userWorklog);
+                    }
+                }
+            }
+
+            return result;
+        }
+
         private void RemoveWorklogsAddedByUser(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, CancellationToken cancellationToken = default)
         {
             var alreadyLoggedToday = GetWorkloggedIssuesByDate(settings, date);
@@ -106,8 +129,11 @@ namespace JiraTimeBot.JiraIntegration
             date = date.GetValueOrDefault(DateTime.Now.Date).Date;
             var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);
 
-            //Удаляем добавленные вручную пользователем данные.
+            if (settings.RemoveManuallyAddedWorklogs)
-            RemoveWorklogsAddedByUser(taskTimeItems, settings, date, dummy, cancellationToken);
+            {
+                //Удаляем добавленные вручную пользователем данные.
+                RemoveWorklogsAddedByUser(taskTimeItems, settings, date, dummy, cancellationToken);
+            }
 
             foreach (TaskTimeItem taskTimeItem in taskTimeItems)
             {
@@ -155,7 +181,7 @@ namespace JiraTimeBot.JiraIntegration
                         {
                             try
                             {
-                                issue.DeleteWorklogAsync(workLog, WorklogStrategy.RetainRemainingEstimate, token: cancellationToken);
+                                issue.DeleteWorklogAsync(workLog, WorklogStrategy.AutoAdjustRemainingEstimate, token: cancellationToken);
                             }
                             catch (Exception ex)
                             {
@@ -181,7 +207,7 @@ namespace JiraTimeBot.JiraIntegration
                     {
                         try
                         {
-                            workLogToAdd = issue.AddWorklogAsync(workLogToAdd, WorklogStrategy.RetainRemainingEstimate, token: cancellationToken).Result;
+                            workLogToAdd = issue.AddWorklogAsync(workLogToAdd, WorklogStrategy.AutoAdjustRemainingEstimate, token: cancellationToken).Result;
                         }
                         catch (Exception ex)
                         {

src/JiraTimeBot/JiraTimeBot.csproj

@@ -121,7 +121,7 @@
     <Compile Include="Job.cs" />
     <Compile Include="Logger.cs" />
     <Compile Include="Configuration\Settings.cs" />
-    <Compile Include="JiraIntegration\JiraCommitEmulator.cs" />
+    <Compile Include="RepositoryProviders\JiraCommitEmulator.cs" />
     <Compile Include="RepositoryProviders\GitLog.cs" />
     <Compile Include="RepositoryProviders\Interfaces\IAllVcsProviders.cs" />
     <Compile Include="RepositoryProviders\Modifiers\ITechnicalInfoSkipper.cs" />

src/JiraTimeBot/Job.cs

@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using JiraTimeBot.JiraIntegration;
 
 namespace JiraTimeBot
 {
@@ -15,12 +16,14 @@ namespace JiraTimeBot
     {
         private readonly IAllRepositoryProviders _mercurialProviders;
         private readonly ITaskTimeCalculator _taskTimeDiscoverer;
+        private readonly IJiraApi _jiraApi;
         private readonly ILog _log;
 
-        public Job(IAllRepositoryProviders mercurialProviders, ITaskTimeCalculator taskTimeDiscoverer, ILog log)
+        public Job(IAllRepositoryProviders mercurialProviders, ITaskTimeCalculator taskTimeDiscoverer, IJiraApi jiraApi, ILog log)
         {
             _mercurialProviders = mercurialProviders;
             _taskTimeDiscoverer = taskTimeDiscoverer;
+            _jiraApi = jiraApi;
             _log = log;
         }
 
@@ -72,22 +75,23 @@ namespace JiraTimeBot
 
         private bool SetTaskTimesForDateImpl(DateTime setForDate, DateTime realDate, Settings settings, ITasksProcessor tasksProcessor, bool dummyMode, CancellationToken cancellationToken)
         {
-            IRepositoryLog mercurial = _mercurialProviders.MercurialLog;
+            IRepositoryLog repository = _mercurialProviders.MercurialLog;
             if (settings.WorkType == WorkType.JiraLogs)
             {
                 _log.Info("Использую Jira как источник информации.");
-                mercurial = _mercurialProviders.JiraCommitEmulator;
+                repository = _mercurialProviders.JiraCommitEmulator;
             }
             else if (settings.WorkType == WorkType.GitLogs)
             {
                 _log.Info("Использую Git как источник информации.");
-                mercurial = _mercurialProviders.GitLog;
+                repository = _mercurialProviders.GitLog;
             }
 
             List<TaskTimeItem> taskTimes;
             if (!(tasksProcessor is MeetingProcessor))
             {
-                List<TaskTimeItem> commits = mercurial.GetRepositoryLog(settings, realDate, cancellationToken);
+                List<TaskTimeItem> commits = repository.GetRepositoryLog(settings, realDate, cancellationToken);
+                ModifyWorktimeByManualLogs(setForDate, settings, cancellationToken, commits);
                 taskTimes = _taskTimeDiscoverer.CalculateTaskTime(commits, settings, cancellationToken);
             }
             else
@@ -111,5 +115,21 @@ namespace JiraTimeBot
             _log.Info("Готово.");
             return true;
         }
+
+        private void ModifyWorktimeByManualLogs(DateTime setForDate, Settings settings, CancellationToken cancellationToken,
+            List<TaskTimeItem> commits)
+        {
+            if (settings.RemoveManuallyAddedWorklogs)
+            {
+                return;
+            }
+
+            //если не удаляем добавленное вручную, то посчитаем сколько там надобавляли и отнимем от рабочего дня
+            var manuallyWorklogged = _jiraApi.GetManuallyWorklogged(commits, settings, setForDate, cancellationToken);
+            if (manuallyWorklogged.Any() && manuallyWorklogged.Sum(f => f.TimeSpentInSeconds) < settings.MinuterPerWorkDay)
+            {
+                settings.MinuterPerWorkDay = (int) (settings.MinuterPerWorkDay - manuallyWorklogged.Sum(f => f.TimeSpentInSeconds));
+            }
+        }
     }
 }

src/JiraTimeBot/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 © 2020")]   
+[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.82")] 
+[assembly: AssemblyVersion("1.0.84")] 
-[assembly: AssemblyFileVersion("1.0.82")] 
+[assembly: AssemblyFileVersion("1.0.84")] 
-[assembly: AssemblyInformationalVersion("1.0.82")] 
+[assembly: AssemblyInformationalVersion("1.0.84")] 

src/JiraTimeBot/RepositoryProviders/GitLog.cs

@@ -35,7 +35,7 @@ namespace JiraTimeBot.RepositoryProviders
             date = date.GetValueOrDefault(DateTime.Now.Date);
 
             var workTasks = new List<TaskTimeItem>();
-            foreach (var repoDirectory in Directory.GetDirectories(settings.RepositoryPath))
+            foreach (var repoDirectory in Directory.GetDirectories(settings.RepositoryPath, ".git", SearchOption.AllDirectories))
             {
                 if (cancellationToken.IsCancellationRequested)
                 {
@@ -43,16 +43,15 @@ namespace JiraTimeBot.RepositoryProviders
                 }
 
                 //var project = new DirectoryInfo(repoDirectory).Name;
-                if (!Directory.Exists(Path.Combine(repoDirectory, ".git")))
+                var repoRootDirectory = repoDirectory.Replace(".git", "");
+                var directoryInfo = new DirectoryInfo(repoRootDirectory);
+                if (!directoryInfo.Exists)
                 {
                     continue;
                 }
 
-                var directoryInfo = new DirectoryInfo(repoDirectory);
-
-
-                var repo = new LibGit2Sharp.Repository(repoDirectory);
 
+                var repo = new LibGit2Sharp.Repository(repoRootDirectory);
                 if (settings.PullBeforeProcess)
                 {
                     try

src/JiraTimeBot/RepositoryProviders/JiraCommitEmulator.cs

@@ -1,14 +1,14 @@
-using Atlassian.Jira;
+using System;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.RepositoryProviders.Interfaces;
-using JiraTimeBot.TaskTime.Objects;
-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
-namespace JiraTimeBot.JiraIntegration
 {
     public class JiraCommitEmulator : IRepositoryLog
     {

src/JiraTimeBot/RepositoryProviders/MercurialLog.cs

@@ -7,8 +7,10 @@ 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
 {
@@ -72,49 +74,58 @@ namespace JiraTimeBot.RepositoryProviders
                     AdditionalArguments = { "--encoding=utf-8" },
                 };
 
-                var log = repo.Log(logCommand);
+                try
-
-                foreach (var changeset in log)
                 {
-                    if (cancellationToken.IsCancellationRequested)
+                    var log = repo.Log(logCommand);
-                    {
-                        return new List<TaskTimeItem>();
-                    }
 
-                    var commitMessage = FixEncoding(changeset.CommitMessage);
+                    foreach (var changeset in log)
-                    if (_commitSkipper.IsNeedToSkip(changeset.Branch, commitMessage))
                     {
-                        continue;
+                        if (cancellationToken.IsCancellationRequested)
-                    }
-                    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];
+                            return new List<TaskTimeItem>();
                         }
-                        var branch = description.Replace("Merge with", "").Replace(" ", "");
-                        var release = task.Branch.Replace("release", "");
 
-                        task.Branch = branch;
+                        var commitMessage = FixEncoding(changeset.CommitMessage);
-                        task.Description = $"Подготовка и публикация версии {task.Project} {release}.";
+                        if (_commitSkipper.IsNeedToSkip(changeset.Branch, commitMessage))
-                        task.ReleaseVersion = release;
+                        {
+                            continue;
+                        }
+                        commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
+
+                        var task = new TaskTimeItem(changeset.Branch,
+                            commitMessage,
+                            directoryInfo.Name,
+                            changeset.Timestamp,
+                            TimeSpan.Zero,
+                            1,
+                            changeset.PathActions.Count,
+                            "",
+                            GetCommitType(changeset.Branch));
+
+                        if (task.Type == CommitType.Release && task.Description.StartsWith("Merge with", StringComparison.CurrentCultureIgnoreCase))
+                        {
+                            var description = task.Description;
+                            if (description.Contains("\n"))
+                            {
+                                description = description.Split('\n')[0];
+                            }
+                            var branch = description.Replace("Merge with", "").Replace(" ", "");
+                            var release = task.Branch.Replace("release", "");
+
+                            task.Branch = branch;
+                            task.Description = $"Подготовка и публикация версии {task.Project} {release}.";
+                            task.ReleaseVersion = release;
+                        }
+                        workTasks.Add(task);
+                        _log?.Trace($" - Найден changeset: {changeset.Timestamp} - {changeset.Branch} - {changeset.AuthorEmailAddress} - {commitMessage}");
                     }
-                    workTasks.Add(task);
-                    _log?.Trace($" - Найден changeset: {changeset.Timestamp} - {changeset.Branch} - {changeset.AuthorEmailAddress} - {commitMessage}");
                 }
+                catch (Exception e)
+                {
+                    MessageBox.Show($"Oops something went wrong in repo {repoDirectory}");
+                    throw;
+                }
+
             }
             if (!workTasks.Any())
             {

src/JiraTimeBot/UI/frmSettings.Designer.cs

@@ -56,6 +56,7 @@
             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.SuspendLayout();
             // 
             // label5
@@ -154,7 +155,7 @@
             // 
             // btnSave
             // 
-            this.btnSave.Location = new System.Drawing.Point(86, 412);
+            this.btnSave.Location = new System.Drawing.Point(86, 432);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(75, 23);
             this.btnSave.TabIndex = 32;
@@ -262,7 +263,7 @@
             // chkPullBeforeProcess
             // 
             this.chkPullBeforeProcess.AutoSize = true;
-            this.chkPullBeforeProcess.Location = new System.Drawing.Point(65, 389);
+            this.chkPullBeforeProcess.Location = new System.Drawing.Point(65, 409);
             this.chkPullBeforeProcess.Name = "chkPullBeforeProcess";
             this.chkPullBeforeProcess.Size = new System.Drawing.Size(83, 17);
             this.chkPullBeforeProcess.TabIndex = 45;
@@ -303,11 +304,22 @@
             this.txtJiraUrl.Size = new System.Drawing.Size(100, 20);
             this.txtJiraUrl.TabIndex = 46;
             // 
+            // chkRemoveManuallyAddedWorklogs
+            // 
+            this.chkRemoveManuallyAddedWorklogs.AutoSize = true;
+            this.chkRemoveManuallyAddedWorklogs.Location = new System.Drawing.Point(65, 387);
+            this.chkRemoveManuallyAddedWorklogs.Name = "chkRemoveManuallyAddedWorklogs";
+            this.chkRemoveManuallyAddedWorklogs.Size = new System.Drawing.Size(157, 17);
+            this.chkRemoveManuallyAddedWorklogs.TabIndex = 48;
+            this.chkRemoveManuallyAddedWorklogs.Text = "Удалять \"ручные записи\"";
+            this.chkRemoveManuallyAddedWorklogs.UseVisualStyleBackColor = true;
+            // 
             // frmSettings
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(243, 442);
+            this.ClientSize = new System.Drawing.Size(243, 467);
+            this.Controls.Add(this.chkRemoveManuallyAddedWorklogs);
             this.Controls.Add(this.lblJiraUrl);
             this.Controls.Add(this.txtJiraUrl);
             this.Controls.Add(this.chkPullBeforeProcess);
@@ -377,5 +389,6 @@
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.Label lblJiraUrl;
         private System.Windows.Forms.TextBox txtJiraUrl;
+        private System.Windows.Forms.CheckBox chkRemoveManuallyAddedWorklogs;
     }
 }

src/JiraTimeBot/UI/frmSettings.cs

@@ -42,6 +42,7 @@ namespace JiraTimeBot.UI
             txtWorkDayDuration.Text = settings.MinuterPerWorkDay.ToString();
             txtRandomMinutes.Text = settings.RandomWorkMinutes.ToString();
             chkPullBeforeProcess.Checked = settings.PullBeforeProcess;
+            chkRemoveManuallyAddedWorklogs.Checked = settings.RemoveManuallyAddedWorklogs;
 
             cboWorkType_SelectedIndexChanged(null, null);
         }
@@ -76,7 +77,8 @@ namespace JiraTimeBot.UI
                 TimeControlTask = txtTimeControlTask.Text,
                 MinuterPerWorkDay = minuterPerWorkDay,
                 RandomWorkMinutes = randomWorkMinutes,
-                PullBeforeProcess = chkPullBeforeProcess.Checked
+                PullBeforeProcess = chkPullBeforeProcess.Checked,
+                RemoveManuallyAddedWorklogs = chkRemoveManuallyAddedWorklogs.Checked
             };
 
             //LockUnlock(false);