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

JsonRPC camelCase and Case Insensitive

Browse source
This commit is contained in:
Kevin Zhang 2021-07-05 11:03:07 +08:00
parent d6ec4b51d5
commit 908d1c4124
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Flow.Launcher.Core/Plugin/JsonPRCModel.cs
View file

@ -30,12 +30,8 @@ namespace Flow.Launcher.Core.Plugin
public string Data { get; set; } public string Data { get; set; }
} }
public class JsonRPCModelBase
{
public int Id { get; set; }
}
public class JsonRPCResponseModel : JsonRPCModelBase public class JsonRPCResponseModel
{ {
public string Result { get; set; } public string Result { get; set; }
@ -49,18 +45,20 @@ namespace Flow.Launcher.Core.Plugin
public string DebugMessage { get; set; } public string DebugMessage { get; set; }
} }
public class JsonRPCRequestModel : JsonRPCModelBase public class JsonRPCRequestModel
{ {
[JsonPropertyName("method")]
public string Method { get; set; } public string Method { get; set; }
[JsonPropertyName("parameters")]
public object[] Parameters { get; set; } public object[] Parameters { get; set; }
private static readonly JsonSerializerOptions options = new()
{
PropertyNamingPolicy = JsonNamingPolicy.CamelCase
};
public override string ToString() public override string ToString()
{ {
return JsonSerializer.Serialize(this); return JsonSerializer.Serialize(this, options);
} }
} }
@ -77,7 +75,6 @@ namespace Flow.Launcher.Core.Plugin
/// </summary> /// </summary>
public class JsonRPCClientRequestModel : JsonRPCRequestModel public class JsonRPCClientRequestModel : JsonRPCRequestModel
{ {
[JsonPropertyName("dontHideAfterAction")]
public bool DontHideAfterAction { get; set; } public bool DontHideAfterAction { get; set; }
} }

9
Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs
View file

@ -47,8 +47,9 @@ namespace Flow.Launcher.Core.Plugin
} }
} }
private static readonly JsonSerializerOptions _options = new() private static readonly JsonSerializerOptions options = new()
{ {
PropertyNameCaseInsensitive = true,
Converters = Converters =
{ {
new JsonObjectConverter() new JsonObjectConverter()
@ -60,7 +61,7 @@ namespace Flow.Launcher.Core.Plugin
if (output == Stream.Null) return null; if (output == Stream.Null) return null;
var queryResponseModel = await var queryResponseModel = await
JsonSerializer.DeserializeAsync<JsonRPCQueryResponseModel>(output, _options); JsonSerializer.DeserializeAsync<JsonRPCQueryResponseModel>(output, options);
return ParseResults(queryResponseModel); return ParseResults(queryResponseModel);
} }
@ -70,7 +71,7 @@ namespace Flow.Launcher.Core.Plugin
if (string.IsNullOrEmpty(output)) return null; if (string.IsNullOrEmpty(output)) return null;
var queryResponseModel = var queryResponseModel =
JsonSerializer.Deserialize<JsonRPCQueryResponseModel>(output, _options); JsonSerializer.Deserialize<JsonRPCQueryResponseModel>(output, options);
return ParseResults(queryResponseModel); return ParseResults(queryResponseModel);
} }
@ -110,7 +111,7 @@ namespace Flow.Launcher.Core.Plugin
return !result.JsonRPCAction.DontHideAfterAction; return !result.JsonRPCAction.DontHideAfterAction;
} }
var jsonRpcRequestModel = JsonSerializer.Deserialize<JsonRPCRequestModel>(actionResponse, _options); var jsonRpcRequestModel = JsonSerializer.Deserialize<JsonRPCRequestModel>(actionResponse, options);
if (jsonRpcRequestModel?.Method?.StartsWith("Flow.Launcher.") ?? false) if (jsonRpcRequestModel?.Method?.StartsWith("Flow.Launcher.") ?? false)
{ {