Merge pull request #463 from gedoor/master

优化正文url拼接

app/src/main/assets/updateLog.md

@@ -8,6 +8,7 @@
 * 解决一些书名太长缓存报错的bug
 * 添加备份搜索记录
 * 替换编辑界面添加正则学习教程
+* 去除解析目录时拼接相对url,提升解析速度
 * 自动分段优化 by [tumuyan](https://github.com/tumuyan)
 
 **2020/11/01**

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

@@ -18,7 +18,7 @@ import java.util.*
         ReplaceRule::class, SearchBook::class, SearchKeyword::class, Cookie::class,
         RssSource::class, Bookmark::class, RssArticle::class, RssReadRecord::class,
         RssStar::class, TxtTocRule::class, ReadRecord::class, HttpTTS::class],
-    version = 22,
+    version = 23,
     exportSchema = true
 )
 abstract class AppDatabase : RoomDatabase() {
@@ -57,7 +57,8 @@ abstract class AppDatabase : RoomDatabase() {
                     migration_18_19,
                     migration_19_20,
                     migration_20_21,
-                    migration_21_22
+                    migration_21_22,
+                    migration_22_23
                 )
                 .allowMainThreadQueries()
                 .addCallback(dbCallback)
@@ -194,6 +195,12 @@ abstract class AppDatabase : RoomDatabase() {
                 database.execSQL("CREATE UNIQUE INDEX IF NOT EXISTS `index_books_name_author` ON `books` (`name`, `author`) ")
             }
         }
+
+        private val migration_22_23 = object : Migration(22, 23) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("ALTER TABLE chapters ADD baseUrl TEXT NOT NULL DEFAULT ''")
+            }
+        }
     }
 
 }

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

@@ -6,6 +6,7 @@ import androidx.room.ForeignKey
 import androidx.room.Ignore
 import androidx.room.Index
 import io.legado.app.utils.GSON
+import io.legado.app.utils.NetworkUtils
 import io.legado.app.utils.fromJsonObject
 import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
@@ -26,13 +27,14 @@ import kotlinx.android.parcel.Parcelize
 )    // 删除书籍时自动删除章节
 data class BookChapter(
     var url: String = "",               // 章节地址
-    var title: String = "",              // 章节标题
+    var title: String = "",             // 章节标题
+    var baseUrl: String = "",           //用来拼接相对url
     var bookUrl: String = "",           // 书籍地址
     var index: Int = 0,                 // 章节序号
     var resourceUrl: String? = null,    // 音频真实URL
     var tag: String? = null,            //
     var start: Long? = null,            // 章节起始位置
-    var end: Long? = null,               // 章节终止位置
+    var end: Long? = null,              // 章节终止位置
     var variable: String? = null        //变量
 ) : Parcelable {
 
@@ -57,5 +59,8 @@ data class BookChapter(
         return false
     }
 
+    fun getAbsoluteURL(): String {
+        return NetworkUtils.getAbsoluteURL(baseUrl, url)!!
+    }
 }
 

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

@@ -65,16 +65,16 @@ object BookChapterList {
                                 headerMapF = bookSource.getHeaderMap()
                             ).getResponseAwait(bookSource.bookSourceUrl)
                                 .body?.let { nextBody ->
-                                chapterData = analyzeChapterList(
-                                    book, nextUrl, nextBody, tocRule, listRule, bookSource
-                                )
-                                nextUrl = if (chapterData.nextUrl.isNotEmpty()) {
-                                    chapterData.nextUrl[0]
-                                } else ""
-                                chapterData.chapterList?.let {
-                                    chapterList.addAll(it)
+                                    chapterData = analyzeChapterList(
+                                        book, nextUrl, nextBody, tocRule, listRule, bookSource
+                                    )
+                                    nextUrl = if (chapterData.nextUrl.isNotEmpty()) {
+                                        chapterData.nextUrl[0]
+                                    } else ""
+                                    chapterData.chapterList?.let {
+                                        chapterList.addAll(it)
+                                    }
                                 }
-                            }
                         }
                         Debug.log(bookSource.bookSourceUrl, "◇目录总页数:${nextUrlList.size}")
                         block.resume(finish(book, chapterList, reverse))
