From 4e151ca30300334b122481ff505a18a5050e4b76 Mon Sep 17 00:00:00 2001
From: Xwite <1797350009@qq.com>
Date: Sun, 9 Jan 2022 23:03:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0isVolume=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/web/bookSource/index.html            | 5 +++++
 app/src/main/java/io/legado/app/data/AppDatabase.kt      | 2 +-
 .../main/java/io/legado/app/data/DatabaseMigrations.kt   | 9 ++++++++-
 .../main/java/io/legado/app/data/entities/BookChapter.kt | 1 +
 .../java/io/legado/app/data/entities/rule/TocRule.kt     | 1 +
 .../app/ui/book/source/edit/BookSourceEditActivity.kt    | 2 ++
 app/src/main/res/values-es-rES/strings.xml               | 1 +
 app/src/main/res/values-ja-rJP/strings.xml               | 1 +
 app/src/main/res/values-zh-rHK/strings.xml               | 1 +
 app/src/main/res/values-zh-rTW/strings.xml               | 1 +
 app/src/main/res/values-zh/strings.xml                   | 1 +
 app/src/main/res/values/strings.xml                      | 1 +
 12 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/src/main/assets/web/bookSource/index.html b/app/src/main/assets/web/bookSource/index.html
index d0031c00c..b29d62842 100644
--- a/app/src/main/assets/web/bookSource/index.html
+++ b/app/src/main/assets/web/bookSource/index.html
@@ -250,6 +250,11 @@
                 <textarea rows="1" id="ruleToc_chapterUrl" class="ruleToc" title="chapterUrl"
                           placeholder="选择章节链接 (规则结果为String类型的Url)"></textarea>
             </div>
+            <div>
+                <div>Volume标识:</div>
+                <textarea rows="1" id="ruleToc_isVolume" class="ruleToc" title="isVolume"
+                          placeholder="章节名称是否是卷名 (规则结果为Bool)"></textarea>
+            </div>
             <div>
                 <div>收费标识:</div>
                 <textarea rows="1" id="ruleToc_isVip" class="ruleToc" title="isVip"
diff --git a/app/src/main/java/io/legado/app/data/AppDatabase.kt b/app/src/main/java/io/legado/app/data/AppDatabase.kt
index 5d645e824..8856acb82 100644
--- a/app/src/main/java/io/legado/app/data/AppDatabase.kt
+++ b/app/src/main/java/io/legado/app/data/AppDatabase.kt
@@ -16,7 +16,7 @@ val appDb by lazy {
 }
 
 @Database(
-    version = 42,
+    version = 43,
     exportSchema = true,
     entities = [Book::class, BookGroup::class, BookSource::class, BookChapter::class,
         ReplaceRule::class, SearchBook::class, SearchKeyword::class, Cookie::class,
diff --git a/app/src/main/java/io/legado/app/data/DatabaseMigrations.kt b/app/src/main/java/io/legado/app/data/DatabaseMigrations.kt
index 095cb7a47..4fc5fce39 100644
--- a/app/src/main/java/io/legado/app/data/DatabaseMigrations.kt
+++ b/app/src/main/java/io/legado/app/data/DatabaseMigrations.kt
@@ -38,7 +38,8 @@ object DatabaseMigrations {
             migration_38_39,
             migration_39_40,
             migration_40_41,
-            migration_41_42
+            migration_41_42,
+            migration_42_43
         )
     }
 
@@ -336,4 +337,10 @@ object DatabaseMigrations {
             database.execSQL("ALTER TABLE 'httpTTS' ADD `contentType` TEXT")
         }
     }
