simplify json converter

Scighost · Sep 16, 2024 · 6a0364b · 6a0364b
1 parent 230f454
commit 6a0364b
Show file tree

Hide file tree

Showing 31 changed files with 136 additions and 225 deletions.
diff --git a/src/Starward.Core/Gacha/GachaLogItem.cs b/src/Starward.Core/Gacha/GachaLogItem.cs
@@ -35,7 +35,7 @@ public class GachaLogItem
 
 
     [JsonPropertyName("time")]
-    [JsonConverter(typeof(DateTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeStringJsonConverter))]
     public DateTime Time { get; set; }
 
 

diff --git a/src/Starward.Core/GameRecord/GameRecordJsonContext.cs b/src/Starward.Core/GameRecord/GameRecordJsonContext.cs
@@ -6,6 +6,7 @@
 using Starward.Core.GameRecord.StarRail.PureFiction;
 using Starward.Core.GameRecord.StarRail.SimulatedUniverse;
 using Starward.Core.GameRecord.StarRail.TrailblazeCalendar;
+using Starward.Core.JsonConverter;
 using System.Text.Json.Serialization;
 
 namespace Starward.Core.GameRecord;
@@ -19,13 +20,12 @@ namespace Starward.Core.GameRecord;
 [JsonSerializable(typeof(miHoYoApiWrapper<TrailblazeCalendarSummary>))]
 [JsonSerializable(typeof(miHoYoApiWrapper<TrailblazeCalendarDetail>))]
 [JsonSerializable(typeof(miHoYoApiWrapper<ForgottenHallInfo>))]
-[JsonSerializable(typeof(miHoYoApiWrapper<ForgottenHallTime>))]
 [JsonSerializable(typeof(miHoYoApiWrapper<PureFictionInfo>))]
 [JsonSerializable(typeof(miHoYoApiWrapper<ApocalypticShadowInfo>))]
 [JsonSerializable(typeof(miHoYoApiWrapper<SimulatedUniverseInfo>))]
-[JsonSerializable(typeof(miHoYoApiWrapper<SimulatedUniverseTime>))]
 [JsonSerializable(typeof(miHoYoApiWrapper<DeviceFpResult>))]
 [JsonSerializable(typeof(miHoYoApiWrapper<ImaginariumTheaterWarpper>))]
