From 2b548344c7b25b95c00fca739de3ac38c0561203 Mon Sep 17 00:00:00 2001
From: mabdc <747455334@qq.com>
Date: Wed, 14 Aug 2019 23:03:46 +0800
Subject: [PATCH] fix

---
 .../rechinx/meow/data/database/dao/ChapterDao.kt   |  3 +++
 .../top/rechinx/meow/ui/details/DetailPresenter.kt | 11 +++++++++++
 .../top/rechinx/meow/ui/result/ResultPresenter.kt  | 14 ++++++++------
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/top/rechinx/meow/data/database/dao/ChapterDao.kt b/app/src/main/java/top/rechinx/meow/data/database/dao/ChapterDao.kt
index 7ce1f6f..7ebfd72 100644
--- a/app/src/main/java/top/rechinx/meow/data/database/dao/ChapterDao.kt
+++ b/app/src/main/java/top/rechinx/meow/data/database/dao/ChapterDao.kt
@@ -24,6 +24,9 @@ interface ChapterDao {
     @Query("SELECT * FROM Chapter WHERE id = :chapterId")
     fun getChapter(chapterId: Long): Chapter?
 
+    @Query("DELETE FROM Chapter WHERE manga_id = :mangaId")
+    fun deleteChapters(mangaId: Long)
+
     @Delete
     fun deleteChapters(list: List<Chapter>)
 
diff --git a/app/src/main/java/top/rechinx/meow/ui/details/DetailPresenter.kt b/app/src/main/java/top/rechinx/meow/ui/details/DetailPresenter.kt
index 3a729e9..743f58d 100644
--- a/app/src/main/java/top/rechinx/meow/ui/details/DetailPresenter.kt
+++ b/app/src/main/java/top/rechinx/meow/ui/details/DetailPresenter.kt
@@ -68,6 +68,7 @@ class DetailPresenter(val sourceId: Long, val url: String): BasePresenter<Detail
         pager = ChapterPager(source, url)
         pager.results.observeOn(Schedulers.io())
                 .map {
+                    chapterDao.deleteChapters(manga?.id!!)
                     it.first to it.second.map { chapter -> networkToLocalChapter(chapter, manga?.id!!) }
                 }.subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -117,6 +118,7 @@ class DetailPresenter(val sourceId: Long, val url: String): BasePresenter<Detail
     }
 
     fun networkToLocalChapter(sChapter: SChapter, mangaId: Long): Chapter {
+        /*
         var localChapter = chapterDao.getChapter(sChapter.url!!, mangaId)
         if(localChapter == null) {
             val newChapter = Chapter.create().apply {
@@ -128,6 +130,15 @@ class DetailPresenter(val sourceId: Long, val url: String): BasePresenter<Detail
             localChapter = newChapter
         }
         return localChapter
+        */
+
+        val newChapter = Chapter.create().apply {
+            manga_id = mangaId
+        }
+        newChapter.copyFrom(sChapter)
+        val insertedId = chapterDao.insertChapter(newChapter)
+        newChapter.id = insertedId
+        return newChapter
     }
 
     /**
diff --git a/app/src/main/java/top/rechinx/meow/ui/result/ResultPresenter.kt b/app/src/main/java/top/rechinx/meow/ui/result/ResultPresenter.kt
index 883c527..b35dce7 100644
--- a/app/src/main/java/top/rechinx/meow/ui/result/ResultPresenter.kt
+++ b/app/src/main/java/top/rechinx/meow/ui/result/ResultPresenter.kt
@@ -68,12 +68,14 @@ class ResultPresenter(val query: String): BasePresenter<ResultActivity>(), KoinC
                                         try {
                                             if(it.list.isEmpty()) throw Exception()
                                             for(item in it.list) {
-                                                val manga = Manga()
-                                                manga.copyFrom(item)
-                                                manga.sourceId = source.id
-                                                manga.sourceName = source.name
-                                                emitter.onNext(manga)
-                                                Thread.sleep(Random().nextInt(200).toLong())
+                                                if(item.title != null && item.title!!.contains(query)){
+                                                    val manga = Manga()
+                                                    manga.copyFrom(item)
+                                                    manga.sourceId = source.id
+                                                    manga.sourceName = source.name
+                                                    emitter.onNext(manga)
+                                                    Thread.sleep(Random().nextInt(200).toLong())
+                                                }
                                             }
                                             emitter.onComplete()
                                         } catch (e: Exception) {