Plugin prerequisites - Added UI for installing/removing prerequisites

Plugin settings - Added button to reload plugin from disk
Confirm dialogs - Made cancel text optional so you can hide the button

src/Artemis.UI/Screens/Plugins/PluginPrerequisiteActionView.xaml

@@ -12,12 +12,12 @@
     <StackPanel>
         <ProgressBar Value="{Binding Action.Progress.Percentage, Mode=OneWay}"
                      IsIndeterminate="{Binding Action.ProgressIndeterminate, Mode=OneWay}"
-                     Visibility="{Binding ShowProgressBar, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}"
+                     Visibility="{Binding Action.ShowProgressBar, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}"
                      materialDesign:TransitionAssist.DisableTransitions="True"
                      Margin="0 10"/>
         <ProgressBar Value="{Binding Action.SubProgress.Percentage, Mode=OneWay}"
                      IsIndeterminate="{Binding Action.SubProgressIndeterminate, Mode=OneWay}"
-                     Visibility="{Binding ShowSubProgressBar, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}"
+                     Visibility="{Binding Action.ShowSubProgressBar, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}"
                      materialDesign:TransitionAssist.DisableTransitions="True" 
                      Margin="0 10"/>
 

src/Artemis.UI/Screens/Plugins/PluginPrerequisiteActionViewModel.cs

@@ -7,8 +7,7 @@ namespace Artemis.UI.Screens.Plugins
 {
     public class PluginPrerequisiteActionViewModel : Screen
     {
-        private bool _showProgressBar;
-        private bool _showSubProgressBar;
+
 
         public PluginPrerequisiteActionViewModel(PluginPrerequisiteAction action)
         {
@@ -16,56 +15,5 @@ namespace Artemis.UI.Screens.Plugins
         }
 
         public PluginPrerequisiteAction Action { get; }
-
-        public bool ShowProgressBar
-        {
-            get => _showProgressBar;
-            set => SetAndNotify(ref _showProgressBar, value);
-        }
-
-        public bool ShowSubProgressBar
-        {
-            get => _showSubProgressBar;
-            set => SetAndNotify(ref _showSubProgressBar, value);
-        }
-
-        private void ActionOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
-        {
-            if (e.PropertyName == nameof(Action.ProgressIndeterminate) || e.PropertyName == nameof(Action.SubProgressIndeterminate))
-                UpdateProgress();
-        }
-
-        private void ProgressReported(object? sender, EventArgs e)
-        {
-            UpdateProgress();
-        }
-        
-        private void UpdateProgress()
-        {
-            ShowSubProgressBar = Action.SubProgress.Percentage != 0 || Action.SubProgressIndeterminate;
-            ShowProgressBar = ShowSubProgressBar || Action.Progress.Percentage != 0 || Action.ProgressIndeterminate;
-        }
-
-        #region Overrides of Screen
-
-        /// <inheritdoc />
-        protected override void OnInitialActivate()
-        {
-            Action.Progress.ProgressReported += ProgressReported;
-            Action.SubProgress.ProgressReported += ProgressReported;
-            Action.PropertyChanged += ActionOnPropertyChanged;
-            base.OnInitialActivate();
-        }
-
-        /// <inheritdoc />
-        protected override void OnClose()
-        {
-            Action.Progress.ProgressReported -= ProgressReported;
-            Action.SubProgress.ProgressReported -= ProgressReported;
-            Action.PropertyChanged -= ActionOnPropertyChanged;
-            base.OnClose();
-        }
-
-        #endregion
     }
 }

src/Artemis.UI/Screens/Plugins/PluginPrerequisiteViewModel.cs

@@ -12,14 +12,16 @@ namespace Artemis.UI.Screens.Plugins
 {
     public class PluginPrerequisiteViewModel : Conductor<PluginPrerequisiteActionViewModel>.Collection.OneActive
     {
+        private readonly bool _uninstall;
         private readonly ICoreService _coreService;
         private readonly IDialogService _dialogService;
         private bool _installing;
         private bool _uninstalling;
         private bool _isMet;
 
-        public PluginPrerequisiteViewModel(PluginPrerequisite pluginPrerequisite, ICoreService coreService, IDialogService dialogService)
+        public PluginPrerequisiteViewModel(PluginPrerequisite pluginPrerequisite, bool uninstall, ICoreService coreService, IDialogService dialogService)
         {
+            _uninstall = uninstall;
             _coreService = coreService;
             _dialogService = dialogService;
 
@@ -77,7 +79,7 @@ namespace Artemis.UI.Screens.Plugins
             finally
             {
                 Installing = false;
-                IsMet = await PluginPrerequisite.IsMet();
+                IsMet = PluginPrerequisite.IsMet();
             }
         }
 
@@ -100,11 +102,11 @@ namespace Artemis.UI.Screens.Plugins
             finally
             {
                 Uninstalling = false;
-                IsMet = await PluginPrerequisite.IsMet();
+                IsMet = PluginPrerequisite.IsMet();
             }
         }
 
-        private void PluginPrerequisiteOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
+        private void PluginPrerequisiteOnPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName == nameof(PluginPrerequisite.CurrentAction))
                 ActivateCurrentAction();
