Added the title of an release to the informations when showing an new…

… version.
Lolle2000la · Aug 18, 2018 · 0a6a282 · 0a6a282
1 parent bb43596
commit 0a6a282
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/Image sort.Communication/UpdaterConstants.cs b/Image sort.Communication/UpdaterConstants.cs
@@ -52,5 +52,9 @@ public class UpdaterConstants
         /// Signals that the new version number of the update is outputted in the next line.
         /// </summary>
         public const string UpdateVersion = "new_update_version";
+        /// <summary>
+        /// Signals that the title of the new version is going to be outputted in the next line.
+        /// </summary>
+        public const string UpdateTitle = "transmitting_title";
     }
 }
diff --git a/Image sort.UI/MainWindow.xaml.cs b/Image sort.UI/MainWindow.xaml.cs
@@ -1717,6 +1717,7 @@ await Task.Run(async () =>
                         {
                             string changelog = "";
                             string version = "unknown";
+                            string title = "";
 
                             // and read the output till the end.
                             while (!output.EndOfStream)
@@ -1731,7 +1732,7 @@ await Dispatcher.InvokeAsync(async () =>
                                     {
                                         // Create a new UpdateDialog to ask for user consent.
                                         var dlg = new UpdateDialog() {
-                                            ChangelogMarkdown = changelog,
+                                            ChangelogMarkdown = $"# {title}{Environment.NewLine}{changelog}",
                                             Version = version,
                                             Title = AppResources.UpdateConsentQuestion
                                         };
@@ -1787,6 +1788,11 @@ await Dispatcher.Invoke(() => this.ShowMessageAsync(AppResources.RateLimitExceed
                                 {
                                     version = output.ReadLine();
                                 }
+                                // if the title is going to be set, then read it.
+                                else if (line == UpdaterConstants.UpdateTitle)
+                                {
+                                    title = output.ReadLine();
+                                }
                                 // Tell the user that an error occured, if it occured.
                                 else if (line == UpdaterConstants.Error)
                                 {

diff --git a/Image sort.UI/UpdateDialog.xaml b/Image sort.UI/UpdateDialog.xaml
@@ -24,7 +24,7 @@
         <TextBlock Margin="0 10 0 0" Text="{x:Static res:AppResources.UpdateWhatsNew}"
                    FontSize="18" TextWrapping="Wrap" Grid.Row="1" FontWeight="Bold"/>
         <Border BorderThickness="2" BorderBrush="Black" Margin="0 10 0 0" Grid.Row="2">
-            <markdigwpf:MarkdownViewer Name="ChangelogViewer" MaxHeight="150" TabIndex="2" Padding="5"/>
+            <markdigwpf:MarkdownViewer Name="ChangelogViewer" MaxHeight="200" TabIndex="2" Padding="5"/>
         </Border>
         <!-- Warning the user that the app will close when giving consent -->
         <TextBlock Text="{x:Static res:AppResources.UpdateWillCloseAppMessage}"

diff --git a/Image sort.Update/Program.cs b/Image sort.Update/Program.cs
@@ -138,6 +138,7 @@ private static void InitUpdating(Release release)
             {
                 string version = release.TagName;
                 string releaseBody = release.Body;
+                string releaseTitle = release.Name;
                 if (releaseBody != null)
                 {
                     // Signal that the changelog is going to be transmitted.
@@ -159,6 +160,15 @@ private static void InitUpdating(Release release)
                     Console.WriteLine(version);
                 }
 
+                if (releaseTitle != null)
+                {
+                    // Signal the main app that the title of the new version is going to be transmitted
+                    Console.WriteLine(UpdaterConstants.UpdateTitle);
+
+                    // Send the title
+                    Console.WriteLine(releaseTitle);
+                }
+
                 // asks the parent process for user consent
                 Console.WriteLine(UpdaterConstants.UserConsent);
                 // asks if consent is given (yes the true : false is for performance optimization)