This commit is contained in:
Anton Volkov
2019-03-19 16:03:06 +03:00
parent 2afc189307
commit 16b15c44a6
4 changed files with 28 additions and 24 deletions
+13 -3
View File
@@ -1,5 +1,4 @@
using System.Windows.Forms; using Autofac;
using Autofac;
using Autofac.Extras.AggregateService; using Autofac.Extras.AggregateService;
using JiraTimeBot.JiraIntegration; using JiraTimeBot.JiraIntegration;
using JiraTimeBot.JiraIntegration.Comments; using JiraTimeBot.JiraIntegration.Comments;
@@ -8,6 +7,8 @@ using JiraTimeBot.Mercurial.Modifiers;
using JiraTimeBot.TasksProcessors; using JiraTimeBot.TasksProcessors;
using JiraTimeBot.TaskTime; using JiraTimeBot.TaskTime;
using JiraTimeBot.UI.Tray; using JiraTimeBot.UI.Tray;
using System;
using System.Windows.Forms;
namespace JiraTimeBot.DI namespace JiraTimeBot.DI
{ {
@@ -21,7 +22,16 @@ namespace JiraTimeBot.DI
public IContainer Build(TextBox logTextBox) 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(f => new TrayMenu()).As<ITrayMenu>().AsSelf();
_builder.Register(c => new CommitSkipper()).As<ICommitSkipper>(); _builder.Register(c => new CommitSkipper()).As<ICommitSkipper>();
@@ -1,8 +1,8 @@
using System; using JiraTimeBot.Configuration;
using JiraTimeBot.TaskTime.Objects;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using JiraTimeBot.Configuration;
using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBot.JiraIntegration.Comments namespace JiraTimeBot.JiraIntegration.Comments
{ {
+4 -10
View File
@@ -1,29 +1,23 @@
using System; using System;
using System.ComponentModel; using System.ComponentModel;
using System.Windows.Forms;
namespace JiraTimeBot namespace JiraTimeBot
{ {
public class Logger : ILog 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) private void AppendText(string message)
{ {
message = $"{DateTime.Now:HH:mm} {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) public void Info([Localizable(false)] string message)
{ {
AppendText(message); AppendText(message);
+7 -7
View File
@@ -1,16 +1,16 @@
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.Collections.Generic;
using System.IO; using System.IO;
using System.IO.Compression; using System.IO.Compression;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using Autofac;
using JiraTimeBot.Configuration;
using JiraTimeBot.DI;
using JiraTimeBot.TasksProcessors;
using JiraTimeBot.UI.Tray;
using JiraTimeBot.Update;
// This is the code for your desktop app. // This is the code for your desktop app.
// Press Ctrl+F5 (or go to Debug > Start Without Debugging) to run your app. // Press Ctrl+F5 (or go to Debug > Start Without Debugging) to run your app.