Fixed import dialog

Author: FalconNL93

WslToolbox.Core/DistributionClass.cs

@@ -28,7 +28,8 @@ public class DistributionClass
 
         public long Size { get; set; }
 
-        public static async Task<List<DistributionClass>> ListAvailableDistributions(List<DistributionClass> currentDistributions)
+        public static async Task<List<DistributionClass>> ListAvailableDistributions(
+            List<DistributionClass> currentDistributions)
         {
             return await DistributionFetcherHelper.ReadOnlineDistributions(currentDistributions);
         }

WslToolbox.Core/Helpers/DistributionFetcherHelper.cs

@@ -43,7 +43,8 @@ public static async Task<List<DistributionClass>> ReadOnlineDistributions(
                 if (WebRequest.Create(Url) is not HttpWebRequest request) return distros;
                 var response = await request.GetResponseAsync();
                 var encoding = Encoding.ASCII;
-                var jsonResponse = new StreamReader(response.GetResponseStream(), encoding);
+                var jsonResponse =
+                    new StreamReader(response.GetResponseStream() ?? throw new InvalidOperationException(), encoding);
                 var onlineDistributions =
                     JsonSerializer.Deserialize<OnlineDistributions>(await jsonResponse.ReadToEndAsync());
 

WslToolbox.Gui/Collections/Dialogs/AboutDialogCollection.cs

@@ -43,7 +43,8 @@ private static string UsedPackages()
                 {"AutoUpdater.NET", "https://github.com/ravibpatel/AutoUpdater.NET"},
                 {"Command Line Parser Library", "https://github.com/commandlineparser/commandline"},
                 {"Hardcodet NotifyIcon for WPF", "https://github.com/hardcodet/wpf-notifyicon"},
-                {"ModernWPF UI Library", "https://github.com/Kinnara/ModernWpf"}
+                {"ModernWPF UI Library", "https://github.com/Kinnara/ModernWpf"},
+                {"Serilog", "https://github.com/serilog/serilog"}
             };
 
             return packages.Aggregate<KeyValuePair<string, string>, string>(null,

WslToolbox.Gui/Collections/Dialogs/ImportDistributionDialogCollection.cs

@@ -1,12 +1,13 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using Microsoft.Win32;
-using WslToolbox.Gui.Configurations;
 using WslToolbox.Gui.Handlers;
 using WslToolbox.Gui.Helpers.Ui;
 using WslToolbox.Gui.Validators;
@@ -16,11 +17,25 @@ namespace WslToolbox.Gui.Collections.Dialogs
 {
     public sealed class ImportDistributionDialogCollection : INotifyPropertyChanged
     {
+        private string _distributionName;
+
         private bool _distributionNameIsValid;
-        public string DistributionName;
-        public string SelectedBasePath;
+        private bool _runAfterImport;
+
+        private string _selectedBasePath;
 
-        public string SelectedFilePath;
+        private string _selectedFilePath;
+
+        public string DistributionName
+        {
+            get => _distributionName;
+            set
+            {
+                if (value == _distributionName) return;
+                _distributionName = value;
+                OnPropertyChanged(nameof(DistributionName));
+            }
+        }
 
         public bool DistributionNameIsValid
         {
@@ -33,71 +48,96 @@ public bool DistributionNameIsValid
             }
         }
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        public string SelectedBasePath
+        {
+            get => _selectedBasePath;
+            set
+            {
+                if (value == _selectedBasePath) return;
+                _selectedBasePath = value;
+                OnPropertyChanged(nameof(SelectedBasePath));
+            }
+        }
 
-        public IEnumerable<Control> Items(MainViewModel viewModel)
+        public string SelectedFilePath
         {
-            var distributionFile = new TextBox
-                {IsEnabled = false, IsReadOnly = true, Margin = new Thickness(0, 0, 0, 2)};
-            var distributionFileBrowse = new Button {Content = "Browse...", Margin = new Thickness(0, 0, 0, 10)};
+            get => _selectedFilePath;
+            set
+            {
+                if (value == _selectedFilePath) return;
+                _selectedFilePath = value;
+                OnPropertyChanged(nameof(SelectedFilePath));
+            }
+        }
 
-            var distributionBasePath = ElementHelper.AddTextBox(nameof(DefaultConfiguration.UserBasePath),
-                null, "Configuration.UserBasePath", viewModel.Config, width: 400, bindingMode: BindingMode.OneWay);
+        public bool RunAfterImport
+        {
+            get => _runAfterImport;
+            set
+            {
+                if (value == _runAfterImport) return;
+                _runAfterImport = value;
+                OnPropertyChanged(nameof(RunAfterImport));
+            }
+        }
 
-            var distributionBasePathBrowse = new Button {Content = "Browse...", Margin = new Thickness(0, 0, 0, 10)};
-            var distributionName = new TextBox {Margin = new Thickness(0, 0, 0, 10)};
+        public event PropertyChangedEventHandler PropertyChanged;
 
-            distributionFileBrowse.Click += (_, _) => { distributionFile.Text = SelectDistributionFile(); };
-            distributionBasePathBrowse.Click += (_, _) => { distributionBasePath.Text = SelectDistributionBasePath(); };
-            distributionName.TextChanged += (_, _) =>
-            {
-                DistributionNameIsValid =
-                    ValidateImportValues(distributionFile.Text, distributionBasePath.Text, distributionName.Text);
+        public IEnumerable<Control> Items(MainViewModel viewModel)
+        {
+            var userBasePath = viewModel.Config.Configuration.UserBasePath;
+            var distributionFileBrowse = new Button {Content = "Browse..."};
+            var distributionBasePathBrowse = new Button {Content = "Browse..."};
 
-                SelectedFilePath = DistributionNameIsValid ? distributionFile.Text : null;
-                SelectedBasePath = DistributionNameIsValid ? distributionBasePath.Text : null;
-                SelectedBasePath = DistributionNameIsValid ? distributionBasePath.Text : null;
-                DistributionName = DistributionNameIsValid ? distributionName.Text : null;
-            };
+            SelectedBasePath = Directory.Exists(userBasePath) ? userBasePath : null;
+            distributionFileBrowse.Click += (_, _) => { SelectDistributionFile(); };
+            distributionBasePathBrowse.Click += (_, _) => { SelectDistributionBasePath(); };
 
             Control[] items =
             {
                 new Label {Content = "Name:", Margin = new Thickness(0, 0, 0, 2), FontWeight = FontWeights.Bold},
                 new Label
                 {
                     Content = "- Only alphanumeric characters are allowed.\n" +
-                              "- Name must contain atleast 3 characters.",
-                    Margin = new Thickness(0, 0, 0, 5)
-                },
-                distributionName,
-                new Label {Content = "Filename:", Margin = new Thickness(0, 0, 0, 2), FontWeight = FontWeights.Bold},
-                new Label
-                {
-                    Content = "Select the file which needs to be imported\n"
+                              "- Name must contain at least 3 characters.",
+                    Margin = new Thickness(0, 0, 0, 10)
                 },
-                distributionFile,
+                ElementHelper.AddTextBox(nameof(DistributionName), bind: "DistributionName", width: 400, source: this,
+                    isReadonly: false, isEnabled: true, updateSourceTrigger: UpdateSourceTrigger.PropertyChanged,
+                    placeholder: "Name your distribution"),
                 ElementHelper.Separator(),
+
+                new Label {Content = "Filename:", Margin = new Thickness(0, 0, 0, 2), FontWeight = FontWeights.Bold},
+                ElementHelper.AddTextBox(nameof(SelectedFilePath),
+                    null, "SelectedFilePath", this, width: 400,
+                    bindingMode: BindingMode.TwoWay, updateSourceTrigger: UpdateSourceTrigger.PropertyChanged,
+                    placeholder: "Select an exported distribution file."),
+                ElementHelper.Separator(0),
                 distributionFileBrowse,
 
-                new Label {Content = "Base path:", Margin = new Thickness(0, 0, 0, 2), FontWeight = FontWeights.Bold},
-                distributionBasePath,
                 ElementHelper.Separator(),
+                new Label {Content = "Base path:", Margin = new Thickness(0, 0, 0, 2), FontWeight = FontWeights.Bold},
+                ElementHelper.AddTextBox(nameof(SelectedBasePath),
+                    bind: "SelectedBasePath", source: this, width: 400, bindingMode: BindingMode.TwoWay,
+                    updateSourceTrigger: UpdateSourceTrigger.PropertyChanged,
+                    placeholder: "Select an installation directory"),
+                ElementHelper.Separator(0),
                 distributionBasePathBrowse
             };
 
             return items;
         }
 
-        private static string SelectDistributionFile()
+        private void SelectDistributionFile()
         {
             var distributionFilePathDialog = FileDialogHandler.OpenFileDialog();
 
-            return distributionFilePathDialog.ShowDialog() == null
+            SelectedFilePath = distributionFilePathDialog.ShowDialog() == null
                 ? null
                 : distributionFilePathDialog.FileName;
         }
 
-        private static string SelectDistributionBasePath()
+        private void SelectDistributionBasePath()
         {
             OpenFileDialog openLocation = new()
             {
@@ -110,21 +150,31 @@ private static string SelectDistributionBasePath()
                 RestoreDirectory = true
             };
 
-            return openLocation.ShowDialog() == null ? null : Path.GetDirectoryName(openLocation.FileName);
+            SelectedBasePath = openLocation.ShowDialog() == null ? null : Path.GetDirectoryName(openLocation.FileName);
         }
 
-        private static bool ValidateImportValues(string distributionFile, string distributionBasePath,
-            string distributionName)
+        private bool ValidateImportValues()
         {
-            return
-                distributionFile.Length >= 1 && distributionBasePath.Length >= 1 &&
-                File.Exists(distributionFile) && Directory.Exists(distributionBasePath) &&
-                DistributionNameValidator.ValidateName(distributionName);
+            return DistributionName != null
+                   && DistributionNameValidator.ValidateName(DistributionName)
+                   && SelectedBasePath is {Length: > 1}
+                   && SelectedFilePath is {Length: > 1}
+                   && Directory.Exists(SelectedBasePath)
+                   && File.Exists(SelectedFilePath);
         }
 
         private void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            Debug.WriteLine($"{propertyName} changed.");
+            try
+            {
+                DistributionNameIsValid = ValidateImportValues();
+            }
+            catch (Exception e)
+            {
+                Debug.WriteLine(e);
+            }
         }
     }
 }

