Improvements to upgrade and notifications

rxtur · rxtur · commit b83330b6b27c · 2018-10-13T13:29:29.000-05:00
diff --git a/src/App/Pages/Admin/AdminPageModel.cs b/src/App/Pages/Admin/AdminPageModel.cs
@@ -8,6 +8,7 @@ namespace App.Pages.Admin
     public class AdminPageModel : PageModel
     {
         public bool IsAdmin { get; set; }
+        public bool HasNewVersion { get; set; }
 
         public IEnumerable<Notification> Notifications { get; set; }
 
diff --git a/src/App/Pages/Admin/Shared/_Layout.cshtml b/src/App/Pages/Admin/Shared/_Layout.cshtml
@@ -78,12 +78,21 @@
                         {
                             foreach (var note in _notifications)
                             {
-                            <div class="alert alert-primary" role="alert">
-                                @Html.Raw(note.Content)
-                                <button type="button" class="close" onclick="notificationsController.remove('@note.Id')" data-dismiss="alert" aria-label="Close">
-                                    <span aria-hidden="true">&times;</span>
-                                </button>
-                            </div>
+                                @if (note.AlertType == AlertType.Sticky)
+                                {
+                                    <div class="alert alert-warning" role="alert">
+                                        @Html.Raw(note.Content)
+                                    </div>
+                                }
+                                else
+                                {
+                                    <div class="alert alert-primary" role="alert">
+                                        @Html.Raw(note.Content)
+                                        <button type="button" class="close" onclick="notificationsController.remove('@note.Id')" data-dismiss="alert" aria-label="Close">
+                                            <span aria-hidden="true">&times;</span>
+                                        </button>
+                                    </div>
+                                }
                             }
                         }
                     </div>
diff --git a/src/App/Pages/Admin/Upgrade/Index.cshtml b/src/App/Pages/Admin/Upgrade/Index.cshtml
@@ -2,6 +2,7 @@
 @model App.Pages.Admin.Upgrade.UpgradeModel
 @{
     Layout = null;
+    var repoLink = "https://github.com/blogifierdotnet/Blogifier/releases/tag/v" + Model.NewVersion;
 }
 <!DOCTYPE html>
 <html>
@@ -14,13 +15,17 @@
         <br />
         <form method="post" asp-antiforgery="true">
             <div class="jumbotron">
-                <h1>Upgrade to version 2.1</h1>
+                <h1>Upgrade to version @Model.NewVersion</h1>
                 <p>
-                    You running Blogifier version 2.0. There new version 2.1 is <a href="#">available in the repository</a>. You can upgrade to new version manually or just click button below and run in-place upgrade process.
+                    You running Blogifier version @Model.OldVersion. There new version @Model.NewVersion is <a href="@repoLink" target="_blank">available in the repository</a>. You can upgrade to new version manually or just click button below and run in-place upgrade process.
                 </p>
-                <p>
-                    Please do <b>back up your data</b> before running upgrade, manual or automatic - if something goes wrong it's always good to have a fallback plan!
-                </p>              
+                
+                <div class="alert alert-warning" role="alert">
+                    <p>
+                        Please do <b>back up your data</b> before running upgrade, manual or automatic.
+                    </p>
+                    Upgrade will turn off your web service before replacing files. You may need to manually turn it on again from your hosting admin panel.
+                </div>
                 @if (Model.IsUpgrading)
                 {
                     <div class="alert alert-success" role="alert">
diff --git a/src/App/Pages/Admin/Upgrade/Index.cshtml.cs b/src/App/Pages/Admin/Upgrade/Index.cshtml.cs
@@ -1,4 +1,5 @@
-﻿using Core.Services;
+﻿using Core;
+using Core.Services;
 using Microsoft.AspNetCore.Hosting;
 using System;
 using System.Diagnostics;
@@ -10,18 +11,29 @@ public class UpgradeModel : AdminPageModel
     {
         private IApplicationLifetime _app;
         private IWebService _ws;
+        private IDataService _db;
 
         public bool IsUpgrading = false;
+        public string OldVersion;
+        public string NewVersion;
 
-        public UpgradeModel(IApplicationLifetime app, IWebService ws)
+        public UpgradeModel(IApplicationLifetime app, IWebService ws, IDataService db)
         {
             _app = app;
             _ws = ws;
+            _db = db;
         }
 
         public void OnGet()
         {
-            // check for newer version
+            OldVersion = AppSettings.Version.Substring(0, 3);
+
+            var field = _db.CustomFields.Single(f => f.Name == Constants.NewestVersion && f.AuthorId == 0);
+
+            if(field != null)
+            {
+                NewVersion = field.Content.Substring(0, 1) + "." + field.Content.Substring(1, 1);
+            }
         }
 
         public async Task OnPost()
@@ -31,14 +43,14 @@ public async Task OnPost()
             if (string.IsNullOrEmpty(await _ws.DownloadLatestRelease()))
             {
                 // start upgrade process
-                //Process p = new Process();
-                //p.StartInfo.FileName = "dotnet";
-                //p.StartInfo.Arguments = "Upgrade.dll";
-                //p.StartInfo.UseShellExecute = false;
-                //p.StartInfo.CreateNoWindow = false;
-                //p.Start();
-
-                //_app.StopApplication();
+                Process p = new Process();
+                p.StartInfo.FileName = "dotnet";
+                p.StartInfo.Arguments = "Upgrade.dll";
+                p.StartInfo.UseShellExecute = false;
+                p.StartInfo.CreateNoWindow = false;
+                p.Start();
+
+                _app.StopApplication();
 
                 //Program.Main(null);
                 //Process.GetCurrentProcess().Kill();
diff --git a/src/Core/Constants.cs b/src/Core/Constants.cs
@@ -0,0 +1,8 @@
+﻿namespace Core
+{
+    public class Constants
+    {
+        public static string NewestVersion = "last-version";
+        public static string UpgradeDirectory = "_upgrade";
+    }
+}
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.0.2.2</Version>
+    <Version>2.0.2.3</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Core/Data/Domain/Notification.cs b/src/Core/Data/Domain/Notification.cs
@@ -15,6 +15,6 @@ public class Notification
     
     public enum AlertType
     {
-        Primary, Success, Warning, Error
+        Primary, Success, Warning, Error, Sticky
     }
 }
diff --git a/src/Core/Services/DataService.cs b/src/Core/Services/DataService.cs
@@ -9,6 +9,7 @@ public interface IDataService : IDisposable
         IAuthorRepository Authors { get; }
         INotificationRepository Notifications { get; }
         IHtmlWidgetRepository HtmlWidgets { get; }
+        ICustomFieldRepository CustomFields { get; }
 
         int Complete();
     }
@@ -25,12 +26,14 @@ public DataService(AppDbContext db)
             Authors = new AuthorRepository(_db);
             Notifications = new NotificationRepository(_db);
             HtmlWidgets = new HtmlWidgetRepository(_db);
+            CustomFields = new CustomFieldRepository(_db);
         }
 
         public IPostRepository BlogPosts { get; private set; }
         public IAuthorRepository Authors { get; private set; }
         public INotificationRepository Notifications { get; private set; }
         public IHtmlWidgetRepository HtmlWidgets { get; private set; }
+        public ICustomFieldRepository CustomFields { get; private set; }
 
         public int Complete()
         {
diff --git a/src/Core/Services/NotificationService.cs b/src/Core/Services/NotificationService.cs
@@ -60,7 +60,33 @@ public async Task<IEnumerable<Notification>> GetNotifications(int authorId)
             var notes = _db.Notifications
                 .Find(n => n.Active && (n.AuthorId == 0 || n.AuthorId == authorId))
                 .OrderByDescending(n => n.DateNotified)
-                .Take(5);
+                .Take(5).ToList();
+
+            // add notification if newer version exists
+            if(authorId > 0)
+            {
+                var author = _db.Authors.Single(a => a.Id == authorId);
+                if(author != null && author.IsAdmin)
+                {
+                    var field = _db.CustomFields.Single(f => f.Name == Constants.NewestVersion && f.AuthorId == 0);
+                    if(field != null)
+                    {
+                        int current, latest;
+
+                        int.TryParse(AppSettings.Version.Replace(".", "").Substring(0, 2), out current);
+                        int.TryParse(field.Content, out latest);
+
+                        if(current < latest)
+                        {
+                            notes.Add(new Notification
+                            {
+                                AlertType = AlertType.Sticky,
+                                Content = $"Upgrade to <a href=\"upgrade\">version {field.Content.Substring(0,1)}.{field.Content.Substring(1, 1)}</a>"
+                            });   
+                        }
+                    }
+                }
+            }
 
             return await Task.FromResult(notes);
         }
diff --git a/src/Core/Services/WebService.cs b/src/Core/Services/WebService.cs
@@ -46,6 +46,18 @@ public async Task<string> CheckForLatestRelease()
                 {
                     var dwnUrl = repo.assets[0].browser_download_url;
                     result = $"The new Blogifier <a href='{repo.html_url}' class='alert-link' target='_blank'>{repo.name}</a> is available for download";
+
+                    var field = _db.CustomFields.Single(f => f.Name == Constants.NewestVersion && f.AuthorId == 0);
+                    if(field == null || (field != null && int.Parse(field.Content) < latest))
+                    {
+                        _db.CustomFields.Add(new Data.CustomField
+                        {
+                            AuthorId = 0,
+                            Name = Constants.NewestVersion,
+                            Content = latest.ToString()
+                        });
+                        _db.Complete();
+                    }
                 }
             }
 
