Отключил комментарии для режима Jira

.semver.txt

@@ -1 +1 @@
-1.0.17
+1.0.19

src/JiraTimeBot/Configuration/PasswordEncryptionClass.cs

@@ -2,7 +2,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace JiraTimeBotForm.Configuration
+namespace JiraTimeBot.Configuration
 {
     public class PasswordEncryptionClass
     {

src/JiraTimeBot/Configuration/Settings.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Windows.Forms;
 using Newtonsoft.Json;
 
-namespace JiraTimeBotForm.Configuration
+namespace JiraTimeBot.Configuration
 {
     public class Settings
     {

src/JiraTimeBot/DI/ContainerBuilder.cs

@@ -1,16 +1,15 @@
 using System.Windows.Forms;
 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;
 
-namespace JiraTimeBotForm.DI
+namespace JiraTimeBot.DI
 {
     public class Bootstrapper
     {

src/JiraTimeBot/JiraIntegration/Comments/IJiraDescriptionSource.cs

@@ -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);
     }
 }

src/JiraTimeBot/JiraIntegration/Comments/JiraDescriptionSource.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
 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
     {
@@ -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;
             }
 
+            if (settings.WorkType == WorkType.Mercurial)
+            {
                 return _dummyComments.OrderBy(f => Guid.NewGuid()).FirstOrDefault();
             }
+
+            return "";
+        }
     }
 }

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -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
     {
@@ -119,7 +119,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)

src/JiraTimeBot/JiraIntegration/JiraCommitEmulator.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using JiraTimeBotForm.Configuration;
-using JiraTimeBotForm.Mercurial;
-using JiraTimeBotForm.Mercurial.Objects;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.Mercurial;
+using JiraTimeBot.Mercurial.Objects;
 
