Merge branch 'master' into feat/intro-2026

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: http://github-mirrors.infra.svc.cluster.local/actions/checkout.git@v4
+        uses: https://mirrors.rrricardo.top/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 -p /root/.docker
+          mkdir /root/.docker
       - name: Login tencent cloud docker registry.
-        uses: http://github-mirrors.infra.svc.cluster.local/actions/podman-login.git@v1
+        uses: https://mirrors.rrricardo.top/actions/podman-login.git@v1
         with:
           registry: ccr.ccs.tencentyun.com
           username: 100044380877

.gitignore

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

YaeBlog.slnx

@@ -12,7 +12,6 @@
     <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

@@ -3,15 +3,16 @@
 [cmdletbinding()]
 param(
     [Parameter(Mandatory = $true, Position = 0, HelpMessage = "Specify the build target")]
-    [ValidateSet("publish", "compress", "build", "dev", "new", "watch", "serve")]
+    [ValidateSet("tailwind", "publish", "compress", "build", "dev", "new", "watch", "serve", "list")]
     [string]$Target,
+    [string]$Output = "wwwroot",
     [string]$Essay,
     [switch]$Compress,
     [string]$Root = "source"
 )
 
 begin {
-    if (($Target -eq "tailwind") -or ($Target -eq "build"))
+    if ($Target -eq "tailwind")
     {
         # Handle tailwind specially.
         return
@@ -81,11 +82,8 @@ process {
     function Build-Image
     {
         $commitId = git rev-parse --short=10 HEAD
-        dotnet publish ./src/YaeBlog/YaeBlog.csproj -o out
+        dotnet publish
-        Write-Host "Succeed to build blog appliocation."
+        podman build . -t ccr.ccs.tencentyun.com/jackfiled/blog --build-arg COMMIT_ID=$commitId
-        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 {
@@ -113,6 +111,11 @@ 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.Abstractions/YaeBlog.Abstractions.csproj

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

src/YaeBlog.Tests/GiteaFetchServiceTests.cs

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

src/YaeBlog.Tests/OptionsMock.cs

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

src/YaeBlog/Abstraction/IEssayContentService.cs

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

src/YaeBlog/Abstraction/IEssayScanService.cs

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

src/YaeBlog/Abstraction/IPostRenderProcessor.cs

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

src/YaeBlog/Abstraction/IPreRenderProcessor.cs

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

src/YaeBlog/Commands/Binders/BlogOptionsBinder.cs

@@ -0,0 +1,33 @@
+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

@@ -0,0 +1,32 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,296 @@
+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/BlogInformationCard.razor

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

src/YaeBlog/Components/EssayCard.razor

@@ -1,5 +1,5 @@
 @using System.Text.Encodings.Web
-@using YaeBlog.Abstractions.Models
+@using YaeBlog.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.Abstractions.Models
+@using YaeBlog.Models
 @using YaeBlog.Services
 @inject GitHeapMapService GitHeapMapInstance
 

src/YaeBlog/Components/Pages/Archives.razor

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

src/YaeBlog/Components/Pages/BlogIndex.razor

@@ -1,6 +1,6 @@
 @page "/blog"
-@using YaeBlog.Abstractions
+@using YaeBlog.Abstraction
-@using YaeBlog.Abstractions.Models
+@using YaeBlog.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.Abstractions
+@using YaeBlog.Abstraction
-@using YaeBlog.Abstractions.Models
+@using YaeBlog.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.Abstractions.Models
+@using YaeBlog.Models
 @inject IOptions<BlogOptions> BlogOptionInstance
 
 <PageTitle>

src/YaeBlog/Components/Pages/Index.razor

@@ -1,6 +1,6 @@
 @page "/"
-@using YaeBlog.Abstractions
+@using YaeBlog.Abstraction
-@using YaeBlog.Abstractions.Models
+@using YaeBlog.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.Abstractions
+@using YaeBlog.Abstraction
-@using YaeBlog.Abstractions.Models
+@using YaeBlog.Models
 
 @inject IEssayContentService Contents
 @inject NavigationManager NavigationInstance

src/YaeBlog/Dockerfile

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

src/YaeBlog/Extensions/WebApplicationBuilderExtensions.cs

@@ -1,8 +1,7 @@
 using AngleSharp;
-using Microsoft.Extensions.Options;
+using YaeBlog.Abstraction;
-using YaeBlog.Abstractions;
 using YaeBlog.Services;
-using YaeBlog.Abstractions.Models;
+using YaeBlog.Models;
 using YaeBlog.Processors;
 
 namespace YaeBlog.Extensions;
@@ -28,25 +27,22 @@ public static class WebApplicationBuilderExtensions
                 .AddTransient<HeadlinePostRenderProcessor>()
                 .AddTransient<EssayStylesPostRenderProcessor>()
                 .AddTransient<GiteaFetchService>()
-                .AddTransient<BlogChangeWatcher>()
-                .AddTransient<BlogHotReloadService>()
                 .AddSingleton<GitHeapMapService>();
 
             return builder;
         }
 
-        public WebApplicationBuilder AddYaeCommand(string[] arguments)
+        public WebApplicationBuilder AddServer()
         {
-            builder.Services.AddHostedService<YaeCommandService>(provider =>
+            builder.Services.AddHostedService<BlogHostedService>();
-            {
-                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,
+            return builder;
-                    applicationLifetime);
+        }
-            });
+
+        public WebApplicationBuilder AddWatcher()
+        {
+            builder.Services.AddTransient<BlogChangeWatcher>();
+            builder.Services.AddHostedService<BlogHotReloadService>();
 
             return builder;
         }

src/YaeBlog/Extensions/WebApplicationExtensions.cs

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

src/YaeBlog/Models/BlogContent.cs

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

src/YaeBlog/Models/BlogContents.cs

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

src/YaeBlog/Models/BlogEssay.cs

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

src/YaeBlog/Models/BlogHeadline.cs

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

src/YaeBlog/Models/BlogImageInfo.cs

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

src/YaeBlog/Models/BlogOptions.cs

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

src/YaeBlog/Models/EssayTag.cs

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

src/YaeBlog/Models/GiteaOptions.cs

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

src/YaeBlog/Models/HeatMapItem.cs

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

src/YaeBlog/Models/MarkdownMetadata.cs

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

src/YaeBlog/Processors/EssayStylesPostRenderProcessor.cs

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

src/YaeBlog/Processors/HeadlinePostRenderProcessor.cs

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

src/YaeBlog/Processors/ImagePostRenderProcessor.cs

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

src/YaeBlog/Program.cs

@@ -1,22 +1,4 @@
-using YaeBlog.Components;
+using YaeBlog.Commands;
-using YaeBlog.Extensions;
 
-WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
+YaeBlogCommand command = new();
-
+await command.RunAsync(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/BlogChangeWatcher.cs

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

src/YaeBlog/Services/BlogHotReloadService.cs

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

src/YaeBlog/Services/EssayContentService.cs

@@ -1,7 +1,7 @@
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
-using YaeBlog.Abstractions;
+using YaeBlog.Abstraction;
-using YaeBlog.Abstractions.Models;
+using YaeBlog.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.Abstractions;
+using YaeBlog.Abstraction;
 using YaeBlog.Core.Exceptions;
-using YaeBlog.Abstractions.Models;
+using YaeBlog.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.Abstractions.Models;
+using YaeBlog.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.Abstractions.Models;
+using YaeBlog.Models;
 
 namespace YaeBlog.Services;
 

src/YaeBlog/Services/ImageCompressService.cs

@@ -1,7 +1,7 @@
 using Imageflow.Fluent;
-using YaeBlog.Abstractions;
+using YaeBlog.Abstraction;
 using YaeBlog.Core.Exceptions;
-using YaeBlog.Abstractions.Models;
+using YaeBlog.Models;
 
 namespace YaeBlog.Services;
 

src/YaeBlog/Services/MarkdownWordCounter.cs

@@ -1,5 +1,5 @@
 using YaeBlog.Extensions;
-using YaeBlog.Abstractions.Models;
+using YaeBlog.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.Abstractions;
+using YaeBlog.Abstraction;
 using YaeBlog.Core.Exceptions;
-using YaeBlog.Abstractions.Models;
+using YaeBlog.Models;
 
 namespace YaeBlog.Services;
 

src/YaeBlog/Services/YaeCommandService.cs

@@ -1,281 +0,0 @@
-using System.CommandLine;
-using System.CommandLine.Invocation;
-using System.Text;
-using Microsoft.Extensions.Options;
-using YaeBlog.Abstractions;
-using YaeBlog.Core.Exceptions;
-using YaeBlog.Abstractions.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

@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <ProjectReference Include="../../third-party/BlazorSvgComponents/src/BlazorSvgComponents/BlazorSvgComponents.csproj" />
-    <ProjectReference Include="..\YaeBlog.Abstractions\YaeBlog.Abstractions.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -28,6 +27,6 @@
 
   <PropertyGroup>
     <ClientAssetsRestoreCommand>pnpm install</ClientAssetsRestoreCommand>
-    <ClientAssetsBuildCommand>pwsh tailwind.ps1</ClientAssetsBuildCommand>
+    <ClientAssetsBuildCommand>pwsh ../../build.ps1 tailwind</ClientAssetsBuildCommand>
   </PropertyGroup>
 </Project>

src/YaeBlog/appsettings.json

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

src/YaeBlog/tailwind.ps1

@@ -1,11 +0,0 @@
-#!/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
-}