prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

add membernotnull attribute and small refactor

Browse source
This commit is contained in:
Hongtao Zhang 2022-12-04 11:38:19 -06:00
parent 281f4db5f8
commit c6a47b0b9e
No known key found for this signature in database
GPG key ID: 75F655B91C7AC9BB
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Plugins/Flow.Launcher.Plugin.Explorer/Main.cs
View file

@ -1,14 +1,11 @@
using Flow.Launcher.Infrastructure.Storage;
using Flow.Launcher.Plugin.Explorer.Helper;
using Flow.Launcher.Plugin.Explorer.Helper;
using Flow.Launcher.Plugin.Explorer.Search;
using Flow.Launcher.Plugin.Explorer.Search.Everything;
using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks;
using Flow.Launcher.Plugin.Explorer.ViewModels;
using Flow.Launcher.Plugin.Explorer.Views;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
@ -55,7 +52,7 @@ namespace Flow.Launcher.Plugin.Explorer
Settings.EverythingInstalledPath = s.Result;
}, TaskScheduler.Default);
}
SortOptionTranslationHelper.API = context.API;
EverythingApiDllImport.Load(Path.Combine(Context.CurrentPluginMetadata.PluginDirectory, "EverythingSDK",

18
Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
View file

@ -8,6 +8,7 @@ using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Linq;
using System.Windows;
@ -82,15 +83,21 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels
}
}
[MemberNotNull(nameof(IndexSearchEngines),
nameof(ContentIndexSearchEngines),
nameof(PathEnumerationEngines),
nameof(_selectedIndexSearchEngine),
nameof(_selectedContentSearchEngine),
nameof(_selectedPathEnumerationEngine))]
private void InitializeEngineSelection()
{
IndexSearchEngines = EnumBindingModel<Settings.IndexSearchEngineOption>.CreateList();
ContentIndexSearchEngines = EnumBindingModel<Settings.ContentIndexSearchEngineOption>.CreateList();
PathEnumerationEngines = EnumBindingModel<Settings.PathEnumerationEngineOption>.CreateList();
SelectedIndexSearchEngine = IndexSearchEngines.First(x => x.Value == Settings.IndexSearchEngine);
SelectedContentSearchEngine = ContentIndexSearchEngines.First(x => x.Value == Settings.ContentSearchEngine);
SelectedPathEnumerationEngine = PathEnumerationEngines.First(x => x.Value == Settings.PathEnumerationEngine);
_selectedIndexSearchEngine = IndexSearchEngines.First(x => x.Value == Settings.IndexSearchEngine);
_selectedContentSearchEngine = ContentIndexSearchEngines.First(x => x.Value == Settings.ContentSearchEngine);
_selectedPathEnumerationEngine = PathEnumerationEngines.First(x => x.Value == Settings.PathEnumerationEngine);
}
#endregion
@ -99,6 +106,7 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels
#region ActionKeyword
[MemberNotNull(nameof(ActionKeywordsModels))]
private void InitializeActionKeywordModels()
{
ActionKeywordsModels = new List<ActionKeywordModel>
@ -307,7 +315,7 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels
Process.Start(psi);
}
private ICommand _openEditorPathCommand;
private ICommand? _openEditorPathCommand;
public ICommand OpenEditorPath => _openEditorPathCommand ??= new RelayCommand(_ =>
{
@ -318,7 +326,7 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels
EditorPath = path;
});
private ICommand _openShellPathCommand;
private ICommand? _openShellPathCommand;
public ICommand OpenShellPath => _openShellPathCommand ??= new RelayCommand(_ =>
{