fix: set gitea api key header correctly.

Rename Foonter to Footer.
Fix the heatmap not rendering until today bug.

Signed-off-by: jackfiled <xcrenchangjun@outlook.com>

.gitea/workflows/build.yaml

@@ -8,19 +8,19 @@ jobs:
     runs-on: archlinux
     steps:
       - name: Check out code.
-        uses: https://mirrors.rrricardo.top/actions/checkout.git@v4
+        uses: http://github-mirrors.infra.svc.cluster.local/actions/checkout.git@v4
         with:
           lfs: true
       - name: Build project.
         run: |
+          git submodule update --init
           podman pull mcr.azure.cn/dotnet/aspnet:10.0
-          cd YaeBlog
           pwsh build.ps1 build
       - name: Workaround to make sure podman-login working.
         run: |
-          mkdir /root/.docker
+          mkdir -p /root/.docker
       - name: Login tencent cloud docker registry.
-        uses: https://mirrors.rrricardo.top/actions/podman-login.git@v1
+        uses: http://github-mirrors.infra.svc.cluster.local/actions/podman-login.git@v1
         with:
           registry: ccr.ccs.tencentyun.com
           username: 100044380877

.gitignore

@@ -184,6 +184,7 @@ DocProject/Help/html
 
 # Click-Once directory
 publish/
+out/
 
 # Publish Web Output
 *.[Pp]ublish.xml

build.ps1