diff --git a/src/Upgrade/Program.cs b/src/Upgrade/Program.cs
@@ -33,28 +33,33 @@ static void Main(string[] args)
                     ReplaceFile(file);
                 }
 
-                ReplaceFolder($"wwwroot{_slash}admin");
-                ReplaceFolder($"wwwroot{_slash}lib");
+                foreach (var dir in GetCoreFolders())
+                {
+                    ReplaceFolder(dir);
+                }
             }
             catch (Exception ex)
             {
                 _items.Add(ex.Message);
             }
 
-            using (StreamWriter writer = new StreamWriter("upgrade.log"))
+            var log = $"upgrade-{DateTime.Now.Year}-{DateTime.Now.Month}-{DateTime.Now.Day}.log";
+            using (StreamWriter writer = new StreamWriter(log))
             {
                 foreach (var item in _items)
                 {
                     writer.WriteLine(item);
                 }
             }
 
-            Process p = new Process();
-            p.StartInfo.FileName = "dotnet";
-            p.StartInfo.Arguments = "App.dll";
-            p.StartInfo.UseShellExecute = false;
-            p.StartInfo.CreateNoWindow = false;
-            p.Start();
+            Directory.Delete(_upgDir, true);
+
+            //Process p = new Process();
+            //p.StartInfo.FileName = "dotnet";
+            //p.StartInfo.Arguments = "App.dll";
+            //p.StartInfo.UseShellExecute = false;
+            //p.StartInfo.CreateNoWindow = false;
+            //p.Start();
         }
 
         static void ReplaceFile(string file)
