fix: 标签跳转失败的问题

YaeBlog.Core/Abstractions/IEssayContentService.cs

@@ -0,0 +1,13 @@
+using System.Diagnostics.CodeAnalysis;
+using YaeBlog.Core.Models;
+
+namespace YaeBlog.Core.Abstractions;
+
+public interface IEssayContentService
+{
+    public IReadOnlyDictionary<string, BlogEssay> Essays { get; }
+
+    public IReadOnlyDictionary<EssayTag, List<BlogEssay>> Tags { get; }
+
+    public bool SearchByUrlEncodedTag(string tag,[NotNullWhen(true)] out List<BlogEssay>? result);
+}

YaeBlog.Core/Extensions/WebApplicationBuilderExtensions.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
+using YaeBlog.Core.Abstractions;
 using YaeBlog.Core.Models;
 using YaeBlog.Core.Processors;
 using YaeBlog.Core.Services;
@@ -20,6 +21,8 @@ public static class WebApplicationBuilderExtensions
         builder.Services.AddSingleton<EssayScanService>();
         builder.Services.AddSingleton<RendererService>();
         builder.Services.AddSingleton<EssayContentService>();
+        builder.Services.AddSingleton<IEssayContentService, EssayContentService>(provider =>
+            provider.GetRequiredService<EssayContentService>());
         builder.Services.AddTransient<ImagePostRenderProcessor>();
         builder.Services.AddTransient<BlogOptions>(provider =>
             provider.GetRequiredService<IOptions<BlogOptions>>().Value);

YaeBlog.Core/Models/EssayTag.cs

@@ -0,0 +1,16 @@
+using System.Text.Encodings.Web;
+
+namespace YaeBlog.Core.Models;
+
+public class EssayTag(string tagName) : IEquatable<EssayTag>
+{
+    public string TagName { get; } = tagName;
+
+    public string UrlEncodedTagName { get; } = UrlEncoder.Default.Encode(tagName);
+
+    public bool Equals(EssayTag? other) => other is not null && TagName == other.TagName;
+
+    public override bool Equals(object? obj) => obj is EssayTag other && Equals(other);
+
+    public override int GetHashCode() => TagName.GetHashCode();
+}

YaeBlog.Core/Services/EssayContentService.cs

@@ -1,57 +1,48 @@
 using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
+using YaeBlog.Core.Abstractions;
 using YaeBlog.Core.Models;
 
 namespace YaeBlog.Core.Services;
 
-public class EssayContentService
+public class EssayContentService : IEssayContentService
 {
     private readonly ConcurrentDictionary<string, BlogEssay> _essays = new();
 
-    private readonly Dictionary<string, List<BlogEssay>> _tags = [];
+    private readonly Dictionary<EssayTag, List<BlogEssay>> _tags = [];
 
-    public bool TryGet(string key, out BlogEssay? essay)
+    public bool TryAdd(BlogEssay essay) => _essays.TryAdd(essay.FileName, essay);
-        => _essays.TryGetValue(key, out essay);
 
-    public bool TryAdd(string key, BlogEssay essay) => _essays.TryAdd(key, essay);
+    public IReadOnlyDictionary<string, BlogEssay> Essays => _essays;
 
-    public IDictionary<string, BlogEssay> Essays => _essays;
+    public IReadOnlyDictionary<EssayTag, List<BlogEssay>> Tags => _tags;
 
     public void RefreshTags()
     {
-        foreach (BlogEssay essay in _essays.Values)
+         _tags.Clear();
-        {
-            foreach (string tag in essay.Tags)
-            {
-                if (_tags.TryGetValue(tag, out var list))
-                {
-                    list.Add(essay);
-                }
-                else
-                {
-                    _tags[tag] = [essay];
-                }
-            }
-        }
 
-        foreach (KeyValuePair<string,List<BlogEssay>> pair in _tags)
+         foreach (BlogEssay essay in _essays.Values)
-        {
+         {
-            pair.Value.Sort();
+             foreach (EssayTag essayTag in essay.Tags.Select(tag => new EssayTag(tag)))
-        }
+             {
+                 if (_tags.TryGetValue(essayTag, out List<BlogEssay>? essays))
+                 {
+                     essays.Add(essay);
+                 }
+                 else
+                 {
+                     _tags.Add(essayTag, [essay]);
+                 }
+             }
+         }
     }
 
-    public IEnumerable<KeyValuePair<string, int>> Tags => from item in _tags
+    public bool SearchByUrlEncodedTag(string tag, [NotNullWhen(true)] out List<BlogEssay>? result)
-        orderby item.Value.Count descending
-        select KeyValuePair.Create(item.Key, item.Value.Count);
-
-    public int TagCount => _tags.Count;
-
-    public IEnumerable<BlogEssay> GetTag(string tag)
     {
-        if (_tags.TryGetValue(tag, out var list))
+        result = (from item in _tags
-        {
+            where item.Key.UrlEncodedTagName == tag
-            return list;
+            select item.Value).FirstOrDefault();
-        }
 
-        throw new KeyNotFoundException("Selected tag not found.");
+        return result is not null;
     }
 }

