Pull перед работой

.semver.txt

@@ -1 +1 @@
-1.0.67
+1.0.71

src/JiraTimeBot/Configuration/Settings.cs

@@ -13,7 +13,7 @@ namespace JiraTimeBot.Configuration
         public int RoundToMinutes { get; set; }
 
         public string JiraUrl = "https://myteam.aeroclub.ru";
-
+        public bool PullBeforeProcess { get; set; }
         public string RepositoryPath { get; set; }
         public string MercurialAuthorEmail { get; set; }
         public string JiraUserName { get; set; }
@@ -61,7 +61,7 @@ namespace JiraTimeBot.Configuration
             var errors = new List<string>();
             message = null;
 
-            if (settings.RoundToMinutes == default(int))
+            if (settings.RoundToMinutes == default)
             {
                 errors.Add("Укажите округление времени, например, 10 (минут)");
             }
@@ -137,7 +137,7 @@ namespace JiraTimeBot.Configuration
             File.WriteAllText(settingsPath, settingsString);
         }
 
-        private static string _settingsFileName = "settings.json";
+        private static readonly string _settingsFileName = "settings.json";
     }
 
     public enum WorkType

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -42,7 +42,7 @@ namespace JiraTimeBot.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);
             date = date.GetValueOrDefault(DateTime.Now.Date);
@@ -69,14 +69,14 @@ namespace JiraTimeBot.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%'\")";
             return GetIssuesByJQL(jql, settings, date, cancellationToken);
         }
 
-        private void RemoveWorklogsAddedByUser(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, CancellationToken cancellationToken = default(CancellationToken))
+        private void RemoveWorklogsAddedByUser(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, CancellationToken cancellationToken = default)
         {
             var alreadyLoggedToday = GetWorkloggedIssuesByDate(settings, date);
             foreach (var issue in alreadyLoggedToday)
@@ -100,7 +100,7 @@ namespace JiraTimeBot.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);

src/JiraTimeBot/JiraIntegration/JiraHistory.cs

@@ -13,7 +13,7 @@ namespace JiraTimeBot.JiraIntegration
     {
         List<TaskTimeItem> GetDayWorklogs(DateTime date,
                                           Settings settings,
-                                          CancellationToken cancellationToken = default(CancellationToken));
+                                          CancellationToken cancellationToken = default);
     }
 
     public class JiraHistory: IJiraHistory
@@ -27,7 +27,7 @@ namespace JiraTimeBot.JiraIntegration
 
         public List<TaskTimeItem> GetDayWorklogs(DateTime date,
                                                  Settings settings,
-                                                 CancellationToken cancellationToken = default(CancellationToken))
+                                                 CancellationToken cancellationToken = default)
         {
             var tasks = _jiraApi.GetIssuesByJQL("worklogDate = \"%DATE%\" and worklogAuthor='%USER%'", settings, date, cancellationToken);
             List<TaskTimeItem> resultItems = new List<TaskTimeItem>();
@@ -35,7 +35,6 @@ namespace JiraTimeBot.JiraIntegration
             {
                 var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
                 var user = settings.JiraUserName;
-                //user = "Zoya.Aleksandridi";
                 var userWorklogs = workLogs.Where(w =>
                     w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(user,
                         StringComparison.InvariantCultureIgnoreCase)).ToList();
@@ -46,7 +45,7 @@ namespace JiraTimeBot.JiraIntegration
 
                 var firstWorklog = userWorklogs.First();
 
-                var description = string.Join("\r\n", userWorklogs.Select(f => f.Comment).Distinct());
+                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'));

src/JiraTimeBot/Job.cs

@@ -79,7 +79,7 @@ namespace JiraTimeBot
                 mercurial = _mercurialProviders.JiraCommitEmulator;
             }
 
-            List<TaskTimeItem> taskTimes = null;
+            List<TaskTimeItem> taskTimes;
             if (!(tasksProcessor is MeetingProcessor))
             {
                 List<TaskTimeItem> commits = mercurial.GetMercurialLog(settings, realDate, cancellationToken);

src/JiraTimeBot/Mercurial/MercurialLog.cs

@@ -24,7 +24,7 @@ namespace JiraTimeBot.Mercurial
             _technicalInfoSkipper = technicalInfoSkipper;
         }
         
-        public List<TaskTimeItem> GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
+        public List<TaskTimeItem> GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrEmpty(settings.RepositoryPath) || !Directory.Exists(settings.RepositoryPath))
             {
@@ -51,6 +51,19 @@ namespace JiraTimeBot.Mercurial
                 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,

src/JiraTimeBot/Properties/AssemblyInfo.cs

@@ -1,31 +1,31 @@
-using System.Reflection;                                                          
-using System.Runtime.InteropServices;                                                          
-// 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")]                                                          
-[assembly: AssemblyDescription("")]                                                          
-[assembly: AssemblyConfiguration("")]                                                          
-[assembly: AssemblyCompany("")]                                                          
-[assembly: AssemblyProduct("JiraTimeBot")]                                                          
-[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)]                                                          
-// The following GUID is for the ID of the typelib if this project is exposed to COM                                                          
-[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]                                                          
-// 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.67")] 
-[assembly: AssemblyFileVersion("1.0.67")] 
-[assembly: AssemblyInformationalVersion("1.0.67")] 
+using System.Reflection;                                                              
+using System.Runtime.InteropServices;                                                              
+// 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")]                                                              
+[assembly: AssemblyDescription("")]                                                              
+[assembly: AssemblyConfiguration("")]                                                              
+[assembly: AssemblyCompany("")]                                                              
+[assembly: AssemblyProduct("JiraTimeBot")]                                                              
+[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)]                                                              
+// The following GUID is for the ID of the typelib if this project is exposed to COM                                                              
+[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]                                                              
+// 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.71")] 
+[assembly: AssemblyFileVersion("1.0.71")] 
+[assembly: AssemblyInformationalVersion("1.0.71")] 

