SolarNetwork/Swarm
2
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fix issues cause by new data structure between services of drive

Browse Source
This commit is contained in:
LittleSheep
2026-01-12 23:45:32 +08:00
parent c11bf579c4
commit 87d9267285
4 changed files with 118 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
DysonNetwork.Shared/Models/CloudFileReferenceObject.cs
View File

@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using System.Text.Json;
using DysonNetwork.Shared.Proto;
namespace DysonNetwork.Shared.Models;
@@ -44,12 +45,16 @@ public class SnCloudFileReferenceObject : ModelBase, ICloudFile
public static SnCloudFileReferenceObject FromProtoValue(Proto.CloudFile proto)
{
var fileMeta = proto.Object != null
? ConvertObjectToDictionary(proto.Object.Meta)
: ConvertToDictionary(proto.FileMeta);
return new SnCloudFileReferenceObject
{
Id = proto.Id,
Name = proto.Name,
FileMeta = GrpcTypeHelper.ConvertByteStringToObject<Dictionary<string, object?>>(proto.FileMeta) ?? [],
UserMeta = GrpcTypeHelper.ConvertByteStringToObject<Dictionary<string, object?>>(proto.UserMeta) ?? [],
FileMeta = fileMeta,
UserMeta = ConvertToDictionary(proto.UserMeta),
SensitiveMarks = proto.HasSensitiveMarks
? GrpcTypeHelper.ConvertByteStringToObject<List<ContentSensitiveMark>>(proto.SensitiveMarks)
: [],
@@ -64,6 +69,65 @@ public class SnCloudFileReferenceObject : ModelBase, ICloudFile
};
}
private static Dictionary<string, object?> ConvertObjectToDictionary(Google.Protobuf.ByteString byteString)
{
if (byteString.IsEmpty)
return [];
var jsonElement = GrpcTypeHelper.ConvertByteStringToObject<JsonElement>(byteString);
if (jsonElement.ValueKind != JsonValueKind.Object)
return [];
var result = new Dictionary<string, object?>();
foreach (var property in jsonElement.EnumerateObject())
{
result[property.Name] = ConvertJsonElement(property.Value);
}
return result;
}
private static Dictionary<string, object?> ConvertToDictionary(Google.Protobuf.ByteString byteString)
{
if (byteString.IsEmpty)
return [];
var jsonElement = GrpcTypeHelper.ConvertByteStringToObject<JsonElement>(byteString);
if (jsonElement.ValueKind != JsonValueKind.Object)
return [];
var result = new Dictionary<string, object?>();
foreach (var property in jsonElement.EnumerateObject())
{
result[property.Name] = ConvertJsonElement(property.Value);
}
return result;
}
private static object? ConvertJsonElement(JsonElement element)
{
return element.ValueKind switch
{
JsonValueKind.String => element.GetString(),
JsonValueKind.Number => element.TryGetInt64(out long l) ? l : element.GetDouble(),
JsonValueKind.True => true,
JsonValueKind.False => false,
JsonValueKind.Null => null,
JsonValueKind.Object => ConvertToDictionaryElement(element),
JsonValueKind.Array => element.EnumerateArray().Select(ConvertJsonElement).ToList(),
_ => null
};
}
private static Dictionary<string, object?> ConvertToDictionaryElement(JsonElement element)
{
var result = new Dictionary<string, object?>();
foreach (var property in element.EnumerateObject())
{
result[property.Name] = ConvertJsonElement(property.Value);
}
return result;
}
/// <summary>
/// Converts the current object to its protobuf representation
/// </summary>