WslToolbox.Gui/Collections/Dialogs/InstallDistributionDialogCollection.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
-using WslToolbox.Core;
 using ModernWpf.Controls.Primitives;
+using WslToolbox.Core;
 
 namespace WslToolbox.Gui.Collections.Dialogs
 {
@@ -38,7 +38,7 @@ private static ComboBox DistributionListControl(List<DistributionClass> distribu
                 Name = "InstallDistributionList",
                 ItemsSource = distributionClass.FindAll(x => !x.IsInstalled),
                 DisplayMemberPath = "Name",
-                MinWidth = 200,
+                MinWidth = 200
             };
 
             ControlHelper.SetHeader(installDistributionList, "Select an online distribution to install");

WslToolbox.Gui/Collections/Settings/GeneralSettingsGenericCollection.cs

@@ -32,7 +32,7 @@ private CompositeCollection GenericControls()
                     "Hide export warning", "Configuration.HideExportWarning", Source, header: null),
                 ElementHelper.AddToggleSwitch(nameof(DefaultConfiguration.AutoCheckUpdates),
                     "Automatically check for updates on startup", "Configuration.AutoCheckUpdates", Source,
-                    header: null),
+                    header: null)
             };
         }
 
@@ -68,7 +68,7 @@ private CompositeCollection EnableSystemTraySettings()
                 ElementHelper.AddToggleSwitch(nameof(DefaultConfiguration.MinimizeToTray),
                     "Minimize to tray", "Configuration.MinimizeToTray", Source),
                 ElementHelper.AddToggleSwitch(nameof(DefaultConfiguration.MinimizeOnStartup),
-                    "Minimize on startup", "Configuration.MinimizeOnStartup", Source),
+                    "Minimize on startup", "Configuration.MinimizeOnStartup", Source)
             };
         }
     }

