Merge branch 'master' of https://github.com/gedoor/legado

4 years ago · c56485e8dc
parent a4ab0319a2 35ab379d19
commit c56485e8dc
6 changed files with 85 additions and 58 deletions
--- a/app/src/main/java/io/legado/app/data/AppDatabase.kt
+++ b/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 ''")
+            }
+        }
    }

 }
--- a/app/src/main/java/io/legado/app/data/entities/BookChapter.kt
+++ b/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)!!
+    }
 }

--- a/app/src/main/java/io/legado/app/model/webBook/BookChapterList.kt
+++ b/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)
                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
@ -257,7 +259,7 @@ object BookChapterList {
            }
            Debug.log(bookSource.bookSourceUrl, "└${chapterList[0].title}", log)
            Debug.log(bookSource.bookSourceUrl, "┌获取首章链接", log)
-            Debug.log(bookSource.bookSourceUrl, "└${chapterList[0].url}", log)
+            Debug.log(bookSource.bookSourceUrl, "└${chapterList[0].getAbsoluteURL()}", log)
            Debug.log(bookSource.bookSourceUrl, "┌获取首章信息", log)
            Debug.log(bookSource.bookSourceUrl, "└${chapterList[0].tag}", log)
        }
--- a/app/src/main/java/io/legado/app/model/webBook/WebBook.kt
+++ b/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)
+            }
+
        }
    }

@ -173,31 +179,37 @@ class WebBook(val bookSource: BookSource) {
            Debug.log(sourceUrl, "⇒正文规则为空,使用章节链接:${bookChapter.url}")
            return bookChapter.url
        }
-        val body =
-            if (bookChapter.url == book.bookUrl && !book.tocHtml.isNullOrEmpty()) {
-                book.tocHtml
-            } else {
-                val analyzeUrl = AnalyzeUrl(
-                    ruleUrl = bookChapter.url,
-                    baseUrl = book.tocUrl,
-                    headerMapF = bookSource.getHeaderMap(),
-                    book = book,
-                    chapter = bookChapter
-                )
-                analyzeUrl.getResponseAwait(
-                    bookSource.bookSourceUrl,
-                    jsStr = bookSource.getContentRule().webJs,
-                    sourceRegex = bookSource.getContentRule().sourceRegex
-                ).body
-            }
-        return BookContent.analyzeContent(
-            scope,
-            body,
-            book,
-            bookChapter,
-            bookSource,
-            bookChapter.url,
-            nextChapterUrl
-        )
+        return if (bookChapter.url == book.bookUrl && !book.tocHtml.isNullOrEmpty()) {
+            BookContent.analyzeContent(
+                scope,
+                book.tocHtml,
+                book,
+                bookChapter,
+                bookSource,
+                bookChapter.getAbsoluteURL(),
+                nextChapterUrl
+            )
+        } else {
+            val res = AnalyzeUrl(
+                ruleUrl = bookChapter.getAbsoluteURL(),
+                baseUrl = book.tocUrl,
+                headerMapF = bookSource.getHeaderMap(),
+                book = book,
+                chapter = bookChapter
+            ).getResponseAwait(
+                bookSource.bookSourceUrl,
+                jsStr = bookSource.getContentRule().webJs,
+                sourceRegex = bookSource.getContentRule().sourceRegex
+            )
+            BookContent.analyzeContent(
+                scope,
+                res.body,
+                book,
+                bookChapter,
+                bookSource,
+                res.url,
+                nextChapterUrl
+            )
+        }
    }
 }
--- a/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt
+++ b/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,
--- a/app/src/main/java/io/legado/app/utils/NetworkUtils.kt
+++ b/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 {