+[JsonSerializable(typeof(DateTimeObjectJsonConverter.DateTimeObject))]
 internal partial class GameRecordJsonContext : JsonSerializerContext
 {
 

diff --git a/src/Starward.Core/GameRecord/Genshin/ImaginariumTheater/ImaginariumTheaterInfo.cs b/src/Starward.Core/GameRecord/Genshin/ImaginariumTheater/ImaginariumTheaterInfo.cs
@@ -16,11 +16,11 @@ public class ImaginariumTheaterInfo
 
 
     [JsonPropertyName("start_time")]
-    [JsonConverter(typeof(DateTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeStringJsonConverter))]
     public DateTime StartTime { get; set; }
 
     [JsonPropertyName("end_time")]
-    [JsonConverter(typeof(DateTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeStringJsonConverter))]
     public DateTime EndTime { get; set; }
 
     /// <summary>

diff --git a/src/Starward.Core/GameRecord/Genshin/ImaginariumTheater/ImaginariumTheaterRoundsData.cs b/src/Starward.Core/GameRecord/Genshin/ImaginariumTheater/ImaginariumTheaterRoundsData.cs
@@ -1,4 +1,4 @@
-using Starward.Core.GameRecord.StarRail.SimulatedUniverse;
+using Starward.Core.JsonConverter;
 using System.Text.Json.Serialization;
 
 namespace Starward.Core.GameRecord.Genshin.ImaginariumTheater;
@@ -46,7 +46,7 @@ public class ImaginariumTheaterRoundsData
     /// 完成时间
     /// </summary>
     [JsonPropertyName("finish_date_time")]
-    [JsonConverter(typeof(SimulatedUniverseTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeObjectJsonConverter))]
     public DateTime FinishDateTime { get; set; }
 
     /// <summary>

diff --git a/src/Starward.Core/GameRecord/Genshin/ImaginariumTheater/ImaginariumTheaterSchedule.cs b/src/Starward.Core/GameRecord/Genshin/ImaginariumTheater/ImaginariumTheaterSchedule.cs
@@ -1,4 +1,4 @@
-using Starward.Core.GameRecord.StarRail.SimulatedUniverse;
+using Starward.Core.JsonConverter;
 using System.Text.Json.Serialization;
 
 namespace Starward.Core.GameRecord.Genshin.ImaginariumTheater;
@@ -24,11 +24,11 @@ public class ImaginariumTheaterSchedule
     public int ScheduleId { get; set; }
 
     [JsonPropertyName("start_date_time")]
-    [JsonConverter(typeof(SimulatedUniverseTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeObjectJsonConverter))]
     public DateTime StartDateTime { get; set; }
 
     [JsonPropertyName("end_date_time")]
-    [JsonConverter(typeof(SimulatedUniverseTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeObjectJsonConverter))]
     public DateTime EndDateTime { get; set; }
 
 

diff --git a/src/Starward.Core/GameRecord/Genshin/SpiralAbyss/SpiralAbyssBattle.cs b/src/Starward.Core/GameRecord/Genshin/SpiralAbyss/SpiralAbyssBattle.cs
@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+using Starward.Core.JsonConverter;
+using System.Text.Json.Serialization;
 
 namespace Starward.Core.GameRecord.Genshin.SpiralAbyss;
 
@@ -14,7 +15,7 @@ public class SpiralAbyssBattle
 
 
     [JsonPropertyName("timestamp")]
-    [JsonConverter(typeof(SpiralAbyssTimeJsonConverter))]
+    [JsonConverter(typeof(TimestampStringJsonConverter))]
     public DateTimeOffset Time { get; set; }
 
 

diff --git a/src/Starward.Core/GameRecord/Genshin/SpiralAbyss/SpiralAbyssInfo.cs b/src/Starward.Core/GameRecord/Genshin/SpiralAbyss/SpiralAbyssInfo.cs
@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+using Starward.Core.JsonConverter;
+using System.Text.Json.Serialization;
 
 namespace Starward.Core.GameRecord.Genshin.SpiralAbyss;
 
@@ -14,12 +15,12 @@ public class SpiralAbyssInfo
 
 
     [JsonPropertyName("start_time")]
-    [JsonConverter(typeof(SpiralAbyssTimeJsonConverter))]
+    [JsonConverter(typeof(TimestampStringJsonConverter))]
     public DateTimeOffset StartTime { get; set; }
 
 
     [JsonPropertyName("end_time")]
-    [JsonConverter(typeof(SpiralAbyssTimeJsonConverter))]
+    [JsonConverter(typeof(TimestampStringJsonConverter))]
     public DateTimeOffset EndTime { get; set; }
 
 

diff --git a/src/Starward.Core/GameRecord/Genshin/TravelersDiary/TravelersDiaryAwardItem.cs b/src/Starward.Core/GameRecord/Genshin/TravelersDiary/TravelersDiaryAwardItem.cs
@@ -1,4 +1,4 @@
-using System.Text.Json;
+using Starward.Core.JsonConverter;
 using System.Text.Json.Serialization;
 
 namespace Starward.Core.GameRecord.Genshin.TravelersDiary;
@@ -34,7 +34,8 @@ public class TravelersDiaryAwardItem
     /// <summary>
     /// 获取时间，UTC+8
     /// </summary>
-    [JsonPropertyName("time"), JsonConverter(typeof(TravelersDiaryDateTimeJsonConverter))]
+    [JsonPropertyName("time")]
+    [JsonConverter(typeof(DateTimeStringJsonConverter))]
     public DateTime Time { get; set; }
 
 
@@ -47,16 +48,3 @@ public class TravelersDiaryAwardItem
 
 }
 
-
-internal class TravelersDiaryDateTimeJsonConverter : JsonConverter<DateTime>
-{
-    public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-    {
-        return DateTime.Parse(reader.GetString()!);
-    }
-
-    public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
-    {
-        writer.WriteStringValue(value.ToString("yyyy-MM-dd HH:mm:ss"));
-    }
-}
diff --git a/src/Starward.Core/GameRecord/Genshin/TravelersDiary/TravelersDiaryBase.cs b/src/Starward.Core/GameRecord/Genshin/TravelersDiary/TravelersDiaryBase.cs
@@ -1,4 +1,4 @@
-using System.Text.Json;
+using Starward.Core.JsonConverter;
 using System.Text.Json.Serialization;
 
 namespace Starward.Core.GameRecord.Genshin.TravelersDiary;
