Merge pull request #910 from AdmiringWorm/545-Allow-for-passing-in-pa…

…ckage-parameters-/-installer-arguments-maybe-other-arguments-directly-to-choco
chocolatey · Feb 1, 2022 · aab86b8 · aab86b8
2 parents 1a6da50 + f8773fc
commit aab86b8
Show file tree

Hide file tree

Showing 29 changed files with 802 additions and 217 deletions.
diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj
@@ -201,6 +201,7 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
     </Reference>
@@ -235,6 +236,7 @@
     <Compile Include="Services\PackageArgumentsService.cs" />
     <Compile Include="Utilities\Converters\LocalizationConverter.cs" />
     <Compile Include="Utilities\Extensions\LocalizeExtension.cs" />
+    <Compile Include="Utilities\Converters\NullToInverseBool.cs" />
     <Compile Include="Utilities\ToolTipBehavior.cs" />
     <Compile Include="Bootstrapper.cs" />
     <Compile Include="Commands\CommandExecutionManager.cs" />

diff --git a/Source/ChocolateyGui.Common.Windows/Resources/Controls.xaml b/Source/ChocolateyGui.Common.Windows/Resources/Controls.xaml
@@ -338,6 +338,15 @@
         <Setter Property="AutomationProperties.HelpText" Value="Go's back" />
         <Setter Property="AutomationProperties.AcceleratorKey" Value="B" />
         <Setter Property="ToolTip" Value="Back" />
+        <Style.Triggers>
+            <Trigger Property="FlowDirection" Value="RightToLeft">
+                <Setter Property="Content">
+                    <Setter.Value>
+                        <iconPacks:PackIconModern Kind="ChevronRight" Width="18" Height="18" />
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
     </Style>
 
     <Style x:Key="IconFlatButtonStyle" TargetType="{x:Type Button}" BasedOn="{StaticResource MahApps.Styles.Button.Flat}">