WslToolbox.Gui/Collections/Settings/KeyboardShortcutSettingsGenericCollection.cs

@@ -28,8 +28,7 @@ public CompositeCollection Items()
                     "Enable keyboard shortcuts", "Configuration.KeyboardShortcutConfiguration.Enabled", Source,
                     header: null),
                 new Separator(),
-                ElementHelper.ItemsControlGroup(ShortcutControls(),
-                    source: Source,
+                ElementHelper.ItemsControlGroup(ShortcutControls(), source: Source,
                     requires: "Configuration.KeyboardShortcutConfiguration.Enabled")
             };
         }
@@ -47,11 +46,20 @@ private CompositeCollection ShortcutControls()
 
                 shortCutKey = $"{shortCutKey}{shortcut.Key}";
 
-                keyboardChecks.Add(ElementHelper.AddToggleSwitch(shortcut.Configuration,
-                    $"{shortcut.Name}\t\t[{shortCutKey}]",
+                var shortcutLine = new StackPanel {Orientation = Orientation.Horizontal};
+                shortcutLine.Children.Add(ElementHelper.AddToggleSwitch(shortcut.Configuration,
+                    $"{shortcut.Name}",
                     $"Configuration.KeyboardShortcutConfiguration.{shortcut.Configuration}", Source,
-                    enabled: shortcut.Modifiable, header: null)
-                );
+                    header: null));
+                shortcutLine.Children.Add(ElementHelper.Separator(marginLeft: 10));
+                shortcutLine.Children.Add(new TextBox
+                {
+                    Text = shortCutKey,
+                    IsReadOnly = true,
+                    IsEnabled = false
+                });
+
+                keyboardChecks.Add(shortcutLine);
             }
 
             return keyboardChecks;