@@ -27,7 +27,7 @@ public abstract class TravelersDiaryBase
     /// 当前日期
     /// </summary>
     [JsonPropertyName("date")]
-    [JsonConverter(typeof(TravelersDiaryDateJsonConverter))]
+    [JsonConverter(typeof(DateTimeStringJsonConverter))]
     public DateTime Date { get; set; }
 
     /// <summary>
@@ -54,16 +54,3 @@ public abstract class TravelersDiaryBase
 
 }
 
-
-internal class TravelersDiaryDateJsonConverter : JsonConverter<DateTime>
-{
-    public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-    {
-        return DateTime.Parse(reader.GetString()!);
-    }
-
-    public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
-    {
-        writer.WriteStringValue(value.ToString("yyyy-MM-dd HH:mm:ss"));
-    }
-}
diff --git a/src/Starward.Core/GameRecord/StarRail/ApocalypticShadow/ApocalypticShadowFloorDetail.cs b/src/Starward.Core/GameRecord/StarRail/ApocalypticShadow/ApocalypticShadowFloorDetail.cs
@@ -1,4 +1,4 @@
-using Starward.Core.GameRecord.StarRail.ForgottenHall;
+using Starward.Core.JsonConverter;
 using System.Text.Json.Serialization;
 
 namespace Starward.Core.GameRecord.StarRail.ApocalypticShadow;
@@ -28,7 +28,7 @@ public class ApocalypticShadowFloorDetail
     public bool IsFast { get; set; }
 
     [JsonPropertyName("last_update_time")]
-    [JsonConverter(typeof(ForgottenHallTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeObjectJsonConverter))]
     public DateTime LastUpdateTime { get; set; }
 
     [JsonIgnore]

diff --git a/src/Starward.Core/GameRecord/StarRail/ApocalypticShadow/ApocalypticShadowInfo.cs b/src/Starward.Core/GameRecord/StarRail/ApocalypticShadow/ApocalypticShadowInfo.cs
@@ -1,4 +1,4 @@
-using Starward.Core.GameRecord.StarRail.ForgottenHall;
+using Starward.Core.JsonConverter;
 using System.Text.Json.Serialization;
 
 namespace Starward.Core.GameRecord.StarRail.ApocalypticShadow;
@@ -14,11 +14,11 @@ public class ApocalypticShadowInfo
     public int ScheduleId { get; set; }
 
     [JsonPropertyName("begin_time")]
-    [JsonConverter(typeof(ForgottenHallTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeObjectJsonConverter))]
     public DateTime BeginTime { get; set; }
 
     [JsonPropertyName("end_time")]
-    [JsonConverter(typeof(ForgottenHallTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeObjectJsonConverter))]
     public DateTime EndTime { get; set; }
 
     [JsonPropertyName("upper_boss_icon")]

diff --git a/src/Starward.Core/GameRecord/StarRail/ApocalypticShadow/ApocalypticShadowMeta.cs b/src/Starward.Core/GameRecord/StarRail/ApocalypticShadow/ApocalypticShadowMeta.cs
@@ -1,4 +1,4 @@
-using Starward.Core.GameRecord.StarRail.ForgottenHall;
+using Starward.Core.JsonConverter;
 using System.Text.Json.Serialization;
 
 namespace Starward.Core.GameRecord.StarRail.ApocalypticShadow;
@@ -10,11 +10,11 @@ public class ApocalypticShadowMeta
     public int ScheduleId { get; set; }
 
     [JsonPropertyName("begin_time")]
-    [JsonConverter(typeof(ForgottenHallTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeObjectJsonConverter))]
     public DateTime BeginTime { get; set; }
 
     [JsonPropertyName("end_time")]
-    [JsonConverter(typeof(ForgottenHallTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeObjectJsonConverter))]
     public DateTime EndTime { get; set; }
 
     [JsonPropertyName("status")]

diff --git a/src/Starward.Core/GameRecord/StarRail/ApocalypticShadow/ApocalypticShadowNode.cs b/src/Starward.Core/GameRecord/StarRail/ApocalypticShadow/ApocalypticShadowNode.cs
@@ -1,4 +1,4 @@
-using Starward.Core.GameRecord.StarRail.ForgottenHall;
+using Starward.Core.JsonConverter;
 using System.Text.Json.Serialization;
 
 namespace Starward.Core.GameRecord.StarRail.ApocalypticShadow;
