(GH-602) Initial attempt at getting things working

gep13 · gep13 · commit a6e78eb17da4 · 2020-06-15T14:31:29.000-07:00
diff --git a/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs b/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs
@@ -95,7 +95,7 @@ public async Task<IEnumerable<Package>> GetInstalledPackages()
 
         public async Task<IReadOnlyList<OutdatedPackage>> GetOutdatedPackages(bool includePrerelease = false, string packageName = null, bool forceCheckForOutdatedPackages = false)
         {
-            var preventAutomatedOutdatedPackagesCheck = _configService.GetAppConfiguration().PreventAutomatedOutdatedPackagesCheck;
+            var preventAutomatedOutdatedPackagesCheck = _configService.GetAppConfiguration().PreventAutomatedOutdatedPackagesCheck ?? false;
 
             if (preventAutomatedOutdatedPackagesCheck && !forceCheckForOutdatedPackages)
             {
diff --git a/Source/ChocolateyGui.Common.Windows/Startup/ChocolateyGuiModule.cs b/Source/ChocolateyGui.Common.Windows/Startup/ChocolateyGuiModule.cs
@@ -109,8 +109,11 @@ protected override void Load(ContainerBuilder builder)
 
             try
             {
-                var database = new LiteDatabase($"filename={Path.Combine(Bootstrapper.LocalAppDataPath, "data.db")};upgrade=true");
-                builder.Register(c => database).SingleInstance();
+                var userDatabase = new LiteDatabase($"filename={Path.Combine(Bootstrapper.LocalAppDataPath, "data.db")};upgrade=true");
+                var globalDatabase = new LiteDatabase($"filename={Path.Combine(Bootstrapper.AppDataPath, "config", "data.db")};upgrade=true");
+
+                builder.RegisterInstance(new ConfigService(globalDatabase, userDatabase)).As<IConfigService>().SingleInstance();
+                builder.RegisterInstance(new LiteDBFileStorageService(userDatabase)).As<IFileStorageService>().SingleInstance();
             }
             catch (IOException ex)
             {
diff --git a/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs b/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs
@@ -375,7 +375,7 @@ public bool IsDownloadCountAvailable
         {
             get
             {
-                return DownloadCount != -1 && !_configService.GetAppConfiguration().HidePackageDownloadCount;
+                return DownloadCount != -1 && !(_configService.GetAppConfiguration().HidePackageDownloadCount ?? false);
             }
         }
 
diff --git a/Source/ChocolateyGui.Common.Windows/ViewModels/LocalSourceViewModel.cs b/Source/ChocolateyGui.Common.Windows/ViewModels/LocalSourceViewModel.cs
@@ -323,19 +323,19 @@ protected override async void OnInitialize()
                     return;
                 }
 
-                ListViewMode = _configService.GetAppConfiguration().DefaultToTileViewForLocalSource ? ListViewMode.Tile : ListViewMode.Standard;
-                ShowAdditionalPackageInformation = _configService.GetAppConfiguration().ShowAdditionalPackageInformation;
+                ListViewMode = _configService.GetAppConfiguration().DefaultToTileViewForLocalSource ?? false ? ListViewMode.Tile : ListViewMode.Standard;
+                ShowAdditionalPackageInformation = _configService.GetAppConfiguration().ShowAdditionalPackageInformation ?? false;
 
                 Observable.FromEventPattern<EventArgs>(_configService, "SettingsChanged")
                     .ObserveOnDispatcher()
                     .Subscribe(eventPattern =>
                     {
                         var appConfig = (AppConfiguration)eventPattern.Sender;
 
-                        ListViewMode = appConfig.DefaultToTileViewForLocalSource
+                        ListViewMode = appConfig.DefaultToTileViewForLocalSource ?? false
                                 ? ListViewMode.Tile
                                 : ListViewMode.Standard;
-                        ShowAdditionalPackageInformation = appConfig.ShowAdditionalPackageInformation;
+                        ShowAdditionalPackageInformation = appConfig.ShowAdditionalPackageInformation ?? false;
                     });
 
                 await LoadPackages();
@@ -472,7 +472,7 @@ private async Task CheckOutdated(bool forceCheckForOutdated)
                 // outdated packages. We should only enable the checkbox here when: (or)
                 // 1. the "Prevent Automated Outdated Packages Check" is disabled
                 // 2. forced a check for outdated packages.
-                IsShowOnlyPackagesWithUpdateEnabled = !_configService.GetAppConfiguration().PreventAutomatedOutdatedPackagesCheck || forceCheckForOutdated;
+                IsShowOnlyPackagesWithUpdateEnabled = !_configService.GetAppConfiguration().PreventAutomatedOutdatedPackagesCheck ?? false || forceCheckForOutdated;
 
                 // Force invalidating the command stuff.
                 // This helps us to prevent disabled buttons after executing this routine.
diff --git a/Source/ChocolateyGui.Common.Windows/ViewModels/RemoteSourceViewModel.cs b/Source/ChocolateyGui.Common.Windows/ViewModels/RemoteSourceViewModel.cs
@@ -249,7 +249,7 @@ public async Task LoadPackages(bool forceCheckForOutdatedPackages)
                     return;
                 }
 
-                if (!HasLoaded && _configService.GetAppConfiguration().PreventPreload)
+                if (!HasLoaded && (_configService.GetAppConfiguration().PreventPreload ?? false))
                 {
                     ShowShouldPreventPreloadMessage = true;
                     HasLoaded = true;
@@ -299,7 +299,7 @@ public async Task LoadPackages(bool forceCheckForOutdatedPackages)
                         Packages.Add(Mapper.Map<IPackageViewModel>(p));
                     });
 