src/JiraTimeBot/UI/frmSettings.Designer.cs

@@ -53,6 +53,7 @@
             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.SuspendLayout();
             // 
             // label5
@@ -168,7 +169,7 @@
             // 
             // btnSave
             // 
-            this.btnSave.Location = new System.Drawing.Point(86, 359);
+            this.btnSave.Location = new System.Drawing.Point(86, 382);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(75, 23);
             this.btnSave.TabIndex = 32;
@@ -272,11 +273,22 @@
             this.txtRandomMinutes.Size = new System.Drawing.Size(99, 20);
             this.txtRandomMinutes.TabIndex = 43;
             // 
+            // chkPullBeforeProcess
+            // 
+            this.chkPullBeforeProcess.AutoSize = true;
+            this.chkPullBeforeProcess.Location = new System.Drawing.Point(65, 359);
+            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;
+            // 
             // frmSettings
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(243, 391);
+            this.ClientSize = new System.Drawing.Size(243, 414);
+            this.Controls.Add(this.chkPullBeforeProcess);
             this.Controls.Add(this.label9);
             this.Controls.Add(this.txtRandomMinutes);
             this.Controls.Add(this.lblWorkDay);
@@ -340,5 +352,6 @@
         private System.Windows.Forms.TextBox txtWorkDayDuration;
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.TextBox txtRandomMinutes;
+        private System.Windows.Forms.CheckBox chkPullBeforeProcess;
     }
 }

src/JiraTimeBot/UI/frmSettings.cs

@@ -40,6 +40,7 @@ namespace JiraTimeBot.UI
             txtJQL.Text = settings.JiraQuery;
             txtWorkDayDuration.Text = settings.MinuterPerWorkDay.ToString();
             txtRandomMinutes.Text = settings.RandomWorkMinutes.ToString();
+            chkPullBeforeProcess.Checked = settings.PullBeforeProcess;
 
             cboWorkType_SelectedIndexChanged(null, null);
         }
@@ -72,7 +73,8 @@ namespace JiraTimeBot.UI
                 JiraQuery = txtJQL.Text,
                 TimeControlTask = txtTimeControlTask.Text,
                 MinuterPerWorkDay = minuterPerWorkDay,
-                RandomWorkMinutes = randomWorkMinutes
+                RandomWorkMinutes = randomWorkMinutes,
+                PullBeforeProcess = chkPullBeforeProcess.Checked
             };
 
             //LockUnlock(false);