From 946cf45393c69f945de66e89c05e85af1a522ab4 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Mon, 18 Nov 2019 19:52:30 +0800
Subject: [PATCH] up

---
 .../main/java/io/legado/app/model/Debug.kt    | 26 ++++++++++++++++---
 app/src/main/java/io/legado/app/model/Rss.kt  | 21 +++++++++++++++
 .../app/ui/rss/read/ReadRssViewModel.kt       | 19 +++-----------
 3 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/io/legado/app/model/Debug.kt b/app/src/main/java/io/legado/app/model/Debug.kt
index 7b75a47ac..f236af2ee 100644
--- a/app/src/main/java/io/legado/app/model/Debug.kt
+++ b/app/src/main/java/io/legado/app/model/Debug.kt
@@ -3,6 +3,7 @@ package io.legado.app.model
 import android.annotation.SuppressLint
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookChapter
+import io.legado.app.data.entities.RssArticle
 import io.legado.app.data.entities.RssSource
 import io.legado.app.help.coroutine.CompositeCoroutine
 import io.legado.app.utils.htmlFormat
@@ -55,15 +56,34 @@ object Debug {
         log(debugSource, "︾开始解析RSS")
         Rss.getArticles(rssSource)
             .onSuccess {
-                log(debugSource, "︽正文页解析完成", state = 1000)
+                if (it == null) {
+                    log(debugSource, "︽解析失败", state = -1)
+                } else {
+                    val ruleContent = rssSource.ruleContent
+                    if (it.isNotEmpty() && it[0].description.isNullOrEmpty() && !ruleContent.isNullOrEmpty()) {
+                        log(debugSource, "︽解析完成")
+                        log(debugSource, showTime = false)
+                        rssContentDebug(it[0], ruleContent)
+                    } else {
+                        log(debugSource, "︽解析完成", state = 1000)
+                    }
+                }
             }
             .onError {
                 log(debugSource, it.localizedMessage, state = -1)
             }
     }
 
-    private fun rssContentDebug() {
-
+    private fun rssContentDebug(rssArticle: RssArticle, ruleContent: String) {
+        log(debugSource, "︾开始解析内容")
+        Rss.getContent(rssArticle, ruleContent)
+            .onSuccess {
+                log(debugSource, it)
+                log(debugSource, "︽解析完成", state = 1000)
+            }
+            .onError {
+                log(debugSource, it.localizedMessage, state = -1)
+            }
     }
 
     fun startDebug(webBook: WebBook, key: String) {
diff --git a/app/src/main/java/io/legado/app/model/Rss.kt b/app/src/main/java/io/legado/app/model/Rss.kt
index dcd49a3b3..b73a48fab 100644
--- a/app/src/main/java/io/legado/app/model/Rss.kt
+++ b/app/src/main/java/io/legado/app/model/Rss.kt
@@ -3,8 +3,10 @@ package io.legado.app.model
 import io.legado.app.data.entities.RssArticle
 import io.legado.app.data.entities.RssSource
 import io.legado.app.help.coroutine.Coroutine
+import io.legado.app.model.analyzeRule.AnalyzeRule
 import io.legado.app.model.analyzeRule.AnalyzeUrl
 import io.legado.app.model.rss.RssParserByRule
+import io.legado.app.utils.NetworkUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlin.coroutines.CoroutineContext
@@ -22,4 +24,23 @@ object Rss {
             RssParserByRule.parseXML(body, rssSource)
         }
     }
+
+    fun getContent(
+        rssArticle: RssArticle,
+        ruleContent: String,
+        scope: CoroutineScope = Coroutine.DEFAULT,
+        context: CoroutineContext = Dispatchers.IO
+    ): Coroutine<String> {
+        return Coroutine.async(scope, context) {
+            val body = AnalyzeUrl(rssArticle.link, baseUrl = rssArticle.origin)
+                .getResponseAwait()
+                .body
+            val analyzeRule = AnalyzeRule()
+            analyzeRule.setContent(
+                body,
+                NetworkUtils.getAbsoluteURL(rssArticle.origin, rssArticle.link)
+            )
+            analyzeRule.getString(ruleContent)
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt
index 4bdcee197..b0312bb9d 100644
--- a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt
@@ -7,9 +7,8 @@ import io.legado.app.App
 import io.legado.app.base.BaseViewModel
 import io.legado.app.data.entities.RssArticle
 import io.legado.app.data.entities.RssSource
-import io.legado.app.model.analyzeRule.AnalyzeRule
+import io.legado.app.model.Rss
 import io.legado.app.model.analyzeRule.AnalyzeUrl
-import io.legado.app.utils.NetworkUtils
 
 class ReadRssViewModel(application: Application) : BaseViewModel(application) {
     var rssSource: RssSource? = null
@@ -53,20 +52,10 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application) {
     }
 
     private fun loadContent(rssArticle: RssArticle, ruleContent: String) {
-        execute {
-            val body = AnalyzeUrl(rssArticle.link, baseUrl = rssArticle.origin)
-                .getResponseAwait()
-                .body
-            AnalyzeRule().apply {
-                setContent(
-                    body,
-                    NetworkUtils.getAbsoluteURL(rssArticle.origin, rssArticle.link)
-                )
-                getString(ruleContent).let { content ->
-                    contentLiveData.postValue(content)
-                }
+        Rss.getContent(rssArticle, ruleContent, this)
+            .onSuccess {
+                contentLiveData.postValue(it)
             }
-        }
     }
 
     fun upRssArticle(rssArticle: RssArticle, success: () -> Unit) {