添加从服务器获取节假日列表功能

Author: YJammak

src/WeatherCalendar/Models/Holiday.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace WeatherCalendar.Models;
 
@@ -18,14 +19,67 @@ public class Holiday
     public string Name { get; set; }
 
     /// <summary>
-    /// 休息日期
+    ///     休息日期
     /// </summary>
     public DateTime[] RestDates { get; set; }
 
     /// <summary>
-    /// 工作日期
+    ///     工作日期
     /// </summary>
     public DateTime[] WorkDates { get; set; }
 
-    public override string ToString() => Name;
+    public override string ToString()
+    {
+        return $"{Year} - {Name}";
+    }
+
+    public static bool Equals(Holiday one, Holiday two)
+    {
+        if (one == null || two == null)
+            return false;
+
+        if (one.Year != two.Year)
+            return false;
+
+        if (one.Name != two.Name)
+            return false;
+
+        if (one.RestDates?.Length != two.RestDates?.Length)
+            return false;
+
+        if (one.WorkDates?.Length != two.WorkDates?.Length)
+            return false;
+
+        return true;
+    }
+
+    public static Holiday Combine(Holiday one, Holiday two)
+    {
+        var holiday = new Holiday
+        {
+            Year = one.Year,
+            Name = one.Name
+        };
+
+        var rest = new List<DateTime>();
+        if (one.RestDates != null)
+            rest.AddRange(one.RestDates);
+        if (two.RestDates != null)
+            foreach (var date in two.RestDates)
+                if (!rest.Contains(date))
+                    rest.Add(date);
+
+        var work = new List<DateTime>();
+        if (one.WorkDates != null)
+            work.AddRange(one.WorkDates);
+        if (two.WorkDates != null)
+            foreach (var date in two.WorkDates)
+                if (!work.Contains(date))
+                    work.Add(date);
+
+        holiday.RestDates = rest.ToArray();
+        holiday.WorkDates = work.ToArray();
+
+        return holiday;
+    }
 }

src/WeatherCalendar/Services/HolidayFileService.cs

@@ -1,5 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using RestSharp;
+using RestSharp.Serializers.NewtonsoftJson;
 using WeatherCalendar.Models;
 using WeatherCalendar.Utils;
 
@@ -13,17 +16,60 @@ public sealed class HolidayFileService : IHolidayService
 
     public Holiday[] Load(string file)
     {
+        List<Holiday> fileHolidays;
         try
         {
-            Holidays = JsonHelper.LoadFromFileToList<Holiday>(file, "yyyy-MM-dd").ToArray();
+            fileHolidays = JsonHelper.LoadFromFileToList<Holiday>(file, "yyyy-MM-dd");
         }
         catch
         {
-            Holidays = Array.Empty<Holiday>();
+            fileHolidays = [];
+        }
+
+        List<Holiday> apiHolidays;
+        try
+        {
+            var client = new RestClient("http://yjammak.site",
+                configureSerialization: cfg => cfg.UseNewtonsoftJson());
+            var request = new RestRequest("api/weatherCalender/holidays");
+            apiHolidays = client.Get<List<Holiday>>(request);
+        }
+        catch
+        {
+            apiHolidays = [];
         }
 
         File = file;
 
+        var fileMaxYear = fileHolidays.Count > 0 ? fileHolidays.Max(f => f.Year) : -1;
+        var apiMaxYear = apiHolidays.Count > 0 ? apiHolidays.Max(a => a.Year) : -1;
+        if (apiMaxYear > fileMaxYear)
+        {
+            foreach (var fileHoliday in fileHolidays)
+            {
+                var holiday = apiHolidays.FirstOrDefault(h => h.Year == fileHoliday.Year && h.Name == fileHoliday.Name);
+                if (holiday == null)
+                {
+                    apiHolidays.Add(fileHoliday);
+                }
+                else
+                {
+                    if (!Holiday.Equals(holiday, fileHoliday))
+                    {
+                        apiHolidays.Remove(holiday);
+                        apiHolidays.Add(Holiday.Combine(holiday, fileHoliday));
+                    }
+                }
+            }
+
+            Holidays = apiHolidays.ToArray();
+            Save();
+        }
+        else
+        {
+            Holidays = fileHolidays.ToArray();
+        }
+
         return Holidays;
     }
 
@@ -68,18 +114,18 @@ public void Add(int year, string name, DateTime date, bool isRestDay)
 
             if (isRestDay)
             {
-                holiday.WorkDates = Array.Empty<DateTime>();
-                holiday.RestDates = new[] { date.Date };
+                holiday.WorkDates = [];
+                holiday.RestDates = [date.Date];
             }
             else
             {
-                holiday.WorkDates = new[] { date.Date };
-                holiday.RestDates = Array.Empty<DateTime>();
+                holiday.WorkDates = [date.Date];
+                holiday.RestDates = [];
             }
 
             Holidays =
                 Holidays == null
-                    ? new[] { holiday }
+                    ? [holiday]
                     : Holidays
                         .Append(holiday)
                         .OrderBy(h => h.Year)

src/WeatherCalendar/WeatherCalendar.csproj

@@ -5,10 +5,10 @@
         <TargetFramework>net9.0-windows</TargetFramework>
         <UseWPF>true</UseWPF>
         <ApplicationIcon>Icon.ico</ApplicationIcon>
-        <Copyright>Copyright © 2021-2024 YJammak All rights reserved.</Copyright>
-        <AssemblyVersion>0.4.5.0</AssemblyVersion>
-        <FileVersion>0.4.5.1</FileVersion>
-        <Version>0.4.5.1</Version>
+        <Copyright>Copyright © 2021-2025 YJammak All rights reserved.</Copyright>
+        <AssemblyVersion>0.4.5.2</AssemblyVersion>
+        <FileVersion>0.4.5.2</FileVersion>
+        <Version>0.4.5.2</Version>
         <Authors>YJammak</Authors>
         <Product>天气日历</Product>
         <PackageProjectUrl>https://github.com/YJammak/Weather</PackageProjectUrl>
@@ -32,7 +32,7 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="H.NotifyIcon.Wpf" Version="2.2.0" />
-        <PackageReference Include="MaterialDesignThemes" Version="5.1.0" />
+        <PackageReference Include="MaterialDesignThemes" Version="5.2.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="NLog" Version="5.3.4" />
         <PackageReference Include="NPinyin.Core" Version="3.0.0" />