YaeBlog.Core/Services/RendererService.cs

@@ -125,7 +125,7 @@ public class RendererService(ILogger<RendererService> logger,
                 essay = await processor.ProcessAsync(essay);
             }
 
-            if (!essayContentService.TryAdd(essay.FileName, essay))
+            if (!essayContentService.TryAdd(essay))
             {
                 throw new BlogFileException(
                     $"There are two essays with the same name: '{essay.FileName}'.");

YaeBlog/Components/BlogInformationCard.razor

@@ -1,7 +1,7 @@
+@using YaeBlog.Core.Abstractions
 @using YaeBlog.Core.Models
-@using YaeBlog.Core.Services
 
-@inject EssayContentService EssayContentInstance
+@inject IEssayContentService Contents
 @inject BlogOptions Options
 
 <div class="container">
@@ -24,7 +24,7 @@
 
         <div class="col-auto">
             <a href="/blog/archives">
-                @(EssayContentInstance.Essays.Count)
+                @(Contents.Essays.Count)
             </a>
         </div>
     </div>
@@ -36,7 +36,7 @@
 
         <div class="col-auto">
             <a href="/blog/tags">
-                @(EssayContentInstance.TagCount)
+                @(Contents.Tags.Count)
             </a>
         </div>
     </div>

YaeBlog/Pages/About.razor

@@ -1,5 +1,9 @@
 @page "/blog/about"
 
+<PageTitle>
+    关于
+</PageTitle>
+
 <div class="container">
     <div class="row">
         <div class="col">

YaeBlog/Pages/Archives.razor

@@ -1,8 +1,12 @@
 @page "/blog/archives"
+@using YaeBlog.Core.Abstractions
 @using YaeBlog.Core.Models
-@using YaeBlog.Core.Services
 
-@inject EssayContentService EssayContentInstance
+@inject IEssayContentService Contents
+
+<PageTitle>
+    归档
+</PageTitle>
 
 <div class="container">
     <div class="row">
@@ -64,9 +68,8 @@
     {
         base.OnInitialized();
 
-        _essays.AddRange(from essay in EssayContentInstance.Essays
+        _essays.AddRange(from essay in Contents.Essays
             orderby essay.Value.PublishTime descending
             group essay by new DateTime(essay.Value.PublishTime.Year, 1, 1));
     }
-
 }

YaeBlog/Pages/BlogIndex.razor

@@ -1,8 +1,8 @@
 @page "/blog"
+@using YaeBlog.Core.Abstractions
 @using YaeBlog.Core.Models
-@using YaeBlog.Core.Services
 
-@inject EssayContentService EssayContentInstance
+@inject IEssayContentService Contents
 @inject NavigationManager NavigationInstance
 
 <PageTitle>
@@ -99,15 +99,15 @@
     protected override void OnInitialized()
     {
         _page = Page ?? 1;
-        _pageCount = EssayContentInstance.Essays.Count / EssaysPerPage + 1;
+        _pageCount = Contents.Essays.Count / EssaysPerPage + 1;
 
-        if (EssaysPerPage * _page > EssayContentInstance.Essays.Count + EssaysPerPage)
+        if (EssaysPerPage * _page > Contents.Essays.Count + EssaysPerPage)
         {
             NavigationInstance.NavigateTo("/NotFount");
             return;
         }
 
-        _essays.AddRange(EssayContentInstance.Essays
+        _essays.AddRange(Contents.Essays
             .OrderByDescending(p => p.Value.PublishTime)
             .Skip((_page - 1) * EssaysPerPage)
             .Take(EssaysPerPage));

YaeBlog/Pages/Essays.razor

@@ -1,9 +1,9 @@
 @page "/blog/essays/{BlogKey}"
+@using YaeBlog.Core.Abstractions
 @using YaeBlog.Core.Models
-@using YaeBlog.Core.Services
 
+@inject IEssayContentService Contents
 @inject NavigationManager NavigationInstance
-@inject EssayContentService EssayContentInstance
 
 <PageTitle>
     @(_essay!.Title)
@@ -52,7 +52,7 @@
             return;
         }
 
-        if (!EssayContentInstance.TryGet(BlogKey, out _essay))
+        if (!Contents.Essays.TryGetValue(BlogKey, out _essay))
         {
             NavigationInstance.NavigateTo("/NotFound");
         }

YaeBlog/Pages/NotFound.razor

@@ -1,5 +1,9 @@
 @page "/NotFound"
 
+<PageTitle>
+    啊~ 页面走丢啦~
+</PageTitle>
+
 <div class="container">
     <h3>NotFound!</h3>
 </div>

YaeBlog/Pages/Tags.razor

@@ -1,8 +1,14 @@
 @page "/blog/tags/"
+@using System.Text.Encodings.Web
+@using YaeBlog.Core.Abstractions
 @using YaeBlog.Core.Models
-@using YaeBlog.Core.Services
 
-@inject EssayContentService EssayContentInstance
+@inject IEssayContentService Contents
+@inject NavigationManager NavigationInstance
+
+<PageTitle>
+    @(TagName ?? "标签")
+</PageTitle>
 
 <div class="container">
     <div class="row">
@@ -28,18 +34,19 @@
     {
         <div>
             <ul>
-                @foreach (KeyValuePair<string, int> pair in EssayContentInstance.Tags)
+                @foreach (KeyValuePair<EssayTag, List<BlogEssay>> pair in
+                          Contents.Tags.OrderByDescending(pair => pair.Value.Count))
                 {
                     <li class="p-2">
-                        <a href="/blog/tags/?tagName=@(pair.Key)">
+                        <a href="/blog/tags/?tagName=@(pair.Key.UrlEncodedTagName)">
                             <div class="container fs-5">
                                 <div class="row">
                                     <div class="col-auto">
-                                        # @(pair.Key)
+                                        # @(pair.Key.TagName)
                                     </div>
 
                                     <div class="col-auto tag-count">
-                                        @(pair.Value)
+                                        @(pair.Value.Count)
                                     </div>
                                 </div>
                             </div>
@@ -52,7 +59,7 @@
     else
     {
         <div class="container">
-            @foreach (BlogEssay essay in EssayContentInstance.GetTag(TagName).OrderByDescending(e => e.PublishTime))
+            @foreach (BlogEssay essay in _essays)
             {
                 <EssayCard Essay="@essay"/>
             }
@@ -63,5 +70,23 @@
 @code {
     [SupplyParameterFromQuery] public string? TagName { get; set; }
 
+    private readonly List<BlogEssay> _essays = [];
+
+    protected override void OnInitialized()
+    {
+        base.OnInitialized();
+        if (string.IsNullOrEmpty(TagName))
+        {
+            return;
+        }
+
+        if (!Contents.SearchByUrlEncodedTag(UrlEncoder.Default.Encode(TagName), out List<BlogEssay>? essays))
+        {
+            NavigationInstance.NavigateTo("/NotFound");
+            return;
+        }
+
+        _essays.AddRange(essays.OrderDescending());
+    }
 
 }