Compare commits

...
2 Commits
36 changed files with 134 additions and 137 deletions
+1 -1
View File
@@ -1 +1 @@
1.0.18 1.0.19
@@ -2,7 +2,7 @@
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text; using System.Text;
namespace JiraTimeBotForm.Configuration namespace JiraTimeBot.Configuration
{ {
public class PasswordEncryptionClass public class PasswordEncryptionClass
{ {
+1 -1
View File
@@ -5,7 +5,7 @@ using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace JiraTimeBotForm.Configuration namespace JiraTimeBot.Configuration
{ {
public class Settings public class Settings
{ {
+8 -9
View File
@@ -1,16 +1,15 @@
using System.Windows.Forms; using System.Windows.Forms;
using Autofac; using Autofac;
using Autofac.Extras.AggregateService; using Autofac.Extras.AggregateService;
using JiraTimeBotForm.JiraIntegration; using JiraTimeBot.JiraIntegration;
using JiraTimeBotForm.JiraIntegration.Comments; using JiraTimeBot.JiraIntegration.Comments;
using JiraTimeBotForm.Mercurial; using JiraTimeBot.Mercurial;
using JiraTimeBotForm.Mercurial.Modifiers; using JiraTimeBot.Mercurial.Modifiers;
using JiraTimeBotForm.TasksProcessors; using JiraTimeBot.TasksProcessors;
using JiraTimeBotForm.TaskTime; using JiraTimeBot.TaskTime;
using JiraTimeBotForm.UI; using JiraTimeBot.UI.Tray;
using JiraTimeBotForm.UI.Tray;
namespace JiraTimeBotForm.DI namespace JiraTimeBot.DI
{ {
public class Bootstrapper public class Bootstrapper
{ {
@@ -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 public interface IJiraDescriptionSource
{ {
string GetDescription(TaskTimeItem item, bool addCommentsToWorklog); string GetDescription(TaskTimeItem item, bool addCommentsToWorklog, Settings settings);
} }
} }
@@ -1,9 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using JiraTimeBotForm.TaskTime.Objects; using JiraTimeBot.Configuration;
using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm.JiraIntegration.Comments namespace JiraTimeBot.JiraIntegration.Comments
{ {
public class JiraDescriptionSource : IJiraDescriptionSource 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) if (addCommentsToWorklog)
{ {
return taskTimeItem.Description; return taskTimeItem.Description;
} }
if (settings.WorkType == WorkType.Mercurial)
{
return _dummyComments.OrderBy(f => Guid.NewGuid()).FirstOrDefault(); return _dummyComments.OrderBy(f => Guid.NewGuid()).FirstOrDefault();
} }
return "";
}
} }
} }
+5 -5
View File
@@ -3,11 +3,11 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using Atlassian.Jira; using Atlassian.Jira;
using JiraTimeBotForm.Configuration; using JiraTimeBot.Configuration;
using JiraTimeBotForm.JiraIntegration.Comments; using JiraTimeBot.JiraIntegration.Comments;
using JiraTimeBotForm.TaskTime.Objects; using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm.JiraIntegration namespace JiraTimeBot.JiraIntegration
{ {
public class JiraApi public class JiraApi
{ {
@@ -119,7 +119,7 @@ namespace JiraTimeBotForm.JiraIntegration
{ {
var timeSpentJira = $"{taskTimeItem.Time.TotalMinutes}m"; 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); Worklog workLogToAdd = new Worklog(timeSpentJira, date.Value, comment);
if (!dummy) if (!dummy)
@@ -1,11 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading; using System.Threading;
using JiraTimeBotForm.Configuration; using JiraTimeBot.Configuration;
using JiraTimeBotForm.Mercurial; using JiraTimeBot.Mercurial;
using JiraTimeBotForm.Mercurial.Objects; using JiraTimeBot.Mercurial.Objects;
namespace JiraTimeBotForm.JiraIntegration namespace JiraTimeBot.JiraIntegration
{ {
public class JiraCommitEmulator : IMercurialLog public class JiraCommitEmulator : IMercurialLog
{ {
+7 -7
View File
@@ -3,14 +3,14 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using JiraTimeBotForm.Configuration; using JiraTimeBot.Configuration;
using JiraTimeBotForm.Mercurial; using JiraTimeBot.Mercurial;
using JiraTimeBotForm.Mercurial.Objects; using JiraTimeBot.Mercurial.Objects;
using JiraTimeBotForm.TasksProcessors; using JiraTimeBot.TasksProcessors;
using JiraTimeBotForm.TaskTime; using JiraTimeBot.TaskTime;
using JiraTimeBotForm.TaskTime.Objects; using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm namespace JiraTimeBot
{ {
class Job class Job
{ {
+1 -1
View File
@@ -2,7 +2,7 @@
using System.ComponentModel; using System.ComponentModel;
using System.Windows.Forms; using System.Windows.Forms;
namespace JiraTimeBotForm namespace JiraTimeBot
{ {
public class Logger : ILog public class Logger : ILog
{ {
@@ -1,11 +1,6 @@
using System; using JiraTimeBot.JiraIntegration;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JiraTimeBotForm.JiraIntegration;
namespace JiraTimeBotForm.Mercurial namespace JiraTimeBot.Mercurial
{ {
public interface IAllMercurialProviders public interface IAllMercurialProviders
{ {
+3 -3
View File
@@ -1,10 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading; using System.Threading;
using JiraTimeBotForm.Configuration; using JiraTimeBot.Configuration;
using JiraTimeBotForm.Mercurial.Objects; using JiraTimeBot.Mercurial.Objects;
namespace JiraTimeBotForm.Mercurial namespace JiraTimeBot.Mercurial
{ {
public interface IMercurialLog public interface IMercurialLog
{ {
+4 -4
View File
@@ -4,12 +4,12 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using JiraTimeBotForm.Configuration; using JiraTimeBot.Configuration;
using JiraTimeBotForm.Mercurial.Modifiers; using JiraTimeBot.Mercurial.Modifiers;
using JiraTimeBotForm.Mercurial.Objects; using JiraTimeBot.Mercurial.Objects;
using Mercurial; using Mercurial;
namespace JiraTimeBotForm.Mercurial namespace JiraTimeBot.Mercurial
{ {
public class MercurialLog: IMercurialLog public class MercurialLog: IMercurialLog
{ {
@@ -1,6 +1,6 @@
using System; using System;
namespace JiraTimeBotForm.Mercurial.Modifiers namespace JiraTimeBot.Mercurial.Modifiers
{ {
public class CommitSkipper : ICommitSkipper public class CommitSkipper : ICommitSkipper
{ {
@@ -1,4 +1,4 @@
namespace JiraTimeBotForm.Mercurial.Modifiers namespace JiraTimeBot.Mercurial.Modifiers
{ {
public interface ICommitSkipper public interface ICommitSkipper
{ {
@@ -1,4 +1,4 @@
namespace JiraTimeBotForm.Mercurial.Modifiers namespace JiraTimeBot.Mercurial.Modifiers
{ {
public interface ITechnicalInfoSkipper public interface ITechnicalInfoSkipper
{ {
@@ -1,6 +1,6 @@
using System.Text; using System.Text;
namespace JiraTimeBotForm.Mercurial.Modifiers namespace JiraTimeBot.Mercurial.Modifiers
{ {
public class TechnicalInfoSkipper : ITechnicalInfoSkipper public class TechnicalInfoSkipper : ITechnicalInfoSkipper
{ {
@@ -1,6 +1,6 @@
using System; using System;
namespace JiraTimeBotForm.Mercurial.Objects namespace JiraTimeBot.Mercurial.Objects
{ {
public class MercurialCommitItem public class MercurialCommitItem
{ {
+2 -2
View File
@@ -1,9 +1,9 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Windows.Forms; using System.Windows.Forms;
using JiraTimeBotForm.UI; using JiraTimeBot.UI;
namespace JiraTimeBotForm namespace JiraTimeBot
{ {
static class Program static class Program
{ {
+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.18")] [assembly: AssemblyVersion("1.0.19")]
[assembly: AssemblyFileVersion("1.0.18")] [assembly: AssemblyFileVersion("1.0.19")]
[assembly: AssemblyInformationalVersion("1.0.18")] [assembly: AssemblyInformationalVersion("1.0.19")]
@@ -1,11 +1,10 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading; using System.Threading;
using JiraTimeBotForm.Configuration; using JiraTimeBot.Configuration;
using JiraTimeBotForm.Mercurial; using JiraTimeBot.Mercurial.Objects;
using JiraTimeBotForm.Mercurial.Objects; using JiraTimeBot.TaskTime.Objects;
using JiraTimeBotForm.TaskTime.Objects;
namespace JiraTimeBotForm.TaskTime namespace JiraTimeBot.TaskTime
{ {
public interface ITaskTimeCalculator public interface ITaskTimeCalculator
{ {
@@ -1,6 +1,6 @@
using System; using System;
namespace JiraTimeBotForm.TaskTime.Objects namespace JiraTimeBot.TaskTime.Objects
{ {
public class TaskTimeItem public class TaskTimeItem
{ {
@@ -3,12 +3,11 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using JiraTimeBotForm.Configuration; using JiraTimeBot.Configuration;
using JiraTimeBotForm.Mercurial; using JiraTimeBot.Mercurial.Objects;
using JiraTimeBotForm.Mercurial.Objects; using JiraTimeBot.TaskTime.Objects;
using JiraTimeBotForm.TaskTime.Objects;
namespace JiraTimeBotForm.TaskTime namespace JiraTimeBot.TaskTime
{ {
public class TaskTimeByCommitsCalculator: ITaskTimeCalculator public class TaskTimeByCommitsCalculator: ITaskTimeCalculator
{ {
@@ -1,4 +1,4 @@
namespace JiraTimeBotForm.TasksProcessors namespace JiraTimeBot.TasksProcessors
{ {
public interface IAllTasksProcessors public interface IAllTasksProcessors
{ {
@@ -1,9 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using JiraTimeBotForm.Configuration; using JiraTimeBot.Configuration;
using JiraTimeBotForm.TaskTime.Objects; using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm.TasksProcessors namespace JiraTimeBot.TasksProcessors
{ {
interface ITasksProcessor interface ITasksProcessor
{ {
@@ -1,11 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using JiraTimeBotForm.Configuration; using JiraTimeBot.Configuration;
using JiraTimeBotForm.JiraIntegration; using JiraTimeBot.JiraIntegration;
using JiraTimeBotForm.TaskTime.Objects; using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm.TasksProcessors namespace JiraTimeBot.TasksProcessors
{ {
public class MeetingProcessor : ITasksProcessor public class MeetingProcessor : ITasksProcessor
{ {
@@ -1,11 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using JiraTimeBotForm.Configuration; using JiraTimeBot.Configuration;
using JiraTimeBotForm.JiraIntegration; using JiraTimeBot.JiraIntegration;
using JiraTimeBotForm.TaskTime; using JiraTimeBot.TaskTime.Objects;
using JiraTimeBotForm.TaskTime.Objects;
namespace JiraTimeBotForm.TasksProcessors namespace JiraTimeBot.TasksProcessors
{ {
public class WorkLogTasksProcessor : ITasksProcessor public class WorkLogTasksProcessor : ITasksProcessor
{ {
+1 -1
View File
@@ -1,6 +1,6 @@
using System.Windows.Forms; using System.Windows.Forms;
namespace JiraTimeBotForm.UI.Tray namespace JiraTimeBot.UI.Tray
{ {
public interface ITrayMenu public interface ITrayMenu
{ {
+1 -1
View File
@@ -2,7 +2,7 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Forms; using System.Windows.Forms;
namespace JiraTimeBotForm.UI.Tray namespace JiraTimeBot.UI.Tray
{ {
public static class RestoreFromTray { public static class RestoreFromTray {
[DllImport( "user32.dll" )] [DllImport( "user32.dll" )]
+1 -1
View File
@@ -1,7 +1,7 @@
using System; using System;
using System.Windows.Forms; using System.Windows.Forms;
namespace JiraTimeBotForm.UI.Tray namespace JiraTimeBot.UI.Tray
{ {
public class TrayMenu: ITrayMenu public class TrayMenu: ITrayMenu
{ {
+1 -1
View File
@@ -1,4 +1,4 @@
namespace JiraTimeBotForm.UI namespace JiraTimeBot.UI
{ {
partial class frmMain partial class frmMain
{ {
+14 -6
View File
@@ -6,16 +6,16 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using Autofac; using Autofac;
using JiraTimeBotForm.Configuration; using JiraTimeBot.Configuration;
using JiraTimeBotForm.DI; using JiraTimeBot.DI;
using JiraTimeBotForm.TasksProcessors; using JiraTimeBot.TasksProcessors;
using JiraTimeBotForm.UI.Tray; using JiraTimeBot.UI.Tray;
using JiraTimeBotForm.Update; 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.
namespace JiraTimeBotForm.UI namespace JiraTimeBot.UI
{ {
public partial class frmMain : Form public partial class frmMain : Form
{ {
@@ -96,8 +96,16 @@ namespace JiraTimeBotForm.UI
PrintStartMessage(); PrintStartMessage();
tmrStart.Enabled = true; tmrStart.Enabled = true;
if (System.Diagnostics.Debugger.IsAttached)
{
_log.Trace("Приложение запущено в режиме отладки. Отключаю обновление.");
}
else
{
tmrUpdate.Enabled = true; tmrUpdate.Enabled = true;
} }
}
private void PrintStartMessage() private void PrintStartMessage()
{ {
+1 -1
View File
@@ -1,4 +1,4 @@
namespace JiraTimeBotForm.UI namespace JiraTimeBot.UI
{ {
partial class frmSettings partial class frmSettings
{ {
+2 -2
View File
@@ -1,8 +1,8 @@
using System; using System;
using System.Windows.Forms; using System.Windows.Forms;
using JiraTimeBotForm.Configuration; using JiraTimeBot.Configuration;
namespace JiraTimeBotForm.UI namespace JiraTimeBot.UI
{ {
public partial class frmSettings : Form public partial class frmSettings : Form
{ {
+1 -7
View File
@@ -1,13 +1,7 @@
using System; using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace JiraTimeBotForm.Update namespace JiraTimeBot.Update
{ {
public partial class GitHubReleaseResponse public partial class GitHubReleaseResponse
{ {
+1 -4
View File
@@ -1,13 +1,10 @@
using System; using System;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace JiraTimeBotForm.Update namespace JiraTimeBot.Update
{ {
class UpdateChecker class UpdateChecker
{ {