(GH-588) Add option to search packages in all available repositories

chocolatey · Jan 26, 2019 · b200c1a · b200c1a · mwallner · Jan 26, 2019
1 parent 6cabc8c
commit b200c1a
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 4 deletions.
diff --git a/Source/ChocolateyGui/Models/AppConfiguration.cs b/Source/ChocolateyGui/Models/AppConfiguration.cs
@@ -17,5 +17,7 @@ public class AppConfiguration
         public bool DefaultToTileViewForRemoteSource { get; set; }
 
         public bool UseDelayedSearch { get; set; }
+
+        public bool SearchInAllRepositories { get; set; }
     }
 }
diff --git a/Source/ChocolateyGui/Models/PackageSearchOptions.cs b/Source/ChocolateyGui/Models/PackageSearchOptions.cs
@@ -15,7 +15,8 @@ public struct PackageSearchOptions
             bool includePrerelease,
             bool includeAllVersions,
             bool matchWord,
-            string source)
+            string source,
+            bool searchInALlRepos)
             : this()
         {
             PageSize = pageSize;
@@ -25,6 +26,7 @@ public struct PackageSearchOptions
             IncludePrerelease = includePrerelease;
             MatchQuery = matchWord;
             Source = source;
+            SearchInAllRepos = searchInALlRepos;
         }
 
         public int CurrentPage { get; set;  }
@@ -33,6 +35,8 @@ public struct PackageSearchOptions
 
         public bool IncludePrerelease { get; set; }
 
+        public bool SearchInAllRepos { get; set; }
+
         public bool MatchQuery { get; set; }
 
         public string Source { get; set; }

diff --git a/Source/ChocolateyGui/Properties/Resources.Designer.cs b/Source/ChocolateyGui/Properties/Resources.Designer.cs
diff --git a/Source/ChocolateyGui/Properties/Resources.resx b/Source/ChocolateyGui/Properties/Resources.resx
@@ -642,4 +642,7 @@ NOTE: Probably only necessary to change in RTL languages.</comment>
   <data name="PackageView_Version" xml:space="preserve">
     <value>Version</value>
   </data>
+  <data name="SettingsView_SearchInAllRepos" xml:space="preserve">
+    <value>Search in all Repos</value>
+  </data>
 </root>
diff --git a/Source/ChocolateyGui/Services/ChocolateyService.cs b/Source/ChocolateyGui/Services/ChocolateyService.cs
@@ -164,7 +164,10 @@ public async Task<PackageResults> Search(string query, PackageSearchOptions opti
                             config.ListCommand.Exact = options.MatchQuery;
                             if (!string.IsNullOrWhiteSpace(options.Source))
                             {
-                                config.Sources = options.Source;
+                                if (string.IsNullOrEmpty(query) || !options.SearchInAllRepos)
+                                {
+                                    config.Sources = options.Source;
+                                }
                             }
 #if !DEBUG
                             config.Verbose = false;

diff --git a/Source/ChocolateyGui/ViewModels/RemoteSourceViewModel.cs b/Source/ChocolateyGui/ViewModels/RemoteSourceViewModel.cs
@@ -232,7 +232,8 @@ public async Task LoadPackages()
                                     IncludePrerelease,
                                     IncludeAllVersions,
                                     MatchWord,
-                                    Source.Value));
+                                    Source.Value,
+                                    _configService.GetSettings().SearchInAllRepositories));
                     var installed = await _chocolateyPackageService.GetInstalledPackages();
                     var outdated = await _chocolateyPackageService.GetOutdatedPackages();
 

diff --git a/Source/ChocolateyGui/ViewModels/SettingsViewModel.cs b/Source/ChocolateyGui/ViewModels/SettingsViewModel.cs
@@ -32,7 +32,8 @@ public sealed class SettingsViewModel : Screen
                                                                            nameof(ShowConsoleOutput),
                                                                            nameof(DefaultToTileViewForLocalSource),
                                                                            nameof(DefaultToTileViewForRemoteSource),
-                                                                           nameof(UseDelayedSearch)
+                                                                           nameof(UseDelayedSearch),
+                                                                           nameof(SearchInAllRepositories)
                                                                        };
 
         private readonly IChocolateyService _packageService;
@@ -126,6 +127,20 @@ public bool UseDelayedSearch
             }
         }
 
+        public bool SearchInAllRepositories
+        {
+            get
+            {
+                return _config.SearchInAllRepositories;
+            }
+
+            set
+            {
+                _config.SearchInAllRepositories = value;
+                NotifyOfPropertyChange();
+            }
+        }
+
         public bool CanSave => SelectedSource != null;
 
         public bool CanRemove => SelectedSource != null && !_isNewItem;

diff --git a/Source/ChocolateyGui/Views/SettingsView.xaml b/Source/ChocolateyGui/Views/SettingsView.xaml
@@ -49,6 +49,7 @@
                             <metro:ToggleSwitch Header="{x:Static lang:Resources.SettingsView_ToggleDefaultTileViewLocal}" IsChecked="{Binding DefaultToTileViewForLocalSource}"/>
                             <metro:ToggleSwitch Header="{x:Static lang:Resources.SettingsView_ToggleDefaultTileViewRemote}" IsChecked="{Binding DefaultToTileViewForRemoteSource}"/>
                             <metro:ToggleSwitch Header="{x:Static lang:Resources.SettingsView_UseDelayedSearch}" IsChecked="{Binding UseDelayedSearch}" />
+                            <metro:ToggleSwitch Header="{x:Static lang:Resources.SettingsView_SearchInAllRepos}" IsChecked="{Binding SearchInAllRepositories}" />
                         </StackPanel>
                     </Grid>
                     <Grid Grid.Column="1" Background="White" Margin="5">