From 30d5153ffc88c8d934856355845c6974c2315598 Mon Sep 17 00:00:00 2001 From: kunfei Date: Sun, 14 Jul 2019 09:24:20 +0800 Subject: [PATCH] up --- .../java/io/legado/app/data/dao/BookDao.kt | 4 +- .../java/io/legado/app/data/entities/Book.kt | 58 +++++++++---------- .../legado/app/data/entities/BookChapter.kt | 2 +- .../io/legado/app/data/entities/SearchBook.kt | 26 ++++----- .../io/legado/app/help/storage/Restore.kt | 8 +-- .../io/legado/app/model/webbook/BookList.kt | 5 +- .../app/ui/bookshelf/BookshelfAdapter.kt | 8 +-- .../app/ui/main/bookshelf/BookshelfAdapter.kt | 4 +- 8 files changed, 56 insertions(+), 59 deletions(-) diff --git a/app/src/main/java/io/legado/app/data/dao/BookDao.kt b/app/src/main/java/io/legado/app/data/dao/BookDao.kt index 35e892c93..670ed6b6c 100644 --- a/app/src/main/java/io/legado/app/data/dao/BookDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/BookDao.kt @@ -24,13 +24,13 @@ interface BookDao { @Query("SELECT * FROM books WHERE `group` = :group") fun observeByGroup(group: Int): DataSource.Factory - @Query("SELECT descUrl FROM books WHERE `group` = :group") + @Query("SELECT bookUrl FROM books WHERE `group` = :group") fun observeUrlsByGroup(group: Int): LiveData> @Query("SELECT * FROM books WHERE `name` in (:names)") fun findByName(vararg names: String): List - @get:Query("SELECT descUrl FROM books") + @get:Query("SELECT bookUrl FROM books") val allBookUrls: List @get:Query("SELECT COUNT(*) FROM books") diff --git a/app/src/main/java/io/legado/app/data/entities/Book.kt b/app/src/main/java/io/legado/app/data/entities/Book.kt index bbe4b0e4a..239097013 100644 --- a/app/src/main/java/io/legado/app/data/entities/Book.kt +++ b/app/src/main/java/io/legado/app/data/entities/Book.kt @@ -13,36 +13,36 @@ import kotlinx.android.parcel.Parcelize import kotlin.math.max @Parcelize -@Entity(tableName = "books", indices = [(Index(value = ["descUrl"], unique = true))]) +@Entity(tableName = "books", indices = [(Index(value = ["bookUrl"], unique = true))]) data class Book( - @PrimaryKey - var descUrl: String = "", // 详情页Url(本地书源存储完整文件路径) - var tocUrl: String = "", // 目录页Url (toc=table of Contents) - var origin: String = "", // 书源URL(默认BookType.local) - var name: String? = null, // 书籍名称(书源获取) - var author: String? = null, // 作者名称(书源获取) - var tag: String? = null, // 分类信息(书源获取) - var customTag: String? = null, // 分类信息(用户修改) - var coverUrl: String? = null, // 封面Url(书源获取) - var customCoverUrl: String? = null, // 封面Url(用户修改) - var description: String? = null, // 简介内容(书源获取) - var customDescription: String? = null, // 简介内容(用户修改) - var charset: String? = null, // 自定义字符集名称(仅适用于本地书籍) - var type: Int = 0, // @BookType - var group: Int = 0, // 自定义分组索引号 - var latestChapterTitle: String? = null, // 最新章节标题 - var latestChapterTime: Long = 0, // 最新章节标题更新时间 - var lastCheckTime: Long = 0, // 最近一次更新书籍信息的时间 - var lastCheckCount: Int = 0, // 最近一次发现新章节的数量 - var totalChapterNum: Int = 0, // 书籍目录总数 - var durChapterTitle: String? = null, // 当前章节名称 - var durChapterIndex: Int = 0, // 当前章节索引 - var durChapterPos: Int = 0, // 当前阅读的进度(首行字符的索引位置) - var durChapterTime: Long = 0, // 最近一次阅读书籍的时间(打开正文的时间) - var canUpdate: Boolean = true, // 刷新书架时更新书籍信息 - var order: Int = 0, // 手动排序 - var useReplaceRule: Boolean = true, // 正文使用净化替换规则 - var variable: String? = null // 自定义书籍变量信息(用于书源规则检索书籍信息) + @PrimaryKey + var bookUrl: String = "", // 详情页Url(本地书源存储完整文件路径) + var tocUrl: String = "", // 目录页Url (toc=table of Contents) + var origin: String = "", // 书源URL(默认BookType.local) + var name: String? = null, // 书籍名称(书源获取) + var author: String? = null, // 作者名称(书源获取) + var tag: String? = null, // 分类信息(书源获取) + var customTag: String? = null, // 分类信息(用户修改) + var coverUrl: String? = null, // 封面Url(书源获取) + var customCoverUrl: String? = null, // 封面Url(用户修改) + var description: String? = null, // 简介内容(书源获取) + var customDescription: String? = null, // 简介内容(用户修改) + var charset: String? = null, // 自定义字符集名称(仅适用于本地书籍) + var type: Int = 0, // @BookType + var group: Int = 0, // 自定义分组索引号 + var latestChapterTitle: String? = null, // 最新章节标题 + var latestChapterTime: Long = 0, // 最新章节标题更新时间 + var lastCheckTime: Long = 0, // 最近一次更新书籍信息的时间 + var lastCheckCount: Int = 0, // 最近一次发现新章节的数量 + var totalChapterNum: Int = 0, // 书籍目录总数 + var durChapterTitle: String? = null, // 当前章节名称 + var durChapterIndex: Int = 0, // 当前章节索引 + var durChapterPos: Int = 0, // 当前阅读的进度(首行字符的索引位置) + var durChapterTime: Long = 0, // 最近一次阅读书籍的时间(打开正文的时间) + var canUpdate: Boolean = true, // 刷新书架时更新书籍信息 + var order: Int = 0, // 手动排序 + var useReplaceRule: Boolean = true, // 正文使用净化替换规则 + var variable: String? = null // 自定义书籍变量信息(用于书源规则检索书籍信息) ) : Parcelable, BaseBook { @IgnoredOnParcel @Ignore 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 042abac42..3203313d7 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 @@ -14,7 +14,7 @@ import kotlinx.android.parcel.Parcelize indices = [(Index(value = ["bookUrl"], unique = true)), (Index(value = ["bookUrl", "index"], unique = true))], foreignKeys = [(ForeignKey( entity = Book::class, - parentColumns = ["descUrl"], + parentColumns = ["bookUrl"], childColumns = ["bookUrl"], onDelete = ForeignKey.CASCADE ))] diff --git a/app/src/main/java/io/legado/app/data/entities/SearchBook.kt b/app/src/main/java/io/legado/app/data/entities/SearchBook.kt index 379b4dc85..a7576cf5d 100644 --- a/app/src/main/java/io/legado/app/data/entities/SearchBook.kt +++ b/app/src/main/java/io/legado/app/data/entities/SearchBook.kt @@ -12,20 +12,20 @@ import kotlinx.android.parcel.IgnoredOnParcel import kotlinx.android.parcel.Parcelize @Parcelize -@Entity(tableName = "searchBooks", indices = [(Index(value = ["descUrl"], unique = true))]) +@Entity(tableName = "searchBooks", indices = [(Index(value = ["bookUrl"], unique = true))]) data class SearchBook( - @PrimaryKey - var descUrl: String = "", - var origin: String = "", // 书源规则id(默认-1,表示本地书籍) - var name: String? = null, - var author: String? = null, - var tag: String? = null, - var coverUrl: String? = null, - var description: String? = null, - var latestChapterTitle: String? = null, - var time: Long = 0L, - var variable: String? = null, - var bookInfoHtml: String? = null + @PrimaryKey + var bookUrl: String = "", + var origin: String = "", // 书源规则id(默认-1,表示本地书籍) + var name: String? = null, + var author: String? = null, + var tag: String? = null, + var coverUrl: String? = null, + var description: String? = null, + var latestChapterTitle: String? = null, + var time: Long = 0L, + var variable: String? = null, + var bookInfoHtml: String? = null ) : Parcelable, BaseBook { @IgnoredOnParcel diff --git a/app/src/main/java/io/legado/app/help/storage/Restore.kt b/app/src/main/java/io/legado/app/help/storage/Restore.kt index 7dafb5c63..0aaa0d6ff 100644 --- a/app/src/main/java/io/legado/app/help/storage/Restore.kt +++ b/app/src/main/java/io/legado/app/help/storage/Restore.kt @@ -45,16 +45,16 @@ object Restore { for (item in items) { val jsonItem = jsonPath.parse(item) val book = Book() - book.descUrl = jsonItem.readString("$.noteUrl") ?: "" - if (book.descUrl.isBlank()) continue + book.bookUrl = jsonItem.readString("$.noteUrl") ?: "" + if (book.bookUrl.isBlank()) continue book.name = jsonItem.readString("$.bookInfoBean.name") - if (book.descUrl in existingBooks) { + if (book.bookUrl in existingBooks) { Log.d(AppConst.APP_TAG, "Found existing book: ${book.name}") continue } book.author = jsonItem.readString("$.bookInfoBean.author") book.type = if (jsonItem.readString("$.bookInfoBean.bookSourceType") == "AUDIO") 1 else 0 - book.tocUrl = jsonItem.readString("$.bookInfoBean.chapterUrl") ?: book.descUrl + book.tocUrl = jsonItem.readString("$.bookInfoBean.chapterUrl") ?: book.bookUrl book.coverUrl = jsonItem.readString("$.bookInfoBean.coverUrl") book.customCoverUrl = jsonItem.readString("$.customCoverPath") book.lastCheckTime = jsonItem.readLong("$.bookInfoBean.finalRefreshData") ?: 0 diff --git a/app/src/main/java/io/legado/app/model/webbook/BookList.kt b/app/src/main/java/io/legado/app/model/webbook/BookList.kt index 2a61e383c..fb6212331 100644 --- a/app/src/main/java/io/legado/app/model/webbook/BookList.kt +++ b/app/src/main/java/io/legado/app/model/webbook/BookList.kt @@ -31,7 +31,7 @@ class BookList { analyzer.setContent(body, baseUrl) bookSource.bookUrlPattern?.let { if (baseUrl.matches(it.toRegex())) { - getItem(analyzer, bookSource)?.let { searchBook -> + getItem(analyzer, bookSource, baseUrl)?.let { searchBook -> searchBook.bookInfoHtml = body bookList.add(searchBook) } @@ -41,7 +41,7 @@ class BookList { return bookList } - private fun getItem(analyzeRule: AnalyzeRule, bookSource: BookSource): SearchBook? { + private fun getItem(analyzeRule: AnalyzeRule, bookSource: BookSource, baseUrl: String): SearchBook? { val searchBook = SearchBook() analyzeRule.setBook(searchBook) with(bookSource.getBookInfoRule()) { @@ -52,6 +52,7 @@ class BookList { if (!searchBook.name.isNullOrEmpty()) { searchBook.author = analyzeRule.getString(author ?: "") searchBook.coverUrl = analyzeRule.getString(coverUrl ?: "") + searchBook.bookUrl = baseUrl return searchBook } } diff --git a/app/src/main/java/io/legado/app/ui/bookshelf/BookshelfAdapter.kt b/app/src/main/java/io/legado/app/ui/bookshelf/BookshelfAdapter.kt index 20e02a425..fa3a945b5 100644 --- a/app/src/main/java/io/legado/app/ui/bookshelf/BookshelfAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/bookshelf/BookshelfAdapter.kt @@ -1,21 +1,17 @@ package io.legado.app.ui.bookshelf -import android.text.TextUtils.isEmpty import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.paging.PagedListAdapter import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.load.engine.DiskCacheStrategy import io.legado.app.R import io.legado.app.data.entities.Book import io.legado.app.help.ImageLoader import io.legado.app.lib.theme.ThemeStore import kotlinx.android.synthetic.main.item_bookshelf_list.view.* import kotlinx.android.synthetic.main.item_relace_rule.view.tv_name -import java.io.File class BookshelfAdapter : PagedListAdapter(DIFF_CALLBACK) { @@ -23,10 +19,10 @@ class BookshelfAdapter : PagedListAdapter(D @JvmField val DIFF_CALLBACK = object : DiffUtil.ItemCallback() { override fun areItemsTheSame(oldItem: Book, newItem: Book): Boolean = - oldItem.descUrl == newItem.descUrl + oldItem.bookUrl == newItem.bookUrl override fun areContentsTheSame(oldItem: Book, newItem: Book): Boolean = - oldItem.descUrl == newItem.descUrl + oldItem.bookUrl == newItem.bookUrl && oldItem.durChapterTitle == newItem.durChapterTitle && oldItem.latestChapterTitle == newItem.latestChapterTitle } diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfAdapter.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfAdapter.kt index c0b9e2293..64e9ab388 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfAdapter.kt @@ -19,10 +19,10 @@ class BookshelfAdapter : PagedListAdapter(D @JvmField val DIFF_CALLBACK = object : DiffUtil.ItemCallback() { override fun areItemsTheSame(oldItem: Book, newItem: Book): Boolean = - oldItem.descUrl == newItem.descUrl + oldItem.bookUrl == newItem.bookUrl override fun areContentsTheSame(oldItem: Book, newItem: Book): Boolean = - oldItem.descUrl == newItem.descUrl + oldItem.bookUrl == newItem.bookUrl && oldItem.durChapterTitle == newItem.durChapterTitle && oldItem.latestChapterTitle == newItem.latestChapterTitle }