-                    if (_configService.GetAppConfiguration().ExcludeInstalledPackages)
+                    if (_configService.GetAppConfiguration().ExcludeInstalledPackages ?? false)
                     {
                         Packages.RemoveAll(x => x.IsInstalled);
                     }
@@ -347,8 +347,8 @@ protected override void OnInitialize()
         {
             try
             {
-                ListViewMode = _configService.GetAppConfiguration().DefaultToTileViewForLocalSource ? ListViewMode.Tile : ListViewMode.Standard;
-                ShowAdditionalPackageInformation = _configService.GetAppConfiguration().ShowAdditionalPackageInformation;
+                ListViewMode = _configService.GetAppConfiguration().DefaultToTileViewForLocalSource ?? false ? ListViewMode.Tile : ListViewMode.Standard;
+                ShowAdditionalPackageInformation = _configService.GetAppConfiguration().ShowAdditionalPackageInformation ?? false;
 
                 Observable.FromEventPattern<EventArgs>(_configService, "SettingsChanged")
                     .ObserveOnDispatcher()
@@ -357,13 +357,13 @@ protected override void OnInitialize()
                         var appConfig = (AppConfiguration)eventPattern.Sender;
 
                         _searchQuerySubscription?.Dispose();
-                        if (appConfig.UseDelayedSearch)
+                        if (appConfig.UseDelayedSearch ?? false)
                         {
                             SubscribeToLoadPackagesOnSearchQueryChange();
                         }
 
-                        ListViewMode = appConfig.DefaultToTileViewForRemoteSource ? ListViewMode.Tile : ListViewMode.Standard;
-                        ShowAdditionalPackageInformation = appConfig.ShowAdditionalPackageInformation;
+                        ListViewMode = appConfig.DefaultToTileViewForRemoteSource ?? false ? ListViewMode.Tile : ListViewMode.Standard;
+                        ShowAdditionalPackageInformation = appConfig.ShowAdditionalPackageInformation ?? false;
                     });
 
 #pragma warning disable 4014
@@ -375,7 +375,7 @@ protected override void OnInitialize()
                     "IncludeAllVersions", "IncludePrerelease", "MatchWord", "SortSelection"
                 };
 
-                if (_configService.GetAppConfiguration().UseDelayedSearch)
+                if (_configService.GetAppConfiguration().UseDelayedSearch ?? false)
                 {
                     SubscribeToLoadPackagesOnSearchQueryChange();
                 }
