From 2b781099f7cb08d6a5b9363b9079fab5be108541 Mon Sep 17 00:00:00 2001 From: Roy Date: Fri, 23 Feb 2018 23:14:27 +0200 Subject: Implemented machine studio periodical update checking. --- .../Notifications/DefaultNotificationProvider.cs | 6 +- .../ViewModels/MainViewVM.cs | 72 ++++++++++++++++++++++ .../ViewModels/UpdateViewVM.cs | 42 ++++++++++--- .../Tango.MachineStudio.UI/Views/LoadingView.xaml | 10 +-- .../Tango.MachineStudio.UI/Views/MainView.xaml | 40 +++++++++--- .../Tango.MachineStudio.UI/Views/UpdateView.xaml | 12 +++- 6 files changed, 157 insertions(+), 25 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs index 1ea22c587..4dd17b500 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs @@ -225,7 +225,7 @@ namespace Tango.MachineStudio.UI.Notifications /// The message. public void ShowError(string message) { - ShowMessageBox(PackIconKind.Exclamation, Brushes.Red, message, false); + ShowMessageBox(PackIconKind.AlertOctagon, Brushes.Red, message, false); } /// @@ -234,7 +234,7 @@ namespace Tango.MachineStudio.UI.Notifications /// The message. public void ShowInfo(string message) { - ShowMessageBox(PackIconKind.Information, Brushes.Black, message, false); + ShowMessageBox(PackIconKind.CommentAlertOutline, Brushes.Black, message, false); } /// @@ -253,7 +253,7 @@ namespace Tango.MachineStudio.UI.Notifications /// The message. public void ShowWarning(string message) { - ShowMessageBox(PackIconKind.Exclamation, Brushes.DarkOrange, message, false); + ShowMessageBox(PackIconKind.AlertOutline, Brushes.DarkOrange, message, false); } /// diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs index acd9e7925..fb2cd5c82 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -6,6 +6,7 @@ using System.IO; using System.Linq; using System.Reflection; using System.Text; +using System.Threading; using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; @@ -19,6 +20,7 @@ using Tango.MachineStudio.Common.Modules; using Tango.MachineStudio.Common.Navigation; using Tango.MachineStudio.Common.Notifications; using Tango.MachineStudio.Common.StudioApplication; +using Tango.MachineStudio.Common.Update; using Tango.MachineStudio.UI.StudioApplication; using Tango.MachineStudio.UI.SupervisingController; using Tango.MachineStudio.UI.Views; @@ -39,6 +41,7 @@ namespace Tango.MachineStudio.UI.ViewModels private IStudioModule _currentModule; private INavigationManager _navigation; private bool _isDisconnecting; + private Thread _updateCheckThread; /// /// Gets or sets the current loaded module. @@ -149,6 +152,38 @@ namespace Tango.MachineStudio.UI.ViewModels set { _applicationManager = value; RaisePropertyChangedAuto(); } } + private bool _isUpdateAvailable; + /// + /// Gets or sets a value indicating whether a new version update is available. + /// + public bool IsUpdateAvailable + { + get { return _isUpdateAvailable; } + set { _isUpdateAvailable = value; RaisePropertyChangedAuto(); } + } + + private String _latestVersion; + /// + /// Gets or sets the latest version. + /// + public String LatestVersion + { + get { return _latestVersion; } + set { _latestVersion = value; RaisePropertyChangedAuto(); } + } + + + private bool _disableCheckForUpdates; + /// + /// Gets or sets a value indicating whether [disable check for updates]. + /// + public bool DisableCheckForUpdates + { + get { return _disableCheckForUpdates; } + set { _disableCheckForUpdates = value; RaisePropertyChangedAuto(); } + } + + /// /// Initializes a new instance of the class. /// @@ -181,6 +216,43 @@ namespace Tango.MachineStudio.UI.ViewModels OpenModuleInWindowCommand = new RelayCommand(OpenModuleInWindow); ExitCommand = new RelayCommand(ExitApplication); UpdateCenterCommand = new RelayCommand(NavigateToUpdateCenter); + + _updateCheckThread = new Thread(UpdateCheckThreadMethod); + _updateCheckThread.IsBackground = true; + _updateCheckThread.Start(); + } + + private void UpdateCheckThreadMethod() + { + while (!DisableCheckForUpdates) + { + Thread.Sleep(TimeSpan.FromMinutes(1)); + + try + { + if (_authenticationProvider.CurrentUser != null) + { + var service = UpdateServiceHelper.GetUpdateServiceChannel(); + var client = service.CreateChannel(); + + CheckForUpdatesResponse response = client.CheckForUpdates(new CheckForUpdatesRequest() + { + Email = _authenticationProvider.CurrentUser.Email, + Password = _authenticationProvider.CurrentUser.Password, + Version = _applicationManager.Version, + }); + + IsUpdateAvailable = response.IsUpdateAvailable; + LatestVersion = response.Version; + } + } + catch (Exception ex) + { + LogManager.Log(ex, "Error in version update periodic check..."); + } + + Thread.Sleep(TimeSpan.FromMinutes(4)); + } } /// diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs index c24204fb6..6be4ba4ca 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs @@ -1,5 +1,6 @@ using FluentFTP; using Ionic.Zip; +using Microsoft.Practices.ServiceLocation; using System; using System.Collections.Generic; using System.Diagnostics; @@ -75,6 +76,14 @@ namespace Tango.MachineStudio.UI.ViewModels set { _updateProgress = value; RaisePropertyChangedAuto(); } } + private String _currentUpdateFile; + + public String CurrentUpdateFile + { + get { return _currentUpdateFile; } + set { _currentUpdateFile = value; RaisePropertyChanged(nameof(CurrentUpdateFile)); } + } + public RelayCommand UpdateCommand { get; set; } public RelayCommand BackCommand { get; set; } @@ -95,7 +104,7 @@ namespace Tango.MachineStudio.UI.ViewModels UpdateCommand = new RelayCommand(StartUpdate, () => Status == UpdateStatus.UpdateAvailable); BackCommand = new RelayCommand(BackToApplication, () => Status != UpdateStatus.Updating); RestartCommand = new RelayCommand(RestartApplication, () => Status == UpdateStatus.UpdateCompleted); - TryAgainCommand = new RelayCommand(TryAgain, () => Status == UpdateStatus.CheckingForUpdate); + TryAgainCommand = new RelayCommand(TryAgain, () => Status == UpdateStatus.Error); } public void OnNavigatedInto() @@ -174,10 +183,10 @@ namespace Tango.MachineStudio.UI.ViewModels Task.Factory.StartNew(() => { + var tempFile = PathHelper.GetTempFilePath() + ".zip"; + try { - var tempFile = PathHelper.GetTempFilePath() + ".zip"; - LogManager.Log("Creating temporary file " + tempFile); int fileSize = 0; @@ -235,6 +244,7 @@ namespace Tango.MachineStudio.UI.ViewModels } else { + CurrentUpdateFile = Path.GetFileName(entry.FileName); entry.Extract(_newPackageTempFolder, ExtractExistingFileAction.OverwriteSilently); } } @@ -245,6 +255,7 @@ namespace Tango.MachineStudio.UI.ViewModels } } + ServiceLocator.Current.GetInstance().DisableCheckForUpdates = true; Status = UpdateStatus.UpdateCompleted; } catch (Exception ex) @@ -252,6 +263,10 @@ namespace Tango.MachineStudio.UI.ViewModels LogManager.Log(ex, "Error while extracting update package."); Status = UpdateStatus.Error; } + finally + { + PathHelper.TryDeleteFile(tempFile); + } }); } @@ -262,11 +277,22 @@ namespace Tango.MachineStudio.UI.ViewModels private void RestartApplication() { - Process p = new Process(); - p.StartInfo.FileName = _appPath + "\\Tango.MachineStudio.Updater.exe"; - p.StartInfo.UseShellExecute = true; - p.StartInfo.Arguments = _newPackageTempFolder; - p.Start(); + try + { + Process p = new Process(); + p.StartInfo.FileName = _appPath + "\\Tango.MachineStudio.Updater.exe"; + p.StartInfo.UseShellExecute = true; + p.StartInfo.Arguments = _newPackageTempFolder; + p.Start(); + } + catch (Exception ex) + { + if (ex.Message == "The operation was canceled by the user") + { + _notification.ShowWarning("It seems like you refused to invoke our update utility. This prevents Machine Studio from completing the update process!"); + return; + } + } Environment.Exit(0); } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml index aaf4accd4..5f65100df 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml @@ -13,15 +13,17 @@ Machine Studio - - v - - Twine Solutions Loading, please wait... + + + + v + + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml index 355bdc1fd..19c0c47df 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml @@ -19,6 +19,7 @@ + @@ -153,14 +154,8 @@ - + + + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml index a08bcbddb..dabbaab94 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml @@ -17,7 +17,7 @@ - + @@ -68,10 +68,14 @@ - New version is available! + + Version + + is available! + - A new version of Machine Studio is available to download + A new version of Machine Studio is available for download Click 'Update' to start the update process. @@ -111,6 +115,8 @@ Updating Machine Studio, please wait... + + -- cgit v1.3.1