Реализовано автоматическое обновление.

.semver.txt

@@ -1 +1 @@
-1.0.14
+1.0.17

src/JiraTimeBot/JiraTimeBot.csproj

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

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

src/JiraTimeBot/Properties/Resources.Designer.cs

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

src/JiraTimeBot/Properties/Settings.Designer.cs

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

src/JiraTimeBot/UI/frmMain.Designer.cs

@@ -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 = 10000;
+            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;
     }
 }
 

src/JiraTimeBot/UI/frmMain.cs

@@ -1,6 +1,7 @@
 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;
@@ -9,6 +10,7 @@ using JiraTimeBotForm.Configuration;
 using JiraTimeBotForm.DI;
 using JiraTimeBotForm.TasksProcessors;
 using JiraTimeBotForm.UI.Tray;
+using JiraTimeBotForm.Update;
 
 // This is the code for your desktop app.
 // Press Ctrl+F5 (or go to Debug > Start Without Debugging) to run your app.
@@ -90,8 +92,11 @@ namespace JiraTimeBotForm.UI
 
         private void Form1_Load(object sender, EventArgs e)
         {
+            this.Text = this.Text + " v." + Application.ProductVersion;
+
             PrintStartMessage();
             tmrStart.Enabled = true;
+            tmrUpdate.Enabled = true;
         }
 
         private void PrintStartMessage()
@@ -182,5 +187,90 @@ namespace JiraTimeBotForm.UI
 
             PrintStartMessage();
         }
+
+        private void tmrUpdate_Tick(object sender, EventArgs e)
+        {
+            try
+            {
+                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);
+                    if (!success)
+                    {
+                        return;
+                    }
+
+                    var result = InstallUpdate(gitVersion);
+                    if (result)
+                    {
+                        //если обновились - отключаем до рестарта
+                        tmrUpdate.Enabled = false;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                //в процессе обновления ни при каком раскладе мы не должны уложить бота. 
+                _log.Error($"Фатальная ошибка в процессе обновления: {ex.Message}");
+            }
+        }
+
+        private bool InstallUpdate(Version gitVersion)
+        {
+            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, "update.zip")))
+                {
+                    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;
+            }
+        }
     }
 }

src/JiraTimeBot/UI/frmMain.resx

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

src/JiraTimeBot/Update/GitHubDataObjects.cs

@@ -0,0 +1,167 @@
+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
+{
+    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; }
+    }
+}

src/JiraTimeBot/Update/UpdateChecker.cs

@@ -0,0 +1,81 @@
+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
+{
+    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)
+        {
+            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, "update.zip");
+                    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 "";
+            }
+        }
+    }
+}