♻️ 配置项 threads 重命名为 concurrency

Author: freeok

bundle/config.ini

@@ -27,8 +27,8 @@ search-limit = 30
 search-filter = 1
 
 [crawl]
-# 并发数 (默认值：100)
-threads =
+# 并发上限 (默认值：100)
+concurrency =
 # 最小间隔 (毫秒)
 min-interval = 200
 # 最大间隔 (毫秒)

bundle/rules/flowlimit-rules.json

@@ -38,7 +38,7 @@
       "nextPage": "#wrapper > article > div.bottem1 > a:nth-child(3)"
     },
     "crawl": {
-      "threads": 5,
+      "concurrency": 5,
       "minInterval": 1000,
       "maxInterval": 2000
     }
@@ -86,7 +86,7 @@
       "nextChapterLink": "https://www\\.0xs\\.net/txt/\\d+/\\d+\\.html"
     },
     "crawl": {
-      "threads": 1,
+      "concurrency": 1,
       "minInterval": 1000,
       "maxInterval": 3000
     }
@@ -130,7 +130,7 @@
       "filterTag": ""
     },
     "crawl": {
-      "threads": 1,
+      "concurrency": 1,
       "minInterval": 1000,
       "maxInterval": 2000
     }
@@ -175,7 +175,7 @@
       "nextPage": ".prenext > span:nth-child(3) > a"
     },
     "crawl": {
-      "threads": 1,
+      "concurrency": 1,
       "minInterval": 1000,
       "maxInterval": 2000
     }

bundle/rules/proxy-rules.json

@@ -30,7 +30,7 @@
       "filterTag": "h1 div"
     },
     "crawl": {
-      "threads": 1,
+      "concurrency": 1,
       "minInterval": 1000,
       "maxInterval": 2000
     }

bundle/rules/rule-template.json5

@@ -95,8 +95,8 @@
   },
   // 限流书源必填
   "crawl": {
-    // 线程数
-    "threads": 0,
+    // 并发数
+    "concurrency": 0,
     // 最小间隔（单位：秒）
     "minInterval": 0,
     // 最大间隔（单位：秒）

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

@@ -80,7 +80,7 @@ public AppConfig loadConfig() {
         cfg.setSearchFilter(usr.getInt("search-filter", SELECTION_SOURCE, 1));
 
         // [crawl]
-        cfg.setThreads(usr.getInt("threads", SELECTION_CRAWL, -1));
+        cfg.setConcurrency(usr.getInt("concurrency", SELECTION_CRAWL, -1));
         cfg.setMinInterval(usr.getInt("min-interval", SELECTION_CRAWL, 200));
         cfg.setMaxInterval(usr.getInt("max-interval", SELECTION_CRAWL, 400));
         cfg.setEnableRetry(usr.getInt("enable-retry", SELECTION_CRAWL, 1));

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

@@ -82,10 +82,10 @@ public double crawl(String bookUrl, List<Chapter> toc) {
             return 0;
         }
 
-        int autoThreads = config.getThreads() == -1
+        int autoThreads = config.getConcurrency() == -1
                 // IO 密集型任务，不要和 CPU 核数绑定
                 ? Math.min(100, toc.size())
-                : config.getThreads();
+                : config.getConcurrency();
 
         Console.log("<== 开始下载《{}》({}) 共计 {} 章 | 最大并发：{}",
                 book.getBookName(), book.getAuthor(), toc.size(), autoThreads);

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

@@ -32,7 +32,7 @@ public Source(Rule rule, AppConfig config) {
         Rule.Crawl crawl = rule.getCrawl();
         if (crawl != null) {
             if (crawl.getThreads() != null) {
-                this.config.setThreads(crawl.getThreads());
+                this.config.setConcurrency(crawl.getThreads());
             }
             if (crawl.getMinInterval() != null) {
                 this.config.setMinInterval(crawl.getMinInterval());

src/main/java/com/pcdd/sonovel/model/AppConfig.java

@@ -29,7 +29,7 @@ public class AppConfig {
     private Integer searchFilter;
 
     // [crawl]
-    private Integer threads;
+    private Integer concurrency;
     private Integer minInterval;
     private Integer maxInterval;
     private Integer enableRetry;

src/test/resources/rule/broken-rules.json

@@ -114,7 +114,7 @@
       "filterTag": "div"
     },
     "crawl": {
-      "threads": 1,
+      "concurrency": 1,
       "min": 1000,
       "max": 2000,
       "maxAttempts": 5,
@@ -151,7 +151,7 @@
       "filterTag": "h1 div br"
     },
     "crawl": {
-      "threads": 1,
+      "concurrency": 1,
       "min": 1000,
       "max": 2000,
       "maxAttempts": 5,
@@ -187,7 +187,7 @@
       "filterTag": "div br"
     },
     "crawl": {
-      "threads": 1,
+      "concurrency": 1,
       "min": 1000,
       "max": 2000,
       "maxAttempts": 5,
@@ -315,7 +315,7 @@
       "nextPage": ".prenext > span:nth-child(3) > a"
     },
     "crawl": {
-      "threads": 1,
+      "concurrency": 1,
       "minInterval": 1000,
       "maxInterval": 2000
     }