diff --git a/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs b/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs
@@ -200,7 +200,12 @@ public async Task<PackageOperationResult> InstallPackage(
                                 config.InstallArguments = advancedInstallOptions.InstallArguments;
                                 config.PackageParameters = advancedInstallOptions.PackageParameters;
                                 config.CommandExecutionTimeoutSeconds = advancedInstallOptions.ExecutionTimeoutInSeconds;
-                                config.AdditionalLogFileLocation = advancedInstallOptions.LogFile;
+
+                                if (!string.IsNullOrEmpty(advancedInstallOptions.LogFile))
+                                {
+                                    config.AdditionalLogFileLocation = advancedInstallOptions.LogFile;
+                                }
+
                                 config.Prerelease = advancedInstallOptions.PreRelease;
                                 config.ForceX86 = advancedInstallOptions.Forcex86;
                                 config.OverrideArguments = advancedInstallOptions.OverrideArguments;
@@ -222,6 +227,11 @@ public async Task<PackageOperationResult> InstallPackage(
                                     config.Features.AllowEmptyChecksumsSecure = false;
                                 }
 
+                                if (!string.IsNullOrEmpty(advancedInstallOptions.CacheLocation))
+                                {
+                                    config.CacheLocation = advancedInstallOptions.CacheLocation;
+                                }
+
                                 config.DownloadChecksum = advancedInstallOptions.DownloadChecksum;
                                 config.DownloadChecksum64 = advancedInstallOptions.DownloadChecksum64bit;
                                 config.DownloadChecksumType = advancedInstallOptions.DownloadChecksumType;
@@ -437,6 +447,11 @@ public async Task<ChocolateyFeature[]> GetFeatures()
 
         public async Task SetFeature(ChocolateyFeature feature)
         {
+            if (feature == null)
+            {
+                return;
+            }
+
             using (await Lock.WriteLockAsync())
             {
                 _choco.Set(

diff --git a/Source/ChocolateyGui.Common.Windows/Services/DialogService.cs b/Source/ChocolateyGui.Common.Windows/Services/DialogService.cs
@@ -33,6 +33,10 @@ public DialogService()
             _lock = new AsyncSemaphore(1);
         }
 
+        public event EventHandler<object> ChildWindowOpened;
+
+        public event EventHandler<object> ChildWindowClosed;
+
         public ShellView ShellView { get; set; }
 
         /// <inheritdoc />
@@ -161,7 +165,10 @@ public async Task<TResult> ShowChildWindowAsync<TDialogContext, TResult>(
 
                     _childWindowLoadedHandler = (sender, e) =>
                     {
+                        ChildWindowOpened?.Invoke(sender, e);
+
                         var cw = (ChildWindow)sender;
+                        cw.ClosingFinished += (senderObj, r) => ChildWindowClosed?.Invoke(senderObj, r);
 
                         if (cw.DataContext is IClosableChildWindow<TResult> vm)
                         {

diff --git a/Source/ChocolateyGui.Common.Windows/Services/IDialogService.cs b/Source/ChocolateyGui.Common.Windows/Services/IDialogService.cs
@@ -5,6 +5,7 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
+using System;
 using System.Threading.Tasks;
 using ChocolateyGui.Common.Windows.Controls.Dialogs;
 using ChocolateyGui.Common.Windows.Views;
@@ -14,6 +15,10 @@ namespace ChocolateyGui.Common.Windows.Services
 {
     public interface IDialogService
     {
+        event EventHandler<object> ChildWindowOpened;
+
+        event EventHandler<object> ChildWindowClosed;
+
         ShellView ShellView { get; set; }
 
         /// <summary>

diff --git a/Source/ChocolateyGui.Common.Windows/Services/PersistenceService.cs b/Source/ChocolateyGui.Common.Windows/Services/PersistenceService.cs
@@ -8,6 +8,8 @@
 using System.IO;
 using ChocolateyGui.Common.Services;
 using Microsoft.Win32;
+using DialogResult = System.Windows.Forms.DialogResult;
+using FolderBrowserDialog = System.Windows.Forms.FolderBrowserDialog;
 
 namespace ChocolateyGui.Common.Windows.Services
 {
@@ -31,6 +33,22 @@ public Stream SaveFile(string defaultExtension, string filter)
             return result != null && result.Value ? fd.OpenFile() : null;
         }
 
+        public string GetFolderPath(string defaultLocation, string description = null)
+        {
+            var fd = new FolderBrowserDialog();
+            fd.SelectedPath = defaultLocation;
+            fd.Description = description;
+
+            if (fd.ShowDialog() == DialogResult.OK)
+            {
+                var path = fd.SelectedPath;
+
+                return path;
+            }
+
+            return null;
+        }
+
         public string GetFilePath(string defaultExtension, string filter)
         {
             var fd = new SaveFileDialog { DefaultExt = defaultExtension, Filter = filter };

diff --git a/Source/ChocolateyGui.Common.Windows/Startup/ChocolateyGuiModule.cs b/Source/ChocolateyGui.Common.Windows/Startup/ChocolateyGuiModule.cs
@@ -8,7 +8,6 @@
 using System;
 using System.ComponentModel;
 using System.IO;
-using System.Security.AccessControl;
 using Autofac;
 using AutoMapper;
 using Caliburn.Micro;
@@ -27,14 +26,12 @@
 using ChocolateyGui.Common.Utilities;
 using ChocolateyGui.Common.ViewModels.Items;
 using ChocolateyGui.Common.Windows.Services;
-using ChocolateyGui.Common.Windows.Utilities;
 using ChocolateyGui.Common.Windows.ViewModels;
-using ChocolateyGui.Common.Windows.ViewModels.Items;
 using ChocolateyGui.Common.Windows.Views;
 using LiteDB;
-using MahApps.Metro.Controls.Dialogs;
 using NuGet;
 using ChocolateySource = chocolatey.infrastructure.app.configuration.ChocolateySource;
+using Environment = System.Environment;
 using PackageViewModel = ChocolateyGui.Common.Windows.ViewModels.Items.PackageViewModel;
 
 namespace ChocolateyGui.Common.Windows.Startup
@@ -111,7 +108,33 @@ protected override void Load(ContainerBuilder builder)
                 config.CreateMap<ChocolateySource, Common.Models.ChocolateySource>()
                     .ForMember(dest => dest.VisibleToAdminsOnly, opt => opt.MapFrom(src => src.VisibleToAdminOnly));
 
-                config.CreateMap<AdvancedInstallViewModel, AdvancedInstall>();
+                config.CreateMap<AdvancedInstallViewModel, AdvancedInstall>()
+                    .ForMember(
+                        dest => dest.DownloadChecksum,
+                        opt => opt.Condition(source => !source.IgnoreChecksums))
+                    .ForMember(
+                        dest => dest.DownloadChecksumType,
+                        opt => opt.Condition(source =>
+                            !source.IgnoreChecksums && !string.IsNullOrEmpty(source.DownloadChecksum)))
+                    .ForMember(
+                        dest => dest.DownloadChecksum64bit,
+                        opt => opt.Condition(source =>
+                            Environment.Is64BitOperatingSystem
+                            && !source.IgnoreChecksums
+                            && !source.Forcex86))
+                    .ForMember(
+                        dest => dest.DownloadChecksumType64bit,
+                        opt => opt.Condition(source =>
+                            Environment.Is64BitOperatingSystem
+                            && !source.IgnoreChecksums
+                            && !source.Forcex86
+                            && !string.IsNullOrEmpty(source.DownloadChecksum64bit)))
+                    .ForMember(
+                        dest => dest.PackageParameters,
+                        opt => opt.Condition(source => !source.SkipPowerShell))
+                    .ForMember(
+                        dest => dest.InstallArguments,
+                        opt => opt.Condition(source => !source.SkipPowerShell && !source.NotSilent));
             });
 
             builder.RegisterType<BundledThemeService>().As<IBundledThemeService>().SingleInstance();

diff --git a/Source/ChocolateyGui.Common.Windows/Startup/Internationalization.cs b/Source/ChocolateyGui.Common.Windows/Startup/Internationalization.cs
@@ -102,7 +102,7 @@ public static void UpdateLanguage(string languageCode)
 
             var culture = GetSupportedCultureInfo(languageCode);
 
-            if (culture != existingLanguage)
+            if (!Equals(culture, existingLanguage))
             {
                 TranslationSource.Instance.CurrentCulture = culture;
                 CultureInfo.DefaultThreadCurrentCulture = culture;

diff --git a/Source/ChocolateyGui.Common.Windows/Utilities/Converters/BooleanInverter.cs b/Source/ChocolateyGui.Common.Windows/Utilities/Converters/BooleanInverter.cs
@@ -7,12 +7,13 @@
 
 using System;
 using System.Globalization;
+using System.Linq;
 using System.Windows;
 using System.Windows.Data;
 
 namespace ChocolateyGui.Common.Windows.Utilities.Converters
 {
-    public class BooleanInverter : DependencyObject, IValueConverter
+    public class BooleanInverter : DependencyObject, IValueConverter, IMultiValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
@@ -24,9 +25,19 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             return value as bool? == false;
         }
 
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            return values.All(value => value == null || value as bool? == false);
+        }
+
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
             throw new NotImplementedException();
         }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/Source/ChocolateyGui.Common.Windows/Utilities/Converters/BooleanToVisibilityInverted.cs b/Source/ChocolateyGui.Common.Windows/Utilities/Converters/BooleanToVisibilityInverted.cs
@@ -7,12 +7,13 @@
 
 using System;
 using System.Globalization;
+using System.Linq;
 using System.Windows;
 using System.Windows.Data;
 
 namespace ChocolateyGui.Common.Windows.Utilities.Converters
 {
-    public class BooleanToVisibilityInverted : DependencyObject, IValueConverter
+    public class BooleanToVisibilityInverted : DependencyObject, IValueConverter, IMultiValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
@@ -21,11 +22,23 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                 : Visibility.Collapsed;
         }
 
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            var collapsed = values.Aggregate(false, (current, value) => current || !IsCollapsed(value, parameter));
+
+            return collapsed ? Visibility.Collapsed : Visibility.Visible;
+        }
+
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
             throw new NotImplementedException();
         }
 
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+
         private static bool IsCollapsed(object value, object parameter)
         {
             var boolVal = (value != null && value != DependencyProperty.UnsetValue) && (bool)value;

diff --git a/Source/ChocolateyGui.Common.Windows/Utilities/Converters/LocalizationConverter.cs b/Source/ChocolateyGui.Common.Windows/Utilities/Converters/LocalizationConverter.cs
@@ -39,9 +39,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
 
             if (parameter is string sParameter)
             {
-                format = string.Format(
-                    TranslationSource.Instance[sParameter],
-                    value);
+                format = TranslationSource.Instance[sParameter, value];
             }
 
             return format;

diff --git a/Source/ChocolateyGui.Common.Windows/Utilities/Converters/NullToInverseBool.cs b/Source/ChocolateyGui.Common.Windows/Utilities/Converters/NullToInverseBool.cs
@@ -0,0 +1,18 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright company="Chocolatey" file="NullToInverseBool.cs">
+//   Copyright 2017 - Present Chocolatey Software, LLC
+//   Copyright 2014 - 2017 Rob Reynolds, the maintainers of Chocolatey, and RealDimensions Software, LLC
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace ChocolateyGui.Common.Windows.Utilities.Converters
+{
+    public class NullToInverseBool : NullToValue
+    {
+        public NullToInverseBool()
+        {
+            TrueValue = false;
+            FalseValue = true;
+        }
+    }
+}