Skip to content

Commit 46bd1c4

Browse files
authored
Enable search on home to search all drives (#5969)
1 parent 8c0f09e commit 46bd1c4

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

Files/Filesystem/Search/FolderSearch.cs

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,11 @@ public async Task SearchAsync(IList<ListedItem> results, CancellationToken token
6161
{
6262
if (App.LibraryManager.TryGetLibrary(Folder, out var library))
6363
{
64-
await AddItemsAsync(library, results, token);
64+
await AddItemsAsyncForLibrary(library, results, token);
65+
}
66+
else if (Folder == "Home".GetLocalized())
67+
{
68+
await AddItemsAsyncForHome(results, token);
6569
}
6670
else
6771
{
@@ -74,6 +78,14 @@ public async Task SearchAsync(IList<ListedItem> results, CancellationToken token
7478
}
7579
}
7680

81+
private async Task AddItemsAsyncForHome(IList<ListedItem> results, CancellationToken token)
82+
{
83+
foreach (var drive in App.DrivesManager.Drives.Where(x => !x.IsNetwork))
84+
{
85+
await AddItemsAsync(drive.Path, results, token);
86+
}
87+
}
88+
7789
public async Task<ObservableCollection<ListedItem>> SearchAsync()
7890
{
7991
ObservableCollection<ListedItem> results = new ObservableCollection<ListedItem>();
@@ -82,7 +94,11 @@ public async Task<ObservableCollection<ListedItem>> SearchAsync()
8294
var token = new CancellationTokenSource().Token;
8395
if (App.LibraryManager.TryGetLibrary(Folder, out var library))
8496
{
85-
await AddItemsAsync(library, results, token);
97+
await AddItemsAsyncForLibrary(library, results, token);
98+
}
99+
else if (Folder == "Home".GetLocalized())
100+
{
101+
await AddItemsAsyncForHome(results, token);
86102
}
87103
else
88104
{
@@ -137,7 +153,7 @@ private async Task SearchAsync(BaseStorageFolder folder, IList<ListedItem> resul
137153
}
138154
}
139155

140-
private async Task AddItemsAsync(LibraryLocationItem library, IList<ListedItem> results, CancellationToken token)
156+
private async Task AddItemsAsyncForLibrary(LibraryLocationItem library, IList<ListedItem> results, CancellationToken token)
141157
{
142158
foreach (var folder in library.Folders)
143159
{

Files/UserControls/NavigationToolbar.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,6 @@
484484
VerticalAlignment="Center"
485485
Canvas.ZIndex="100"
486486
CornerRadius="{StaticResource ControlCornerRadius}"
487-
IsEnabled="{x:Bind ViewModel.InstanceViewModel.IsPageTypeNotHome, Mode=OneWay}"
488487
LostFocus="SearchRegion_LostFocus"
489488
SearchBoxViewModel="{x:Bind ViewModel.SearchBoxViewModel, Mode=OneWay}"
490489
Visibility="{x:Bind converters:MultiBooleanConverter.OrConvertToVisibility(ShowSearchBox, ViewModel.IsSearchBoxVisible), Mode=OneWay}">

0 commit comments

Comments
 (0)