fix the bug where read was not shown correctly

IReaderorg · Apr 3, 2022 · 72cd7e0 · 72cd7e0
1 parent 7c9528b
commit 72cd7e0
Show file tree

Hide file tree

Showing 30 changed files with 299 additions and 239 deletions.
diff --git a/core/src/main/java/org/ireader/core/utils/Constants.kt b/core/src/main/java/org/ireader/core/utils/Constants.kt
@@ -24,7 +24,7 @@ object Constants {
     const val CATALOG_REMOTE = "catalog_remote"
     const val UPDATE_TABLE = "updates"
     const val HISTORY_TABLE = "history"
-    const val CATEGORY_TABLE = "category_table"
+    const val CATEGORY_TABLE = "category"
 
     const val EXPLORE_BOOK_TABLE = "explore"
 
@@ -38,17 +38,6 @@ object Constants {
 
     const val ARG_HIDE_BOTTOM_BAR = "ARG_HIDE_BOTTOM_BAR"
 
-
-    const val NO_BOOKS_ERROR = "There is no book"
-    const val NO_BOOK_ERROR = "There is no book with this name"
-    const val NO_CHAPTER_ERROR = "There is No chapter with this name"
-    const val NO_CHAPTERS_ERROR = "There are no chapters with this name"
-
-    const val CLOUDFLARE_PROTECTION_ERROR =
-        "Cloudflare site protection is enable, Please Open the WebView."
-
-    const val UNKNOWN_ERROR = "Unknown Error Happened"
-
     const val repo_url = "/repos/kazemcodes/IReader/releases/latest"
     const val github_api_url = "https://api.github.com"
 

diff --git a/data/schemas/org.ireader.data.local.AppDatabase/13.json b/data/schemas/org.ireader.data.local.AppDatabase/13.json
@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 13,
-    "identityHash": "8bcbb7c5073388da5a0a8fcaf4f0c940",
+    "identityHash": "8c1420c5d760d01a03ea739d80a6d316",
     "entities": [
       {
         "tableName": "library",
@@ -189,7 +189,7 @@
         "foreignKeys": []
       },
       {
-        "tableName": "category_table",
+        "tableName": "category",
         "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `sort` INTEGER NOT NULL, `updateInterval` INTEGER NOT NULL, `flags` INTEGER NOT NULL)",
         "fields": [
           {
@@ -524,11 +524,17 @@
       },
       {
         "tableName": "page_key_table",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `sourceId` INTEGER NOT NULL, `prevPage` INTEGER, `nextPage` INTEGER, PRIMARY KEY(`id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `title` TEXT NOT NULL, `sourceId` INTEGER NOT NULL, `prevPage` INTEGER, `nextPage` INTEGER)",
         "fields": [
           {
             "fieldPath": "id",
             "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
             "affinity": "TEXT",
             "notNull": true
           },
@@ -555,7 +561,7 @@
           "columnNames": [
             "id"
           ],
-          "autoGenerate": false
+          "autoGenerate": true
         },
         "indices": [],
         "foreignKeys": []
@@ -564,7 +570,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '8bcbb7c5073388da5a0a8fcaf4f0c940')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '8c1420c5d760d01a03ea739d80a6d316')"
     ]
   }
 }
diff --git a/data/src/main/java/org/ireader/data/local/dao/HistoryDao.kt b/data/src/main/java/org/ireader/data/local/dao/HistoryDao.kt
@@ -22,8 +22,9 @@ interface HistoryDao {
     FROM history
     JOIN library ON history.bookId = library.id
     JOIN chapter ON history.chapterId = chapter.id
+    WHERE bookTitle LIKE '%' || :query || '%' 
     ORDER BY history.readAt DESC""")
-    fun findHistoriesPaging(): kotlinx.coroutines.flow.Flow<List<HistoryWithRelations>>
+    fun findHistoriesPaging(query: String): kotlinx.coroutines.flow.Flow<List<HistoryWithRelations>>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertHistory(history: History): Long

diff --git a/data/src/main/java/org/ireader/data/local/dao/LibraryBookDao.kt b/data/src/main/java/org/ireader/data/local/dao/LibraryBookDao.kt
@@ -50,7 +50,7 @@ interface LibraryBookDao {
         desc: Boolean = false,
     ): Flow<List<Book>>
 
-
+    @RewriteQueriesToDropUnusedColumns
     @Query("""
     SELECT library.*, MAX(history.readAt) AS max
     FROM library
@@ -66,6 +66,7 @@ interface LibraryBookDao {
 """)
     fun subscribeLatestRead(desc: Boolean): Flow<List<Book>>
 
+    @RewriteQueriesToDropUnusedColumns
     @Query("""
     SELECT library.*, MAX(chapter.dateUpload) AS max
     FROM library
@@ -78,6 +79,7 @@ interface LibraryBookDao {
 """)
     fun subscribeLatestChapter(desc: Boolean): Flow<List<Book>>
 
+    @RewriteQueriesToDropUnusedColumns
     @Query("""
     SELECT library.*, SUM(CASE WHEN chapter.read == 0 THEN 1 ELSE 0 END) AS unread
     FROM library
@@ -91,6 +93,7 @@ interface LibraryBookDao {
 """)
     fun subscribeTotalChapter(desc: Boolean): Flow<List<Book>>
 
+    @RewriteQueriesToDropUnusedColumns
     @Query("""
     SELECT library.*, 
     SUM(CASE WHEN chapter.read == 0 THEN 1 ELSE 0 END) AS unread,
@@ -103,6 +106,7 @@ interface LibraryBookDao {
 """)
     suspend fun findUnreadBooks(): List<Book>
 
+    @RewriteQueriesToDropUnusedColumns
     @Query("""
     SELECT library.*, 
     SUM(length(chapter.content) > 10) as total_download,
@@ -115,6 +119,7 @@ interface LibraryBookDao {
 """)
     suspend fun findCompletedBooks(): List<Book>
 
+    @RewriteQueriesToDropUnusedColumns
     @Query("""
     SELECT library.*, 
     SUM(CASE WHEN chapter.read == 0 THEN 1 ELSE 0 END) AS unread,

diff --git a/data/src/main/java/org/ireader/data/local/dao/LibraryChapterDao.kt b/data/src/main/java/org/ireader/data/local/dao/LibraryChapterDao.kt
@@ -19,6 +19,7 @@ interface LibraryChapterDao {
         chapterId: Long,
     ): Chapter?
 
+    @RewriteQueriesToDropUnusedColumns
     @Query("""
         SELECT *,library.favorite
 FROM chapter 
@@ -64,22 +65,24 @@ WHERE library.favorite = 1
         bookId: Int,
     ): PagingSource<Int, Chapter>
 
-
+    @RewriteQueriesToDropUnusedColumns
     @Query("""
-        SELECT *, history.readAt as lastRead
-        from chapter 
-        JOIN history ON history.bookId = chapter.bookId
-        GROUP BY chapterId
-        HAVING chapter.bookId == :bookId AND lastRead = (SELECT MAX(lastRead) FROM chapter WHERE bookId == :bookId)
+        SELECT *
+        from chapter
+        GROUP BY id
+        HAVING chapter.bookId == :bookId
+        ORDER BY readAt DESC
         LIMIT 1
     """)
     fun subscribeLastReadChapter(bookId: Long): Flow<Chapter?>
 
+    @RewriteQueriesToDropUnusedColumns
     @Query("""
-        SELECT chapter.* , MAX(chapter.readAt) as lastRead
+        SELECT *
         from chapter
-        GROUP By chapter.id
-        HAVING chapter.readAt == lastRead AND chapter.bookId = :bookId
+        GROUP BY id
+        HAVING chapter.bookId == :bookId
+        ORDER BY readAt DESC
         LIMIT 1
     """)
     suspend fun findLastReadChapter(bookId: Long): Chapter?

diff --git a/data/src/main/java/org/ireader/data/local/dao/RemoteKeysDao.kt b/data/src/main/java/org/ireader/data/local/dao/RemoteKeysDao.kt
@@ -15,7 +15,12 @@ interface RemoteKeysDao {
     @Query("SELECT * FROM library WHERE id =:id")
     fun getExploreBookById(id: Int): Flow<Book?>
 
-    @Query("SELECT DISTINCT library.* FROM library JOIN  page_key_table ON library.title = page_key_table.id AND library.sourceId = page_key_table.sourceId  OR tableId = 1 GROUP BY  library.title ORDER BY id")
+    @Query("""
+        SELECT DISTINCT library.* FROM library 
+        JOIN  page_key_table ON library.title = page_key_table.title AND library.sourceId = page_key_table.sourceId  OR tableId = 1 
+        GROUP BY  library.title
+        ORDER BY page_key_table.id
+    """)
     fun getAllExploreBookByPaging(): PagingSource<Int, Book>
 
 

diff --git a/data/src/main/java/org/ireader/data/repository/HistoryRepositoryImpl.kt b/data/src/main/java/org/ireader/data/repository/HistoryRepositoryImpl.kt
@@ -18,9 +18,9 @@ class HistoryRepositoryImpl constructor(private val historyDao: HistoryDao) : Hi
     }
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    override fun findHistoriesPaging():
+    override fun findHistoriesPaging(query: String):
             Flow<Map<String, List<HistoryWithRelations>>> {
-        return historyDao.findHistoriesPaging().mapLatest { histories ->
+        return historyDao.findHistoriesPaging(query).mapLatest { histories ->
             histories.distinctBy { it.bookId }.groupBy { history -> history.date }
         }
     }

diff --git a/data/src/main/java/org/ireader/data/repository/mediator/ExploreRemoteMediator.kt b/data/src/main/java/org/ireader/data/repository/mediator/ExploreRemoteMediator.kt
@@ -92,7 +92,7 @@ class ExploreRemoteMediator(
                 }
                 val keys = response.mangas.map { book ->
                     RemoteKeys(
-                        id = book.title,
+                        title = book.title,
                         prevPage = prevPage,
                         nextPage = nextPage,
                         sourceId = source.id