@@ -129,10 +131,12 @@ namespace Artemis.UI.Screens.Plugins
         protected override void OnInitialActivate()
         {
             PluginPrerequisite.PropertyChanged -= PluginPrerequisiteOnPropertyChanged;
-            Task.Run(async () => IsMet = await PluginPrerequisite.IsMet());
+            // Could be slow so take it off of the UI thread
+            Task.Run(() => IsMet = PluginPrerequisite.IsMet());
 
-            Items.AddRange(PluginPrerequisite.InstallActions.Select(a => new PluginPrerequisiteActionViewModel(a)));
-            Items.AddRange(PluginPrerequisite.UninstallActions.Select(a => new PluginPrerequisiteActionViewModel(a)));
+            Items.AddRange(!_uninstall
+                ? PluginPrerequisite.InstallActions.Select(a => new PluginPrerequisiteActionViewModel(a))
+                : PluginPrerequisite.UninstallActions.Select(a => new PluginPrerequisiteActionViewModel(a)));
 
             base.OnInitialActivate();
         }

src/Artemis.UI/Screens/Plugins/PluginPrerequisitesInstallDialogView.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="Artemis.UI.Screens.Plugins.PluginPrerequisitesDialogView"
+<UserControl x:Class="Artemis.UI.Screens.Plugins.PluginPrerequisitesInstallDialogView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -9,7 +9,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance local:PluginPrerequisitesDialogViewModel}">
+             d:DataContext="{d:DesignInstance local:PluginPrerequisitesInstallDialogViewModel}">
     <UserControl.Resources>
         <shared:NullToVisibilityConverter x:Key="NullToVisibilityConverter"/>
     </UserControl.Resources>

