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

Move storage to api call for websearch and calculator plugins

Browse source
This commit is contained in:
张弘韬 2021-05-12 19:38:29 +08:00
parent a9695e3119
commit 358460cb22
6 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Flow.Launcher.Infrastructure/Storage/PluginJsonStorage.cs
View file

@ -9,7 +9,7 @@ namespace Flow.Launcher.Infrastructure.Storage
{
// C# related, add python related below
var dataType = typeof(T);
var assemblyName = typeof(T).Assembly.GetName().Name;
var assemblyName = dataType.Assembly.GetName().Name;
DirectoryPath = Path.Combine(DataLocation.DataDirectory(), DirectoryName, Constant.Plugins, assemblyName);
Helper.ValidateDirectory(DirectoryPath);

5
Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
View file

@ -33,9 +33,8 @@ namespace Flow.Launcher.Plugin.Caculator
public void Init(PluginInitContext context)
{
Context = context;
_viewModel = new SettingsViewModel();
_settings = _viewModel.Settings;
_settings = context.API.LoadJsonStorage<Settings>();
_viewModel = new SettingsViewModel(_settings);
MagesEngine = new Engine(new Configuration
{

9
Plugins/Flow.Launcher.Plugin.Calculator/ViewModels/SettingsViewModel.cs
View file

@ -10,15 +10,12 @@ namespace Flow.Launcher.Plugin.Caculator.ViewModels
{
public class SettingsViewModel : BaseModel
{
private readonly PluginJsonStorage<Settings> _storage;
public SettingsViewModel()
public SettingsViewModel(Settings settings)
{
_storage = new PluginJsonStorage<Settings>();
Settings = _storage.Load();
Settings = settings;
}
public Settings Settings { get; set; }
public Settings Settings { get; init; }
public IEnumerable<int> MaxDecimalPlacesRange => Enumerable.Range(1, 20);
}

3
Plugins/Flow.Launcher.Plugin.PluginsManager/ViewModels/SettingsViewModel.cs
View file

@ -5,8 +5,6 @@ namespace Flow.Launcher.Plugin.PluginsManager.ViewModels
{
internal class SettingsViewModel
{
private readonly PluginJsonStorage<Settings> storage;
internal Settings Settings { get; set; }
internal PluginInitContext Context { get; set; }
@ -14,7 +12,6 @@ namespace Flow.Launcher.Plugin.PluginsManager.ViewModels
public SettingsViewModel(PluginInitContext context, Settings settings)
{
Context = context;
storage = new PluginJsonStorage<Settings>();
Settings = settings;
}
}

14
Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs
View file

@ -18,8 +18,8 @@ namespace Flow.Launcher.Plugin.WebSearch
{
private PluginInitContext _context;
private readonly Settings _settings;
private readonly SettingsViewModel _viewModel;
private Settings _settings;
private SettingsViewModel _viewModel;
internal const string Images = "Images";
internal static string DefaultImagesDirectory;
@ -160,12 +160,6 @@ namespace Flow.Launcher.Plugin.WebSearch
return new List<Result>();
}
public Main()
{
_viewModel = new SettingsViewModel();
_settings = _viewModel.Settings;
}
public Task InitAsync(PluginInitContext context)
{
return Task.Run(Init);
@ -173,6 +167,10 @@ namespace Flow.Launcher.Plugin.WebSearch
void Init()
{
_context = context;
_settings = _context.API.LoadJsonStorage<Settings>();
_viewModel = new SettingsViewModel(_settings);
var pluginDirectory = _context.CurrentPluginMetadata.PluginDirectory;
var bundledImagesDirectory = Path.Combine(pluginDirectory, Images);

7
Plugins/Flow.Launcher.Plugin.WebSearch/SettingsViewModel.cs
View file

@ -6,13 +6,12 @@ namespace Flow.Launcher.Plugin.WebSearch
{
private readonly PluginJsonStorage<Settings> _storage;
public SettingsViewModel()
public SettingsViewModel(Settings settings)
{
_storage = new PluginJsonStorage<Settings>();
Settings = _storage.Load();
Settings = settings;
}
public Settings Settings { get; set; }
public Settings Settings { get; }
public void Save()
{