WslToolbox.Gui/Collections/Settings/OtherSettingsGenericCollection.cs

@@ -1,4 +1,5 @@
-using System.Windows;
+using System;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using ModernWpf.Controls;
@@ -88,7 +89,13 @@ private CompositeCollection AdvancedControls()
                     LogConfiguration.GetValues(),
                     "Configuration.MinimumLogLevel",
                     Source
-                )
+                ),
+                new Label {Margin = new Thickness(0, 5, 0, 0), Content = "Update manifest:"},
+                new HyperlinkButton
+                {
+                    Content = AppConfiguration.AppConfigurationUpdateXml,
+                    NavigateUri = new Uri(AppConfiguration.AppConfigurationUpdateXml)
+                }
             };
         }
     }

WslToolbox.Gui/Commands/Distribution/ExportDistributionCommand.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using ModernWpf.Controls;
 using WslToolbox.Core;
 using WslToolbox.Gui.Handlers;

WslToolbox.Gui/Commands/Distribution/InstallDistributionCommand.cs

@@ -6,7 +6,6 @@
 using WslToolbox.Core.Helpers;
 using WslToolbox.Gui.Collections.Dialogs;
 using WslToolbox.Gui.Handlers;
-using WslToolbox.Gui.Helpers;
 using WslToolbox.Gui.Helpers.Ui;
 using WslToolbox.Gui.ViewModels;