admin/LehrerApp
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Untis-API: Download Bug behoben

Browse Source
This commit is contained in:
admin
2026-08-24 22:06:42 +02:00
parent 34a9fdf73b
commit 1db16f8b69
3 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LehrerApp.WebUntis/WebUntisClient.cs
+33 -3
View File
@@ -417,7 +417,7 @@ public sealed class WebUntisClient : IAsyncDisposable
}
if (!TryProperty(payload, "data", out var data) || data.ValueKind != JsonValueKind.Object ||
(TryProperty(data, "error", out var reportError) && reportError.ValueKind is not JsonValueKind.Null and not JsonValueKind.Undefined))
(TryProperty(data, "error", out var reportError) && HasErrorValue(reportError)))
throw new WebUntisException($"Report-Anfrage fehlgeschlagen: {ErrorMessage(payload, response)}");
if (!OptionalBoolean(data, "finished")) return null;
return ReportData.From(data);
@@ -646,6 +646,19 @@ public sealed class WebUntisClient : IAsyncDisposable
(string.Equals(value.GetString(), "true", StringComparison.OrdinalIgnoreCase) || value.GetString() == "1");
}
private static bool HasErrorValue(JsonElement value) => value.ValueKind switch
{
JsonValueKind.Null or JsonValueKind.Undefined or JsonValueKind.False => false,
JsonValueKind.True => true,
JsonValueKind.String => !string.IsNullOrWhiteSpace(value.GetString()) &&
!string.Equals(value.GetString(), "false", StringComparison.OrdinalIgnoreCase) &&
value.GetString() != "0",
JsonValueKind.Number => !value.TryGetInt32(out var number) || number != 0,
JsonValueKind.Array => value.GetArrayLength() > 0,
JsonValueKind.Object => value.EnumerateObject().Any(),
_ => true,
};
private static string ErrorMessage(JsonElement payload, HttpResponseMessage response)
{
if (payload.ValueKind == JsonValueKind.String) return payload.GetString() ?? "Unerwartete Antwort.";
@@ -654,8 +667,25 @@ public sealed class WebUntisClient : IAsyncDisposable
if (TryProperty(payload, "error", out var error) && OptionalString(error, "message") is { } errorMessage)
return errorMessage;
if (OptionalString(payload, "message") is { } message) return message;
if (TryProperty(payload, "data", out var data) && OptionalString(data, "message") is { } dataMessage)
return dataMessage;
if (TryProperty(payload, "data", out var data))
{
if (OptionalString(data, "message") is { } dataMessage) return dataMessage;
if (data.ValueKind == JsonValueKind.Object)
{
var dataFields = data.EnumerateObject().Select(property => property.Name).Take(8).ToArray();
if (dataFields.Length > 0)
return $"HTTP {(int)response.StatusCode}; unerwartete data-Felder: " +
$"{string.Join(", ", dataFields)}.";
}
else
{
return $"HTTP {(int)response.StatusCode}; data hat den Typ {data.ValueKind}.";
}
}
var fields = payload.EnumerateObject().Select(property => property.Name).Take(8).ToArray();
return fields.Length == 0
? $"HTTP {(int)response.StatusCode}; leeres JSON-Objekt."
: $"HTTP {(int)response.StatusCode}; unerwartete JSON-Felder: {string.Join(", ", fields)}.";
}
return response.IsSuccessStatusCode ? "Unerwartete JSON-Antwort." : $"HTTP {(int)response.StatusCode}";
}