@@ -67,11 +72,11 @@ static void ReplaceFile(string file)
                     File.Delete(oldFile);
                     
                 File.Copy(newFile, oldFile);
-                _items.Add($"Replacing {oldFile} with {newFile}");
+                _items.Add($"Replacing file: {oldFile} with {newFile}");
             }
             catch (Exception fe)
             {
-                _items.Add($"Error replacing {oldFile}: {fe.Message}");
+                _items.Add($"Error replacing file: {oldFile}: {fe.Message}");
             }
         }
 
@@ -85,11 +90,11 @@ static void ReplaceFolder(string folder)
                     Directory.Delete(oldFolder, true);
 
                 Directory.Move(newFolder, oldFolder);
-                _items.Add($"Replacing {oldFolder} with {newFolder}");
+                _items.Add($"Replacing folder: {oldFolder} with {newFolder}");
             }
             catch (Exception fe)
             {
-                _items.Add($"Error replacing {oldFolder}: {fe.Message}");
+                _items.Add($"Error replacing folder: {oldFolder}: {fe.Message}");
             }
         }
 
@@ -128,5 +133,19 @@ static List<string> GetCoreFiles()
                 "System.Xml.XPath.XmlDocument.dll"
             };
         }
+
+        static List<string> GetCoreFolders()
+        {
+            return new List<string>
+            {
+                "Pages",
+                $"Views{_slash}Shared",
+                $"Views{_slash}Themes{_slash}Standard",
+                $"wwwroot{_slash}admin",
+                $"wwwroot{_slash}lib",
+                $"wwwroot{_slash}themes{_slash}simple",
+                $"wwwroot{_slash}themes{_slash}standard"
+            };
+        }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ namespace App.Pages.Admin`
`8`	`8`	`public class AdminPageModel : PageModel`
`9`	`9`	`{`
`10`	`10`	`public bool IsAdmin { get; set; }`
	`11`	`+ public bool HasNewVersion { get; set; }`
`11`	`12`
`12`	`13`	`public IEnumerable<Notification> Notifications { get; set; }`
`13`	`14`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ public class Notification`
`15`	`15`
`16`	`16`	`public enum AlertType`
`17`	`17`	`{`
`18`		`- Primary, Success, Warning, Error`
	`18`	`+ Primary, Success, Warning, Error, Sticky`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ public interface IDataService : IDisposable`
`9`	`9`	`IAuthorRepository Authors { get; }`
`10`	`10`	`INotificationRepository Notifications { get; }`
`11`	`11`	`IHtmlWidgetRepository HtmlWidgets { get; }`
	`12`	`+ ICustomFieldRepository CustomFields { get; }`
`12`	`13`
`13`	`14`	`int Complete();`
`14`	`15`	`}`
`@@ -25,12 +26,14 @@ public DataService(AppDbContext db)`
`25`	`26`	`Authors = new AuthorRepository(_db);`
`26`	`27`	`Notifications = new NotificationRepository(_db);`
`27`	`28`	`HtmlWidgets = new HtmlWidgetRepository(_db);`
	`29`	`+ CustomFields = new CustomFieldRepository(_db);`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`public IPostRepository BlogPosts { get; private set; }`
`31`	`33`	`public IAuthorRepository Authors { get; private set; }`
`32`	`34`	`public INotificationRepository Notifications { get; private set; }`
`33`	`35`	`public IHtmlWidgetRepository HtmlWidgets { get; private set; }`
	`36`	`+ public ICustomFieldRepository CustomFields { get; private set; }`
`34`	`37`
`35`	`38`	`public int Complete()`
`36`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,18 @@ public async Task<string> CheckForLatestRelease()`
`46`	`46`	`{`
`47`	`47`	`var dwnUrl = repo.assets[0].browser_download_url;`
`48`	`48`	`result = $"The new Blogifier <a href='{repo.html_url}' class='alert-link' target='_blank'>{repo.name}</a> is available for download";`
	`49`	`+`
	`50`	`+ var field = _db.CustomFields.Single(f => f.Name == Constants.NewestVersion && f.AuthorId == 0);`
	`51`	`+ if(field == null \|\| (field != null && int.Parse(field.Content) < latest))`
	`52`	`+ {`
	`53`	`+ _db.CustomFields.Add(new Data.CustomField`
	`54`	`+ {`
	`55`	`+ AuthorId = 0,`
	`56`	`+ Name = Constants.NewestVersion,`
	`57`	`+ Content = latest.ToString()`
	`58`	`+ });`
	`59`	`+ _db.Complete();`
	`60`	`+ }`
`49`	`61`	`}`
`50`	`62`	`}`
`51`	`63`