🔍 优化书源规则

Author: freeok

src/main/java/com/pcdd/sonovel/convert/ChineseConverter.java

@@ -48,7 +48,7 @@ private <T> T applyConversion(T obj, Function<String, String> convertFunc) {
             book.setCategory(convertIfNotNull(book.getCategory(), convertFunc));
             book.setLatestChapter(convertIfNotNull(book.getLatestChapter(), convertFunc));
             book.setLatestUpdate(convertIfNotNull(book.getLatestUpdate(), convertFunc));
-            book.setIsEnd(convertIfNotNull(book.getIsEnd(), convertFunc));
+            book.setStatus(convertIfNotNull(book.getStatus(), convertFunc));
             return (T) book;
         }
 
@@ -62,8 +62,11 @@ private <T> T applyConversion(T obj, Function<String, String> convertFunc) {
             sr.setBookName(convertIfNotNull(sr.getBookName(), convertFunc));
             sr.setAuthor(convertIfNotNull(sr.getAuthor(), convertFunc));
             sr.setIntro(convertIfNotNull(sr.getIntro(), convertFunc));
+            sr.setCategory(convertIfNotNull(sr.getCategory(), convertFunc));
             sr.setLatestChapter(convertIfNotNull(sr.getLatestChapter(), convertFunc));
             sr.setLatestUpdate(convertIfNotNull(sr.getLatestUpdate(), convertFunc));
+            sr.setWordCount(convertIfNotNull(sr.getWordCount(), convertFunc));
+            sr.setStatus(convertIfNotNull(sr.getStatus(), convertFunc));
             return (T) sr;
         }
 

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

@@ -18,6 +18,6 @@ public class Book {
     private String coverUrl;
     private String latestChapter;
     private String latestUpdate;
-    private String isEnd;
+    private String status;
 
 }

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

@@ -55,7 +55,7 @@ public static class Book {
         private String coverUrl;
         private String latestChapter;
         private String latestUpdate;
-        private String isEnd;
+        private String status;
     }
 
     @Data

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

@@ -115,14 +115,14 @@ private List<SearchResult> getSearchResults(String url, Connection.Response resp
                     return Collections.emptyList();
                 }
 
-                SearchResult build = SearchResult.builder()
+                SearchResult sr = SearchResult.builder()
                         .url(bookUrl)
                         .bookName(book.getBookName())
                         .author(book.getAuthor())
                         .latestChapter(book.getLatestChapter())
                         .latestUpdate(book.getLatestUpdate())
                         .build();
-                list.add(build);
+                list.add(ChineseConverter.convert(sr, this.rule.getLanguage(), config.getLanguage()));
                 Thread.sleep(CrawlUtils.randomInterval(config));
 
                 return list;

src/main/resources/rule/rule-1.json

@@ -20,8 +20,7 @@
     "author": "meta[property=\"og:novel:author\"]",
     "intro": "meta[property=\"og:description\"]",
     "category": "meta[property=\"og:novel:category\"]",
-    "coverUrl": "meta[property=\"og:image\"]",
-    "isEnd": false
+    "coverUrl": "meta[property=\"og:image\"]"
   },
   "toc": {
     "result": "#list > dl > dd > a",

src/main/resources/rule/rule-10.json

@@ -21,7 +21,7 @@
     "coverUrl": "meta[name=\"og:image\"]",
     "latestChapter": "meta[name=\"og:novel:latest_chapter_name\"]",
     "latestUpdate": "meta[name=\"og:novel:update_time\"]",
-    "isEnd": "meta[name=\"og:novel:status\"]"
+    "status": "meta[name=\"og:novel:status\"]"
   },
   "toc": {
     "result": ".full_chapters > div:nth-child(1) > a",

src/main/resources/rule/rule-11.json

@@ -22,8 +22,7 @@
     "category": "meta[property=\"og:novel:category\"]",
     "coverUrl": "meta[property=\"og:image\"]",
     "latestChapter": "meta[property=\"og:novel:latest_chapter_name\"]",
-    "latestUpdate": "meta[property=\"og:novel:update_time\"]",
-    "isEnd": false
+    "latestUpdate": "meta[property=\"og:novel:update_time\"]"
   },
   "toc": {
     "result": "#list > dl > dd > a",

src/main/resources/rule/rule-12.json

@@ -28,7 +28,7 @@
     "coverUrl": "meta[property=\"og:image\"]",
     "latestChapter": "meta[property=\"og:novel:latest_chapter_name\"]",
     "latestUpdate": "meta[property=\"og:novel:update_time\"]",
-    "isEnd": "meta[property=\"og:novel:status\"]"
+    "status": "meta[property=\"og:novel:status\"]"
   },
   "toc": {
     "url": "https://www.0xs.net/list/%s.html",

src/main/resources/rule/rule-13.json

@@ -25,7 +25,7 @@
     "coverUrl": ".item > a > img",
     "latestChapter": ".item > div > ul > li:nth-child(1) > a",
     "latestUpdate": ".item > div > ul > li:nth-child(1) > i",
-    "isEnd": ".item > div > p:nth-child(2) > span:nth-child(1)"
+    "status": ".item > div > p:nth-child(2) > span:nth-child(1)"
   },
   "toc": {
     "result": "#list > ul > li > a"

src/main/resources/rule/rule-14.json

@@ -25,7 +25,7 @@
     "coverUrl": ".imgbox > img",
     "latestChapter": "meta[property=\"og:novel:lastest_chapter_name\"]",
     "latestUpdate": "meta[property=\"og:novel:update_time\"]",
-    "isEnd": "meta[property=\"og:novel:status\"]"
+    "status": "meta[property=\"og:novel:status\"]"
   },
   "toc": {
     "result": ".row.row-section > div > div:nth-child(4) > ul > li > a",