@@ -241,13 +241,15 @@ object BookChapterList {
             var isVip: String?
             for (item in elements) {
                 analyzeRule.setContent(item)
-                val bookChapter = BookChapter(bookUrl = book.bookUrl)
+                val bookChapter = BookChapter(bookUrl = book.bookUrl, baseUrl = baseUrl)
                 analyzeRule.chapter = bookChapter
                 bookChapter.title = analyzeRule.getString(nameRule)
-                bookChapter.url = analyzeRule.getString(urlRule, true)
+                bookChapter.url = analyzeRule.getString(urlRule)
                 bookChapter.tag = analyzeRule.getString(update)
                 isVip = analyzeRule.getString(vipRule)
-                if (bookChapter.url.isEmpty()) bookChapter.url = baseUrl
+                if (bookChapter.url.isEmpty()) {
+                    bookChapter.url = baseUrl
+                }
                 if (bookChapter.title.isNotEmpty()) {
                     if (isVip.isNotEmpty() && isVip != "null" && isVip != "false" && isVip != "0") {
                         bookChapter.title = "\uD83D\uDD12" + bookChapter.title

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

@@ -128,18 +128,24 @@ class WebBook(val bookSource: BookSource) {
     ): Coroutine<List<BookChapter>> {
         return Coroutine.async(scope, context) {
             book.type = bookSource.bookSourceType
-            val body =
-                if (book.bookUrl == book.tocUrl && !book.tocHtml.isNullOrEmpty()) {
-                    book.tocHtml
-                } else {
-                    AnalyzeUrl(
-                        book = book,
-                        ruleUrl = book.tocUrl,
-                        baseUrl = book.bookUrl,
-                        headerMapF = bookSource.getHeaderMap()
-                    ).getResponseAwait(bookSource.bookSourceUrl).body
-                }
-            BookChapterList.analyzeChapterList(this, book, body, bookSource, book.tocUrl)
+            if (book.bookUrl == book.tocUrl && !book.tocHtml.isNullOrEmpty()) {
+                BookChapterList.analyzeChapterList(
+                    this,
+                    book,
+                    book.tocHtml,
+                    bookSource,
+                    book.tocUrl
+                )
+            } else {
+                val res = AnalyzeUrl(
+                    book = book,
+                    ruleUrl = book.tocUrl,
+                    baseUrl = book.bookUrl,
+                    headerMapF = bookSource.getHeaderMap()
+                ).getResponseAwait(bookSource.bookSourceUrl)
+                BookChapterList.analyzeChapterList(this, book, res.body, bookSource, res.url)
+            }
+
         }
     }
 
@@ -178,7 +184,7 @@ class WebBook(val bookSource: BookSource) {
                 book.tocHtml
             } else {
                 val analyzeUrl = AnalyzeUrl(
-                    ruleUrl = bookChapter.url,
+                    ruleUrl = bookChapter.getAbsoluteURL(),
                     baseUrl = book.tocUrl,
                     headerMapF = bookSource.getHeaderMap(),
                     book = book,

app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt

@@ -102,7 +102,7 @@ object ChapterProvider {
         return TextChapter(
             bookChapter.index,
             bookChapter.title,
-            bookChapter.url,
+            bookChapter.getAbsoluteURL(),
             textPages,
             pageLines,
             pageLengths,

app/src/main/java/io/legado/app/utils/NetworkUtils.kt

@@ -11,9 +11,10 @@ import java.util.regex.Pattern
 @Suppress("unused", "MemberVisibilityCanBePrivate")
 object NetworkUtils {
     fun getUrl(response: Response<*>): String {
-        val networkResponse = response.raw().networkResponse()
-        return networkResponse?.request()?.url()?.toString()
-            ?: response.raw().request().url().toString()
+        response.raw().networkResponse()?.let {
+            return it.request().url().toString()
+        }
+        return response.raw().request().url().toString()
     }
 
     private val notNeedEncoding: BitSet by lazy {