aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Aaru linked dependencies to v6.0.0-alpha.10.

Browse Source
This commit is contained in:
Natalia Portillo
2025-04-27 12:01:17 +01:00
parent 94d330fe88
commit f7a1a134ba
11 changed files with 4627 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Aaru.Server.New/Controllers/UploadReportController.cs
View File

@@ -33,7 +33,6 @@
using System.Diagnostics;
using System.Net;
using System.Text;
using System.Xml.Serialization;
using Aaru.CommonTypes.Metadata;
using Aaru.Server.Database.Models;
using Cinchoo.PGP;
@@ -65,57 +64,12 @@ public sealed class UploadReportController : ControllerBase
{
var response = new ContentResult
{
StatusCode = (int)HttpStatusCode.OK,
ContentType = "text/plain"
StatusCode = (int)HttpStatusCode.InternalServerError,
ContentType = "text/plain",
Content = "error"
};
try
{
var newReport = new DeviceReport();
HttpRequest request = HttpContext.Request;
var xs = new XmlSerializer(newReport.GetType());
newReport =
(DeviceReport)xs.Deserialize(new StringReader(await new StreamReader(request.Body).ReadToEndAsync()));
if(newReport == null)
{
response.Content = "notstats";
return response;
}
var reportV2 = new DeviceReportV2(newReport);
var jsonSw = new StringWriter();
await jsonSw.WriteAsync(JsonConvert.SerializeObject(reportV2,
Formatting.Indented,
new JsonSerializerSettings
{
NullValueHandling = NullValueHandling.Ignore
}));
var reportV2String = jsonSw.ToString();
jsonSw.Close();
await SaveReport(reportV2, reportV2String);
response.Content = "ok";
return response;
}
// ReSharper disable once RedundantCatchClause
catch
{
#if DEBUG
if(Debugger.IsAttached) throw;
#endif
response.Content = "error";
return response;
}
return response;
}
/// <summary>Receives a report from Aaru.Core, verifies it's in the correct format and stores it on the server</summary>
@@ -134,9 +88,9 @@ public sealed class UploadReportController : ControllerBase
{
HttpRequest request = HttpContext.Request;
var sr = new StreamReader(request.Body);
string reportJson = await sr.ReadToEndAsync();
DeviceReportV2 newReport = JsonConvert.DeserializeObject<DeviceReportV2>(reportJson);
var sr = new StreamReader(request.Body);
string reportJson = await sr.ReadToEndAsync();
DeviceReport newReport = JsonConvert.DeserializeObject<DeviceReport>(reportJson);
if(newReport == null)
{
@@ -164,7 +118,7 @@ public sealed class UploadReportController : ControllerBase
}
}
async Task SaveReport(DeviceReportV2 newReport, string reportJson)
async Task SaveReport(DeviceReport newReport, string reportJson)
{
var newUploadedReport = new UploadedReport(newReport);