@@ -3,16 +3,15 @@
 [cmdletbinding()]
 param(
     [Parameter(Mandatory = $true, Position = 0, HelpMessage = "Specify the build target")]
-    [ValidateSet("tailwind", "publish", "compress", "build", "dev", "new", "watch", "serve", "list")]
+    [ValidateSet("publish", "compress", "build", "dev", "new", "watch", "serve")]
     [string]$Target,
-    [string]$Output = "wwwroot",
     [string]$Essay,
     [switch]$Compress,
     [string]$Root = "source"
 )
 
 begin {
-    if ($Target -eq "tailwind")
+    if (($Target -eq "tailwind") -or ($Target -eq "build"))
     {
         # Handle tailwind specially.
         return
@@ -82,8 +81,11 @@ process {
     function Build-Image
     {
         $commitId = git rev-parse --short=10 HEAD
-        dotnet publish
-        podman build . -t ccr.ccs.tencentyun.com/jackfiled/blog --build-arg COMMIT_ID=$commitId
+        dotnet publish ./src/YaeBlog/YaeBlog.csproj -o out
+        Write-Host "Succeed to build blog appliocation."
+        podman build . -t ccr.ccs.tencentyun.com/jackfiled/blog --build-arg COMMIT_ID=$commitId `
+            -f ./src/YaeBlog/Dockerfile
+        Write-Host "Succeed to build ccr.ccs.tencentyun.com/jackfiled/blog image."
     }
 
     function Start-Develop {
@@ -111,11 +113,6 @@ process {
 
     switch ($Target)
     {
-        "tailwind" {
-            Write-Host "Build tailwind css into $Output."
-            pnpm tailwindcss -i wwwroot/tailwind.css -o $Output/tailwind.g.css
-            break
-        }
         "publish" {
             Write-Host "Publish essay $Essay..."
             dotnet run -- publish $Essay

src/YaeBlog.Tests/GiteaFetchServiceTests.cs

@@ -1,4 +1,5 @@
 using DotNext;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Moq;
 using YaeBlog.Models;
@@ -9,6 +10,7 @@ namespace YaeBlog.Tests;
 public sealed class GiteaFetchServiceTests
 {
     private static readonly Mock<IOptions<GiteaOptions>> s_giteaOptionsMock = new();
+    private static readonly Mock<ILogger<GiteaFetchService>> s_logger = new();
     private readonly GiteaFetchService _giteaFetchService;
 
     public GiteaFetchServiceTests()
@@ -16,12 +18,10 @@ public sealed class GiteaFetchServiceTests
         s_giteaOptionsMock.SetupGet(o => o.Value)
             .Returns(new GiteaOptions
             {
-                BaseAddress = "https://git.rrricardo.top/api/v1/",
-                ApiKey = "7e33617e5d084199332fceec3e0cb04c6ddced55",
-                HeatMapUsername = "jackfiled"
+                BaseAddress = "https://git.rrricardo.top/api/v1/", HeatMapUsername = "jackfiled"
             });
 
-        _giteaFetchService = new GiteaFetchService(s_giteaOptionsMock.Object, new HttpClient());
+        _giteaFetchService = new GiteaFetchService(s_giteaOptionsMock.Object, new HttpClient(), s_logger.Object);
     }
 
     [Fact]

src/YaeBlog/Commands/Binders/BlogOptionsBinder.cs

@@ -1,33 +0,0 @@
-using System.CommandLine.Binding;
-using System.Text.Json;
-using Microsoft.Extensions.Options;
-using YaeBlog.Models;
-
-namespace YaeBlog.Commands.Binders;
-
-public sealed class BlogOptionsBinder : BinderBase<IOptions<BlogOptions>>
-{
-    protected override IOptions<BlogOptions> GetBoundValue(BindingContext bindingContext)
-    {
-        bindingContext.AddService<IOptions<BlogOptions>>(_ =>
-        {
-            FileInfo settings = new(Path.Combine(Environment.CurrentDirectory, "appsettings.json"));
-            if (!settings.Exists)
-            {
-                throw new InvalidOperationException("Failed to load YaeBlog configurations.");
-            }
-
-            using StreamReader reader = settings.OpenText();
-            using JsonDocument document = JsonDocument.Parse(reader.ReadToEnd());
-            JsonElement root = document.RootElement;
-            JsonElement optionSection = root.GetProperty(BlogOptions.OptionName);
-
-            BlogOptions? result = optionSection.Deserialize<BlogOptions>();
-            return result is null
-                ? throw new InvalidOperationException("Failed to load YaeBlog configuration in appsettings.json.")
-                : new OptionsWrapper<BlogOptions>(result);
-        });
-
-        return bindingContext.GetRequiredService<IOptions<BlogOptions>>();
-    }
-}

src/YaeBlog/Commands/Binders/EssayScanServiceBinder.cs

@@ -1,32 +0,0 @@
-using System.CommandLine.Binding;
-using Microsoft.Extensions.Options;
-using YaeBlog.Abstraction;
-using YaeBlog.Models;
-using YaeBlog.Services;
-using YamlDotNet.Serialization;
-using YamlDotNet.Serialization.NamingConventions;
-
-namespace YaeBlog.Commands.Binders;
-
-public sealed class EssayScanServiceBinder : BinderBase<IEssayScanService>
-{
-    protected override IEssayScanService GetBoundValue(BindingContext bindingContext)
-    {
-        bindingContext.AddService<IEssayScanService>(provider =>
-        {
-            DeserializerBuilder deserializerBuilder = new();
-            deserializerBuilder.WithNamingConvention(CamelCaseNamingConvention.Instance);
-            deserializerBuilder.IgnoreUnmatchedProperties();
-
-            SerializerBuilder serializerBuilder = new();
-            serializerBuilder.WithNamingConvention(CamelCaseNamingConvention.Instance);
-
-            IOptions<BlogOptions> options = provider.GetRequiredService<IOptions<BlogOptions>>();
-            ILogger<EssayScanService> logger = provider.GetRequiredService<ILogger<EssayScanService>>();
-
-            return new EssayScanService(serializerBuilder.Build(), deserializerBuilder.Build(), options, logger);
-        });
-
-        return bindingContext.GetRequiredService<IEssayScanService>();
-    }
-}

src/YaeBlog/Commands/Binders/ImageCompressServiceBinder.cs

@@ -1,21 +0,0 @@
-using System.CommandLine.Binding;
-using YaeBlog.Abstraction;
-using YaeBlog.Services;
-
-namespace YaeBlog.Commands.Binders;
-
-public sealed class ImageCompressServiceBinder : BinderBase<ImageCompressService>
-{
-    protected override ImageCompressService GetBoundValue(BindingContext bindingContext)
-    {
-        bindingContext.AddService(provider =>
-        {
-            IEssayScanService essayScanService = provider.GetRequiredService<IEssayScanService>();
-            ILogger<ImageCompressService> logger = provider.GetRequiredService<ILogger<ImageCompressService>>();
-
-            return new ImageCompressService(essayScanService, logger);
-        });
-
-        return bindingContext.GetRequiredService<ImageCompressService>();
-    }
-}

src/YaeBlog/Commands/Binders/LoggerBinder.cs

@@ -1,18 +0,0 @@
-using System.CommandLine.Binding;
-
-namespace YaeBlog.Commands.Binders;
-
-public sealed class LoggerBinder<T> : BinderBase<ILogger<T>>
-{
-    protected override ILogger<T> GetBoundValue(BindingContext bindingContext)
-    {
-        bindingContext.AddService(_ => LoggerFactory.Create(builder => builder.AddConsole()));
-        bindingContext.AddService<ILogger<T>>(provider =>
-        {
-            ILoggerFactory factory = provider.GetRequiredService<ILoggerFactory>();
-            return factory.CreateLogger<T>();
-        });
-
-        return bindingContext.GetRequiredService<ILogger<T>>();
-    }
-}

src/YaeBlog/Commands/YaeBlogCommand.cs

@@ -1,296 +0,0 @@
-using System.CommandLine;
-using Microsoft.Extensions.Options;
-using YaeBlog.Abstraction;
-using YaeBlog.Commands.Binders;
-using YaeBlog.Components;
-using YaeBlog.Extensions;
-using YaeBlog.Models;
-using YaeBlog.Services;
-
-namespace YaeBlog.Commands;
-
-public sealed class YaeBlogCommand
-{
-    private readonly RootCommand _rootCommand = new("YaeBlog Cli");
-
-    public YaeBlogCommand()
-    {
-        AddServeCommand(_rootCommand);
-        AddWatchCommand(_rootCommand);
-        AddListCommand(_rootCommand);
-        AddNewCommand(_rootCommand);
-        AddUpdateCommand(_rootCommand);
-        AddPublishCommand(_rootCommand);
-        AddScanCommand(_rootCommand);
-        AddCompressCommand(_rootCommand);
-    }
-
-    public Task<int> RunAsync(string[] args)
-    {
-        return _rootCommand.InvokeAsync(args);
-    }
-
-    private static void AddServeCommand(RootCommand rootCommand)
-    {
-        Command serveCommand = new("serve", "Start http server.");
-        rootCommand.AddCommand(serveCommand);
-
-        serveCommand.SetHandler(async context =>
-        {
-            WebApplicationBuilder builder = WebApplication.CreateBuilder();
-
-            builder.Services.AddRazorComponents()
-                .AddInteractiveServerComponents();
-            builder.Services.AddControllers();
-            builder.AddYaeBlog();
-            builder.AddServer();
-
-            WebApplication application = builder.Build();
-
-            application.MapStaticAssets();
-            application.UseAntiforgery();
-            application.UseYaeBlog();
-
-            application.MapRazorComponents<App>()
-                .AddInteractiveServerRenderMode();
-            application.MapControllers();
-
-            CancellationToken token = context.GetCancellationToken();
-            await application.RunAsync(token);
-        });
-    }
-
-    private static void AddWatchCommand(RootCommand rootCommand)
-    {
-        Command command = new("watch", "Start a blog watcher that re-render when file changes.");
-        rootCommand.AddCommand(command);
-
-        command.SetHandler(async context =>
-        {
-            WebApplicationBuilder builder = WebApplication.CreateBuilder();
-
-            builder.Services.AddRazorComponents()
-                .AddInteractiveServerComponents();
-            builder.Services.AddControllers();
-            builder.AddYaeBlog();
-            builder.AddWatcher();
-
-            WebApplication application = builder.Build();
-
-            application.MapStaticAssets();
-            application.UseAntiforgery();
-            application.UseYaeBlog();
-
-            application.MapRazorComponents<App>()
-                .AddInteractiveServerRenderMode();
-            application.MapControllers();
-
-            CancellationToken token = context.GetCancellationToken();
-            await application.RunAsync(token);
-        });
-    }
-
-    private static void AddNewCommand(RootCommand rootCommand)
-    {
-        Command newCommand = new("new", "Create a new blog file and image directory.");
-        rootCommand.AddCommand(newCommand);
-
-        Argument<string> filenameArgument = new(name: "blog name", description: "The created blog filename.");
-        newCommand.AddArgument(filenameArgument);
-
-        newCommand.SetHandler(async (file, blogOption, _, essayScanService) =>
-            {
-                BlogContents contents = await essayScanService.ScanContents();
-
-                if (contents.Posts.Any(content => content.BlogName == file))
-                {
-                    Console.WriteLine("There exists the same title blog in posts.");
-                    return;
-                }
-
-                await essayScanService.SaveBlogContent(new BlogContent(
-                    new FileInfo(Path.Combine(blogOption.Value.Root, "drafts", file + ".md")),
-                    new MarkdownMetadata
-                    {
-                        Title = file,
-                        Date = DateTimeOffset.Now.ToString("o"),
-                        UpdateTime = DateTimeOffset.Now.ToString("o")
-                    },
-                    string.Empty, true, [], []));
-
-                Console.WriteLine($"Created new blog '{file}.");
-            }, filenameArgument, new BlogOptionsBinder(), new LoggerBinder<EssayScanService>(),
-            new EssayScanServiceBinder());
-    }
-
-    private static void AddUpdateCommand(RootCommand rootCommand)
-    {
-        Command newCommand = new("update", "Update the blog essay.");
-        rootCommand.AddCommand(newCommand);
-
-        Argument<string> filenameArgument = new(name: "blog name", description: "The blog filename to update.");
-        newCommand.AddArgument(filenameArgument);
-
-        newCommand.SetHandler(async (file, _, _, essayScanService) =>
-            {
-                Console.WriteLine("HINT: The update command only consider published blogs.");
-                BlogContents contents = await essayScanService.ScanContents();
-
-                BlogContent? content = contents.Posts.FirstOrDefault(c => c.BlogName == file);
-                if (content is null)
-                {
-                    Console.WriteLine($"Target essay {file} is not exist.");
-                    return;
-                }
-
-                content.Metadata.UpdateTime = DateTimeOffset.Now.ToString("o");
-                await essayScanService.SaveBlogContent(content, content.IsDraft);
-            }, filenameArgument,
-            new BlogOptionsBinder(), new LoggerBinder<EssayScanService>(), new EssayScanServiceBinder());
-    }
-
-    private static void AddListCommand(RootCommand rootCommand)
-    {
-        Command command = new("list", "List all blogs");
-        rootCommand.AddCommand(command);
-
-        command.SetHandler(async (_, _, essyScanService) =>
-        {
-            BlogContents contents = await essyScanService.ScanContents();
-
-            Console.WriteLine($"All {contents.Posts.Count} Posts:");
-            foreach (BlogContent content in contents.Posts.OrderBy(x => x.BlogName))
-            {
-                Console.WriteLine($" - {content.BlogName}");
-            }
-
-            Console.WriteLine($"All {contents.Drafts.Count} Drafts:");
-            foreach (BlogContent content in contents.Drafts.OrderBy(x => x.BlogName))
-            {
-                Console.WriteLine($" - {content.BlogName}");
-            }
-        }, new BlogOptionsBinder(), new LoggerBinder<EssayScanService>(), new EssayScanServiceBinder());
-    }
-
-    private static void AddScanCommand(RootCommand rootCommand)
-    {
-        Command command = new("scan", "Scan unused and not found images.");
-        rootCommand.AddCommand(command);
-
-        Option<bool> removeOption =
-            new(name: "--rm", description: "Remove unused images.", getDefaultValue: () => false);
-        command.AddOption(removeOption);
-
-        command.SetHandler(async (_, _, essayScanService, removeOptionValue) =>
-        {
-            BlogContents contents = await essayScanService.ScanContents();
-            List<BlogImageInfo> unusedImages = (from content in contents
-                from image in content.Images
-                where image is { IsUsed: false }
-                select image).ToList();
-
-            if (unusedImages.Count != 0)
-            {
-                Console.WriteLine("Found unused images:");
-                Console.WriteLine("HINT: use '--rm' to remove unused images.");
-            }
-
-            foreach (BlogImageInfo image in unusedImages)
-            {
-                Console.WriteLine($" - {image.File.FullName}");
-            }
-
-            if (removeOptionValue)
-            {
-                foreach (BlogImageInfo image in unusedImages)
-                {
-                    image.File.Delete();
-                }
-            }
-
-            Console.WriteLine("Used not existed images:");
-
-            foreach (BlogContent content in contents)
-            {
-                foreach (FileInfo file in content.NotfoundImages)
-                {
-                    Console.WriteLine($"- {file.Name} in {content.BlogName}");
-                }
-            }
-        }, new BlogOptionsBinder(), new LoggerBinder<EssayScanService>(), new EssayScanServiceBinder(), removeOption);
-    }
-
-    private static void AddPublishCommand(RootCommand rootCommand)
-    {
-        Command command = new("publish", "Publish a new blog file.");
-        rootCommand.AddCommand(command);
-
-        Argument<string> filenameArgument = new(name: "blog name", description: "The published blog filename.");
-        command.AddArgument(filenameArgument);
-
-        command.SetHandler(async (blogOptions, _, essayScanService, filename) =>
-            {
-                BlogContents contents = await essayScanService.ScanContents();
-
-                BlogContent? content = (from blog in contents.Drafts
-                    where blog.BlogName == filename
-                    select blog).FirstOrDefault();
-
-                if (content is null)
-                {
-                    Console.WriteLine("Target blog does not exist.");
-                    return;
-                }
-
-                // 设置发布的时间
-                content.Metadata.Date = DateTimeOffset.Now.ToString("o");
-                content.Metadata.UpdateTime = DateTimeOffset.Now.ToString("o");
-
-                // 将选中的博客文件复制到posts
-                await essayScanService.SaveBlogContent(content, isDraft: false);
-
-                // 复制图片文件夹
-                DirectoryInfo sourceImageDirectory =
-                    new(Path.Combine(blogOptions.Value.Root, "drafts", content.BlogName));
-                DirectoryInfo targetImageDirectory =
-                    new(Path.Combine(blogOptions.Value.Root, "posts", content.BlogName));
-
-                if (sourceImageDirectory.Exists)
-                {
-                    targetImageDirectory.Create();
-                    foreach (FileInfo file in sourceImageDirectory.EnumerateFiles())
-                    {
-                        file.CopyTo(Path.Combine(targetImageDirectory.FullName, file.Name), true);
-                    }
-
-                    sourceImageDirectory.Delete(true);
-                }
-
-                // 删除原始的文件
-                FileInfo sourceBlogFile = new(Path.Combine(blogOptions.Value.Root, "drafts", content.BlogName + ".md"));
-                sourceBlogFile.Delete();
-            }, new BlogOptionsBinder(),
-            new LoggerBinder<EssayScanService>(), new EssayScanServiceBinder(), filenameArgument);
-    }
-
-    private static void AddCompressCommand(RootCommand rootCommand)
-    {
-        Command command = new("compress", "Compress png/jpeg image to webp image to reduce size.");
-        rootCommand.Add(command);
-
-        Option<bool> dryRunOption = new("--dry-run", description: "Dry run the compression task but not write.",
-            getDefaultValue: () => false);
-        command.AddOption(dryRunOption);
-
-        command.SetHandler(ImageCommandHandler,
-            new BlogOptionsBinder(), new LoggerBinder<EssayScanService>(), new LoggerBinder<ImageCompressService>(),
-            new EssayScanServiceBinder(), new ImageCompressServiceBinder(), dryRunOption);
-    }
-
-    private static async Task ImageCommandHandler(IOptions<BlogOptions> _, ILogger<EssayScanService> _1,
-        ILogger<ImageCompressService> _2,
-        IEssayScanService _3, ImageCompressService imageCompressService, bool dryRun)
-    {
-        await imageCompressService.Compress(dryRun);
-    }
-}

src/YaeBlog/Components/Footer.razor

@@ -7,10 +7,13 @@
             <Anchor Address="https://dotnet.microsoft.com" Text="@DotnetVersion"/>
             驱动。
         </p>
-        <p class="text-md">
-            Build Commit #
-            <Anchor Address="@BuildCommitUrl" Text="@BuildCommitId"/>
-        </p>
+        @if (!string.IsNullOrEmpty(BuildCommitId))
+        {
+            <p class="text-md">
+                Build Commit #
+                <Anchor Address="@BuildCommitUrl" Text="@BuildCommitId" NewPage="true"/>
+            </p>
+        }
     </div>
 
     <div>
@@ -24,7 +27,7 @@
 {
     private static string DotnetVersion => $".NET {Environment.Version}";
 
-    private static string BuildCommitId => Environment.GetEnvironmentVariable("COMMIT_ID") ?? "local_build";
+    private static string? BuildCommitId => Environment.GetEnvironmentVariable("COMMIT_ID");
 
     private static string BuildCommitUrl => $"https://git.rrricardo.top/jackfiled/YaeBlog/commit/{BuildCommitId}";
 }

src/YaeBlog/Components/GitHeatMap.razor

@@ -7,13 +7,13 @@
         <SvgGroup Transform="@GlobalMonthTransform">
             @foreach ((int i, string text) in _monthIndices)
             {
-                <SvgText Content="@text" Transform="@(MonthTextTransform(i))" Class="text-[10px]"/>
+                <SvgText Content="@text" Transform="@(MonthTextTransform(i))" Class="text-[8px] font-light"/>
             }
         </SvgGroup>
         <SvgGroup Transform="@GlobalWeekTransform">
             @foreach ((int i, string text) in Weekdays.Index())
             {
-                <SvgText Content="@text" Transform="@(DayTextTransform(i))" Class="text-[10px]"/>
+                <SvgText Content="@text" Transform="@(DayTextTransform(i))" Class="text-[8px] font-light"/>
             }
         </SvgGroup>
         <SvgGroup Transform="@GlobalMapTransform">
@@ -23,7 +23,8 @@
                     @foreach ((int j, GitContributionItem item) in contribution.Contributions.Index())
                     {
                         <Rectangle Width="@Width" Height="@Width" Transform="@(WeekdayGridTransform(j))"
-                                   Class="@(GetColorByContribution(item.ContributionCount))"/>
+                                   Class="@(GetColorByContribution(item.ContributionCount))"
+                                   Id="@(item.ItemId)"/>
                     }
                 </SvgGroup>
             }
@@ -118,5 +119,4 @@
             _ => "fill-blue-800"
         };
     }
-
 }

src/YaeBlog/Components/Layout/BlogLayout.razor

@@ -24,5 +24,5 @@
         @Body
     </div>
 
-    <Foonter/>
+    <Footer/>
 </main>

src/YaeBlog/Components/Layout/MainLayout.razor

@@ -32,5 +32,5 @@
         </div>
     </div>
 
-    <Foonter/>
+    <Footer/>
 </main>

src/YaeBlog/Components/Pages/About.razor

@@ -6,7 +6,7 @@
 
 <div class="flex flex-col">
     <div>
-        <h1 class="text-4xl">关于</h1>
+        <h1 class="text-4xl page-starter">关于</h1>
     </div>
 
     <div class="py-4">

src/YaeBlog/Components/Pages/Archives.razor

@@ -10,7 +10,7 @@
 
 <div class="flex flex-col">
     <div>
-        <h1 class="text-4xl">归档</h1>
+        <h1 class="text-4xl page-starter">归档</h1>
     </div>
 
     <div class="py-4">

src/YaeBlog/Components/Pages/BlogIndex.razor

@@ -10,6 +10,7 @@
 </PageTitle>
 
 <div>
+    <div class="page-starter"></div>
     <div class="grid grid-cols-4">
         <div class="col-span-4 md:col-span-3">
             @foreach (BlogEssay essay in _essays)

src/YaeBlog/Components/Pages/Essays.razor

@@ -14,7 +14,7 @@
     <div>
         <div class="flex flex-col items-center">
             <div>
-                <h1 id="title" class="text-4xl">@(_essay!.Title)</h1>
+                <h1 id="title" class="text-4xl page-starter">@(_essay!.Title)</h1>
             </div>
 
             <div class="flex flex-row gap-4 py-2">

src/YaeBlog/Components/Pages/Friends.razor

@@ -9,7 +9,7 @@
 
 <div class="flex flex-col">
     <div>
-        <h1 class="text-4xl">
+        <h1 class="text-4xl page-starter">
             友链
         </h1>
     </div>

src/YaeBlog/Components/Pages/Index.razor

@@ -17,7 +17,7 @@
         <div class="col-span-3 md:col-span-2">
             <div class="flex flex-col gap-y-3 items-center md:items-start md:px-6">
                 <div class="">
-                    <div class="text-3xl font-bold">初冬的朝阳</div>
+                    <div class="text-3xl font-bold page-starter">初冬的朝阳</div>
                 </div>
 
                 <div class="">

src/YaeBlog/Components/Pages/NotFound.razor

@@ -5,7 +5,7 @@
 </PageTitle>
 
 <div>
-    <h3 class="text-3xl">NotFound!</h3>
+    <h3 class="text-3xl page-starter">NotFound!</h3>
 </div>
 
 @code {

src/YaeBlog/Components/Pages/Tags.razor

@@ -11,7 +11,7 @@
 </PageTitle>
 
 <div class="flex flex-col">
-    <div>
+    <div class="page-starter">
         @if (TagName is null)
         {
             <h1 class="text-4xl">标签</h1>

src/YaeBlog/Components/Routes.razor

@@ -9,6 +9,6 @@
             <RouteView RouteData="@routeData" DefaultLayout="@typeof(Layout.MainLayout)"></RouteView>
         }
 
-        <FocusOnNavigate RouteData="routeData" Selector="h1"/>
+        <FocusOnNavigate RouteData="routeData" Selector="page-starter"/>
     </Found>
 </Router>

src/YaeBlog/Dockerfile

@@ -4,8 +4,10 @@ ARG COMMIT_ID
 ENV COMMIT_ID=${COMMIT_ID}
 
 WORKDIR /app
-COPY bin/Release/net10.0/publish/ ./
+COPY out/ ./
 COPY source/ ./source/
-COPY appsettings.json .
+COPY src/YaeBlog/appsettings.json .
+
+ENV BLOG__ROOT="./source"
 
 ENTRYPOINT ["dotnet", "YaeBlog.dll", "serve"]

src/YaeBlog/Extensions/DateOnlyExtensions.cs

@@ -18,5 +18,17 @@ public static class DateOnlyExtensions
                 };
             }
         }
+
+        public int DayNumberOfWeek
+        {
+            get
+            {
+                return date.DayOfWeek switch
+                {
+                    DayOfWeek.Sunday => 7,
+                    _ => (int)date.DayOfWeek + 1
+                };
+            }
+        }
     }
 }

src/YaeBlog/Extensions/WebApplicationBuilderExtensions.cs

@@ -1,4 +1,5 @@
 using AngleSharp;
+using Microsoft.Extensions.Options;
 using YaeBlog.Abstraction;
 using YaeBlog.Services;
 using YaeBlog.Models;
@@ -27,22 +28,25 @@ public static class WebApplicationBuilderExtensions
                 .AddTransient<HeadlinePostRenderProcessor>()
                 .AddTransient<EssayStylesPostRenderProcessor>()
                 .AddTransient<GiteaFetchService>()
+                .AddTransient<BlogChangeWatcher>()
+                .AddTransient<BlogHotReloadService>()
                 .AddSingleton<GitHeapMapService>();
 
             return builder;
         }
 
-        public WebApplicationBuilder AddServer()
+        public WebApplicationBuilder AddYaeCommand(string[] arguments)
         {
-            builder.Services.AddHostedService<BlogHostedService>();
+            builder.Services.AddHostedService<YaeCommandService>(provider =>
+            {
+                IEssayScanService essayScanService = provider.GetRequiredService<IEssayScanService>();
+                IOptions<BlogOptions> blogOptions = provider.GetRequiredService<IOptions<BlogOptions>>();
+                ILogger<YaeCommandService> logger = provider.GetRequiredService<ILogger<YaeCommandService>>();
+                IHostApplicationLifetime applicationLifetime = provider.GetRequiredService<IHostApplicationLifetime>();
 
-            return builder;
-        }
-
-        public WebApplicationBuilder AddWatcher()
-        {
-            builder.Services.AddTransient<BlogChangeWatcher>();
-            builder.Services.AddHostedService<BlogHotReloadService>();
+                return new YaeCommandService(arguments, essayScanService, provider, blogOptions, logger,
+                    applicationLifetime);
+            });
 
             return builder;
         }

src/YaeBlog/Models/GiteaOptions.cs

@@ -8,7 +8,7 @@ public class GiteaOptions
 
     [Required] public required string BaseAddress { get; init; }
 
-    [Required] public required string ApiKey { get; init; }
+    public string? ApiKey { get; init; }
 
     [Required] public required string HeatMapUsername { get; init; }
 }

src/YaeBlog/Models/HeatMapItem.cs

@@ -1,5 +1,8 @@
 namespace YaeBlog.Models;
 
-public record GitContributionItem(DateOnly Time, long ContributionCount);
+public record GitContributionItem(DateOnly Time, long ContributionCount)
+{
+    public string ItemId => $"item-{Time:yyyy-MM-dd}";
+}
 
 public record GitContributionGroupedByWeek(DateOnly Monday, List<GitContributionItem> Contributions);

src/YaeBlog/Program.cs

@@ -1,4 +1,22 @@
-using YaeBlog.Commands;
+using YaeBlog.Components;
+using YaeBlog.Extensions;
 
-YaeBlogCommand command = new();
-await command.RunAsync(args);
+WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddRazorComponents()
+    .AddInteractiveServerComponents();
+builder.Services.AddControllers();
+builder.AddYaeBlog();
+builder.AddYaeCommand(args);
+
+WebApplication application = builder.Build();
+
+application.MapStaticAssets();
+application.UseAntiforgery();
+application.UseYaeBlog();
+
+application.MapRazorComponents<App>()
+    .AddInteractiveServerRenderMode();
+application.MapControllers();
+
+await application.RunAsync();

src/YaeBlog/Services/GitHeatMapService.cs

@@ -5,7 +5,9 @@ using YaeBlog.Models;
 
 namespace YaeBlog.Services;
 
-public sealed class GitHeapMapService(IServiceProvider serviceProvider, IOptions<GiteaOptions> giteaOptions,
+public sealed class GitHeapMapService(
+    IServiceProvider serviceProvider,
+    IOptions<GiteaOptions> giteaOptions,
     ILogger<GitHeapMapService> logger)
 {
     /// <summary>
@@ -83,7 +85,24 @@ public sealed class GitHeapMapService(IServiceProvider serviceProvider, IOptions
             groupedContribution.Contributions.Add(new GitContributionItem(date, contributions));
         }
 
-        // Not fill the last item and add directly.
+        // If the last contributing day is not today, fill the spacing.
+        // But be careful here! If the last grouped contribution is current week, just fill the spacing until today.
+        // If the last grouped contribution is before current week, first fill the blank week then fill until today.
+        while (groupedContribution.Monday < today.LastMonday)
+        {
+            FillSpacing(groupedContribution, today);
+            result.Add(groupedContribution);
+            groupedContribution = new GitContributionGroupedByWeek(groupedContribution.Monday.AddDays(7), []);
+        }
+
+        // Currently the grouped contribution must be current week.
+        for (DateOnly date = groupedContribution.Monday.AddDays(groupedContribution.Contributions.Count);
+             date <= today;
+             date = date.AddDays(1))
+        {
+            groupedContribution.Contributions.Add(new GitContributionItem(date, 0));
+        }
+
         result.Add(groupedContribution);
 
         _gitContributionsGroupedByWeek = result;

src/YaeBlog/Services/GiteaFetchService.cs

@@ -10,27 +10,38 @@ namespace YaeBlog.Services;
 public sealed class GiteaFetchService
 {
     private readonly HttpClient _httpClient;
+    private readonly ILogger<GiteaFetchService> _logger;
 
     private static readonly JsonSerializerOptions s_serializerOptions = new()
     {
-        PropertyNameCaseInsensitive = true, PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower,
-        RespectRequiredConstructorParameters = true, RespectNullableAnnotations = true
+        PropertyNameCaseInsensitive = true,
+        PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower,
+        RespectRequiredConstructorParameters = true,
+        RespectNullableAnnotations = true
     };
 
     /// <summary>
     /// For test only.
     /// </summary>
-    internal GiteaFetchService(IOptions<GiteaOptions> giteaOptions, HttpClient httpClient)
+    internal GiteaFetchService(IOptions<GiteaOptions> giteaOptions, HttpClient httpClient,
+        ILogger<GiteaFetchService> logger)
     {
         _httpClient = httpClient;
+        _logger = logger;
 
         _httpClient.BaseAddress = new Uri(giteaOptions.Value.BaseAddress);
-        _httpClient.DefaultRequestHeaders.Authorization =
-            new AuthenticationHeaderValue("Bearer", giteaOptions.Value.ApiKey);
+        if (string.IsNullOrWhiteSpace(giteaOptions.Value.ApiKey))
+        {
+            return;
+        }
+
+        logger.LogInformation("Api Token is set.");
+        httpClient.DefaultRequestHeaders.Authorization =
+            new AuthenticationHeaderValue("token", giteaOptions.Value.ApiKey);
     }
 
-    public GiteaFetchService(IOptions<GiteaOptions> giteaOptions, IHttpClientFactory httpClientFactory) : this(
-        giteaOptions, httpClientFactory.CreateClient())
+    public GiteaFetchService(IOptions<GiteaOptions> giteaOptions, IHttpClientFactory httpClientFactory,
+        ILogger<GiteaFetchService> logger) : this(giteaOptions, httpClientFactory.CreateClient(), logger)
     {
     }
 
@@ -50,6 +61,7 @@ public sealed class GiteaFetchService
                     new GiteaFetchException("Failed to fetch valid data."));
             }
 
+            _logger.LogInformation("Fetch new user heat map data.");
             return Result.FromValue(data.Select(i =>
                 new GitContributionItem(DateOnly.FromDateTime(DateTimeOffset.FromUnixTimeSeconds(i.Timestamp).DateTime),
                     i.Contributions)).ToList());

src/YaeBlog/Services/YaeCommandService.cs

@@ -0,0 +1,281 @@
+using System.CommandLine;
+using System.CommandLine.Invocation;
+using System.Text;
+using Microsoft.Extensions.Options;
+using YaeBlog.Abstraction;
+using YaeBlog.Core.Exceptions;
+using YaeBlog.Models;
+
+namespace YaeBlog.Services;
+
+public class YaeCommandService(
+    string[] arguments,
+    IEssayScanService essayScanService,
+    IServiceProvider serviceProvider,
+    IOptions<BlogOptions> blogOptions,
+    ILogger<YaeCommandService> logger,
+    IHostApplicationLifetime applicationLifetime)
+    : IHostedService
+{
+    private readonly BlogOptions _blogOptions = blogOptions.Value;
+    private bool _oneShotCommandFlag = true;
+
+    public async Task StartAsync(CancellationToken cancellationToken)
+    {
+        RootCommand rootCommand = new("YaeBlog CLI");
+
+        RegisterServeCommand(rootCommand);
+        RegisterWatchCommand(rootCommand, cancellationToken);
+
+        RegisterNewCommand(rootCommand);
+        RegisterUpdateCommand(rootCommand);
+        RegisterScanCommand(rootCommand);
+        RegisterPublishCommand(rootCommand);
+        RegisterCompressCommand(rootCommand);
+
+        int exitCode = await rootCommand.InvokeAsync(arguments);
+
+        if (exitCode != 0)
+        {
+            throw new BlogCommandException($"YaeBlog command exited with no-zero code {exitCode}");
+        }
+
+        if (_oneShotCommandFlag)
+        {
+            applicationLifetime.StopApplication();
+        }
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+
+    private void RegisterServeCommand(RootCommand rootCommand)
+    {
+        Command command = new("serve", "Start http server.");
+        rootCommand.AddCommand(command);
+
+        command.SetHandler(HandleServeCommand);
+
+        // When invoking the root command without sub command, fallback to serve command.
+        rootCommand.SetHandler(HandleServeCommand);
+    }
+
+    private async Task HandleServeCommand(InvocationContext context)
+    {
+        _oneShotCommandFlag = false;
+
+        logger.LogInformation("Failed to load cache, re-render essays.");
+        RendererService rendererService = serviceProvider.GetRequiredService<RendererService>();
+        await rendererService.RenderAsync();
+    }
+
+    private void RegisterWatchCommand(RootCommand rootCommand, CancellationToken cancellationToken)
+    {
+        Command command = new("watch", "Start a blog watcher that re-render when file changes.");
+        rootCommand.AddCommand(command);
+
+        command.SetHandler(async _ =>
+        {
+            _oneShotCommandFlag = false;
+
+            // BlogHotReloadService is derived from BackgroundService, but we do not let framework trigger it.
+            BlogHotReloadService blogHotReloadService = serviceProvider.GetRequiredService<BlogHotReloadService>();
+            await blogHotReloadService.StartAsync(cancellationToken);
+        });
+    }
+
+    private void RegisterNewCommand(RootCommand rootCommand)
+    {
+        Command command = new("new", "Create a new blog file and image directory.");
+        rootCommand.AddCommand(command);
+
+        Argument<string> filenameArgument = new(name: "blog name", description: "The created blog filename.");
+        command.AddArgument(filenameArgument);
+
+        command.SetHandler(HandleNewCommand, filenameArgument);
+    }
+
+    private async Task HandleNewCommand(string filename)
+    {
+        BlogContents contents = await essayScanService.ScanContents();
+
+        if (contents.Posts.Any(content => content.BlogName == filename))
+        {
+            throw new BlogCommandException("There exits the same title blog in posts.");
+        }
+
+        await essayScanService.SaveBlogContent(new BlogContent(
+            new FileInfo(Path.Combine(_blogOptions.Root, "drafts", filename + ".md")),
+            new MarkdownMetadata
+            {
+                Title = filename,
+                Date = DateTimeOffset.Now.ToString("o"),
+                UpdateTime = DateTimeOffset.Now.ToString("o")
+            },
+            string.Empty, true, [], []
+        ));
+
+        logger.LogInformation("Create new blog '{}'", filename);
+    }
+
+    private void RegisterUpdateCommand(RootCommand rootCommand)
+    {
+        Command command = new("update", "Update the blog essay.");
+        rootCommand.AddCommand(command);
+
+        Argument<string> filenameArgument = new(name: "blog name", description: "The blog filename to update.");
+        command.AddArgument(filenameArgument);
+
+        command.SetHandler(HandleUpdateCommand, filenameArgument);
+    }
+
+    private async Task HandleUpdateCommand(string filename)
+    {
+        logger.LogInformation("The update command only considers published blogs.");
+        BlogContents contents = await essayScanService.ScanContents();
+
+        BlogContent? content = contents.Posts.FirstOrDefault(c => c.BlogName == filename);
+        if (content is null)
+        {
+            throw new BlogCommandException($"Target essay {filename} is not exist.");
+        }
+
+        content.Metadata.UpdateTime = DateTimeOffset.Now.ToString("o");
+        await essayScanService.SaveBlogContent(content, content.IsDraft);
+        logger.LogInformation("Update time of essay '{}' updated.", content.BlogName);
+    }
+
+    private void RegisterScanCommand(RootCommand rootCommand)
+    {
+        Command command = new("scan", "Scan unused and not found images.");
+        rootCommand.AddCommand(command);
+
+        Option<bool> removeOption =
+            new(name: "--rm", description: "Remove unused images.", getDefaultValue: () => false);
+        command.AddOption(removeOption);
+
+        command.SetHandler(HandleScanCommand, removeOption);
+    }
+
+    private async Task HandleScanCommand(bool removeUnusedImages)
+    {
+        BlogContents contents = await essayScanService.ScanContents();
+        List<BlogImageInfo> unusedImages = (from content in contents
+            from image in content.Images
+            where image is { IsUsed: false }
+            select image).ToList();
+
+        if (unusedImages.Count != 0)
+        {
+            StringBuilder builder = new();
+            builder.Append("Found unused images:").Append('\n');
+
+            foreach (BlogImageInfo image in unusedImages)
+            {
+                builder.Append('\t').Append("- ").Append(image.File.FullName).Append('\n');
+            }
+
+            logger.LogInformation("{}", builder.ToString());
+            logger.LogInformation("HINT: use '--rm' to remove unused images.");
+        }
+
+        if (removeUnusedImages)
+        {
+            foreach (BlogImageInfo image in unusedImages)
+            {
+                image.File.Delete();
+            }
+        }
+
+        StringBuilder infoBuilder = new();
+        infoBuilder.Append("Used not existed images:\n");
+
+        bool flag = false;
+        foreach (BlogContent content in contents)
+        {
+            foreach (FileInfo file in content.NotfoundImages)
+            {
+                flag = true;
+                infoBuilder.Append('\t').Append("- ").Append(file.Name).Append(" in ").Append(content.BlogName)
+                    .Append('\n');
+            }
+        }
+
+        if (flag)
+        {
+            logger.LogInformation("{}", infoBuilder.ToString());
+        }
+    }
+
+    private void RegisterPublishCommand(RootCommand rootCommand)
+    {
+        Command command = new("publish", "Publish a new blog file.");
+        rootCommand.AddCommand(command);
+
+        Argument<string> filenameArgument = new(name: "blog name", description: "The published blog filename.");
+        command.AddArgument(filenameArgument);
+
+        command.SetHandler(HandlePublishCommand, filenameArgument);
+    }
+
+    private async Task HandlePublishCommand(string filename)
+    {
+        BlogContents contents = await essayScanService.ScanContents();
+
+        BlogContent? content = (from blog in contents.Drafts
+            where blog.BlogName == filename
+            select blog).FirstOrDefault();
+
+        if (content is null)
+        {
+            throw new BlogCommandException("Target blog doest not exist.");
+        }
+
+        logger.LogInformation("Publish blog {}", content.BlogName);
+
+        // 设置发布的时间
+        content.Metadata.Date = DateTimeOffset.Now.ToString("o");
+        content.Metadata.UpdateTime = DateTimeOffset.Now.ToString("o");
+
+        // 将选中的博客文件复制到posts
+        await essayScanService.SaveBlogContent(content, isDraft: false);
+
+        // 复制图片文件夹
+        DirectoryInfo sourceImageDirectory =
+            new(Path.Combine(blogOptions.Value.Root, "drafts", content.BlogName));
+        DirectoryInfo targetImageDirectory =
+            new(Path.Combine(blogOptions.Value.Root, "posts", content.BlogName));
+
+        if (sourceImageDirectory.Exists)
+        {
+            targetImageDirectory.Create();
+            foreach (FileInfo file in sourceImageDirectory.EnumerateFiles())
+            {
+                file.CopyTo(Path.Combine(targetImageDirectory.FullName, file.Name), true);
+            }
+
+            sourceImageDirectory.Delete(true);
+        }
+
+        // 删除原始的文件
+        FileInfo sourceBlogFile = new(Path.Combine(blogOptions.Value.Root, "drafts", content.BlogName + ".md"));
+        sourceBlogFile.Delete();
+    }
+
+    private void RegisterCompressCommand(RootCommand rootCommand)
+    {
+        Command command = new("compress", "Compress png/jpeg image to webp image to reduce size.");
+        rootCommand.Add(command);
+
+        Option<bool> dryRunOption = new("--dry-run", description: "Dry run the compression task but not write.",
+            getDefaultValue: () => false);
+        command.AddOption(dryRunOption);
+
+        command.SetHandler(HandleCompressCommand, dryRunOption);
+    }
+
+    private async Task HandleCompressCommand(bool dryRun)
+    {
+        ImageCompressService imageCompressService = serviceProvider.GetRequiredService<ImageCompressService>();
+        await imageCompressService.Compress(dryRun);
+    }
+}

src/YaeBlog/YaeBlog.csproj

@@ -27,6 +27,6 @@
 
   <PropertyGroup>
     <ClientAssetsRestoreCommand>pnpm install</ClientAssetsRestoreCommand>
-    <ClientAssetsBuildCommand>pwsh ../../build.ps1 tailwind</ClientAssetsBuildCommand>
+    <ClientAssetsBuildCommand>pwsh tailwind.ps1</ClientAssetsBuildCommand>
   </PropertyGroup>
 </Project>

src/YaeBlog/appsettings.json

@@ -18,7 +18,7 @@
     "Links": [
       {
         "Name": "Ichirinko",
-        "Description": "这是个大哥",
+        "Description": "黑历史集合地，naive的代价",
         "Link": "https://ichirinko.top",
         "AvatarImage": "https://ichirinko-blog-img-1.oss-cn-shenzhen.aliyuncs.com/Pic_res/img/202209122110798.png"
       },

src/YaeBlog/tailwind.ps1

@@ -0,0 +1,11 @@
+#!/pwsh
+
+[cmdletbinding()]
+param(
+    [string]$Output = "wwwroot"
+)
+
+end {
+    Write-Host "Build tailwind css into $Output."
+    pnpm tailwindcss -i wwwroot/tailwind.css -o $Output/tailwind.g.css
+}