put JsonSerializerOptions in SerializerOptions

This commit is contained in:
Syping 2025-11-04 04:29:57 +01:00
parent dccd33bcf4
commit 348945ac0c

13
Json.cs
View file

@ -1,4 +1,5 @@
using System.Text.Encodings.Web; using System.Text.Encodings.Web;
using System.Text.Json;
using System.Text.Json.Nodes; using System.Text.Json.Nodes;
namespace RagePhoto.Cli; namespace RagePhoto.Cli;
@ -69,9 +70,7 @@ internal class Json {
}, },
_ => throw new ArgumentException("Invalid format", nameof(format)), _ => throw new ArgumentException("Invalid format", nameof(format)),
}; };
return json.ToJsonString(new() { return json.ToJsonString(SerializerOptions);
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
});
} }
internal static String UpdateSign(Photo photo, String json) { internal static String UpdateSign(Photo photo, String json) {
@ -79,13 +78,15 @@ internal class Json {
if (JsonNode.Parse(json) is not JsonObject jsonObject) if (JsonNode.Parse(json) is not JsonObject jsonObject)
throw new ArgumentException("Invalid json", nameof(json)); throw new ArgumentException("Invalid json", nameof(json));
jsonObject["sign"] = photo.Sign; jsonObject["sign"] = photo.Sign;
return jsonObject.ToJsonString(new() { return jsonObject.ToJsonString(SerializerOptions);
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
});
} }
catch (Exception exception) { catch (Exception exception) {
Console.Error.WriteLine($"Failed to update sign: {exception.Message}"); Console.Error.WriteLine($"Failed to update sign: {exception.Message}");
return json; return json;
} }
} }
internal static readonly JsonSerializerOptions SerializerOptions = new() {
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
};
} }