+
+    private val migration_42_43 = object : Migration(42, 43) {
+        override fun migrate(database: SupportSQLiteDatabase) {
+            database.execSQL("ALTER TABLE `chapters` ADD `isVolume` INTEGER NOT NULL DEFAULT 0")
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/data/entities/BookChapter.kt b/app/src/main/java/io/legado/app/data/entities/BookChapter.kt
index 39b8ea6b0..cf5b2b2b7 100644
--- a/app/src/main/java/io/legado/app/data/entities/BookChapter.kt
+++ b/app/src/main/java/io/legado/app/data/entities/BookChapter.kt
@@ -33,6 +33,7 @@ import splitties.init.appCtx
 data class BookChapter(
     var url: String = "",               // 章节地址
     var title: String = "",             // 章节标题
+    var isVolume: Boolean = false,    // 是否是卷名
     var baseUrl: String = "",           // 用来拼接相对url
     var bookUrl: String = "",           // 书籍地址
     var index: Int = 0,                 // 章节序号
diff --git a/app/src/main/java/io/legado/app/data/entities/rule/TocRule.kt b/app/src/main/java/io/legado/app/data/entities/rule/TocRule.kt
index a368b8c09..10337735d 100644
--- a/app/src/main/java/io/legado/app/data/entities/rule/TocRule.kt
+++ b/app/src/main/java/io/legado/app/data/entities/rule/TocRule.kt
@@ -8,6 +8,7 @@ data class TocRule(
     var chapterList: String? = null,
     var chapterName: String? = null,
     var chapterUrl: String? = null,
+    var isVolume: String? = null,
     var isVip: String? = null,
     var isPay: String? = null,
     var updateTime: String? = null,
diff --git a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt
index 34f4cf915..9c30bbb4f 100644
--- a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt
@@ -265,6 +265,7 @@ class BookSourceEditActivity :
             add(EditEntity("chapterList", tr?.chapterList, R.string.rule_chapter_list))
             add(EditEntity("chapterName", tr?.chapterName, R.string.rule_chapter_name))
             add(EditEntity("chapterUrl", tr?.chapterUrl, R.string.rule_chapter_url))
+            add(EditEntity("isVolume", tr?.isVolume, R.string.rule_is_volume))
             add(EditEntity("updateTime", tr?.updateTime, R.string.rule_update_time))
             add(EditEntity("isVip", tr?.isVip, R.string.rule_is_vip))
             add(EditEntity("isPay", tr?.isPay, R.string.rule_is_pay))
@@ -360,6 +361,7 @@ class BookSourceEditActivity :
                 "chapterList" -> tocRule.chapterList = it.value
                 "chapterName" -> tocRule.chapterName = it.value
                 "chapterUrl" -> tocRule.chapterUrl = it.value
+                "isVolume" -> tocRule.isVolume = it.value
                 "updateTime" -> tocRule.updateTime = it.value
                 "isVip" -> tocRule.isVip = it.value
                 "isPay" -> tocRule.isPay = it.value
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 40ab66282..622e5e4ff 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -414,6 +414,7 @@
     <string name="rule_chapter_list">目录列表规则(chapterList)</string>
     <string name="rule_chapter_name">章节名称规则(ChapterName)</string>
     <string name="rule_chapter_url">章节URL规则(chapterUrl)</string>
+    <string name="rule_is_volume">Volume mark(isVolume)</string>
     <string name="rule_is_vip">VIP标识(isVip)</string>
     <string name="rule_update_time">更新时间(ChapterInfo)</string>
     <string name="rule_book_content">正文规则(content)</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 941df5cd6..3a17a80eb 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -418,6 +418,7 @@
     <string name="rule_chapter_list">目录列表规则(chapterList)</string>
     <string name="rule_chapter_name">章节名称规则(ChapterName)</string>
     <string name="rule_chapter_url">章节URL规则(chapterUrl)</string>
+    <string name="rule_is_volume">Volume mark(isVolume)</string>
     <string name="rule_is_vip">VIP标识(isVip)</string>
     <string name="rule_update_time">更新时间(ChapterInfo)</string>
     <string name="rule_book_content">正文规则(content)</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 43e13a2d5..a2e00281d 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -413,6 +413,7 @@
     <string name="rule_chapter_list">目錄列表規則 (chapterList)</string>
     <string name="rule_chapter_name">章節名稱規則 (ChapterName)</string>
     <string name="rule_chapter_url">章節 URL 規則 (chapterUrl)</string>
+    <string name="rule_is_volume">Volume標識(isVolume)</string>
     <string name="rule_is_vip">VIP 標識 (isVip)</string>
     <string name="rule_update_time">更新時間 (ChapterInfo)</string>
     <string name="rule_book_content">正文規則 (content)</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index dbbf3a53d..9195535bf 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -417,6 +417,7 @@
     <string name="rule_chapter_list">目錄列表規則(chapterList)</string>
     <string name="rule_chapter_name">章節名稱規則(ChapterName)</string>
     <string name="rule_chapter_url">章節URL規則(chapterUrl)</string>
+    <string name="rule_is_volume">Volume標識(isVolume)</string>
     <string name="rule_is_vip">VIP標識(isVip)</string>
     <string name="rule_update_time">更新時間(ChapterInfo)</string>
     <string name="rule_book_content">正文規則(content)</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 1b42bc052..fe9b236f3 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -417,6 +417,7 @@
     <string name="rule_chapter_list">目录列表规则(chapterList)</string>
     <string name="rule_chapter_name">章节名称规则(ChapterName)</string>
     <string name="rule_chapter_url">章节URL规则(chapterUrl)</string>
+    <string name="rule_is_volume">Volume标识(isVolume)</string>
     <string name="rule_is_vip">VIP标识(isVip)</string>
     <string name="rule_update_time">更新时间(ChapterInfo)</string>
     <string name="rule_book_content">正文规则(content)</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6f83accdb..e0ae17a7b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -418,6 +418,7 @@
     <string name="rule_chapter_list">目录列表规则(chapterList)</string>
     <string name="rule_chapter_name">章节名称规则(ChapterName)</string>
     <string name="rule_chapter_url">章节URL规则(chapterUrl)</string>
+    <string name="rule_is_volume">Volume标识(isVolume)</string>
     <string name="rule_is_vip">VIP标识(isVip)</string>
     <string name="rule_update_time">更新时间(ChapterInfo)</string>
     <string name="rule_book_content">正文规则(content)</string>