diff --git a/Source/ChocolateyGui.Common.Windows/ViewModels/SettingsViewModel.cs b/Source/ChocolateyGui.Common.Windows/ViewModels/SettingsViewModel.cs
@@ -443,7 +443,7 @@ private async void OnActivated(object sender, ActivationEventArgs activationEven
                         .Concat()
                         .Subscribe();
 
-            var chocolateyGuiFeatures = _configService.GetFeatures();
+            var chocolateyGuiFeatures = _configService.GetFeatures(global: false);
             foreach (var chocolateyGuiFeature in chocolateyGuiFeatures)
             {
                 ChocolateyGuiFeatures.Add(chocolateyGuiFeature);
@@ -455,7 +455,7 @@ private async void OnActivated(object sender, ActivationEventArgs activationEven
                 .Concat()
                 .Subscribe();
 
-            var chocolateyGuiSettings = _configService.GetSettings();
+            var chocolateyGuiSettings = _configService.GetSettings(global: false);
             foreach (var chocolateyGuiSetting in chocolateyGuiSettings)
             {
                 ChocolateyGuiSettings.Add(chocolateyGuiSetting);
diff --git a/Source/ChocolateyGui.Common.Windows/ViewModels/ShellViewModel.cs b/Source/ChocolateyGui.Common.Windows/ViewModels/ShellViewModel.cs
@@ -153,7 +153,7 @@ protected override void OnInitialize()
 
         private bool CanGoToSource(object obj)
         {
-            if (!_configService.GetAppConfiguration().UseKeyboardBindings)
+            if (!_configService.GetAppConfiguration().UseKeyboardBindings ?? true)
             {
                 return false;
             }
diff --git a/Source/ChocolateyGui.Common.Windows/ViewModels/SourcesViewModel.cs b/Source/ChocolateyGui.Common.Windows/ViewModels/SourcesViewModel.cs
@@ -90,7 +90,7 @@ public async Task LoadSources()
             var sources = await _packageService.GetSources();
             var vms = new List<ISourceViewModelBase>();
 
-            if (_configService.GetAppConfiguration().ShowAggregatedSourceView)
+            if (_configService.GetAppConfiguration().ShowAggregatedSourceView ?? false)
             {
                 vms.Add(_remoteSourceVmFactory(new ChocolateyAggregatedSources()));
                 vms.Add(new SourceSeparatorViewModel());
diff --git a/Source/ChocolateyGui.Common.Windows/Views/ShellView.xaml.cs b/Source/ChocolateyGui.Common.Windows/Views/ShellView.xaml.cs
@@ -96,7 +96,7 @@ public Task<ChocolateyDialogController> ShowChocolateyDialogAsync(
             return Dispatcher.Invoke(async () =>
             {
                 // create the dialog control
-                var dialog = new ChocolateyDialog(this, _configService.GetAppConfiguration().ShowConsoleOutput)
+                var dialog = new ChocolateyDialog(this, _configService.GetAppConfiguration().ShowConsoleOutput ?? false)
                 {
                     Title = title,
                     IsCancelable = isCancelable,
diff --git a/Source/ChocolateyGui.Common/Commands/ConfigCommand.cs b/Source/ChocolateyGui.Common/Commands/ConfigCommand.cs
@@ -39,7 +39,11 @@ public virtual void ConfigureArgumentParser(OptionSet optionSet, ChocolateyGuiCo
                 .Add(
                     "value=",
                     Resources.ConfigCommand_ValueOption,
-                    option => configuration.ConfigCommand.ConfigValue = option.remove_surrounding_quotes());
+                    option => configuration.ConfigCommand.ConfigValue = option.remove_surrounding_quotes())
+                .Add(
+                    "g|global",
+                    Resources.ConfigCommand_GlobalOption,
+                    option => configuration.ConfigCommand.Global = option != null);
         }
 
         public virtual void HandleAdditionalArgumentParsing(IList<string> unparsedArguments, ChocolateyGuiConfiguration configuration)
diff --git a/Source/ChocolateyGui.Common/Commands/FeatureCommand.cs b/Source/ChocolateyGui.Common/Commands/FeatureCommand.cs
@@ -35,7 +35,11 @@ public virtual void ConfigureArgumentParser(OptionSet optionSet, ChocolateyGuiCo
                 .Add(
                     "n=|name=",
                     Resources.FeatureCommand_NameOption,
-                    option => configuration.FeatureCommand.Name = option.remove_surrounding_quotes());
+                    option => configuration.FeatureCommand.Name = option.remove_surrounding_quotes())
+                .Add(
+                    "g|global",
+                    Resources.FeatureCommand_GlobalOption,
+                    option => configuration.FeatureCommand.Global = option != null);
         }
 
         public virtual void HandleAdditionalArgumentParsing(IList<string> unparsedArguments, ChocolateyGuiConfiguration configuration)
diff --git a/Source/ChocolateyGui.Common/Models/AppConfiguration.cs b/Source/ChocolateyGui.Common/Models/AppConfiguration.cs
@@ -19,50 +19,50 @@ public class AppConfiguration
 
         [LocalizedDescription("SettingsView_ToggleShowConsoleOutputDescription")]
         [Feature]
-        public bool ShowConsoleOutput { get; set; }
+        public bool? ShowConsoleOutput { get; set; }
 
         [LocalizedDescription("SettingsView_ToggleDefaultTileViewLocalDescription")]
         [Feature]
-        public bool DefaultToTileViewForLocalSource { get; set; }
+        public bool? DefaultToTileViewForLocalSource { get; set; }
 
         [LocalizedDescription("SettingsView_ToggleDefaultTileViewRemoteDescription")]
         [Feature]
-        public bool DefaultToTileViewForRemoteSource { get; set; }
+        public bool? DefaultToTileViewForRemoteSource { get; set; }
 
         [LocalizedDescription("SettingsView_ToggleUseDelayedSearchDescription")]
         [Feature]
-        public bool UseDelayedSearch { get; set; }
+        public bool? UseDelayedSearch { get; set; }
 
         [LocalizedDescription("SettingsView_TogglePreventPreloadDescription")]
         [Feature]
-        public bool PreventPreload { get; set; }
+        public bool? PreventPreload { get; set; }
 
         [LocalizedDescription("SettingsView_TogglePreventAutomatedOutdatedPackagesCheckDescription")]
         [Feature]
-        public bool PreventAutomatedOutdatedPackagesCheck { get; set; }
+        public bool? PreventAutomatedOutdatedPackagesCheck { get; set; }
 
         [LocalizedDescription("SettingsView_ToggleExcludeInstalledPackagesDescription")]
         [Feature]
-        public bool ExcludeInstalledPackages { get; set; }
+        public bool? ExcludeInstalledPackages { get; set; }
 
         [LocalizedDescription("SettingsView_ToggleShowAggregatedSourceViewDescription")]
         [Feature]
-        public bool ShowAggregatedSourceView { get; set; }
+        public bool? ShowAggregatedSourceView { get; set; }
 
         [LocalizedDescription("SettingsView_ToggleShowAdditionalPackageInformationDescription")]
         [Feature]
-        public bool ShowAdditionalPackageInformation { get; set; }
+        public bool? ShowAdditionalPackageInformation { get; set; }
 
         [LocalizedDescription("SettingsView_ToggleAllowNonAdminAccessToSettingsDescription")]
         [Feature]
-        public bool AllowNonAdminAccessToSettings { get; set; }
+        public bool? AllowNonAdminAccessToSettings { get; set; }
 
         [LocalizedDescription("SettingsView_ToggleUseKeyboardBindings")]
         [Feature]
-        public bool UseKeyboardBindings { get; set; }
+        public bool? UseKeyboardBindings { get; set; }
 
         [LocalizedDescription("SettingsView_TogglePackageDownloadCountDescription")]
         [Feature]
-        public bool HidePackageDownloadCount { get; set; }
+        public bool? HidePackageDownloadCount { get; set; }
     }
 }
diff --git a/Source/ChocolateyGui.Common/Models/ConfigCommandConfiguration.cs b/Source/ChocolateyGui.Common/Models/ConfigCommandConfiguration.cs
@@ -17,5 +17,7 @@ public sealed class ConfigCommandConfiguration
         public string ConfigValue { get; set; }
 
         public ConfigCommandType Command { get; set; }
+
+        public bool Global { get; set; }
     }
 }
diff --git a/Source/ChocolateyGui.Common/Models/FeatureCommandConfiguration.cs b/Source/ChocolateyGui.Common/Models/FeatureCommandConfiguration.cs
@@ -15,5 +15,7 @@ public sealed class FeatureCommandConfiguration
         public string Name { get; set; }
 
         public FeatureCommandType Command { get; set; }
+
+        public bool Global { get; set; }
     }
 }
diff --git a/Source/ChocolateyGui.Common/Properties/Resources.Designer.cs b/Source/ChocolateyGui.Common/Properties/Resources.Designer.cs
diff --git a/Source/ChocolateyGui.Common/Properties/Resources.resx b/Source/ChocolateyGui.Common/Properties/Resources.resx
@@ -970,4 +970,10 @@ Normal:
   <data name="RemoteSourceView_SearchNoPackagesFoundHeading" xml:space="preserve">
     <value>Change the search string, and/or options used, and try again.</value>
   </data>
+  <data name="ConfigCommand_GlobalOption" xml:space="preserve">
+    <value>Something else...</value>
+  </data>
+  <data name="FeatureCommand_GlobalOption" xml:space="preserve">
+    <value>Something...</value>
+  </data>
 </root>
diff --git a/Source/ChocolateyGui.Common/Services/ConfigService.cs b/Source/ChocolateyGui.Common/Services/ConfigService.cs
diff --git a/Source/ChocolateyGui.Common/Services/IConfigService.cs b/Source/ChocolateyGui.Common/Services/IConfigService.cs
diff --git a/Source/ChocolateyGuiCli/Startup/ChocolateyGuiCliModule.cs b/Source/ChocolateyGuiCli/Startup/ChocolateyGuiCliModule.cs

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public async Task<IEnumerable<Package>> GetInstalledPackages()`
`95`	`95`
`96`	`96`	`public async Task<IReadOnlyList<OutdatedPackage>> GetOutdatedPackages(bool includePrerelease = false, string packageName = null, bool forceCheckForOutdatedPackages = false)`
`97`	`97`	`{`
`98`		`- var preventAutomatedOutdatedPackagesCheck = _configService.GetAppConfiguration().PreventAutomatedOutdatedPackagesCheck;`
	`98`	`+ var preventAutomatedOutdatedPackagesCheck = _configService.GetAppConfiguration().PreventAutomatedOutdatedPackagesCheck ?? false;`
`99`	`99`
`100`	`100`	`if (preventAutomatedOutdatedPackagesCheck && !forceCheckForOutdatedPackages)`
`101`	`101`	`{`
Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,11 @@ protected override void Load(ContainerBuilder builder)`
`109`	`109`
`110`	`110`	`try`
`111`	`111`	`{`
`112`		`- var database = new LiteDatabase($"filename={Path.Combine(Bootstrapper.LocalAppDataPath, "data.db")};upgrade=true");`
`113`		`- builder.Register(c => database).SingleInstance();`
	`112`	`+ var userDatabase = new LiteDatabase($"filename={Path.Combine(Bootstrapper.LocalAppDataPath, "data.db")};upgrade=true");`
	`113`	`+ var globalDatabase = new LiteDatabase($"filename={Path.Combine(Bootstrapper.AppDataPath, "config", "data.db")};upgrade=true");`
	`114`	`+`
	`115`	`+ builder.RegisterInstance(new ConfigService(globalDatabase, userDatabase)).As<IConfigService>().SingleInstance();`
	`116`	`+ builder.RegisterInstance(new LiteDBFileStorageService(userDatabase)).As<IFileStorageService>().SingleInstance();`
`114`	`117`	`}`
`115`	`118`	`catch (IOException ex)`
`116`	`119`	`{`
Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ public bool IsDownloadCountAvailable`
`375`	`375`	`{`
`376`	`376`	`get`
`377`	`377`	`{`
`378`		`- return DownloadCount != -1 && !_configService.GetAppConfiguration().HidePackageDownloadCount;`
	`378`	`+ return DownloadCount != -1 && !(_configService.GetAppConfiguration().HidePackageDownloadCount ?? false);`
`379`	`379`	`}`
`380`	`380`	`}`
`381`	`381`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ public async Task LoadPackages(bool forceCheckForOutdatedPackages)`
`249`	`249`	`return;`
`250`	`250`	`}`
`251`	`251`
`252`		`- if (!HasLoaded && _configService.GetAppConfiguration().PreventPreload)`
	`252`	`+ if (!HasLoaded && (_configService.GetAppConfiguration().PreventPreload ?? false))`
`253`	`253`	`{`
`254`	`254`	`ShowShouldPreventPreloadMessage = true;`
`255`	`255`	`HasLoaded = true;`
`@@ -299,7 +299,7 @@ public async Task LoadPackages(bool forceCheckForOutdatedPackages)`
`299`	`299`	`Packages.Add(Mapper.Map<IPackageViewModel>(p));`
`300`	`300`	`});`
`301`	`301`
`302`		`- if (_configService.GetAppConfiguration().ExcludeInstalledPackages)`
	`302`	`+ if (_configService.GetAppConfiguration().ExcludeInstalledPackages ?? false)`
`303`	`303`	`{`
`304`	`304`	`Packages.RemoveAll(x => x.IsInstalled);`
`305`	`305`	`}`
`@@ -347,8 +347,8 @@ protected override void OnInitialize()`
`347`	`347`	`{`
`348`	`348`	`try`
`349`	`349`	`{`
`350`		`- ListViewMode = _configService.GetAppConfiguration().DefaultToTileViewForLocalSource ? ListViewMode.Tile : ListViewMode.Standard;`
`351`		`- ShowAdditionalPackageInformation = _configService.GetAppConfiguration().ShowAdditionalPackageInformation;`
	`350`	`+ ListViewMode = _configService.GetAppConfiguration().DefaultToTileViewForLocalSource ?? false ? ListViewMode.Tile : ListViewMode.Standard;`
	`351`	`+ ShowAdditionalPackageInformation = _configService.GetAppConfiguration().ShowAdditionalPackageInformation ?? false;`
`352`	`352`
`353`	`353`	`Observable.FromEventPattern<EventArgs>(_configService, "SettingsChanged")`
`354`	`354`	`.ObserveOnDispatcher()`
`@@ -357,13 +357,13 @@ protected override void OnInitialize()`
`357`	`357`	`var appConfig = (AppConfiguration)eventPattern.Sender;`
`358`	`358`
`359`	`359`	`_searchQuerySubscription?.Dispose();`
`360`		`- if (appConfig.UseDelayedSearch)`
	`360`	`+ if (appConfig.UseDelayedSearch ?? false)`
`361`	`361`	`{`
`362`	`362`	`SubscribeToLoadPackagesOnSearchQueryChange();`
`363`	`363`	`}`
`364`	`364`
`365`		`- ListViewMode = appConfig.DefaultToTileViewForRemoteSource ? ListViewMode.Tile : ListViewMode.Standard;`
`366`		`- ShowAdditionalPackageInformation = appConfig.ShowAdditionalPackageInformation;`
	`365`	`+ ListViewMode = appConfig.DefaultToTileViewForRemoteSource ?? false ? ListViewMode.Tile : ListViewMode.Standard;`
	`366`	`+ ShowAdditionalPackageInformation = appConfig.ShowAdditionalPackageInformation ?? false;`
`367`	`367`	`});`
`368`	`368`
`369`	`369`	`#pragma warning disable 4014`
`@@ -375,7 +375,7 @@ protected override void OnInitialize()`
`375`	`375`	`"IncludeAllVersions", "IncludePrerelease", "MatchWord", "SortSelection"`
`376`	`376`	`};`
`377`	`377`
`378`		`- if (_configService.GetAppConfiguration().UseDelayedSearch)`
	`378`	`+ if (_configService.GetAppConfiguration().UseDelayedSearch ?? false)`
`379`	`379`	`{`
`380`	`380`	`SubscribeToLoadPackagesOnSearchQueryChange();`
`381`	`381`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ protected override void OnInitialize()`
`153`	`153`
`154`	`154`	`private bool CanGoToSource(object obj)`
`155`	`155`	`{`
`156`		`- if (!_configService.GetAppConfiguration().UseKeyboardBindings)`
	`156`	`+ if (!_configService.GetAppConfiguration().UseKeyboardBindings ?? true)`
`157`	`157`	`{`
`158`	`158`	`return false;`
`159`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public async Task LoadSources()`
`90`	`90`	`var sources = await _packageService.GetSources();`
`91`	`91`	`var vms = new List<ISourceViewModelBase>();`
`92`	`92`
`93`		`- if (_configService.GetAppConfiguration().ShowAggregatedSourceView)`
	`93`	`+ if (_configService.GetAppConfiguration().ShowAggregatedSourceView ?? false)`
`94`	`94`	`{`
`95`	`95`	`vms.Add(_remoteSourceVmFactory(new ChocolateyAggregatedSources()));`
`96`	`96`	`vms.Add(new SourceSeparatorViewModel());`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public Task<ChocolateyDialogController> ShowChocolateyDialogAsync(`
`96`	`96`	`return Dispatcher.Invoke(async () =>`
`97`	`97`	`{`
`98`	`98`	`// create the dialog control`
`99`		`- var dialog = new ChocolateyDialog(this, _configService.GetAppConfiguration().ShowConsoleOutput)`
	`99`	`+ var dialog = new ChocolateyDialog(this, _configService.GetAppConfiguration().ShowConsoleOutput ?? false)`
`100`	`100`	`{`
`101`	`101`	`Title = title,`
`102`	`102`	`IsCancelable = isCancelable,`