Compare commits

..
27 Commits
Author SHA1 Message Date
Danil Kislov fd350ef43d Чаще проверяем обновления, не спамим про актуальную версию в лог. 2019-03-20 09:31:12 +03:00
Danil Kislov 87ef6551e0 Merge branch 'master' of github.com:monster1025/JiraTimeBot 2019-03-20 09:23:54 +03:00
Danil Kislov 0c021a5b3c Дополнен алгоритм работы с JIRA-задачами 2019-03-20 09:23:39 +03:00
Danil Kislov 6bc2627c1b Дополнен алгоритм работы с JIRA-задачами 2019-03-20 09:23:28 +03:00
Danil 8ee71eca6e Update README.md 2019-03-19 21:21:00 +03:00
Danil 5227897010 Update README.md 2019-03-19 21:12:52 +03:00
Danil Kislov 53050ebed3 Исправление алгоритма удаления ворклогов 2019-03-19 20:35:11 +03:00
Danil Kislov 2f6d522636 При удалении ворклога правильно сравниваем юзернейм. 2019-03-19 20:21:05 +03:00
Danil Kislov da0968d003 Дополнительное условие фильтра 2019-03-19 20:05:47 +03:00
Danil Kislov 882ecf3a4b Исправление добавления отрицательного времени 2019-03-19 19:55:32 +03:00
Danil Kislov 9563b2220d Merge branch 'master' of github.com:monster1025/JiraTimeBot 2019-03-19 19:53:28 +03:00
Danil Kislov 9a3adc5059 Исправлено возможное добавление отрицательного времени 2019-03-19 19:53:05 +03:00
Anton Volkov 16b15c44a6 up 2019-03-19 16:03:06 +03:00
Anton Volkov 2afc189307 + mutex 2019-03-19 15:41:41 +03:00
Danil Kislov 98f4985f06 Алгоритм перерасчета округленя. 2019-03-19 14:21:38 +03:00
Danil Kislov 4e5ccaf658 Уменьшил время старта обновления и добавил алгоритм уменьшения округления 2019-03-19 13:44:37 +03:00
Danil Kislov fab2b22bce Merge branch 'master' of github.com:monster1025/JiraTimeBot 2019-03-19 12:27:23 +03:00
Danil Kislov 7c86cefa53 Отключил комментарии для режима Jira 2019-03-19 12:27:09 +03:00
Danil fce2939cce Update README.md 2019-03-19 12:19:23 +03:00
Danil 0121d8d139 Update README.md 2019-03-19 11:58:14 +03:00
Danil Kislov 2d8214e64f Отключено обновление в режиме отладки 2019-03-19 11:31:47 +03:00
Danil Kislov 02bee8abbd Релиз 2019-03-19 10:53:30 +03:00
Danil Kislov 0f00ba3f0e Сообщение о последней версии 2019-03-19 10:52:44 +03:00
Danil Kislov 71d02f7efe немного изменений 2019-03-19 10:51:25 +03:00
Danil Kislov 71fbd6ee80 Реализовано автоматическое обновление. 2019-03-19 10:37:22 +03:00
Danil Kislov 7d236ba9b0 Переименовал exe-файл 2019-03-19 10:01:27 +03:00
Danil Kislov dd29f9230e Проверка на новую версию 2019-03-19 10:00:36 +03:00
42 changed files with 642 additions and 237 deletions
+1 -1
View File
@@ -1 +1 @@
1.0.14
1.0.24
+16 -1
View File
@@ -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
+1 -1
View File
@@ -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
@@ -2,7 +2,7 @@
using System.Security.Cryptography;
using System.Text;
namespace JiraTimeBotForm.Configuration
namespace JiraTimeBot.Configuration
{
public class PasswordEncryptionClass
{
+1 -1
View File
@@ -5,7 +5,7 @@ using System.Linq;
using System.Windows.Forms;
using Newtonsoft.Json;
namespace JiraTimeBotForm.Configuration
namespace JiraTimeBot.Configuration
{
public class Settings
{
+21 -12
View File
@@ -1,16 +1,16 @@
using System.Windows.Forms;
using Autofac;
using Autofac;
using Autofac.Extras.AggregateService;
using JiraTimeBotForm.JiraIntegration;
using JiraTimeBotForm.JiraIntegration.Comments;
using JiraTimeBotForm.Mercurial;
using JiraTimeBotForm.Mercurial.Modifiers;
using JiraTimeBotForm.TasksProcessors;
using JiraTimeBotForm.TaskTime;
using JiraTimeBotForm.UI;
using JiraTimeBotForm.UI.Tray;
using JiraTimeBot.JiraIntegration;
using JiraTimeBot.JiraIntegration.Comments;
using JiraTimeBot.Mercurial;
using JiraTimeBot.Mercurial.Modifiers;
using JiraTimeBot.TasksProcessors;
using JiraTimeBot.TaskTime;
using JiraTimeBot.UI.Tray;
using System;
using System.Windows.Forms;
namespace JiraTimeBotForm.DI
namespace JiraTimeBot.DI
{
public class Bootstrapper
{
@@ -22,7 +22,16 @@ 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>();
@@ -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);
}
}
@@ -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 "";
}
}
}
+25 -18
View File
@@ -3,11 +3,11 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using Atlassian.Jira;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.JiraIntegration.Comments;
using JiraTimeBotForm.TaskTime.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.JiraIntegration.Comments;
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. Пропускаю.");
hasTodayWorklog = true;
_log.Trace($"Найдено более одного ворклога на задачу, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
}
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)
@@ -1,11 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.Mercurial;
using JiraTimeBotForm.Mercurial.Objects;
using Atlassian.Jira;
using JiraTimeBot.Configuration;
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,
Time = issue.Updated.GetValueOrDefault(date.Value),
Branch = issue.Key.Value,
FilesAffected = 1
});
return new List<MercurialCommitItem>();
}
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;
+6 -2
View File
@@ -6,8 +6,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{F3B89316-C38C-4CE6-9D88-0B1373CFBA1A}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>JiraTimeBotForm</RootNamespace>
<AssemblyName>JiraTimeBotForm</AssemblyName>
<RootNamespace>JiraTimeBot</RootNamespace>
<AssemblyName>JiraTimeBot</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -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" />
@@ -118,6 +119,8 @@
<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\UpdateChecker.cs" />
<EmbeddedResource Include="UI\frmMain.resx">
<DependentUpon>frmMain.cs</DependentUpon>
</EmbeddedResource>
@@ -129,6 +132,7 @@
<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>
+7 -7
View File
@@ -3,14 +3,14 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.Mercurial;
using JiraTimeBotForm.Mercurial.Objects;
using JiraTimeBotForm.TasksProcessors;
using JiraTimeBotForm.TaskTime;
using JiraTimeBotForm.TaskTime.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.Mercurial;
using JiraTimeBot.Mercurial.Objects;
using JiraTimeBot.TasksProcessors;
using JiraTimeBot.TaskTime;
using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm
namespace JiraTimeBot
{
class Job
{
+5 -11
View File
@@ -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 AppendLog _safeAppender;
private readonly Action<string> _logAction;
public Logger(TextBox txt)
public Logger(Action<string> logAction)
{
_txt = txt;
_safeAppender = text => _txt.AppendText(text);
_logAction = logAction;
}
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);
@@ -1,11 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JiraTimeBotForm.JiraIntegration;
using JiraTimeBot.JiraIntegration;
namespace JiraTimeBotForm.Mercurial
namespace JiraTimeBot.Mercurial
{
public interface IAllMercurialProviders
{
+3 -3
View File
@@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
using System.Threading;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.Mercurial.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.Mercurial.Objects;
namespace JiraTimeBotForm.Mercurial
namespace JiraTimeBot.Mercurial
{
public interface IMercurialLog
{
+4 -4
View File
@@ -4,12 +4,12 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.Mercurial.Modifiers;
using JiraTimeBotForm.Mercurial.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.Mercurial.Modifiers;
using JiraTimeBot.Mercurial.Objects;
using Mercurial;
namespace JiraTimeBotForm.Mercurial
namespace JiraTimeBot.Mercurial
{
public class MercurialLog: IMercurialLog
{
@@ -1,6 +1,6 @@
using System;
namespace JiraTimeBotForm.Mercurial.Modifiers
namespace JiraTimeBot.Mercurial.Modifiers
{
public class CommitSkipper : ICommitSkipper
{
@@ -1,4 +1,4 @@
namespace JiraTimeBotForm.Mercurial.Modifiers
namespace JiraTimeBot.Mercurial.Modifiers
{
public interface ICommitSkipper
{
@@ -1,4 +1,4 @@
namespace JiraTimeBotForm.Mercurial.Modifiers
namespace JiraTimeBot.Mercurial.Modifiers
{
public interface ITechnicalInfoSkipper
{
@@ -1,6 +1,6 @@
using System.Text;
namespace JiraTimeBotForm.Mercurial.Modifiers
namespace JiraTimeBot.Mercurial.Modifiers
{
public class TechnicalInfoSkipper : ITechnicalInfoSkipper
{
@@ -1,6 +1,6 @@
using System;
namespace JiraTimeBotForm.Mercurial.Objects
namespace JiraTimeBot.Mercurial.Objects
{
public class MercurialCommitItem
{
+13 -28
View File
@@ -1,45 +1,30 @@
using System;
using System.Diagnostics;
using JiraTimeBot.UI;
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;
}
}
}
+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
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.14")]
[assembly: AssemblyFileVersion("1.0.14")]
[assembly: AssemblyInformationalVersion("1.0.14")]
[assembly: AssemblyVersion("1.0.24")]
[assembly: AssemblyFileVersion("1.0.24")]
[assembly: AssemblyInformationalVersion("1.0.24")]
+13 -21
View File
@@ -1,4 +1,4 @@
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
@@ -8,8 +8,8 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace JiraTimeBotForm.Properties
{
namespace JiraTimeBot.Properties {
using System;
/// <summary>
@@ -19,32 +19,27 @@ namespace JiraTimeBotForm.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", "4.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
{
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()
{
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("JiraTimeBotForm.Properties.Resources", typeof(Resources).Assembly);
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("JiraTimeBot.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
@@ -56,14 +51,11 @@ namespace JiraTimeBotForm.Properties
/// 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
{
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set
{
set {
resourceCulture = value;
}
}
+6 -10
View File
@@ -1,4 +1,4 @@
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
@@ -8,21 +8,17 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace JiraTimeBotForm.Properties
{
namespace JiraTimeBot.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
{
[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())));
public static Settings Default
{
get
{
public static Settings Default {
get {
return defaultInstance;
}
}
@@ -1,11 +1,10 @@
using System.Collections.Generic;
using System.Threading;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.Mercurial;
using JiraTimeBotForm.Mercurial.Objects;
using JiraTimeBotForm.TaskTime.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.Mercurial.Objects;
using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm.TaskTime
namespace JiraTimeBot.TaskTime
{
public interface ITaskTimeCalculator
{
@@ -1,6 +1,6 @@
using System;
namespace JiraTimeBotForm.TaskTime.Objects
namespace JiraTimeBot.TaskTime.Objects
{
public class TaskTimeItem
{
@@ -3,12 +3,11 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.Mercurial;
using JiraTimeBotForm.Mercurial.Objects;
using JiraTimeBotForm.TaskTime.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.Mercurial.Objects;
using JiraTimeBot.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 часов - скореектируем остаток в первой задаче (она самая трудозатратная).
workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes);
if (workTimeItems.First().Time.TotalMinutes > Math.Abs(remainMinutes) && remainMinutes < 0)
{
//если переборщили или не достаточно добавили до 8 часов - скореектируем остаток в первой задаче (она самая трудозатратная).
workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes);
}
return workTimeItems;
}
@@ -1,4 +1,4 @@
namespace JiraTimeBotForm.TasksProcessors
namespace JiraTimeBot.TasksProcessors
{
public interface IAllTasksProcessors
{
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.TaskTime.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm.TasksProcessors
namespace JiraTimeBot.TasksProcessors
{
interface ITasksProcessor
{
@@ -1,11 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.JiraIntegration;
using JiraTimeBotForm.TaskTime.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.JiraIntegration;
using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm.TasksProcessors
namespace JiraTimeBot.TasksProcessors
{
public class MeetingProcessor : ITasksProcessor
{
@@ -1,11 +1,10 @@
using System;
using System.Collections.Generic;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.JiraIntegration;
using JiraTimeBotForm.TaskTime;
using JiraTimeBotForm.TaskTime.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.JiraIntegration;
using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm.TasksProcessors
namespace JiraTimeBot.TasksProcessors
{
public class WorkLogTasksProcessor : ITasksProcessor
{
+1 -1
View File
@@ -1,6 +1,6 @@
using System.Windows.Forms;
namespace JiraTimeBotForm.UI.Tray
namespace JiraTimeBot.UI.Tray
{
public interface ITrayMenu
{
+1 -1
View File
@@ -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" )]
+1 -1
View File
@@ -1,7 +1,7 @@
using System;
using System.Windows.Forms;
namespace JiraTimeBotForm.UI.Tray
namespace JiraTimeBot.UI.Tray
{
public class TrayMenu: ITrayMenu
{
+8 -1
View File
@@ -1,4 +1,4 @@
namespace JiraTimeBotForm.UI
namespace JiraTimeBot.UI
{
partial class frmMain
{
@@ -38,6 +38,7 @@
this.btnMeeting = new System.Windows.Forms.Button();
this.btnCancel = new System.Windows.Forms.Button();
this.btnSettings = new System.Windows.Forms.Button();
this.tmrUpdate = new System.Windows.Forms.Timer(this.components);
this.SuspendLayout();
//
// txtLog
@@ -111,6 +112,11 @@
this.btnSettings.UseVisualStyleBackColor = true;
this.btnSettings.Click += new System.EventHandler(this.btnSettings_Click);
//
// tmrUpdate
//
this.tmrUpdate.Interval = 1000;
this.tmrUpdate.Tick += new System.EventHandler(this.tmrUpdate_Tick);
//
// frmMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -144,6 +150,7 @@
private System.Windows.Forms.Button btnMeeting;
private System.Windows.Forms.Button btnCancel;
private System.Windows.Forms.Button btnSettings;
private System.Windows.Forms.Timer tmrUpdate;
}
}
+113 -9
View File
@@ -1,19 +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.Net.Configuration;
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;
// 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
{
@@ -27,6 +29,7 @@ namespace JiraTimeBotForm.UI
private Settings _settings;
private readonly Action _settingsWindowShow;
private readonly Action<string> _settingsErrorReporter;
private bool _updateChecked;
private CancellationTokenSource GetTokenSource()
{
@@ -59,7 +62,6 @@ namespace JiraTimeBotForm.UI
var frmSettings = new frmSettings();
frmSettings.ShowDialog(this);
};
_settingsErrorReporter = msg => MessageBox.Show(msg, "Загрузка настроек", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);;
}
@@ -90,8 +92,19 @@ namespace JiraTimeBotForm.UI
private void Form1_Load(object sender, EventArgs e)
{
this.Text = this.Text + " v." + Application.ProductVersion;
PrintStartMessage();
tmrStart.Enabled = true;
if (System.Diagnostics.Debugger.IsAttached)
{
_log.Trace("Приложение запущено в режиме отладки. Отключаю обновление.");
}
else
{
tmrUpdate.Enabled = true;
}
}
private void PrintStartMessage()
@@ -182,5 +195,96 @@ namespace JiraTimeBotForm.UI
PrintStartMessage();
}
private void tmrUpdate_Tick(object sender, EventArgs e)
{
try
{
var firstTime = !_updateChecked;
_updateChecked = true;
tmrUpdate.Interval = 1 * 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 if (firstTime)
{
_log.Info($"Вы используете актуальную версию.");
}
}
catch (Exception ex)
{
//в процессе обновления ни при каком раскладе мы не должны уложить бота.
_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;
}
}
}
}
+3
View File
@@ -123,6 +123,9 @@
<metadata name="tmrStart.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>113, 17</value>
</metadata>
<metadata name="tmrUpdate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>209, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
+1 -1
View File
@@ -1,4 +1,4 @@
namespace JiraTimeBotForm.UI
namespace JiraTimeBot.UI
{
partial class frmSettings
{
+2 -2
View File
@@ -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
{
+161
View File
@@ -0,0 +1,161 @@
using System;
using Newtonsoft.Json;
namespace JiraTimeBot.Update
{
public partial class GitHubReleaseResponse
{
[JsonProperty("url")]
public Uri Url { get; set; }
[JsonProperty("assets_url")]
public Uri AssetsUrl { get; set; }
[JsonProperty("upload_url")]
public string UploadUrl { get; set; }
[JsonProperty("html_url")]
public Uri HtmlUrl { get; set; }
[JsonProperty("id")]
public long Id { get; set; }
[JsonProperty("node_id")]
public string NodeId { get; set; }
[JsonProperty("tag_name")]
public string TagName { get; set; }
[JsonProperty("target_commitish")]
public string TargetCommitish { get; set; }
[JsonProperty("name")]
public object Name { get; set; }
[JsonProperty("draft")]
public bool Draft { get; set; }
[JsonProperty("author")]
public Author Author { get; set; }
[JsonProperty("prerelease")]
public bool Prerelease { get; set; }
[JsonProperty("created_at")]
public DateTimeOffset CreatedAt { get; set; }
[JsonProperty("published_at")]
public DateTimeOffset PublishedAt { get; set; }
[JsonProperty("assets")]
public Asset[] Assets { get; set; }
[JsonProperty("tarball_url")]
public Uri TarballUrl { get; set; }
[JsonProperty("zipball_url")]
public Uri ZipballUrl { get; set; }
[JsonProperty("body")]
public object Body { get; set; }
}
public partial class Asset
{
[JsonProperty("url")]
public Uri Url { get; set; }
[JsonProperty("id")]
public long Id { get; set; }
[JsonProperty("node_id")]
public string NodeId { get; set; }
[JsonProperty("name")]
public string Name { get; set; }
[JsonProperty("label")]
public string Label { get; set; }
[JsonProperty("uploader")]
public Author Uploader { get; set; }
[JsonProperty("content_type")]
public string ContentType { get; set; }
[JsonProperty("state")]
public string State { get; set; }
[JsonProperty("size")]
public long Size { get; set; }
[JsonProperty("download_count")]
public long DownloadCount { get; set; }
[JsonProperty("created_at")]
public DateTimeOffset CreatedAt { get; set; }
[JsonProperty("updated_at")]
public DateTimeOffset UpdatedAt { get; set; }
[JsonProperty("browser_download_url")]
public Uri BrowserDownloadUrl { get; set; }
}
public partial class Author
{
[JsonProperty("login")]
public string Login { get; set; }
[JsonProperty("id")]
public long Id { get; set; }
[JsonProperty("node_id")]
public string NodeId { get; set; }
[JsonProperty("avatar_url")]
public Uri AvatarUrl { get; set; }
[JsonProperty("gravatar_id")]
public string GravatarId { get; set; }
[JsonProperty("url")]
public Uri Url { get; set; }
[JsonProperty("html_url")]
public Uri HtmlUrl { get; set; }
[JsonProperty("followers_url")]
public Uri FollowersUrl { get; set; }
[JsonProperty("following_url")]
public string FollowingUrl { get; set; }
[JsonProperty("gists_url")]
public string GistsUrl { get; set; }
[JsonProperty("starred_url")]
public string StarredUrl { get; set; }
[JsonProperty("subscriptions_url")]
public Uri SubscriptionsUrl { get; set; }
[JsonProperty("organizations_url")]
public Uri OrganizationsUrl { get; set; }
[JsonProperty("repos_url")]
public Uri ReposUrl { get; set; }
[JsonProperty("events_url")]
public string EventsUrl { get; set; }
[JsonProperty("received_events_url")]
public Uri ReceivedEventsUrl { get; set; }
[JsonProperty("type")]
public string Type { get; set; }
[JsonProperty("site_admin")]
public bool SiteAdmin { get; set; }
}
}
+78
View File
@@ -0,0 +1,78 @@
using System;
using System.IO;
using System.Linq;
using System.Net;
using Newtonsoft.Json;
namespace JiraTimeBot.Update
{
class UpdateChecker
{
private const string GithubUser = "monster1025";
private const string GithubRepo = "JiraTimeBot";
public string GetLatestVersion(GitHubReleaseResponse release)
{
var version = release?.TagName?.TrimStart('v');
return version;
}
public string GetDownloadUrl(GitHubReleaseResponse release)
{
var downloadUrl = release?.Assets?.FirstOrDefault()?.BrowserDownloadUrl?.ToString();
return downloadUrl ?? "";
}
public GitHubReleaseResponse GetRelease()
{
var latestReleasePage = Get($"https://api.github.com/repos/{GithubUser}/{GithubRepo}/releases/latest");
if (string.IsNullOrEmpty(latestReleasePage))
{
return null;
}
var release = JsonConvert.DeserializeObject<GitHubReleaseResponse>(latestReleasePage);
return release;
}
public bool DownloadFile(string url, string to)
{
try
{
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;
}
}
private string Get(string uri)
{
try
{
HttpWebRequest request = (HttpWebRequest) WebRequest.Create(uri);
request.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
request.UserAgent = "Mozilla/5.0 (X11; Linux i686; rv:64.0) Gecko/20100101 Firefox/64.0";
using (HttpWebResponse response = (HttpWebResponse) request.GetResponse())
using (Stream stream = response.GetResponseStream())
using (StreamReader reader = new StreamReader(stream))
{
return reader.ReadToEnd();
}
}
catch (Exception ex)
{
return "";
}
}
}
}