优化

app/src/main/java/io/legado/app/data/AppDatabase.kt

@@ -20,13 +20,13 @@ val appDb by lazy {
 }
 
 @Database(
-    version = 59,
+    version = 60,
     exportSchema = true,
     entities = [Book::class, BookGroup::class, BookSource::class, BookChapter::class,
         ReplaceRule::class, SearchBook::class, SearchKeyword::class, Cookie::class,
         RssSource::class, Bookmark::class, RssArticle::class, RssReadRecord::class,
         RssStar::class, TxtTocRule::class, ReadRecord::class, HttpTTS::class, Cache::class,
-        RuleSub::class, KeyboardAssist::class],
+        RuleSub::class, DictRule::class, KeyboardAssist::class],
     autoMigrations = [
         AutoMigration(from = 43, to = 44),
         AutoMigration(from = 44, to = 45),
@@ -43,7 +43,8 @@ val appDb by lazy {
         AutoMigration(from = 55, to = 56),
         AutoMigration(from = 56, to = 57),
         AutoMigration(from = 57, to = 58),
-        AutoMigration(from = 58, to = 59)
+        AutoMigration(from = 58, to = 59),
+        AutoMigration(from = 59, to = 60)
     ]
 )
 abstract class AppDatabase : RoomDatabase() {
@@ -65,6 +66,7 @@ abstract class AppDatabase : RoomDatabase() {
     abstract val httpTTSDao: HttpTTSDao
     abstract val cacheDao: CacheDao
     abstract val ruleSubDao: RuleSubDao
+    abstract val dictRuleDao: DictRuleDao
     abstract val keyboardAssistsDao: KeyboardAssistsDao
 
     companion object {

app/src/main/java/io/legado/app/data/dao/BookDao.kt

@@ -104,8 +104,8 @@ interface BookDao {
     @Query("select 1 from books where originName = :fileName")
     fun hasFile(fileName: String): Boolean?
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Upsert
-    fun insert(vararg book: Book)
+    fun upsert(vararg book: Book)
 
     @Update
     fun update(vararg book: Book)

app/src/main/java/io/legado/app/data/dao/DictRuleDao.kt

@@ -0,0 +1,21 @@
+package io.legado.app.data.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Query
+import androidx.room.Upsert
+import io.legado.app.data.entities.DictRule
+
+@Dao
+interface DictRuleDao {
+
+    @get:Query("select * from dictRules")
+    val all: List<DictRule>
+
+    @Upsert
+    fun upsert(vararg dictRule: DictRule)
+
+    @Delete
+    fun delete(vararg dictRule: DictRule)
+
+}

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

@@ -298,7 +298,7 @@ data class Book(
         if (appDb.bookDao.has(bookUrl) == true) {
             appDb.bookDao.update(this)
         } else {
-            appDb.bookDao.insert(this)
+            appDb.bookDao.upsert(this)
         }
     }
 

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

@@ -0,0 +1,15 @@
+package io.legado.app.data.entities
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+/**
+ * 字典规则
+ */
+@Entity(tableName = "dictRules")
+data class DictRule(
+    @PrimaryKey
+    val name: String,
+    val urlRule: String,
+    val showRule: String
+)

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

@@ -3,7 +3,9 @@ package io.legado.app.data.entities.rule
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
-
+/**
+ * 书籍详情页规则
+ */
 @Parcelize
 data class BookInfoRule(
     var init: String? = null,

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

@@ -1,5 +1,8 @@
 package io.legado.app.data.entities.rule
 
+/**
+ * 书籍列表规则
+ */
 interface BookListRule {
     var bookList: String?
     var name: String?

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

@@ -3,6 +3,9 @@ package io.legado.app.data.entities.rule
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
+/**
+ * 正文处理规则
+ */
 @Parcelize
 data class ContentRule(
     var content: String? = null,

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

@@ -1,5 +1,8 @@
 package io.legado.app.data.entities.rule
 
+/**
+ * 发现分类
+ */
 data class ExploreKind(
     val title: String,
     val url: String? = null,

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

@@ -3,6 +3,9 @@ package io.legado.app.data.entities.rule
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
+/**
+ * 发现结果规则
+ */
 @Parcelize
 data class ExploreRule(
     override var bookList: String? = null,

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

@@ -3,10 +3,13 @@ package io.legado.app.data.entities.rule
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
-
+/**
+ * 搜索结果处理规则
+ */
 @Parcelize
 data class SearchRule(
-    var checkKeyWord: String? = null,               // 校验关键字
+    /**校验关键字**/
+    var checkKeyWord: String? = null,
     override var bookList: String? = null,
     override var name: String? = null,
     override var author: String? = null,

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

@@ -87,7 +87,7 @@ object ImportOldData {
 
     private fun importOldBookshelf(json: String): Int {
         val books = fromOldBooks(json)
-        appDb.bookDao.insert(*books.toTypedArray())
+        appDb.bookDao.upsert(*books.toTypedArray())
         return books.size
     }
 

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

@@ -75,7 +75,7 @@ object Restore {
                     .forEach { book ->
                         book.coverUrl = LocalBook.getCoverPath(book)
                     }
-                appDb.bookDao.insert(*it.toTypedArray())
+                appDb.bookDao.upsert(*it.toTypedArray())
             }
             fileToListT<Bookmark>(path, "bookmark.json")?.let {
                 appDb.bookmarkDao.insert(*it.toTypedArray())

app/src/main/java/io/legado/app/model/localBook/LocalBook.kt

@@ -184,7 +184,7 @@ object LocalBook {
             if (book.isEpub) EpubFile.upBookInfo(book)
             if (book.isUmd) UmdFile.upBookInfo(book)
             if (book.isPdf) PdfFile.upBookInfo(book)
-            appDb.bookDao.insert(book)
+            appDb.bookDao.upsert(book)
         } else {
             //已有书籍说明是更新,删除原有目录
             appDb.bookChapterDao.delByBook(bookUrl)

app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt

@@ -195,7 +195,7 @@ class AudioPlayActivity :
             launch {
                 withContext(IO) {
                     AudioPlay.book?.migrateTo(book, toc)
-                    appDb.bookDao.insert(book)
+                    appDb.bookDao.upsert(book)
                 }
                 startActivity<ReadBookActivity> {
                     putExtra("bookUrl", book.bookUrl)

app/src/main/java/io/legado/app/ui/book/audio/AudioPlayViewModel.kt

@@ -79,7 +79,7 @@ class AudioPlayViewModel(application: Application) : BaseViewModel(application)
     fun changeTo(source: BookSource, book: Book, toc: List<BookChapter>) {
         execute {
             AudioPlay.book?.migrateTo(book, toc)
-            appDb.bookDao.insert(book)
+            appDb.bookDao.upsert(book)
             AudioPlay.book = book
             AudioPlay.bookSource = source
             appDb.bookChapterDao.insert(*toc.toTypedArray())

app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt

@@ -196,7 +196,7 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
                                 if (oldBook.bookUrl == book.bookUrl) {
                                     appDb.bookDao.update(book)
                                 } else {
-                                    appDb.bookDao.insert(book)
+                                    appDb.bookDao.upsert(book)
                                     BookHelp.updateCacheFolder(oldBook, book)
                                 }
                                 appDb.bookChapterDao.delByBook(oldBook.bookUrl)
@@ -237,7 +237,7 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
             bookData.value?.migrateTo(book, toc)
             if (inBookshelf) {
                 book.removeType(BookType.updateError)
-                appDb.bookDao.insert(book)
+                appDb.bookDao.upsert(book)
                 appDb.bookChapterDao.insert(*toc.toTypedArray())
             }
             bookData.postValue(book)

app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageViewModel.kt

@@ -59,7 +59,7 @@ class BookshelfManageViewModel(application: Application) : BaseViewModel(applica
                             }.getOrNull()?.let { toc ->
                                 book.migrateTo(newBook, toc)
                                 book.removeType(BookType.updateError)
-                                appDb.bookDao.insert(newBook)
+                                appDb.bookDao.upsert(newBook)
                                 appDb.bookChapterDao.insert(*toc.toTypedArray())
                             }
                     }

app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt

@@ -833,7 +833,7 @@ class ReadBookActivity : BaseReadBookActivity(),
             ReadAloud.stop(this)
             launch {
                 ReadBook.book?.migrateTo(book, toc)
-                appDb.bookDao.insert(book)
+                appDb.bookDao.upsert(book)
             }
             startActivity<AudioPlayActivity> {
                 putExtra("bookUrl", book.bookUrl)

app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt

@@ -165,7 +165,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
                         if (oldBook.bookUrl == book.bookUrl) {
                             appDb.bookDao.update(book)
                         } else {
-                            appDb.bookDao.insert(book)
+                            appDb.bookDao.upsert(book)
                             BookHelp.updateCacheFolder(oldBook, book)
                         }
                         appDb.bookChapterDao.delByBook(oldBook.bookUrl)
@@ -216,7 +216,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
             ReadBook.upMsg(context.getString(R.string.loading))
             ReadBook.book?.migrateTo(book, toc)
             book.removeType(BookType.updateError)
-            appDb.bookDao.insert(book)
+            appDb.bookDao.upsert(book)
             appDb.bookChapterDao.insert(*toc.toTypedArray())
             ReadBook.resetData(book)
             ReadBook.upMsg(null)

app/src/main/java/io/legado/app/ui/main/MainViewModel.kt

@@ -134,7 +134,7 @@ class MainViewModel(application: Application) : BaseViewModel(application) {
                     appDb.bookDao.update(book)
                 } else {
                     upTocAdd(book.bookUrl)
-                    appDb.bookDao.insert(book)
+                    appDb.bookDao.upsert(book)
                     BookHelp.updateCacheFolder(oldBook, book)
                 }
                 appDb.bookChapterDao.delByBook(bookUrl)

build.gradle

@@ -2,15 +2,13 @@
 
 buildscript {
     ext{
-        kotlin_version = '1.8.0'
-        compose_version = '1.3.0-rc01'
-        compose_compiler_version = '1.3.2'
-        agp_version = '7.4.1'
-        exoplayer_version = '2.18.2'
-        splitties_version = '3.0.0'
-        room_version = '2.5.0'
         compile_sdk_version = 33
         build_tool_version = '33.0.1'
+        kotlin_version = '1.8.0'
+        agp_version = '7.4.1'
+        exoplayer_version = '2.18.3'
+        splitties_version = '3.0.0'
+        room_version = '2.5.0'
     }
 }