From 0332dcd7158cf3b72168d03a87909041508d737d Mon Sep 17 00:00:00 2001 From: yuuko Date: Mon, 24 Nov 2025 15:47:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 支持 FreePic2Pdf_bkmk.txt 扩展名的文件，解决文件查找失败的问题 更新错误消息显示支持的文件格式 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- FileMerger.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/FileMerger.cs b/FileMerger.cs index 3c61f42..14b984e 100644 --- a/FileMerger.cs +++ b/FileMerger.cs @@ -23,12 +23,14 @@ namespace SlideCombine try { - // 获取所有包含FreePic2Pdf_bkmk文件的文件夹 - var bkmkFiles = Directory.GetFiles(pdfRootPath, "FreePic2Pdf_bkmk", SearchOption.AllDirectories); + // 获取所有包含FreePic2Pdf_bkmk文件的文件夹（支持无扩展名和.txt扩展名） + var bkmkFiles = new List(); + bkmkFiles.AddRange(Directory.GetFiles(pdfRootPath, "FreePic2Pdf_bkmk", SearchOption.AllDirectories)); + bkmkFiles.AddRange(Directory.GetFiles(pdfRootPath, "FreePic2Pdf_bkmk.txt", SearchOption.AllDirectories)); - if (bkmkFiles.Length == 0) + if (bkmkFiles.Count == 0) { - throw new Exception($"在路径 {pdfRootPath} 下未找到任何 FreePic2Pdf_bkmk 文件"); + throw new Exception($"在路径 {pdfRootPath} 下未找到任何 FreePic2Pdf_bkmk 或 FreePic2Pdf_bkmk.txt 文件"); } // 按基础文件名分组（取文件夹名称的空格前缀）