Skip to content

Auto reindex #312

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 2 commits into from
Jan 24, 2021
Merged

Auto reindex #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e6961d
automatically check whether we shall reindex when querying
taooceros Jan 23, 2021
267c796
await indexing process in Program plugin
taooceros Jan 23, 2021
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
5 changes: 4 additions & 1 deletion Plugins/Flow.Launcher.Plugin.Program/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ public void Save()

public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
{
if (IsStartupIndexProgramsRequired)
_ = IndexPrograms();

Win32[] win32;
UWP.Application[] uwps;

Expand Down Expand Up @@ -147,7 +150,7 @@ public static async Task IndexPrograms()

var t2 = Task.Run(IndexUwpPrograms);

await Task.WhenAll(t1, t2);
await Task.WhenAll(t1, t2).ConfigureAwait(false);

_settings.LastIndexTime = DateTime.Today;
}
Expand Down
26 changes: 12 additions & 14 deletions Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ private void Setting_Loaded(object sender, RoutedEventArgs e)

private void ViewRefresh()
{
if(programSourceView.Items.Count == 0
if (programSourceView.Items.Count == 0
&& btnProgramSourceStatus.Visibility == Visibility.Visible
&& btnEditProgramSource.Visibility == Visibility.Visible)
{
Expand All @@ -70,21 +70,19 @@ private void ViewRefresh()
programSourceView.Items.Refresh();
}

private void ReIndexing()
private async void ReIndexing()
{
ViewRefresh();
Task.Run(() =>
{
Dispatcher.Invoke(() => { indexingPanel.Visibility = Visibility.Visible; });
Main.IndexPrograms();
Dispatcher.Invoke(() => { indexingPanel.Visibility = Visibility.Hidden; });
});

indexingPanel.Visibility = Visibility.Visible;
await Main.IndexPrograms();
indexingPanel.Visibility = Visibility.Hidden;
}

private void btnAddProgramSource_OnClick(object sender, RoutedEventArgs e)
{
var add = new AddProgramSource(context, _settings);
if(add.ShowDialog() ?? false)
if (add.ShowDialog() ?? false)
{
ReIndexing();
}
Expand Down Expand Up @@ -165,14 +163,14 @@ private void programSourceView_Drop(object sender, DragEventArgs e)
UniqueIdentifier = directory
};

directoriesToAdd.Add(source);
directoriesToAdd.Add(source);
}
}

if (directoriesToAdd.Count() > 0)
{
directoriesToAdd.ForEach(x => _settings.ProgramSources.Add(x));
directoriesToAdd.ForEach(x => ProgramSettingDisplayList.Add(x));
directoriesToAdd.ForEach(x => ProgramSettingDisplayList.Add(x));

ViewRefresh();
ReIndexing();
Expand Down Expand Up @@ -238,8 +236,8 @@ private void btnProgramSourceStatus_OnClick(object sender, RoutedEventArgs e)
ProgramSettingDisplayList.SetProgramSourcesStatus(selectedItems, true);

ProgramSettingDisplayList.RemoveDisabledFromSettings();
}
}

if (selectedItems.IsReindexRequired())
ReIndexing();

Expand Down Expand Up @@ -282,7 +280,7 @@ private void GridViewColumnHeaderClickedHandler(object sender, RoutedEventArgs e
var sortBy = columnBinding?.Path.Path ?? headerClicked.Column.Header as string;

Sort(sortBy, direction);

_lastHeaderClicked = headerClicked;
_lastDirection = direction;
}
Expand Down