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

Merge pull request #556 from taooceros/JsonCaseInsensitive

Browse source 
JsonRPC camelCase and Case Insensitive
This commit is contained in:
Jeremy Wu 2021-07-05 18:42:01 +10:00 committed by GitHub
commit dd2f84a42f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 16 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 class JsonRPCModelBase
{
public int Id { get; set; }
}
public class JsonRPCResponseModel : JsonRPCModelBase
public class JsonRPCResponseModel
{
public string Result { get; set; }
@ -49,18 +45,20 @@ namespace Flow.Launcher.Core.Plugin
public string DebugMessage { get; set; }
}
public class JsonRPCRequestModel : JsonRPCModelBase
public class JsonRPCRequestModel
{
[JsonPropertyName("method")]
public string Method { get; set; }
[JsonPropertyName("parameters")]
public object[] Parameters { get; set; }
private static readonly JsonSerializerOptions options = new()
{
PropertyNamingPolicy = JsonNamingPolicy.CamelCase
};
public override string ToString()
{
return JsonSerializer.Serialize(this);
return JsonSerializer.Serialize(this, options);
}
}
@ -77,7 +75,6 @@ namespace Flow.Launcher.Core.Plugin
/// </summary>
public class JsonRPCClientRequestModel : JsonRPCRequestModel
{
[JsonPropertyName("dontHideAfterAction")]
public bool DontHideAfterAction { get; set; }
}

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

@ -47,8 +47,10 @@ namespace Flow.Launcher.Core.Plugin
}
}
private static readonly JsonSerializerOptions _options = new()
private static readonly JsonSerializerOptions options = new()
{
PropertyNameCaseInsensitive = true,
IgnoreNullValues = true,
Converters =
{
new JsonObjectConverter()
@ -60,8 +62,10 @@ namespace Flow.Launcher.Core.Plugin
if (output == Stream.Null) return null;
var queryResponseModel = await
JsonSerializer.DeserializeAsync<JsonRPCQueryResponseModel>(output, _options);
JsonSerializer.DeserializeAsync<JsonRPCQueryResponseModel>(output, options);
await output.DisposeAsync();
return ParseResults(queryResponseModel);
}
@ -70,7 +74,7 @@ namespace Flow.Launcher.Core.Plugin
if (string.IsNullOrEmpty(output)) return null;
var queryResponseModel =
JsonSerializer.Deserialize<JsonRPCQueryResponseModel>(output, _options);
JsonSerializer.Deserialize<JsonRPCQueryResponseModel>(output, options);
return ParseResults(queryResponseModel);
}
@ -110,7 +114,7 @@ namespace Flow.Launcher.Core.Plugin
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)
{

7
Flow.Launcher/Storage/UserSelectedRecord.cs
View file

@ -28,6 +28,11 @@ namespace Flow.Launcher.Storage
private static int GenerateStaticHashCode(string s, int start = HASH_INITIAL)
{
if (s == null)
{
return start;
}
unchecked
{
// skip the empty space
@ -101,4 +106,4 @@ namespace Flow.Launcher.Storage
return selectedCount;
}
}
}
}