Skip to content
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

Improve JsonRPC plugin settings #2430

Merged
merged 8 commits into from
Nov 21, 2023
Merged

Improve JsonRPC plugin settings #2430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1cafae8
Allow nullable for Configuration
Garulf Nov 18, 2023
93100c0
Remove missing template file short circuit logic
Garulf Nov 18, 2023
b67e815
Load template file only if exists
Garulf Nov 18, 2023
388688e
Short circuit template UI process if doesn't exist
Garulf Nov 18, 2023
ba9aba2
Allow new setting keys to be instantiated
Garulf Nov 18, 2023
5c90946
Save to file on update
Garulf Nov 18, 2023
a86e7bc
Remove save function from loop
Garulf Nov 19, 2023
9275421
Merge branch 'dev' into Allow-SettingsChange-without-template-file
Garulf Nov 19, 2023
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
15 changes: 8 additions & 7 deletions Flow.Launcher.Core/Plugin/JsonRPCPluginBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,15 @@ protected void ExecuteFlowLauncherAPI(string method, object[] parameters)

private async Task InitSettingAsync()
{
if (!File.Exists(SettingConfigurationPath))
return;
JsonRpcConfigurationModel configuration = null;
if (File.Exists(SettingConfigurationPath))
{
var deserializer = new DeserializerBuilder().WithNamingConvention(CamelCaseNamingConvention.Instance).Build();
configuration =
deserializer.Deserialize<JsonRpcConfigurationModel>(
await File.ReadAllTextAsync(SettingConfigurationPath));
}

var deserializer = new DeserializerBuilder().WithNamingConvention(CamelCaseNamingConvention.Instance)
.Build();
var configuration =
deserializer.Deserialize<JsonRpcConfigurationModel>(
await File.ReadAllTextAsync(SettingConfigurationPath));

Settings ??= new JsonRPCPluginSettings
{
Expand Down
13 changes: 8 additions & 5 deletions Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Flow.Launcher.Core.Plugin
{
public class JsonRPCPluginSettings
{
public required JsonRpcConfigurationModel Configuration { get; init; }
public required JsonRpcConfigurationModel? Configuration { get; init; }

public required string SettingPath { get; init; }
public Dictionary<string, FrameworkElement> SettingControls { get; } = new();
Expand All @@ -37,6 +37,11 @@ public async Task InitializeAsync()
_storage = new JsonStorage<ConcurrentDictionary<string, object>>(SettingPath);
Settings = await _storage.LoadAsync();

if (Settings != null)
{
return;
}

foreach (var (type, attributes) in Configuration.Body)
{
if (attributes.Name == null)
Expand All @@ -59,10 +64,7 @@ public void UpdateSettings(IReadOnlyDictionary<string, object> settings)

foreach (var (key, value) in settings)
{
if (Settings.ContainsKey(key))
{
Settings[key] = value;
}
Settings[key] = value;

if (SettingControls.TryGetValue(key, out var control))
{
Expand All @@ -83,6 +85,7 @@ public void UpdateSettings(IReadOnlyDictionary<string, object> settings)
}
}
}
Save();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry another thoughts that why didn't we keep this consistent with other plugins. Save only be called when manually triggered or flow being closed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess just personal preference. It feels off to not save to file on change.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah ok

}

public async Task SaveAsync()
Expand Down
Loading