diff --git a/app/src/main/java/io/legado/app/model/WebBook.kt b/app/src/main/java/io/legado/app/model/WebBook.kt index b534cb272..e662ce6dc 100644 --- a/app/src/main/java/io/legado/app/model/WebBook.kt +++ b/app/src/main/java/io/legado/app/model/WebBook.kt @@ -56,7 +56,7 @@ class WebBook(private val bookSource: BookSource) { return Coroutine.async { val analyzeUrl = AnalyzeUrl(book = book, ruleUrl = bookChapter.url) val response = analyzeUrl.getResponseAsync().await() - BookContent.analyzeContent(response, book, bookChapter, bookSource, analyzeUrl) + BookContent.analyzeContent(this, response, book, bookChapter, bookSource, analyzeUrl) } } } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/model/webbook/BookContent.kt b/app/src/main/java/io/legado/app/model/webbook/BookContent.kt index dc480a6f8..6b3c28032 100644 --- a/app/src/main/java/io/legado/app/model/webbook/BookContent.kt +++ b/app/src/main/java/io/legado/app/model/webbook/BookContent.kt @@ -1,23 +1,45 @@ package io.legado.app.model.webbook +import io.legado.app.App +import io.legado.app.R import io.legado.app.data.entities.Book import io.legado.app.data.entities.BookChapter import io.legado.app.data.entities.BookSource +import io.legado.app.data.entities.rule.ContentRule import io.legado.app.model.analyzeRule.AnalyzeUrl +import io.legado.app.utils.NetworkUtils +import kotlinx.coroutines.CoroutineScope import retrofit2.Response object BookContent { - fun analyzeContent( + @Throws(Exception::class) + suspend fun analyzeContent( + coroutineScope: CoroutineScope, response: Response, book: Book, bookChapter: BookChapter, bookSource: BookSource, analyzeUrl: AnalyzeUrl ): String { - + val baseUrl: String = NetworkUtils.getUrl(response) + val body: String? = response.body() + body ?: throw Exception( + App.INSTANCE.getString( + R.string.get_web_content_error, + baseUrl + ) + ) + val contentRule = bookSource.getContentRule() return "" } + fun analyzeContent( + body: String, + contentRule: ContentRule + ): ContentData { + + return ContentData("", "") + } } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/model/webbook/ContentData.kt b/app/src/main/java/io/legado/app/model/webbook/ContentData.kt new file mode 100644 index 000000000..98b8aed20 --- /dev/null +++ b/app/src/main/java/io/legado/app/model/webbook/ContentData.kt @@ -0,0 +1,6 @@ +package io.legado.app.model.webbook + +data class ContentData( + var content: String, + var nextUrl: T +) \ No newline at end of file