🔊 修正日志格式

Author: freeok

src/main/java/com/pcdd/sonovel/action/AggregatedSearchAction.java

@@ -1,5 +1,6 @@
 package com.pcdd.sonovel.action;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Console;
 import com.pcdd.sonovel.core.Source;
 import com.pcdd.sonovel.handle.SearchResultsHandler;
@@ -36,6 +37,11 @@ public void execute() {
 
         List<SearchResult> results = getSearchResults(kw);
 
+        if (CollUtil.isEmpty(results)) {
+            Console.log(render("聚合搜索结果为空！", "yellow"));
+            return;
+        }
+
         SearchParser.printAggregateSearchResult(results);
 
         new DownloadAction(null).execute(results);
@@ -51,7 +57,7 @@ public static List<SearchResult> getSearchResults(String kw) {
             threadPool.execute(() -> {
                 List<SearchResult> res = new SearchParser(source.config).parse(kw);
                 Rule rule = source.rule;
-                Console.log("==> 书源 {} ({}) 搜索到 {} 条记录", rule.getId(), rule.getName(), res.size());
+                Console.log("<== 书源 {} ({})\t搜索到 {} 条记录", rule.getId(), rule.getName(), res.size());
                 results.add(res);
                 latch.countDown();
             });

src/main/java/com/pcdd/sonovel/core/Source.java

@@ -40,8 +40,7 @@ public Source(int id, AppConfig config) {
             // 根据 sourceId 获取对应书源规则
             jsonStr = ResourceUtil.readUtf8Str("rule/rule-" + id + ".json");
         } catch (Exception e) {
-            Console.error(render("书源规则初始化失败，请检查配置项 source-id 是否正确", "red"));
-            Console.error(render("错误信息：{}", "red"), e.getMessage());
+            Console.error(render("书源规则初始化失败，请检查配置项 source-id 是否正确。{}", "red"), e.getMessage());
             System.exit(1);
         }
 

src/main/java/com/pcdd/sonovel/handle/EpubMergeHandler.java

@@ -30,7 +30,7 @@ public class EpubMergeHandler implements PostProcessingHandler {
     @Override
     public void handle(Book b, File savePath) {
         if (FileUtil.isDirEmpty(savePath)) {
-            Console.error(render("==> 《{}》（{}）下载章节数为 0，取消生成 EPUB", "red"), b.getBookName(), b.getAuthor());
+            Console.error(render("<== 《{}》（{}）下载章节数为 0，取消生成 EPUB", "red"), b.getBookName(), b.getAuthor());
             return;
         }
 

src/main/java/com/pcdd/sonovel/parse/ChapterParser.java

@@ -68,14 +68,14 @@ private Chapter retry(Chapter chapter, SearchResult sr) {
         for (int attempt = 1; attempt <= config.getMaxRetryAttempts(); attempt++) {
             try {
                 long interval = CrawlUtils.randomInterval(config, true);
-                Console.log(render("==> 章节下载失败，正在重试: 【{}】 重试次数: {}/{} 重试间隔: {} ms", "red"),
+                Console.log(render("<== 章节下载失败，正在重试: 【{}】 重试次数: {}/{} 重试间隔: {} ms", "red"),
                         chapter.getTitle(), attempt, config.getMaxRetryAttempts(), interval);
                 chapter.setContent(crawl(chapter.getUrl(), interval));
                 Console.log(render("<== 重试成功: 【{}】", "green"), chapter.getTitle());
                 return chapterConverter.convert(chapter);
 
             } catch (Exception e) {
-                Console.error(render("==> 第 {} 次重试失败: 【{}】 原因: {}", "red"), attempt, chapter.getTitle(), e.getMessage());
+                Console.error(render("<== 第 {} 次重试失败: 【{}】 原因: {}", "red"), attempt, chapter.getTitle(), e.getMessage());
                 if (attempt == config.getMaxRetryAttempts()) {
                     // 最终失败时记录日志
                     saveErrorLog(chapter, sr, e.getMessage());

src/main/java/com/pcdd/sonovel/parse/SearchParser.java

@@ -49,12 +49,12 @@ public List<SearchResult> parse(String keyword) {
         Rule.Search r = this.rule.getSearch();
 
         if (r == null) {
-            Console.log("书源 {} 不支持搜索", config.getSourceId());
+            Console.log(render("<== 书源 {} 不支持搜索", "red"), config.getSourceId());
             return Collections.emptyList();
         }
 
         if (this.rule.isDisabled()) {
-            Console.error("书源 {} 暂被禁用！", this.rule.getId());
+            Console.error(render("<== 书源 {} 暂被禁用！", "red"), this.rule.getId());
             return Collections.emptyList();
         }
 
@@ -66,7 +66,7 @@ public List<SearchResult> parse(String keyword) {
                     .execute();
             document = Jsoup.parse(resp.body());
         } catch (Exception e) {
-            Console.error(render("书源 {} 搜索解析出错: {}", "red"), this.rule.getId(), e.getMessage());
+            Console.error(render("<== 书源 {} 搜索解析出错: {}", "red"), this.rule.getId(), e.getMessage());
             return Collections.emptyList();
         }