-namespace JiraTimeBotForm.JiraIntegration
+namespace JiraTimeBot.JiraIntegration
 {
     public class JiraCommitEmulator : IMercurialLog
     {

src/JiraTimeBot/Job.cs

@@ -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
     {

src/JiraTimeBot/Logger.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Windows.Forms;
 
-namespace JiraTimeBotForm
+namespace JiraTimeBot
 {
     public class Logger : ILog
     {

src/JiraTimeBot/Mercurial/IAllMercurialProviders.cs

@@ -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
     {

src/JiraTimeBot/Mercurial/IMercurialLog.cs

@@ -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
     {

src/JiraTimeBot/Mercurial/MercurialLog.cs

@@ -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
     {

src/JiraTimeBot/Mercurial/Modifiers/CommitSkipper.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace JiraTimeBotForm.Mercurial.Modifiers
+namespace JiraTimeBot.Mercurial.Modifiers
 {
     public class CommitSkipper : ICommitSkipper
     {

src/JiraTimeBot/Mercurial/Modifiers/ICommitSkipper.cs

@@ -1,4 +1,4 @@
-namespace JiraTimeBotForm.Mercurial.Modifiers
+namespace JiraTimeBot.Mercurial.Modifiers
 {
     public interface ICommitSkipper
     {

src/JiraTimeBot/Mercurial/Modifiers/ITechnicalInfoSkipper.cs

@@ -1,4 +1,4 @@
-namespace JiraTimeBotForm.Mercurial.Modifiers
+namespace JiraTimeBot.Mercurial.Modifiers
 {
     public interface ITechnicalInfoSkipper
     {

src/JiraTimeBot/Mercurial/Modifiers/TechnicalInfoSkipper.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace JiraTimeBotForm.Mercurial.Modifiers
+namespace JiraTimeBot.Mercurial.Modifiers
 {
     public class TechnicalInfoSkipper : ITechnicalInfoSkipper
     {

src/JiraTimeBot/Mercurial/Objects/MercurialCommitItem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace JiraTimeBotForm.Mercurial.Objects
+namespace JiraTimeBot.Mercurial.Objects
 {
     public class MercurialCommitItem
     {

src/JiraTimeBot/Program.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Diagnostics;
 using System.Windows.Forms;
-using JiraTimeBotForm.UI;
+using JiraTimeBot.UI;
 
-namespace JiraTimeBotForm
+namespace JiraTimeBot
 {
     static class Program
     {

src/JiraTimeBot/Properties/AssemblyInfo.cs

@@ -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.17")] 
-[assembly: AssemblyFileVersion("1.0.17")] 
-[assembly: AssemblyInformationalVersion("1.0.17")] 
+[assembly: AssemblyVersion("1.0.19")] 
+[assembly: AssemblyFileVersion("1.0.19")] 
+[assembly: AssemblyInformationalVersion("1.0.19")] 

src/JiraTimeBot/TaskTime/ITaskTimeCalculator.cs

@@ -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
     {

src/JiraTimeBot/TaskTime/Objects/TaskTimeItem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace JiraTimeBotForm.TaskTime.Objects
+namespace JiraTimeBot.TaskTime.Objects
 {
     public class TaskTimeItem
     {

src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -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
     {

src/JiraTimeBot/TasksProcessors/IAllTasksProcessors.cs

@@ -1,4 +1,4 @@
-namespace JiraTimeBotForm.TasksProcessors
+namespace JiraTimeBot.TasksProcessors
 {
     public interface IAllTasksProcessors
     {

src/JiraTimeBot/TasksProcessors/ITasksProcessor.cs

@@ -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
     {

src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs

@@ -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
     {

src/JiraTimeBot/TasksProcessors/WorkLogTasksProcessor.cs

@@ -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
     {

src/JiraTimeBot/UI/Tray/ITrayMenu.cs

@@ -1,6 +1,6 @@
 using System.Windows.Forms;
 
-namespace JiraTimeBotForm.UI.Tray
+namespace JiraTimeBot.UI.Tray
 {
     public interface ITrayMenu
     {

src/JiraTimeBot/UI/Tray/RestoreFromTray.cs

@@ -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" )]

src/JiraTimeBot/UI/Tray/TrayMenu.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace JiraTimeBotForm.UI.Tray
+namespace JiraTimeBot.UI.Tray
 {
     public class TrayMenu: ITrayMenu
     {

src/JiraTimeBot/UI/frmMain.Designer.cs

@@ -1,4 +1,4 @@
-namespace JiraTimeBotForm.UI
+namespace JiraTimeBot.UI
 {
     partial class frmMain
     {

src/JiraTimeBot/UI/frmMain.cs

@@ -6,16 +6,16 @@ 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;
-using JiraTimeBotForm.Update;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.DI;
+using JiraTimeBot.TasksProcessors;
+using JiraTimeBot.UI.Tray;
+using JiraTimeBot.Update;
 
 // 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
     {
@@ -96,8 +96,16 @@ namespace JiraTimeBotForm.UI
 
             PrintStartMessage();
             tmrStart.Enabled = true;
+
+            if (System.Diagnostics.Debugger.IsAttached)
+            {
+                _log.Trace("Приложение запущено в режиме отладки. Отключаю обновление.");
+            }
+            else
+            {
                 tmrUpdate.Enabled = true;
             }
+        }
 
         private void PrintStartMessage()
         {
@@ -210,19 +218,23 @@ namespace JiraTimeBotForm.UI
                     var downloadUrl = checker.GetDownloadUrl(release);
                     _log.Info($"Доступна новая версия: {gitVersion} {downloadUrl}");
 
-                    var success = checker.DownloadFile(downloadUrl);
+                    var success = checker.DownloadFile(downloadUrl, "update.zip");
                     if (!success)
                     {
                         return;
                     }
 
-                    var result = InstallUpdate(gitVersion);
+                    var result = InstallUpdate(gitVersion, "update.zip");
                     if (result)
                     {
                         //если обновились - отключаем до рестарта
                         tmrUpdate.Enabled = false;
                     }
                 }
+                else
+                {
+                    _log.Info($"Вы используете последнюю версию.");
+                }
             }
             catch (Exception ex)
             {
@@ -231,7 +243,7 @@ namespace JiraTimeBotForm.UI
             }
         }
 
-        private bool InstallUpdate(Version gitVersion)
+        private bool InstallUpdate(Version gitVersion, string updateFile)
         {
             try
             {
@@ -244,7 +256,7 @@ namespace JiraTimeBotForm.UI
                     Directory.CreateDirectory(bkpDir);
                 }
 
-                using (ZipArchive archive = ZipFile.OpenRead(Path.Combine(appFile.DirectoryName, "update.zip")))
+                using (ZipArchive archive = ZipFile.OpenRead(Path.Combine(appFile.DirectoryName, updateFile)))
                 {
                     foreach (ZipArchiveEntry entry in archive.Entries)
                     {

src/JiraTimeBot/UI/frmSettings.Designer.cs

@@ -1,4 +1,4 @@
-namespace JiraTimeBotForm.UI
+namespace JiraTimeBot.UI
 {
     partial class frmSettings
     {

src/JiraTimeBot/UI/frmSettings.cs

@@ -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
     {

src/JiraTimeBot/Update/GitHubDataObjects.cs

@@ -1,13 +1,7 @@
 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.Converters;
 
-namespace JiraTimeBotForm.Update
+namespace JiraTimeBot.Update
 {
     public partial class GitHubReleaseResponse
     {

src/JiraTimeBot/Update/UpdateChecker.cs

@@ -1,13 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 
-namespace JiraTimeBotForm.Update
+namespace JiraTimeBot.Update
 {
     class UpdateChecker
     {
@@ -38,7 +35,7 @@ namespace JiraTimeBotForm.Update
             return release;
         }
 
-        public bool DownloadFile(string url)
+        public bool DownloadFile(string url, string to)
         {
             try
             {
@@ -47,7 +44,7 @@ namespace JiraTimeBotForm.Update
                 {
                     client.Headers.Add("User-Agent",
                         "Mozilla/5.0 (X11; Linux i686; rv:64.0) Gecko/20100101 Firefox/64.0");
-                    client.DownloadFile(url, "update.zip");
+                    client.DownloadFile(url, to);
                     return true;
                 }
             }