Solar/Swarm
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Trying to fix cloud file meta serialization issue

Browse Source
This commit is contained in:
LittleSheep
2025-07-23 12:43:20 +08:00
parent be589aed1d
commit c316a099f8
3 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DysonNetwork.Drive/Storage/CloudFile.cs
View File

@@ -119,11 +119,11 @@ public class CloudFile : ModelBase, ICloudFile, IIdentifiedResource
UploadedAt = UploadedAt?.ToTimestamp(), UploadedAt = UploadedAt?.ToTimestamp(),
// Convert file metadata // Convert file metadata
FileMeta = ByteString.CopyFromUtf8( FileMeta = ByteString.CopyFromUtf8(
System.Text.Json.JsonSerializer.Serialize(FileMeta, GrpcTypeHelper.SystemTextSerializerOptions) JsonConvert.SerializeObject(FileMeta, GrpcTypeHelper.SerializerSettings)
), ),
// Convert user metadata // Convert user metadata
UserMeta = ByteString.CopyFromUtf8( UserMeta = ByteString.CopyFromUtf8(
System.Text.Json.JsonSerializer.Serialize(UserMeta, GrpcTypeHelper.SystemTextSerializerOptions) JsonConvert.SerializeObject(UserMeta, GrpcTypeHelper.SerializerSettings)
) )
}; };

13
DysonNetwork.Shared/Data/CloudFileReferenceObject.cs
View File

@@ -1,5 +1,6 @@
using DysonNetwork.Shared.Proto; using DysonNetwork.Shared.Proto;
using Google.Protobuf; using Google.Protobuf;
using Newtonsoft.Json;
namespace DysonNetwork.Shared.Data; namespace DysonNetwork.Shared.Data;
@@ -41,13 +42,13 @@ public class CloudFileReferenceObject : ModelBase, ICloudFile
{ {
Id = proto.Id, Id = proto.Id,
Name = proto.Name, Name = proto.Name,
FileMeta = System.Text.Json.JsonSerializer.Deserialize<Dictionary<string, object?>>( FileMeta = JsonConvert.DeserializeObject<Dictionary<string, object?>>(
proto.FileMeta.ToStringUtf8(), proto.FileMeta.ToStringUtf8(),
GrpcTypeHelper.SystemTextSerializerOptions GrpcTypeHelper.SerializerSettings
) ?? [], ) ?? [],
UserMeta = System.Text.Json.JsonSerializer.Deserialize<Dictionary<string, object?>>( UserMeta = JsonConvert.DeserializeObject<Dictionary<string, object?>>(
proto.UserMeta.ToStringUtf8(), proto.UserMeta.ToStringUtf8(),
GrpcTypeHelper.SystemTextSerializerOptions GrpcTypeHelper.SerializerSettings
) ?? [], ) ?? [],
MimeType = proto.MimeType, MimeType = proto.MimeType,
Hash = proto.Hash, Hash = proto.Hash,
@@ -75,12 +76,12 @@ public class CloudFileReferenceObject : ModelBase, ICloudFile
// Convert file metadata // Convert file metadata
proto.FileMeta = ByteString.CopyFromUtf8( proto.FileMeta = ByteString.CopyFromUtf8(
System.Text.Json.JsonSerializer.Serialize(FileMeta, GrpcTypeHelper.SystemTextSerializerOptions) JsonConvert.SerializeObject(FileMeta, GrpcTypeHelper.SerializerSettings)
); );
// Convert user metadata // Convert user metadata
proto.UserMeta = ByteString.CopyFromUtf8( proto.UserMeta = ByteString.CopyFromUtf8(
System.Text.Json.JsonSerializer.Serialize(UserMeta, GrpcTypeHelper.SystemTextSerializerOptions) JsonConvert.SerializeObject(UserMeta, GrpcTypeHelper.SerializerSettings)
); );
return proto; return proto;

7
DysonNetwork.Shared/Proto/GrpcTypeHelper.cs
View File

@@ -9,13 +9,6 @@ namespace DysonNetwork.Shared.Proto;
public abstract class GrpcTypeHelper public abstract class GrpcTypeHelper
{ {
public static readonly JsonSerializerOptions SystemTextSerializerOptions = new()
{
PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower,
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
Converters = { new JsonStringEnumConverter() }
};
public static readonly JsonSerializerSettings SerializerSettings = new() public static readonly JsonSerializerSettings SerializerSettings = new()
{ {
ContractResolver = new DefaultContractResolver { NamingStrategy = new SnakeCaseNamingStrategy() }, ContractResolver = new DefaultContractResolver { NamingStrategy = new SnakeCaseNamingStrategy() },