Compare commits

...
2 Commits
5 changed files with 40 additions and 47 deletions
+1 -1
View File
@@ -1 +1 @@
1.0.24 1.0.25
@@ -34,20 +34,11 @@ namespace JiraTimeBot.JiraIntegration
{ {
return new List<MercurialCommitItem>(); return new List<MercurialCommitItem>();
} }
var comments = issue.GetCommentsAsync(cancellationToken).Result?.ToList() ?? new List<Comment>();
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 user = settings.JiraUserName;
var userComments = comments.Where(f => f.Author.Equals(user, StringComparison.InvariantCultureIgnoreCase)).ToList(); var userComments = comments.Where(f => f.Author.Equals(user, StringComparison.InvariantCultureIgnoreCase)).ToList();
_log.Trace($"Получены комментарии по задаче {issue.Key} ({issue.Type?.Name}): {userComments.Count}.");
if (userComments.Any()) if (userComments.Any())
{ {
+5 -3
View File
@@ -1,5 +1,7 @@
using JiraTimeBot.UI; using JiraTimeBot.UI;
using System; using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Threading; using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
@@ -7,19 +9,19 @@ namespace JiraTimeBot
{ {
static class Program static class Program
{ {
private static Mutex _mutex = new Mutex(true, "{44426B3E-B901-4792-ACEA-1385D79DBAD1}"); private static readonly Mutex Mutex = new Mutex(true, "{44426B3E-B901-4792-ACEA-1385D79DBAD1}");
/// <summary> /// <summary>
/// The main entry point for the application. /// The main entry point for the application.
/// </summary> /// </summary>
[STAThread] [STAThread]
static void Main() static void Main()
{ {
if (_mutex.WaitOne(TimeSpan.Zero, true)) if (Mutex.WaitOne(TimeSpan.Zero, true))
{ {
Application.EnableVisualStyles(); Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new frmMain()); Application.Run(new frmMain());
_mutex.ReleaseMutex(); Mutex.ReleaseMutex();
} }
else else
{ {
+3 -3
View File
@@ -26,6 +26,6 @@ using System.Runtime.InteropServices;
// //
// 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.24")] [assembly: AssemblyVersion("1.0.25")]
[assembly: AssemblyFileVersion("1.0.24")] [assembly: AssemblyFileVersion("1.0.25")]
[assembly: AssemblyInformationalVersion("1.0.24")] [assembly: AssemblyInformationalVersion("1.0.25")]
@@ -27,7 +27,7 @@ namespace JiraTimeBot.TaskTime
while (totalCommitsCount > (8 * (60.0 / settings.RountToMinutes))) while (totalCommitsCount > (8 * (60.0 / settings.RountToMinutes)))
{ {
settings.RountToMinutes = (int)RoundTo((decimal)(settings.RountToMinutes / 2.0), 5); settings.RountToMinutes = (int)RoundTo((decimal)(settings.RountToMinutes / 2.0), 5);
_log.Info($"Слишком много задачь - уменьшаю интервал до {settings.RountToMinutes}."); _log.Info($"Слишком много задач - уменьшаю интервал до {settings.RountToMinutes}.");
if (settings.RountToMinutes == 5) if (settings.RountToMinutes == 5)
{ {
break; break;