refact: introduce YaeBlog.Abstractions layer.

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

YaeBlog.slnx

@@ -12,6 +12,7 @@
     <File Path="README.md" />
   </Folder>
   <Folder Name="/src/">
+    <Project Path="src/YaeBlog.Abstractions/YaeBlog.Abstractions.csproj" />
     <Project Path="src/YaeBlog.Tests/YaeBlog.Tests.csproj" />
     <Project Path="src/YaeBlog/YaeBlog.csproj" />
   </Folder>

build.ps1

@@ -146,10 +146,6 @@ process {
             dotnet run -- serve
             break
         }
-        "list" {
-            dotnet run -- list
-            break
-        }
     }
 }
 

src/YaeBlog.Abstractions/IEssayContentService.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 
-namespace YaeBlog.Abstraction;
+namespace YaeBlog.Abstractions;
 
 public interface IEssayContentService
 {

src/YaeBlog.Abstractions/IEssayScanService.cs

@@ -1,6 +1,6 @@
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 
-namespace YaeBlog.Abstraction;
+namespace YaeBlog.Abstractions;
 
 public interface IEssayScanService
 {

src/YaeBlog.Abstractions/IPostRenderProcessor.cs

@@ -1,6 +1,6 @@
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 
-namespace YaeBlog.Abstraction;
+namespace YaeBlog.Abstractions;
 
 public interface IPostRenderProcessor
 {

src/YaeBlog.Abstractions/IPreRenderProcessor.cs

@@ -1,6 +1,6 @@
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 
-namespace YaeBlog.Abstraction;
+namespace YaeBlog.Abstractions;
 
 public interface IPreRenderProcessor
 {

src/YaeBlog.Abstractions/Models/BlogContent.cs

@@ -1,4 +1,4 @@
-namespace YaeBlog.Models;
+namespace YaeBlog.Abstractions.Models;
 
 /// <summary>
 /// 单个博客文件的所有数据和元数据

src/YaeBlog.Abstractions/Models/BlogContents.cs

@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Collections.Concurrent;
 
-namespace YaeBlog.Models;
+namespace YaeBlog.Abstractions.Models;
 
 public record BlogContents(ConcurrentBag<BlogContent> Drafts, ConcurrentBag<BlogContent> Posts)
     : IEnumerable<BlogContent>

src/YaeBlog.Abstractions/Models/BlogEssay.cs

@@ -1,4 +1,4 @@
-namespace YaeBlog.Models;
+namespace YaeBlog.Abstractions.Models;
 
 public record BlogEssay(
     string Title,

src/YaeBlog.Abstractions/Models/BlogHeadline.cs

@@ -1,4 +1,4 @@
-namespace YaeBlog.Models;
+namespace YaeBlog.Abstractions.Models;
 
 public class BlogHeadline(string title, string selectorId)
 {

src/YaeBlog.Abstractions/Models/BlogImageInfo.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace YaeBlog.Models;
+namespace YaeBlog.Abstractions.Models;
 
 public record BlogImageInfo(FileInfo File, long Width, long Height, string MineType, byte[] Content, bool IsUsed)
     : IComparable<BlogImageInfo>

src/YaeBlog.Abstractions/Models/BlogOptions.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace YaeBlog.Models;
+namespace YaeBlog.Abstractions.Models;
 
 /// <summary>
 /// 友链模型类

src/YaeBlog.Abstractions/Models/EssayTag.cs

@@ -1,6 +1,6 @@
 using System.Text.Encodings.Web;
 
-namespace YaeBlog.Models;
+namespace YaeBlog.Abstractions.Models;
 
 public class EssayTag(string tagName) : IEquatable<EssayTag>
 {

src/YaeBlog.Abstractions/Models/GiteaOptions.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace YaeBlog.Models;
+namespace YaeBlog.Abstractions.Models;
 
 public class GiteaOptions
 {

src/YaeBlog.Abstractions/Models/HeatMapItem.cs

@@ -1,4 +1,4 @@
-namespace YaeBlog.Models;
+namespace YaeBlog.Abstractions.Models;
 
 public record GitContributionItem(DateOnly Time, long ContributionCount)
 {

src/YaeBlog.Abstractions/Models/MarkdownMetadata.cs

@@ -1,4 +1,4 @@
-namespace YaeBlog.Models;
+namespace YaeBlog.Abstractions.Models;
 
 public class MarkdownMetadata
 {

src/YaeBlog.Abstractions/YaeBlog.Abstractions.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net10.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+</Project>

src/YaeBlog.Tests/GiteaFetchServiceTests.cs

@@ -2,7 +2,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Moq;
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 using YaeBlog.Services;
 
 namespace YaeBlog.Tests;

src/YaeBlog.Tests/OptionsMock.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Options;
 using Moq;
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 
 namespace YaeBlog.Tests;
 

src/YaeBlog/Components/BlogInformationCard.razor

@@ -1,6 +1,6 @@
 @using Microsoft.Extensions.Options
-@using YaeBlog.Abstraction
+@using YaeBlog.Abstractions
-@using YaeBlog.Models
+@using YaeBlog.Abstractions.Models
 
 @inject IEssayContentService Contents
 @inject IOptions<BlogOptions> Options

src/YaeBlog/Components/EssayCard.razor

@@ -1,5 +1,5 @@
 @using System.Text.Encodings.Web
-@using YaeBlog.Models
+@using YaeBlog.Abstractions.Models
 
 <div class="flex flex-col p-3">
     <div class="text-3xl font-bold py-2">

src/YaeBlog/Components/GitHeatMap.razor

@@ -1,4 +1,4 @@
-@using YaeBlog.Models
+@using YaeBlog.Abstractions.Models
 @using YaeBlog.Services
 @inject GitHeapMapService GitHeapMapInstance
 

src/YaeBlog/Components/Pages/Archives.razor

@@ -1,6 +1,6 @@
 @page "/blog/archives"
-@using YaeBlog.Abstraction
+@using YaeBlog.Abstractions
-@using YaeBlog.Models
+@using YaeBlog.Abstractions.Models
 
 @inject IEssayContentService Contents
 

src/YaeBlog/Components/Pages/BlogIndex.razor

@@ -1,6 +1,6 @@
 @page "/blog"
-@using YaeBlog.Abstraction
+@using YaeBlog.Abstractions
-@using YaeBlog.Models
+@using YaeBlog.Abstractions.Models
 
 @inject IEssayContentService Contents
 @inject NavigationManager NavigationInstance

src/YaeBlog/Components/Pages/Essays.razor

@@ -1,7 +1,7 @@
 @page "/blog/essays/{BlogKey}"
 @using System.Text.Encodings.Web
-@using YaeBlog.Abstraction
+@using YaeBlog.Abstractions
-@using YaeBlog.Models
+@using YaeBlog.Abstractions.Models
 
 @inject IEssayContentService Contents
 @inject NavigationManager NavigationInstance

src/YaeBlog/Components/Pages/Friends.razor

@@ -1,6 +1,6 @@
 @page "/friends"
 @using Microsoft.Extensions.Options
-@using YaeBlog.Models
+@using YaeBlog.Abstractions.Models
 @inject IOptions<BlogOptions> BlogOptionInstance
 
 <PageTitle>

src/YaeBlog/Components/Pages/Index.razor

@@ -1,6 +1,6 @@
 @page "/"
-@using YaeBlog.Abstraction
+@using YaeBlog.Abstractions
-@using YaeBlog.Models
+@using YaeBlog.Abstractions.Models
 @inject IEssayContentService EssayContentInstance
 
 <PageTitle>

src/YaeBlog/Components/Pages/Tags.razor

@@ -1,7 +1,7 @@
 @page "/blog/tags/"
 @using System.Text.Encodings.Web
-@using YaeBlog.Abstraction
+@using YaeBlog.Abstractions
-@using YaeBlog.Models
+@using YaeBlog.Abstractions.Models
 
 @inject IEssayContentService Contents
 @inject NavigationManager NavigationInstance

src/YaeBlog/Extensions/HostApplicationBuilderExtensions.cs

@@ -1,26 +1,73 @@
 using AngleSharp;
 using Microsoft.Extensions.Options;
-using YaeBlog.Abstraction;
+using YaeBlog.Abstractions;
 using YaeBlog.Services;
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 using YaeBlog.Processors;
 
 namespace YaeBlog.Extensions;
 
-public static class WebApplicationBuilderExtensions
+public static class HostApplicationBuilderExtensions
 {
-    extension(WebApplicationBuilder builder)
+    extension(IHostApplicationBuilder builder)
     {
-        public WebApplicationBuilder AddYaeBlog()
+        public ConsoleInfoService AddYaeCommand(string[] arguments)
         {
-            builder.ConfigureOptions<BlogOptions>(BlogOptions.OptionName)
+            builder.AddCommonServices();
-                .ConfigureOptions<GiteaOptions>(GiteaOptions.OptionName);
 
+            builder.Logging.AddFilter("Microsoft.Hosting.Lifetime", LogLevel.Warning);
+
+            builder.Services.AddTransient<ImageCompressService>();
+            builder.Services.AddHostedService<YaeCommandService>(provider =>
+            {
+                IEssayScanService essayScanService = provider.GetRequiredService<IEssayScanService>();
+                ImageCompressService imageCompressService = provider.GetRequiredService<ImageCompressService>();
+                ConsoleInfoService consoleInfoService = provider.GetRequiredService<ConsoleInfoService>();
+                IOptions<BlogOptions> blogOptions = provider.GetRequiredService<IOptions<BlogOptions>>();
+                ILogger<YaeCommandService> logger = provider.GetRequiredService<ILogger<YaeCommandService>>();
+                IHostApplicationLifetime hostApplicationLifetime =
+                    provider.GetRequiredService<IHostApplicationLifetime>();
+
+                return new YaeCommandService(arguments, essayScanService, imageCompressService, consoleInfoService,
+                    hostApplicationLifetime, blogOptions, logger);
+            });
+
+            ConsoleInfoService infoService = new();
+            builder.Services.AddSingleton<ConsoleInfoService>(_ => infoService);
+
+            return infoService;
+        }
+
+        private void AddCommonServices()
+        {
             builder.Services.AddHttpClient()
                 .AddMarkdig()
                 .AddYamlParser();
 
+            builder.ConfigureOptions<BlogOptions>(BlogOptions.OptionName)
+                .ConfigureOptions<GiteaOptions>(GiteaOptions.OptionName);
+
+            builder.Services.AddSingleton<IEssayScanService, EssayScanService>();
+        }
+
+        private IHostApplicationBuilder ConfigureOptions<T>(string optionSectionName) where T : class
+        {
+            builder.Services
+                .AddOptions<T>()
+                .Bind(builder.Configuration.GetSection(optionSectionName))
+                .ValidateDataAnnotations();
+            return builder;
+        }
+    }
+
+    extension(WebApplicationBuilder builder)
+    {
+        public WebApplicationBuilder AddYaeServer(ConsoleInfoService consoleInfoService)
+        {
+            builder.AddCommonServices();
+
             builder.Services.AddSingleton<AngleSharp.IConfiguration>(_ => Configuration.Default)
+                .AddSingleton<ConsoleInfoService>(_ => consoleInfoService)
                 .AddSingleton<IEssayScanService, EssayScanService>()
                 .AddSingleton<RendererService>()
                 .AddSingleton<IEssayContentService, EssayContentService>()
@@ -32,32 +79,9 @@ public static class WebApplicationBuilderExtensions
                 .AddTransient<BlogHotReloadService>()
                 .AddSingleton<GitHeapMapService>();
 
-            return builder;
+            builder.Services.AddHostedService<StartServerService>();
-        }
-
-        public WebApplicationBuilder AddYaeCommand(string[] arguments)
-        {
-            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 new YaeCommandService(arguments, essayScanService, provider, blogOptions, logger,
-                    applicationLifetime);
-            });
 
             return builder;
         }
-
-        private WebApplicationBuilder ConfigureOptions<T>(string optionSectionName) where T : class
-        {
-            builder.Services
-                .AddOptions<T>()
-                .Bind(builder.Configuration.GetSection(optionSectionName))
-                .ValidateDataAnnotations();
-            return builder;
-        }
     }
 }

src/YaeBlog/Extensions/WebApplicationExtensions.cs

@@ -1,4 +1,4 @@
-using YaeBlog.Abstraction;
+using YaeBlog.Abstractions;
 using YaeBlog.Processors;
 using YaeBlog.Services;
 

src/YaeBlog/Processors/EssayStylesPostRenderProcessor.cs

@@ -1,8 +1,8 @@
 using AngleSharp;
 using AngleSharp.Dom;
-using YaeBlog.Abstraction;
+using YaeBlog.Abstractions;
 using YaeBlog.Extensions;
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 
 namespace YaeBlog.Processors;
 

src/YaeBlog/Processors/HeadlinePostRenderProcessor.cs

@@ -1,7 +1,7 @@
 using AngleSharp;
 using AngleSharp.Dom;
-using YaeBlog.Abstraction;
+using YaeBlog.Abstractions;
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 
 namespace YaeBlog.Processors;
 

src/YaeBlog/Processors/ImagePostRenderProcessor.cs

@@ -1,9 +1,9 @@
 using AngleSharp;
 using AngleSharp.Dom;
 using Microsoft.Extensions.Options;
-using YaeBlog.Abstraction;
+using YaeBlog.Abstractions;
 using YaeBlog.Core.Exceptions;
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 
 namespace YaeBlog.Processors;
 

src/YaeBlog/Program.cs

@@ -1,13 +1,25 @@
 using YaeBlog.Components;
 using YaeBlog.Extensions;
+using YaeBlog.Services;
+
+HostApplicationBuilder consoleBuilder = Host.CreateApplicationBuilder(args);
+
+ConsoleInfoService consoleInfoService = consoleBuilder.AddYaeCommand(args);
+
+IHost consoleApp = consoleBuilder.Build();
+await consoleApp.RunAsync();
+
+if (consoleInfoService.IsOneShotCommand)
+{
+    return;
+}
 
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddRazorComponents()
     .AddInteractiveServerComponents();
 builder.Services.AddControllers();
-builder.AddYaeBlog();
+builder.AddYaeServer(consoleInfoService);
-builder.AddYaeCommand(args);
 
 WebApplication application = builder.Build();
 

src/YaeBlog/Services/BlogChangeWatcher.cs

@@ -1,5 +1,5 @@
 using Microsoft.Extensions.Options;
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 
 namespace YaeBlog.Services;
 

src/YaeBlog/Services/BlogHotReloadService.cs

@@ -1,4 +1,4 @@
-using YaeBlog.Abstraction;
+using YaeBlog.Abstractions;
 
 namespace YaeBlog.Services;
 

src/YaeBlog/Services/ConsoleInfoService.cs

@@ -0,0 +1,14 @@
+namespace YaeBlog.Services;
+
+public enum ServerCommand
+{
+    Serve,
+    Watch
+}
+
+public sealed class ConsoleInfoService
+{
+    public bool IsOneShotCommand { get; set; }
+
+    public ServerCommand Command { get; set; }
+}

src/YaeBlog/Services/EssayContentService.cs

@@ -1,7 +1,7 @@
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
-using YaeBlog.Abstraction;
+using YaeBlog.Abstractions;
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 
 namespace YaeBlog.Services;
 

src/YaeBlog/Services/EssayScanService.cs

@@ -3,9 +3,9 @@ using System.Text.RegularExpressions;
 using Imageflow.Bindings;
 using Imageflow.Fluent;
 using Microsoft.Extensions.Options;
-using YaeBlog.Abstraction;
+using YaeBlog.Abstractions;
 using YaeBlog.Core.Exceptions;
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 using YamlDotNet.Core;
 using YamlDotNet.Serialization;
 

src/YaeBlog/Services/GitHeatMapService.cs

@@ -1,7 +1,7 @@
 using DotNext;
 using Microsoft.Extensions.Options;
 using YaeBlog.Extensions;
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 
 namespace YaeBlog.Services;
 

src/YaeBlog/Services/GiteaFetchService.cs

@@ -3,7 +3,7 @@ using System.Text.Json;
 using DotNext;
 using Microsoft.Extensions.Options;
 using YaeBlog.Core.Exceptions;
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 
 namespace YaeBlog.Services;
 

src/YaeBlog/Services/ImageCompressService.cs

@@ -1,7 +1,7 @@
 using Imageflow.Fluent;
-using YaeBlog.Abstraction;
+using YaeBlog.Abstractions;
 using YaeBlog.Core.Exceptions;
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 
 namespace YaeBlog.Services;
 
@@ -34,6 +34,7 @@ public sealed class ImageCompressService(IEssayScanService essayScanService, ILo
 
         if (needCompressContents.Count == 0)
         {
+            logger.LogInformation("No candidates found to be compressed.");
             return;
         }
 
@@ -51,7 +52,7 @@ public sealed class ImageCompressService(IEssayScanService essayScanService, ILo
 
             foreach (BlogImageInfo image in uncompressedImages)
             {
-                logger.LogInformation("Uncompressed image: {} belonging to blog {}.", image.File.Name,
+                logger.LogInformation("Uncompressed image: {filename} belonging to blog {blog}.", image.File.Name,
                     content.BlogName);
             }
 
@@ -82,7 +83,7 @@ public sealed class ImageCompressService(IEssayScanService essayScanService, ILo
 
         logger.LogInformation("Compression ratio: {}%.", (double)compressedSize / uncompressedSize * 100.0);
 
-        if (dryRun is false)
+        if (!dryRun)
         {
             await Task.WhenAll(from content in compressedContent
                 select essayScanService.SaveBlogContent(content, content.IsDraft));

src/YaeBlog/Services/MarkdownWordCounter.cs

@@ -1,5 +1,5 @@
 using YaeBlog.Extensions;
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 
 namespace YaeBlog.Services
 {

src/YaeBlog/Services/RendererService.cs

@@ -3,9 +3,9 @@ using System.Diagnostics;
 using System.Text;
 using System.Text.RegularExpressions;
 using Markdig;
-using YaeBlog.Abstraction;
+using YaeBlog.Abstractions;
 using YaeBlog.Core.Exceptions;
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 
 namespace YaeBlog.Services;
 

src/YaeBlog/Services/StartServerService.cs

@@ -0,0 +1,27 @@
+namespace YaeBlog.Services;
+
+public sealed class StartServerService(ConsoleInfoService consoleInfoService,
+    RendererService rendererService,
+    BlogHotReloadService blogHotReloadService) : IHostedService
+{
+    public async Task StartAsync(CancellationToken cancellationToken)
+    {
+        switch (consoleInfoService.Command)
+        {
+            case ServerCommand.Serve:
+                {
+                    await rendererService.RenderAsync();
+                    break;
+                }
+            case ServerCommand.Watch:
+                {
+                    await blogHotReloadService.StartAsync(cancellationToken);
+                    break;
+                }
+            default:
+                throw new InvalidOperationException();
+        }
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}

src/YaeBlog/Services/YaeCommandService.cs

@@ -2,30 +2,31 @@
 using System.CommandLine.Invocation;
 using System.Text;
 using Microsoft.Extensions.Options;
-using YaeBlog.Abstraction;
+using YaeBlog.Abstractions;
 using YaeBlog.Core.Exceptions;
-using YaeBlog.Models;
+using YaeBlog.Abstractions.Models;
 
 namespace YaeBlog.Services;
 
-public class YaeCommandService(
+public sealed class YaeCommandService(
     string[] arguments,
     IEssayScanService essayScanService,
-    IServiceProvider serviceProvider,
+    ImageCompressService imageCompressService,
+    ConsoleInfoService consoleInfoService,
+    IHostApplicationLifetime hostApplicationLifetime,
     IOptions<BlogOptions> blogOptions,
-    ILogger<YaeCommandService> logger,
+    ILogger<YaeCommandService> logger)
-    IHostApplicationLifetime applicationLifetime)
+    : BackgroundService
-    : IHostedService
 {
     private readonly BlogOptions _blogOptions = blogOptions.Value;
     private bool _oneShotCommandFlag = true;
 
-    public async Task StartAsync(CancellationToken cancellationToken)
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
         RootCommand rootCommand = new("YaeBlog CLI");
 
         RegisterServeCommand(rootCommand);
-        RegisterWatchCommand(rootCommand, cancellationToken);
+        RegisterWatchCommand(rootCommand);
 
         RegisterNewCommand(rootCommand);
         RegisterUpdateCommand(rootCommand);
@@ -33,6 +34,10 @@ public class YaeCommandService(
         RegisterPublishCommand(rootCommand);
         RegisterCompressCommand(rootCommand);
 
+        // Shit code: wait for the application starting.
+        // If the command service finished early before the application starting, there will be an ugly exception.
+        await Task.Delay(500, stoppingToken);
+        logger.LogInformation("Running YaeBlog Command.");
         int exitCode = await rootCommand.InvokeAsync(arguments);
 
         if (exitCode != 0)
@@ -40,13 +45,14 @@ public class YaeCommandService(
             throw new BlogCommandException($"YaeBlog command exited with no-zero code {exitCode}");
         }
 
-        if (_oneShotCommandFlag)
+        consoleInfoService.IsOneShotCommand = _oneShotCommandFlag;
-        {
-            applicationLifetime.StopApplication();
-        }
-    }
 
-    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+        if (!consoleInfoService.IsOneShotCommand)
+        {
+            logger.LogInformation("Start YaeBlog command: {}", consoleInfoService.Command);
+        }
+        hostApplicationLifetime.StopApplication();
+    }
 
     private void RegisterServeCommand(RootCommand rootCommand)
     {
@@ -59,27 +65,23 @@ public class YaeCommandService(
         rootCommand.SetHandler(HandleServeCommand);
     }
 
-    private async Task HandleServeCommand(InvocationContext context)
+    private Task HandleServeCommand(InvocationContext context)
     {
         _oneShotCommandFlag = false;
+        consoleInfoService.Command = ServerCommand.Serve;
 
-        logger.LogInformation("Failed to load cache, re-render essays.");
+        return Task.CompletedTask;
-        RendererService rendererService = serviceProvider.GetRequiredService<RendererService>();
-        await rendererService.RenderAsync();
     }
 
-    private void RegisterWatchCommand(RootCommand rootCommand, CancellationToken cancellationToken)
+    private void RegisterWatchCommand(RootCommand rootCommand)
     {
         Command command = new("watch", "Start a blog watcher that re-render when file changes.");
         rootCommand.AddCommand(command);
 
-        command.SetHandler(async _ =>
+        command.SetHandler(_ =>
         {
             _oneShotCommandFlag = false;
-
+            consoleInfoService.Command = ServerCommand.Watch;
-            // BlogHotReloadService is derived from BackgroundService, but we do not let framework trigger it.
-            BlogHotReloadService blogHotReloadService = serviceProvider.GetRequiredService<BlogHotReloadService>();
-            await blogHotReloadService.StartAsync(cancellationToken);
         });
     }
 
@@ -270,12 +272,6 @@ public class YaeCommandService(
             getDefaultValue: () => false);
         command.AddOption(dryRunOption);
 
-        command.SetHandler(HandleCompressCommand, dryRunOption);
+        command.SetHandler(async dryRun => { await imageCompressService.Compress(dryRun); }, dryRunOption);
-    }
-
-    private async Task HandleCompressCommand(bool dryRun)
-    {
-        ImageCompressService imageCompressService = serviceProvider.GetRequiredService<ImageCompressService>();
-        await imageCompressService.Compress(dryRun);
     }
 }

src/YaeBlog/YaeBlog.csproj

@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <ProjectReference Include="../../third-party/BlazorSvgComponents/src/BlazorSvgComponents/BlazorSvgComponents.csproj" />
+    <ProjectReference Include="..\YaeBlog.Abstractions\YaeBlog.Abstractions.csproj" />
   </ItemGroup>
 
   <ItemGroup>