Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-09-13 03:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

should not throw exceptions anymore

Browse Source
This commit is contained in:
4sval
2022-08-07 15:26:46 +02:00
parent 4a9327633f
commit 4931313636
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
FModel/ViewModels/ApiEndpoints/DynamicApiEndpoint.cs
View File

@@ -18,16 +18,10 @@ public class DynamicApiEndpoint : AbstractApiProvider
public async Task<AesResponse> GetAesKeysAsync(CancellationToken token, string url, string path)
{
var request = new FRestRequest(url)
{
OnBeforeDeserialization = resp => { resp.ContentType = "application/json; charset=utf-8"; }
};
var response = await _client.ExecuteAsync(request, token).ConfigureAwait(false);
var body = JToken.Parse(response.Content!);
Log.Information("[{Method}] [{Status}({StatusCode})] '{Resource}'", request.Method, response.StatusDescription, (int) response.StatusCode, response.ResponseUri?.OriginalString);
var body = await GetRequestBody(token, url).ConfigureAwait(false);
var tokens = body.SelectTokens(path);
var ret = new AesResponse { MainKey = Helper.FixKey(tokens.ElementAtOrDefault(0).ToString()) };
var ret = new AesResponse { MainKey = Helper.FixKey(tokens.ElementAtOrDefault(0)?.ToString()) };
if (tokens.ElementAtOrDefault(1) is JArray dynamicKeys)
{
foreach (var dynamicKey in dynamicKeys)
@@ -52,19 +46,13 @@ public class DynamicApiEndpoint : AbstractApiProvider
public async Task<MappingsResponse[]> GetMappingsAsync(CancellationToken token, string url, string path)
{
var request = new FRestRequest(url)
{
OnBeforeDeserialization = resp => { resp.ContentType = "application/json; charset=utf-8"; }
};
var response = await _client.ExecuteAsync(request, token).ConfigureAwait(false);
var body = JToken.Parse(response.Content!);
Log.Information("[{Method}] [{Status}({StatusCode})] '{Resource}'", request.Method, response.StatusDescription, (int) response.StatusCode, response.ResponseUri?.OriginalString);
var body = await GetRequestBody(token, url).ConfigureAwait(false);
var tokens = body.SelectTokens(path);
var ret = new MappingsResponse[] {new()};
ret[0].Url = tokens.ElementAtOrDefault(0).ToString();
ret[0].Url = tokens.ElementAtOrDefault(0)?.ToString();
if (tokens.ElementAtOrDefault(1) is not { } fileName)
fileName = ret[0].Url.SubstringAfterLast("/");
fileName = ret[0].Url?.SubstringAfterLast("/");
ret[0].FileName = fileName.ToString();
return ret;
}
@@ -73,4 +61,15 @@ public class DynamicApiEndpoint : AbstractApiProvider
{
return GetMappingsAsync(token, url, path).GetAwaiter().GetResult();
}
private async Task<JToken> GetRequestBody(CancellationToken token, string url)
{
var request = new FRestRequest(url)
{
OnBeforeDeserialization = resp => { resp.ContentType = "application/json; charset=utf-8"; }
};
var response = await _client.ExecuteAsync(request, token).ConfigureAwait(false);
Log.Information("[{Method}] [{Status}({StatusCode})] '{Resource}'", request.Method, response.StatusDescription, (int) response.StatusCode, response.ResponseUri?.OriginalString);
return string.IsNullOrEmpty(response.Content) ? JToken.Parse("{}") : JToken.Parse(response.Content);
}
}

2
FModel/Views/Resources/Controls/EndpointEditor.xaml.cs
View File

@@ -64,7 +64,7 @@ public partial class EndpointEditor
{
OnBeforeDeserialization = resp => { resp.ContentType = "application/json; charset=utf-8"; }
}).ConfigureAwait(false);
var body = JToken.Parse(response.Content!);
var body = string.IsNullOrEmpty(response.Content) ? JToken.Parse("{}") : JToken.Parse(response.Content);
Application.Current.Dispatcher.Invoke(delegate
{