src/Artemis.UI/Screens/Plugins/PluginPrerequisitesInstallDialogViewModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -11,28 +12,30 @@ using Stylet;
 
 namespace Artemis.UI.Screens.Plugins
 {
-    public class PluginPrerequisitesDialogViewModel : DialogViewModelBase
+    public class PluginPrerequisitesInstallDialogViewModel : DialogViewModelBase
     {
+        private readonly IDialogService _dialogService;
         private PluginPrerequisiteViewModel _activePrerequisite;
         private bool _canInstall;
         private bool _isFinished;
         private CancellationTokenSource _tokenSource;
 
-        public PluginPrerequisitesDialogViewModel(object pluginOrFeature, IPrerequisitesVmFactory prerequisitesVmFactory)
+        public PluginPrerequisitesInstallDialogViewModel(object pluginOrFeature, IPrerequisitesVmFactory prerequisitesVmFactory, IDialogService dialogService)
         {
+            _dialogService = dialogService;
             // Constructor overloading doesn't work very well with Kernel.Get<T> :(
             if (pluginOrFeature is Plugin plugin)
             {
                 Plugin = plugin;
-                Prerequisites = new BindableCollection<PluginPrerequisiteViewModel>(plugin.Prerequisites.Select(prerequisitesVmFactory.PluginPrerequisiteViewModel));
+                Prerequisites = new BindableCollection<PluginPrerequisiteViewModel>(plugin.Prerequisites.Select(p => prerequisitesVmFactory.PluginPrerequisiteViewModel(p, false)));
             }
             else if (pluginOrFeature is PluginFeature feature)
             {
                 Feature = feature;
-                Prerequisites = new BindableCollection<PluginPrerequisiteViewModel>(feature.Prerequisites.Select(prerequisitesVmFactory.PluginPrerequisiteViewModel));
+                Prerequisites = new BindableCollection<PluginPrerequisiteViewModel>(feature.Prerequisites.Select(p => prerequisitesVmFactory.PluginPrerequisiteViewModel(p, false)));
             }
             else
-                throw new ArtemisUIException($"Expected plugin or feature to be passed to {nameof(PluginPrerequisitesDialogViewModel)}");
+                throw new ArtemisUIException($"Expected plugin or feature to be passed to {nameof(PluginPrerequisitesInstallDialogViewModel)}");
 
             foreach (PluginPrerequisiteViewModel pluginPrerequisiteViewModel in Prerequisites)
                 pluginPrerequisiteViewModel.ConductWith(this);
@@ -81,11 +84,11 @@ namespace Artemis.UI.Screens.Plugins
             {
                 foreach (PluginPrerequisiteViewModel pluginPrerequisiteViewModel in Prerequisites)
                 {
-                    ActivePrerequisite = pluginPrerequisiteViewModel;
-                    ActivePrerequisite.IsMet = await ActivePrerequisite.PluginPrerequisite.IsMet();
-                    if (ActivePrerequisite.IsMet)
+                    pluginPrerequisiteViewModel.IsMet = pluginPrerequisiteViewModel.PluginPrerequisite.IsMet();
+                    if (pluginPrerequisiteViewModel.IsMet)
                         continue;
 
+                    ActivePrerequisite = pluginPrerequisiteViewModel;
                     await ActivePrerequisite.Install(_tokenSource.Token);
 
                     // Wait after the task finished for the user to process what happened
@@ -94,7 +97,21 @@ namespace Artemis.UI.Screens.Plugins
                 }
 
                 if (Prerequisites.All(p => p.IsMet))
+                {
                     IsFinished = true;
+                    return;
+                }
+
+                // This shouldn't be happening and the experience isn't very nice for the user (too lazy to make a nice UI for such an edge case)
+                // but at least give some feedback
+                Session?.Close(false);
+                await _dialogService.ShowConfirmDialog(
+                    "Plugin prerequisites",
+                    "All prerequisites are installed but some still aren't met. \r\nPlease try again or contact the plugin creator.",
+                    "Confirm",
+                    ""
+                );
+                await _dialogService.ShowDialog<PluginPrerequisitesInstallDialogViewModel>(new Dictionary<string, object> {{"pluginOrFeature", Plugin}});
             }
             catch (OperationCanceledException)
             {
@@ -118,8 +135,10 @@ namespace Artemis.UI.Screens.Plugins
         /// <inheritdoc />
         protected override void OnInitialActivate()
         {
+            CanInstall = false;
+            Task.Run(() => CanInstall = !Plugin.ArePrerequisitesMet());
+
             base.OnInitialActivate();
-            CanInstall = Prerequisites.Any(p => !p.IsMet);
         }
 
         #endregion

src/Artemis.UI/Screens/Plugins/PluginPrerequisitesUninstallDialogView.xaml

@@ -0,0 +1,125 @@
+<UserControl x:Class="Artemis.UI.Screens.Plugins.PluginPrerequisitesUninstallDialogView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:Artemis.UI.Screens.Plugins"
+             xmlns:s="https://github.com/canton7/Stylet"
+             xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d"
+             d:DesignHeight="450" d:DesignWidth="800"
+             d:DataContext="{d:DesignInstance local:PluginPrerequisitesUninstallDialogViewModel}">
+    <UserControl.Resources>
+        <shared:NullToVisibilityConverter x:Key="NullToVisibilityConverter"/>
+    </UserControl.Resources>
+    <Grid Margin="16">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition MinHeight="150"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="300" />
+            <ColumnDefinition Width="500" />
+        </Grid.ColumnDefinitions>
+        <TextBlock Grid.Row="0" Style="{StaticResource MaterialDesignHeadline6TextBlock}" TextWrapping="Wrap" Margin="0 0 0 20">
+            Plugin prerequisites
+        </TextBlock>
+
+        <ListBox Grid.Row="1"
+                 Grid.Column="0"
+                 ItemsSource="{Binding Prerequisites}"
+                 SelectedItem="{Binding ActivePrerequisite, Mode=OneWay}"
+                 HorizontalContentAlignment="Stretch">
+
+            <ListBox.ItemTemplate>
+                <DataTemplate DataType="{x:Type local:PluginPrerequisiteViewModel}">
+                    <Border Padding="8" BorderThickness="0 0 0 1" BorderBrush="{DynamicResource MaterialDesignDivider}" VerticalAlignment="Stretch">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+
+                            <ToggleButton VerticalAlignment="Center"
+                                          Style="{StaticResource MaterialDesignActionToggleButton}"
+                                          Focusable="False"
+                                          IsHitTestVisible="False"
+                                          IsChecked="{Binding IsMet}">
+                                <ToggleButton.Content>
+                                    <Border Background="#E74C4C" Width="32" Height="32">
+                                        <materialDesign:PackIcon Kind="Close" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                    </Border>
+                                </ToggleButton.Content>
+                                <materialDesign:ToggleButtonAssist.OnContent>
+                                    <materialDesign:PackIcon Kind="Check" />
+                                </materialDesign:ToggleButtonAssist.OnContent>
+                            </ToggleButton>
+
+                            <StackPanel Margin="8 0 0 0" Grid.Column="1" VerticalAlignment="Stretch">
+                                <TextBlock FontWeight="Bold" Text="{Binding PluginPrerequisite.Name}" TextWrapping="Wrap" />
+                                <TextBlock Text="{Binding PluginPrerequisite.Description}" TextWrapping="Wrap" />
+                            </StackPanel>
+                        </Grid>
+                    </Border>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+
+        <ContentControl Grid.Row="0"
+                        Grid.RowSpan="2"
+                        Grid.Column="1"
+                        s:View.Model="{Binding ActivePrerequisite}"
+                        VerticalContentAlignment="Stretch"
+                        HorizontalContentAlignment="Stretch"
+                        Margin="10 0"
+                        IsTabStop="False"
+                        Visibility="{Binding ActivePrerequisite, Converter={StaticResource NullToVisibilityConverter}}"/>
+
+        <TextBlock Grid.Row="1" 
+                   Grid.Column="1" 
+                   Style="{StaticResource MaterialDesignBody1TextBlock}" 
+                   TextWrapping="Wrap"
+                   Margin="10 0"
+                   Visibility="{Binding ActivePrerequisite, Converter={StaticResource NullToVisibilityConverter}, ConverterParameter=Inverted}">
+            This plugin installed certain prerequisites in order to function. <LineBreak /><LineBreak />
+            In this screen you can chose to remove these, this will mean the plugin will no longer work until you reinstall the prerequisites.
+        </TextBlock>
+
+        <StackPanel Grid.Row="2"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Right"
+                    Margin="0 8 0 0"
+                    Visibility="{Binding IsFinished, Converter={x:Static s:BoolToVisibilityConverter.InverseInstance}, Mode=OneWay}">
+            <Button Style="{StaticResource MaterialDesignFlatButton}"
+                    Focusable="False"
+                    IsCancel="True"
+                    Command="{s:Action Cancel}"
+                    Content="CANCEL" />
+            <Button x:Name="ConfirmButton"
+                    Style="{StaticResource MaterialDesignFlatButton}"
+                    IsDefault="True"
+                    Focusable="True"
+                    Command="{s:Action Uninstall}"
+                    Content="REMOVE PREREQUISITES" />
+        </StackPanel>
+
+        <StackPanel Grid.Row="2"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Right"
+                    Margin="0 8 0 0"
+                    Visibility="{Binding IsFinished, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}">
+            <Button Style="{StaticResource MaterialDesignFlatButton}"
+                    Focusable="False"
+                    IsCancel="True"
+                    Command="{s:Action Accept}"
+                    Content="FINISH" />
+        </StackPanel>
+
+    </Grid>
+</UserControl>

src/Artemis.UI/Screens/Plugins/PluginPrerequisitesUninstallDialogViewModel.cs

@@ -0,0 +1,154 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Artemis.Core;
+using Artemis.Core.Services;
+using Artemis.UI.Exceptions;
+using Artemis.UI.Ninject.Factories;
+using Artemis.UI.Shared.Services;
+using MaterialDesignThemes.Wpf;
+using Stylet;
+
+namespace Artemis.UI.Screens.Plugins
+{
+    public class PluginPrerequisitesUninstallDialogViewModel : DialogViewModelBase
+    {
+        private readonly IDialogService _dialogService;
+        private readonly IPluginManagementService _pluginManagementService;
+        private PluginPrerequisiteViewModel _activePrerequisite;
+        private bool _canUninstall;
+        private bool _isFinished;
+        private CancellationTokenSource _tokenSource;
+
+        public PluginPrerequisitesUninstallDialogViewModel(object pluginOrFeature, IPrerequisitesVmFactory prerequisitesVmFactory, IDialogService dialogService,
+            IPluginManagementService pluginManagementService)
+        {
+            _dialogService = dialogService;
+            _pluginManagementService = pluginManagementService;
+
+            // Constructor overloading doesn't work very well with Kernel.Get<T> :(
+            if (pluginOrFeature is Plugin plugin)
+            {
+                Plugin = plugin;
+                Prerequisites = new BindableCollection<PluginPrerequisiteViewModel>(plugin.Prerequisites.Select(p => prerequisitesVmFactory.PluginPrerequisiteViewModel(p, true)));
+            }
+            else if (pluginOrFeature is PluginFeature feature)
+            {
+                Feature = feature;
+                Prerequisites = new BindableCollection<PluginPrerequisiteViewModel>(feature.Prerequisites.Select(p => prerequisitesVmFactory.PluginPrerequisiteViewModel(p, true)));
+            }
+            else
+                throw new ArtemisUIException($"Expected plugin or feature to be passed to {nameof(PluginPrerequisitesInstallDialogViewModel)}");
+
+            foreach (PluginPrerequisiteViewModel pluginPrerequisiteViewModel in Prerequisites)
+                pluginPrerequisiteViewModel.ConductWith(this);
+        }
+
+
+        public PluginFeature Feature { get; }
+        public Plugin Plugin { get; }
+        public BindableCollection<PluginPrerequisiteViewModel> Prerequisites { get; }
+
+        public PluginPrerequisiteViewModel ActivePrerequisite
+        {
+            get => _activePrerequisite;
+            set => SetAndNotify(ref _activePrerequisite, value);
+        }
+
+        public bool CanUninstall
+        {
+            get => _canUninstall;
+            set => SetAndNotify(ref _canUninstall, value);
+        }
+
+        public bool IsFinished
+        {
+            get => _isFinished;
+            set => SetAndNotify(ref _isFinished, value);
+        }
+
+        #region Overrides of DialogViewModelBase
+
+        /// <inheritdoc />
+        public override void OnDialogClosed(object sender, DialogClosingEventArgs e)
+        {
+            _tokenSource?.Cancel();
+            base.OnDialogClosed(sender, e);
+        }
+
+        #endregion
+
+        public async void Uninstall()
+        {
+            CanUninstall = false;
+
+            _pluginManagementService.DisablePlugin(Plugin, true);
+            _tokenSource = new CancellationTokenSource();
+
+            try
+            {
+                foreach (PluginPrerequisiteViewModel pluginPrerequisiteViewModel in Prerequisites)
+                {
+                    pluginPrerequisiteViewModel.IsMet = pluginPrerequisiteViewModel.PluginPrerequisite.IsMet();
+                    if (!pluginPrerequisiteViewModel.IsMet)
+                        continue;
+
+                    ActivePrerequisite = pluginPrerequisiteViewModel;
+                    await ActivePrerequisite.Uninstall(_tokenSource.Token);
+
+                    // Wait after the task finished for the user to process what happened
+                    if (pluginPrerequisiteViewModel != Prerequisites.Last())
+                        await Task.Delay(1000);
+                }
+
+                if (Prerequisites.All(p => !p.IsMet))
+                {
+                    IsFinished = true;
+                    return;
+                }
+
+                // This shouldn't be happening and the experience isn't very nice for the user (too lazy to make a nice UI for such an edge case)
+                // but at least give some feedback
+                Session?.Close(false);
+                await _dialogService.ShowConfirmDialog(
+                    "Plugin prerequisites",
+                    "The plugin was not able to fully remove all prerequisites. \r\nPlease try again or contact the plugin creator.",
+                    "Confirm",
+                    ""
+                );
+                await _dialogService.ShowDialog<PluginPrerequisitesUninstallDialogViewModel>(new Dictionary<string, object> {{"pluginOrFeature", Plugin}});
+            }
+            catch (OperationCanceledException)
+            {
+                // ignored
+            }
+            finally
+            {
+                CanUninstall = true;
+                _tokenSource.Dispose();
+                _tokenSource = null;
+            }
+        }
+
+        public void Accept()
+        {
+            Session?.Close(true);
+        }
+
+        #region Overrides of Screen
+
+        /// <inheritdoc />
+        protected override void OnInitialActivate()
+        {
+            CanUninstall = false;
+            // Could be slow so take it off of the UI thread
+            Task.Run(() => CanUninstall = Plugin.Prerequisites.Any(p => p.IsMet()));
+
+            base.OnInitialActivate();
+        }
+
+        #endregion
+    }
+}