Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
98f4985f06 | ||
|
|
4e5ccaf658 | ||
|
|
fab2b22bce | ||
|
|
7c86cefa53 | ||
|
|
fce2939cce | ||
|
|
0121d8d139 | ||
|
|
2d8214e64f | ||
|
|
02bee8abbd | ||
|
|
0f00ba3f0e | ||
|
|
71d02f7efe | ||
|
|
71fbd6ee80 |
+1
-1
@@ -1 +1 @@
|
|||||||
1.0.16
|
1.0.20
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
# JiraTimeBot [](https://travis-ci.org/monster1025/JiraTimeBot)
|
# JiraTimeBot [](https://travis-ci.org/monster1025/JiraTimeBot)
|
||||||
Приложение для автоматического добавления Jira Worklog'ов исходя из количества коммитов в ветку.
|
Приложение для автоматического добавления Jira Worklog'ов исходя из количества коммитов в ветку.
|
||||||
|
|
||||||
# Предположения
|
# Ограничения
|
||||||
- Предполагается что все Ваши репозитории находятся в одной папке (к которой вы указываете путь в настройках).
|
- Предполагается что все Ваши репозитории находятся в одной папке (к которой вы указываете путь в настройках).
|
||||||
- Предполагается что ветки в JIRA имеют название эквивалентное имени бранча в Mercurial.
|
- Предполагается что ветки в JIRA имеют название эквивалентное имени бранча в Mercurial.
|
||||||
|
|
||||||
|
# Скачать
|
||||||
|
Скачать актуальную версию можно тут: https://github.com/monster1025/JiraTimeBot/releases/latest
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@ call tools\SetVersion.cmd %VERSION%
|
|||||||
git add .
|
git add .
|
||||||
git commit -m "%~1"
|
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 origin v%VERSION%
|
||||||
|
|
||||||
git push
|
git push
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
return _dummyComments.OrderBy(f => Guid.NewGuid()).FirstOrDefault();
|
if (settings.WorkType == WorkType.Mercurial)
|
||||||
|
{
|
||||||
|
return _dummyComments.OrderBy(f => Guid.NewGuid()).FirstOrDefault();
|
||||||
|
}
|
||||||
|
|
||||||
|
return "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -61,6 +61,7 @@
|
|||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.DirectoryServices" />
|
<Reference Include="System.DirectoryServices" />
|
||||||
<Reference Include="System.IO.Compression" />
|
<Reference Include="System.IO.Compression" />
|
||||||
|
<Reference Include="System.IO.Compression.FileSystem" />
|
||||||
<Reference Include="System.Runtime.Serialization" />
|
<Reference Include="System.Runtime.Serialization" />
|
||||||
<Reference Include="System.Security" />
|
<Reference Include="System.Security" />
|
||||||
<Reference Include="System.ServiceModel" />
|
<Reference Include="System.ServiceModel" />
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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,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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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.16")]
|
[assembly: AssemblyVersion("1.0.20")]
|
||||||
[assembly: AssemblyFileVersion("1.0.16")]
|
[assembly: AssemblyFileVersion("1.0.20")]
|
||||||
[assembly: AssemblyInformationalVersion("1.0.16")]
|
[assembly: AssemblyInformationalVersion("1.0.20")]
|
||||||
|
|||||||
@@ -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
|
||||||
{
|
{
|
||||||
@@ -24,6 +23,17 @@ namespace JiraTimeBotForm.TaskTime
|
|||||||
int remainMinutes = settings.MinuterPerWorkDay;
|
int remainMinutes = settings.MinuterPerWorkDay;
|
||||||
int totalCommitsCount = commits.Count;
|
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>();
|
List<TaskTimeItem> workTimeItems = new List<TaskTimeItem>();
|
||||||
|
|
||||||
//Нам нужно раскидать 480 минут в день.
|
//Нам нужно раскидать 480 минут в день.
|
||||||
|
|||||||
@@ -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,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
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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,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
|
||||||
{
|
{
|
||||||
|
|||||||
Generated
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
namespace JiraTimeBotForm.UI
|
namespace JiraTimeBot.UI
|
||||||
{
|
{
|
||||||
partial class frmMain
|
partial class frmMain
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,20 +1,21 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
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 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
|
||||||
{
|
{
|
||||||
@@ -95,7 +96,15 @@ namespace JiraTimeBotForm.UI
|
|||||||
|
|
||||||
PrintStartMessage();
|
PrintStartMessage();
|
||||||
tmrStart.Enabled = true;
|
tmrStart.Enabled = true;
|
||||||
tmrUpdate.Enabled = true;
|
|
||||||
|
if (System.Diagnostics.Debugger.IsAttached)
|
||||||
|
{
|
||||||
|
_log.Trace("Приложение запущено в режиме отладки. Отключаю обновление.");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
tmrUpdate.Enabled = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void PrintStartMessage()
|
private void PrintStartMessage()
|
||||||
@@ -189,23 +198,90 @@ namespace JiraTimeBotForm.UI
|
|||||||
|
|
||||||
private void tmrUpdate_Tick(object sender, EventArgs e)
|
private void tmrUpdate_Tick(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
tmrUpdate.Interval = 8 * 60 * 60 * 1000;
|
try
|
||||||
|
|
||||||
var checker = new UpdateChecker();
|
|
||||||
var release = checker.GetRelease();
|
|
||||||
if (release == null)
|
|
||||||
{
|
{
|
||||||
return;
|
tmrUpdate.Interval = 8 * 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
|
||||||
|
{
|
||||||
|
_log.Info($"Вы используете последнюю версию.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
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}");
|
_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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
namespace JiraTimeBotForm.UI
|
namespace JiraTimeBot.UI
|
||||||
{
|
{
|
||||||
partial class frmSettings
|
partial class frmSettings
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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,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,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
|
||||||
{
|
{
|
||||||
@@ -38,12 +35,22 @@ namespace JiraTimeBotForm.Update
|
|||||||
return release;
|
return release;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void DownloadFile(string url)
|
public bool DownloadFile(string url, string to)
|
||||||
{
|
{
|
||||||
using (var client = new WebClient())
|
try
|
||||||
{
|
{
|
||||||
client.Headers.Add("User-Agent", "Mozilla/5.0 (X11; Linux i686; rv:64.0) Gecko/20100101 Firefox/64.0");
|
|
||||||
client.DownloadFile(url, "update.zip");
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user