feat: 优化

app/src/main/java/io/legado/app/data/entities/BookSource.kt

@@ -1,10 +1,7 @@
 package io.legado.app.data.entities
 
 import android.os.Parcelable
-import androidx.room.Entity
-import androidx.room.Ignore
-import androidx.room.Index
-import androidx.room.PrimaryKey
+import androidx.room.*
 import io.legado.app.App
 import io.legado.app.constant.AppConst
 import io.legado.app.constant.AppConst.userAgent
@@ -15,12 +12,12 @@ import io.legado.app.utils.ACache
 import io.legado.app.utils.GSON
 import io.legado.app.utils.fromJsonObject
 import io.legado.app.utils.getPrefString
-import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
 import java.util.*
 import javax.script.SimpleBindings
 
 @Parcelize
+@TypeConverters(BookSource.Converters::class)
 @Entity(
     tableName = "book_sources",
     indices = [(Index(value = ["bookSourceUrl"], unique = false))]
@@ -40,12 +37,12 @@ data class BookSource(
     var lastUpdateTime: Long = 0,                   // 最后更新时间，用于排序
     var weight: Int = 0,                            // 智能排序的权重
     var exploreUrl: String? = null,                 // 发现url
-    var ruleExplore: String? = null,                // 发现规则
+    var ruleExplore: ExploreRule? = null,           // 发现规则
     var searchUrl: String? = null,                  // 搜索url
-    var ruleSearch: String? = null,                 // 搜索规则
-    var ruleBookInfo: String? = null,               // 书籍信息页规则
-    var ruleToc: String? = null,                    // 目录页规则
-    var ruleContent: String? = null                 // 正文页规则
+    var ruleSearch: SearchRule? = null,             // 搜索规则
+    var ruleBookInfo: BookInfoRule? = null,         // 书籍信息页规则
+    var ruleToc: TocRule? = null,                   // 目录页规则
+    var ruleContent: ContentRule? = null            // 正文页规则
 ) : Parcelable, JsExtensions {
 
     override fun hashCode(): Int {
@@ -59,26 +56,6 @@ data class BookSource(
         return false
     }
 
-    @Ignore
-    @IgnoredOnParcel
-    private var searchRuleV: SearchRule? = null
-
-    @Ignore
-    @IgnoredOnParcel
-    private var exploreRuleV: ExploreRule? = null
-
-    @Ignore
-    @IgnoredOnParcel
-    private var bookInfoRuleV: BookInfoRule? = null
-
-    @Ignore
-    @IgnoredOnParcel
-    private var tocRuleV: TocRule? = null
-
-    @Ignore
-    @IgnoredOnParcel
-    private var contentRuleV: ContentRule? = null
-
     @Throws(Exception::class)
     fun getHeaderMap(): Map<String, String> {
         val headerMap = HashMap<String, String>()
@@ -99,43 +76,23 @@ data class BookSource(
     }
 
     fun getSearchRule(): SearchRule {
-        searchRuleV ?: let {
-            searchRuleV = GSON.fromJsonObject<SearchRule>(ruleSearch)
-            searchRuleV ?: let { searchRuleV = SearchRule() }
-        }
-        return searchRuleV!!
+        return ruleSearch ?: SearchRule()
     }
 
     fun getExploreRule(): ExploreRule {
-        exploreRuleV ?: let {
-            exploreRuleV = GSON.fromJsonObject<ExploreRule>(ruleExplore)
-            exploreRuleV ?: let { exploreRuleV = ExploreRule() }
-        }
-        return exploreRuleV!!
+        return ruleExplore ?: ExploreRule()
     }
 
     fun getBookInfoRule(): BookInfoRule {
-        bookInfoRuleV ?: let {
-            bookInfoRuleV = GSON.fromJsonObject<BookInfoRule>(ruleBookInfo)
-            bookInfoRuleV ?: let { bookInfoRuleV = BookInfoRule() }
-        }
-        return bookInfoRuleV!!
+        return ruleBookInfo ?: BookInfoRule()
     }
 
     fun getTocRule(): TocRule {
-        tocRuleV ?: let {
-            tocRuleV = GSON.fromJsonObject<TocRule>(ruleToc)
-            tocRuleV ?: let { tocRuleV = TocRule() }
-        }
-        return tocRuleV!!
+        return ruleToc ?: TocRule()
     }
 
     fun getContentRule(): ContentRule {
-        contentRuleV ?: let {
-            contentRuleV = GSON.fromJsonObject<ContentRule>(ruleContent)
-            contentRuleV ?: let { contentRuleV = ContentRule() }
-        }
-        return contentRuleV!!
+        return ruleContent ?: ContentRule()
     }
 
     fun addGroup(group: String) {
@@ -219,4 +176,57 @@ data class BookSource(
         var title: String,
         var url: String? = null
     )
+
+    class Converters {
+        @TypeConverter
+        fun exploreRuleToString(exploreRule: ExploreRule?): String {
+            return GSON.toJson(exploreRule)
+        }
+
+        @TypeConverter
+        fun stringToExploreRule(json: String?): ExploreRule? {
+            return GSON.fromJsonObject<ExploreRule>(json)
+        }
+
+        @TypeConverter
+        fun searchRuleToString(searchRule: SearchRule): String {
+            return GSON.toJson(searchRule)
+        }
+
+        @TypeConverter
+        fun stringToSearchRule(json: String?): SearchRule? {
+            return GSON.fromJsonObject<SearchRule>(json)
+        }
+
+        @TypeConverter
+        fun bookInfoRuleToString(bookInfoRule: BookInfoRule): String {
+            return GSON.toJson(bookInfoRule)
+        }
+
+        @TypeConverter
+        fun stringToBookInfoRule(json: String?): BookInfoRule? {
+            return GSON.fromJsonObject<BookInfoRule>(json)
+        }
+
+        @TypeConverter
+        fun tocRuleToString(tocRule: TocRule): String {
+            return GSON.toJson(tocRule)
+        }
+
+        @TypeConverter
+        fun stringToTocRule(json: String?): TocRule? {
+            return GSON.fromJsonObject<TocRule>(json)
+        }
+
+        @TypeConverter
+        fun contentRuleToString(contentRule: ContentRule): String {
+            return GSON.toJson(contentRule)
+        }
+
+        @TypeConverter
+        fun stringToContentRule(json: String?): ContentRule? {
+            return GSON.fromJsonObject<ContentRule>(json)
+        }
+
+    }
 }

app/src/main/java/io/legado/app/data/entities/rule/BookInfoRule.kt

@@ -1,5 +1,8 @@
 package io.legado.app.data.entities.rule
 
+import android.os.Parcel
+import android.os.Parcelable
+
 data class BookInfoRule(
     var init: String? = null,
     var name: String? = null,
@@ -11,4 +14,45 @@ data class BookInfoRule(
     var coverUrl: String? = null,
     var tocUrl: String? = null,
     var wordCount: String? = null
-)
+) : Parcelable {
+
+    constructor(parcel: Parcel) : this(
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString()
+    )
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeString(init)
+        dest.writeString(name)
+        dest.writeString(author)
+        dest.writeString(intro)
+        dest.writeString(kind)
+        dest.writeString(lastChapter)
+        dest.writeString(updateTime)
+        dest.writeString(coverUrl)
+        dest.writeString(tocUrl)
+        dest.writeString(wordCount)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<BookInfoRule> {
+        override fun createFromParcel(parcel: Parcel): BookInfoRule {
+            return BookInfoRule(parcel)
+        }
+
+        override fun newArray(size: Int): Array<BookInfoRule?> {
+            return arrayOfNulls(size)
+        }
+    }
+}

app/src/main/java/io/legado/app/data/entities/rule/ContentRule.kt

@@ -1,8 +1,39 @@
 package io.legado.app.data.entities.rule
 
+import android.os.Parcel
+import android.os.Parcelable
+
 data class ContentRule(
     var content: String? = null,
     var nextContentUrl: String? = null,
     var webJs: String? = null,
     var sourceRegex: String? = null
-)
+) : Parcelable {
+    constructor(parcel: Parcel) : this(
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString()
+    )
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeString(content)
+        dest.writeString(nextContentUrl)
+        dest.writeString(webJs)
+        dest.writeString(sourceRegex)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<ContentRule> {
+        override fun createFromParcel(parcel: Parcel): ContentRule {
+            return ContentRule(parcel)
+        }
+
+        override fun newArray(size: Int): Array<ContentRule?> {
+            return arrayOfNulls(size)
+        }
+    }
+}

app/src/main/java/io/legado/app/data/entities/rule/ExploreRule.kt

@@ -1,5 +1,8 @@
 package io.legado.app.data.entities.rule
 
+import android.os.Parcel
+import android.os.Parcelable
+
 data class ExploreRule(
     override var bookList: String? = null,
     override var name: String? = null,
@@ -11,4 +14,46 @@ data class ExploreRule(
     override var bookUrl: String? = null,
     override var coverUrl: String? = null,
     override var wordCount: String? = null
-) : BookListRule
+) : BookListRule, Parcelable {
+
+    constructor(parcel: Parcel) : this(
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString()
+    )
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeString(bookList)
+        dest.writeString(name)
+        dest.writeString(author)
+        dest.writeString(intro)
+        dest.writeString(kind)
+        dest.writeString(lastChapter)
+        dest.writeString(updateTime)
+        dest.writeString(bookUrl)
+        dest.writeString(coverUrl)
+        dest.writeString(wordCount)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<ExploreRule> {
+        override fun createFromParcel(parcel: Parcel): ExploreRule {
+            return ExploreRule(parcel)
+        }
+
+        override fun newArray(size: Int): Array<ExploreRule?> {
+            return arrayOfNulls(size)
+        }
+    }
+}
+

app/src/main/java/io/legado/app/data/entities/rule/SearchRule.kt

@@ -1,5 +1,8 @@
 package io.legado.app.data.entities.rule
 
+import android.os.Parcel
+import android.os.Parcelable
+
 data class SearchRule(
         override var bookList: String? = null,
         override var name: String? = null,
@@ -11,4 +14,46 @@ data class SearchRule(
         override var bookUrl: String? = null,
         override var coverUrl: String? = null,
         override var wordCount: String? = null
-) : BookListRule
+) : BookListRule, Parcelable {
+
+        constructor(parcel: Parcel) : this(
+                parcel.readString(),
+                parcel.readString(),
+                parcel.readString(),
+                parcel.readString(),
+                parcel.readString(),
+                parcel.readString(),
+                parcel.readString(),
+                parcel.readString(),
+                parcel.readString(),
+                parcel.readString()
+        )
+
+        override fun writeToParcel(dest: Parcel, flags: Int) {
+                dest.writeString(bookList)
+                dest.writeString(name)
+                dest.writeString(author)
+                dest.writeString(intro)
+                dest.writeString(kind)
+                dest.writeString(lastChapter)
+                dest.writeString(updateTime)
+                dest.writeString(bookUrl)
+                dest.writeString(coverUrl)
+                dest.writeString(wordCount)
+        }
+
+        override fun describeContents(): Int {
+                return 0
+        }
+
+        companion object CREATOR : Parcelable.Creator<SearchRule> {
+                override fun createFromParcel(parcel: Parcel): SearchRule {
+                        return SearchRule(parcel)
+                }
+
+                override fun newArray(size: Int): Array<SearchRule?> {
+                        return arrayOfNulls(size)
+                }
+        }
+}
+

app/src/main/java/io/legado/app/data/entities/rule/TocRule.kt

@@ -1,5 +1,8 @@
 package io.legado.app.data.entities.rule
 
+import android.os.Parcel
+import android.os.Parcelable
+
 data class TocRule(
     var chapterList: String? = null,
     var chapterName: String? = null,
@@ -7,4 +10,36 @@ data class TocRule(
     var isVip: String? = null,
     var updateTime: String? = null,
     var nextTocUrl: String? = null
-)
+) : Parcelable {
+    constructor(parcel: Parcel) : this(
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString()
+    )
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeString(chapterList)
+        dest.writeString(chapterName)
+        dest.writeString(chapterUrl)
+        dest.writeString(isVip)
+        dest.writeString(updateTime)
+        dest.writeString(nextTocUrl)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<TocRule> {
+        override fun createFromParcel(parcel: Parcel): TocRule {
+            return TocRule(parcel)
+        }
+
+        override fun newArray(size: Int): Array<TocRule?> {
+            return arrayOfNulls(size)
+        }
+    }
+}

app/src/main/java/io/legado/app/help/storage/OldRule.kt

@@ -19,7 +19,7 @@ object OldRule {
             source = GSON.fromJsonObject<BookSource>(json.trim())
         }
         runCatching {
-            if (source == null || source?.ruleToc.isNullOrBlank()) {
+            if (source == null || source?.ruleToc == null) {
                 source = BookSource().apply {
                     val jsonItem = jsonPath.parse(json.trim())
                     bookSourceUrl = jsonItem.readString("bookSourceUrl") ?: ""
@@ -37,7 +37,7 @@ object OldRule {
                     if (exploreUrl.isNullOrBlank()) {
                         enabledExplore = false
                     }
-                    val searchRule = SearchRule(
+                    ruleSearch = SearchRule(
                         bookList = toNewRule(jsonItem.readString("ruleSearchList")),
                         name = toNewRule(jsonItem.readString("ruleSearchName")),
                         author = toNewRule(jsonItem.readString("ruleSearchAuthor")),
@@ -47,8 +47,7 @@ object OldRule {
                         coverUrl = toNewRule(jsonItem.readString("ruleSearchCoverUrl")),
                         lastChapter = toNewRule(jsonItem.readString("ruleSearchLastChapter"))
                     )
-                    ruleSearch = GSON.toJson(searchRule)
-                    val exploreRule = ExploreRule(
+                    ruleExplore = ExploreRule(
                         bookList = toNewRule(jsonItem.readString("ruleFindList")),
                         name = toNewRule(jsonItem.readString("ruleFindName")),
                         author = toNewRule(jsonItem.readString("ruleFindAuthor")),
@@ -58,8 +57,7 @@ object OldRule {
                         coverUrl = toNewRule(jsonItem.readString("ruleFindCoverUrl")),
                         lastChapter = toNewRule(jsonItem.readString("ruleFindLastChapter"))
                     )
-                    ruleExplore = GSON.toJson(exploreRule)
-                    val bookInfoRule = BookInfoRule(
+                    ruleBookInfo = BookInfoRule(
                         init = toNewRule(jsonItem.readString("ruleBookInfoInit")),
                         name = toNewRule(jsonItem.readString("ruleBookName")),
                         author = toNewRule(jsonItem.readString("ruleBookAuthor")),
@@ -69,23 +67,20 @@ object OldRule {
                         lastChapter = toNewRule(jsonItem.readString("ruleBookLastChapter")),
                         tocUrl = toNewRule(jsonItem.readString("ruleChapterUrl"))
                     )
-                    ruleBookInfo = GSON.toJson(bookInfoRule)
-                    val chapterRule = TocRule(
+                    ruleToc = TocRule(
                         chapterList = toNewRule(jsonItem.readString("ruleChapterList")),
                         chapterName = toNewRule(jsonItem.readString("ruleChapterName")),
                         chapterUrl = toNewRule(jsonItem.readString("ruleContentUrl")),
                         nextTocUrl = toNewRule(jsonItem.readString("ruleChapterUrlNext"))
                     )
-                    ruleToc = GSON.toJson(chapterRule)
                     var content = toNewRule(jsonItem.readString("ruleBookContent")) ?: ""
                     if (content.startsWith("$") && !content.startsWith("$.")) {
                         content = content.substring(1)
                     }
-                    val contentRule = ContentRule(
+                    ruleContent = ContentRule(
                         content = content,
                         nextContentUrl = toNewRule(jsonItem.readString("ruleContentUrlNext"))
                     )
-                    ruleContent = GSON.toJson(contentRule)
                 }
             }
         }

app/src/main/java/io/legado/app/model/webBook/BookList.kt

@@ -4,6 +4,7 @@ import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.data.entities.BookSource
 import io.legado.app.data.entities.SearchBook
+import io.legado.app.data.entities.rule.BookListRule
 import io.legado.app.help.BookHelp
 import io.legado.app.model.Debug
 import io.legado.app.model.analyzeRule.AnalyzeRule
@@ -47,7 +48,7 @@ object BookList {
         }
         val collections: List<Any>
         var reverse = false
-        val bookListRule = when {
+        val bookListRule: BookListRule = when {
             isSearch -> bookSource.getSearchRule()
             bookSource.getExploreRule().bookList.isNullOrBlank() -> bookSource.getSearchRule()
             else -> bookSource.getExploreRule()

app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt

@@ -334,11 +334,11 @@ class BookSourceEditActivity :
                 "sourceRegex" -> contentRule.sourceRegex = it.value
             }
         }
-        source.ruleSearch = GSON.toJson(searchRule)
-        source.ruleExplore = GSON.toJson(exploreRule)
-        source.ruleBookInfo = GSON.toJson(bookInfoRule)
-        source.ruleToc = GSON.toJson(tocRule)
-        source.ruleContent = GSON.toJson(contentRule)
+        source.ruleSearch = searchRule
+        source.ruleExplore = exploreRule
+        source.ruleBookInfo = bookInfoRule
+        source.ruleToc = tocRule
+        source.ruleContent = contentRule
         return source
     }