@@ -7,7 +7,7 @@ public class ApocalypticShadowNode
 {
 
     [JsonPropertyName("challenge_time")]
-    [JsonConverter(typeof(ForgottenHallTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeObjectJsonConverter))]
     public DateTime ChallengeTime { get; set; }
 
     [JsonPropertyName("avatars")]

diff --git a/src/Starward.Core/GameRecord/StarRail/ForgottenHall/ForgottenHallInfo.cs b/src/Starward.Core/GameRecord/StarRail/ForgottenHall/ForgottenHallInfo.cs
@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+using Starward.Core.JsonConverter;
+using System.Text.Json.Serialization;
 
 namespace Starward.Core.GameRecord.StarRail.ForgottenHall;
 
@@ -14,11 +15,11 @@ public class ForgottenHallInfo
     public int ScheduleId { get; set; }
 
     [JsonPropertyName("begin_time")]
-    [JsonConverter(typeof(ForgottenHallTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeObjectJsonConverter))]
     public DateTime BeginTime { get; set; }
 
     [JsonPropertyName("end_time")]
-    [JsonConverter(typeof(ForgottenHallTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeObjectJsonConverter))]
     public DateTime EndTime { get; set; }
 
     [JsonPropertyName("star_num")]

diff --git a/src/Starward.Core/GameRecord/StarRail/ForgottenHall/ForgottenHallMeta.cs b/src/Starward.Core/GameRecord/StarRail/ForgottenHall/ForgottenHallMeta.cs
@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+using Starward.Core.JsonConverter;
+using System.Text.Json.Serialization;
 
 namespace Starward.Core.GameRecord.StarRail.ForgottenHall;
 
@@ -10,11 +11,11 @@ public class ForgottenHallMeta
     public int ScheduleId { get; set; }
 
     [JsonPropertyName("begin_time")]
-    [JsonConverter(typeof(ForgottenHallTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeObjectJsonConverter))]
     public DateTime BeginTime { get; set; }
 
     [JsonPropertyName("end_time")]
-    [JsonConverter(typeof(ForgottenHallTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeObjectJsonConverter))]
     public DateTime EndTime { get; set; }
 
     [JsonPropertyName("status")]

diff --git a/src/Starward.Core/GameRecord/StarRail/ForgottenHall/ForgottenHallNode.cs b/src/Starward.Core/GameRecord/StarRail/ForgottenHall/ForgottenHallNode.cs
@@ -1,11 +1,12 @@
-using System.Text.Json.Serialization;
+using Starward.Core.JsonConverter;
+using System.Text.Json.Serialization;
 
 namespace Starward.Core.GameRecord.StarRail.ForgottenHall;
 
 public class ForgottenHallNode
 {
     [JsonPropertyName("challenge_time")]
-    [JsonConverter(typeof(ForgottenHallTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeObjectJsonConverter))]
     public DateTime ChallengeTime { get; set; }
 
     [JsonPropertyName("avatars")]

diff --git a/src/Starward.Core/GameRecord/StarRail/ForgottenHall/ForgottenHallTime.cs b/src/Starward.Core/GameRecord/StarRail/ForgottenHall/ForgottenHallTime.cs
diff --git a/src/Starward.Core/GameRecord/StarRail/PureFiction/PureFictionInfo.cs b/src/Starward.Core/GameRecord/StarRail/PureFiction/PureFictionInfo.cs
@@ -1,4 +1,4 @@
-using Starward.Core.GameRecord.StarRail.ForgottenHall;
+using Starward.Core.JsonConverter;
 using System.Text.Json.Serialization;
 
 namespace Starward.Core.GameRecord.StarRail.PureFiction;
@@ -14,11 +14,11 @@ public class PureFictionInfo
     public int ScheduleId { get; set; }
 
     [JsonPropertyName("begin_time")]
-    [JsonConverter(typeof(ForgottenHallTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeObjectJsonConverter))]
     public DateTime BeginTime { get; set; }
 
     [JsonPropertyName("end_time")]
-    [JsonConverter(typeof(ForgottenHallTimeJsonConverter))]
+    [JsonConverter(typeof(DateTimeObjectJsonConverter))]
     public DateTime EndTime { get; set; }
 
     [JsonPropertyName("star_num")]