Skip to content

Pass MaxResult setting to EverythingApi #2874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 12, 2024
Merged

Pass MaxResult setting to EverythingApi #2874

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2e078d7
Pass MaxResult setting to EverythingApi
Ishmaeel Aug 3, 2024
578b4cb
Add UI for Explorer plugin's MaxResult setting
Ishmaeel Aug 5, 2024
b181e0f
Update min to 100, remove redundant minmax, add binding delay
Ishmaeel Aug 8, 2024
df07a64
Convert MaxResult editor to TextBox
Ishmaeel Aug 10, 2024
9285b9c
Add numeric input restriction
Ishmaeel Aug 10, 2024
785b365
Add maxlength
Ishmaeel Aug 10, 2024
8b7b5b5
Merge branch 'Flow-Launcher:dev' into ishmaeel_2873
Ishmaeel Aug 11, 2024
672854b
Merge branch 'Flow-Launcher:dev' into ishmaeel_2873
Ishmaeel Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
Expand Down Expand Up @@ -48,6 +48,7 @@
<PackageReference Include="System.Data.OleDb" Version="8.0.0" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
<PackageReference Include="tlbimp-Microsoft.Search.Interop" Version="1.0.0" />
<PackageReference Include="ModernWpfUI" Version="0.9.4" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@
<system:String x:Key="plugin_explorer_Open_Window_Index_Option">Open Windows Index Option</system:String>
<system:String x:Key="plugin_explorer_Excluded_File_Types">Excluded File Types (comma seperated)</system:String>
<system:String x:Key="plugin_explorer_Excluded_File_Types_Tooltip">For example: exe,jpg,png</system:String>
<system:String x:Key="plugin_explorer_Maximum_Results">Maximum results</system:String>
<system:String x:Key="plugin_explorer_Maximum_Results_Tooltip">The maximum number of results requested from active search engine</system:String>

<!-- Plugin Infos -->
<system:String x:Key="plugin_explorer_plugin_name">Explorer</system:String>
Expand Down
8 changes: 7 additions & 1 deletion Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingSearchManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ public async IAsyncEnumerable<SearchResult> SearchAsync(string search, [Enumerat
if (token.IsCancellationRequested)
yield break;

var option = new EverythingSearchOption(search, Settings.SortOption, IsFullPathSearch: Settings.EverythingSearchFullPath, IsRunCounterEnabled: Settings.EverythingEnableRunCount);
var option = new EverythingSearchOption(search,
Settings.SortOption,
MaxCount: Settings.MaxResult,
IsFullPathSearch: Settings.EverythingSearchFullPath,
IsRunCounterEnabled: Settings.EverythingEnableRunCount);

await foreach (var result in EverythingApi.SearchAsync(option, token))
yield return result;
Expand Down Expand Up @@ -96,6 +100,7 @@ public async IAsyncEnumerable<SearchResult> ContentSearchAsync(string plainSearc
Settings.SortOption,
IsContentSearch: true,
ContentSearchKeyword: contentSearch,
MaxCount: Settings.MaxResult,
IsFullPathSearch: Settings.EverythingSearchFullPath,
IsRunCounterEnabled: Settings.EverythingEnableRunCount);

Expand All @@ -116,6 +121,7 @@ public async IAsyncEnumerable<SearchResult> EnumerateAsync(string path, string s
Settings.SortOption,
ParentPath: path,
IsRecursive: recursive,
MaxCount: Settings.MaxResult,
IsFullPathSearch: Settings.EverythingSearchFullPath,
IsRunCounterEnabled: Settings.EverythingEnableRunCount);

Expand Down
10 changes: 10 additions & 0 deletions Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,16 @@ public string ExcludedFileTypes
}
}

public int MaxResult
{
get => Settings.MaxResult;
set
{
Settings.MaxResult = Math.Clamp(value, 0, 10000);
OnPropertyChanged();
}
}


#region Everything FastSortWarning

Expand Down
22 changes: 22 additions & 0 deletions Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<TextBlock
Grid.Row="0"
Expand Down Expand Up @@ -348,6 +349,27 @@
Margin="0,9,0,6"
ToolTip="{DynamicResource plugin_explorer_Excluded_File_Types_Tooltip}"
Text="{Binding ExcludedFileTypes}" />
<TextBlock
Grid.Row="4"
Grid.Column="0"
Margin="0 15 20 0"
VerticalAlignment="Center"
Text="{DynamicResource plugin_explorer_Maximum_Results}"
TextBlock.Foreground="{DynamicResource Color05B}" />
<ui:NumberBox
Grid.Row="4"
Grid.Column="1"
MinWidth="350"
Maximum="10000"
Minimum="0"
Margin="0,9,0,6"
HorizontalAlignment="Left"
VerticalAlignment="Center"
CornerRadius="4"
SmallChange="10"
SpinButtonPlacementMode="Inline"
Value="{Binding MaxResult}"
ToolTip="{DynamicResource plugin_explorer_Maximum_Results_Tooltip}"/>
</Grid>
</StackPanel>
<StackPanel Orientation="Horizontal">
Expand Down