Add library manga class

app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt

@@ -65,9 +65,8 @@ class MangaPutResolver : DefaultPutResolver<Manga>() {
     }
 }
 
-open class MangaGetResolver : DefaultGetResolver<Manga>() {
-
-    override fun mapFromCursor(cursor: Cursor): Manga = MangaImpl().apply {
+interface BaseMangaGetResolver {
+    fun mapBaseFromCursor(manga: Manga, cursor: Cursor) = manga.apply {
         id = cursor.getLong(cursor.getColumnIndex(COL_ID))
         source = cursor.getLong(cursor.getColumnIndex(COL_SOURCE))
         url = cursor.getString(cursor.getColumnIndex(COL_URL))
@@ -86,6 +85,13 @@ open class MangaGetResolver : DefaultGetResolver<Manga>() {
     }
 }
 
+open class MangaGetResolver : DefaultGetResolver<Manga>(), BaseMangaGetResolver {
+
+    override fun mapFromCursor(cursor: Cursor): Manga {
+        return mapBaseFromCursor(MangaImpl(), cursor)
+    }
+}
+
 class MangaDeleteResolver : DefaultDeleteResolver<Manga>() {
 
     override fun mapToDeleteQuery(obj: Manga) = DeleteQuery.builder()

app/src/main/java/eu/kanade/tachiyomi/data/database/models/LibraryManga.kt

@@ -0,0 +1,11 @@
+package eu.kanade.tachiyomi.data.database.models
+
+class LibraryManga : MangaImpl() {
+
+    var unread: Int = 0
+
+    var category: Int = 0
+
+    var downloadTotal: Int = 0
+
+}

app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt

@@ -16,12 +16,6 @@ interface Manga : SManga {
 
     var chapter_flags: Int
 
-    var unread: Int
-
-    var downloadTotal: Int
-
-    var category: Int
-
     fun setChapterOrder(order: Int) {
         setFlags(order, SORT_MASK)
     }

app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.models
 
-class MangaImpl : Manga {
+open class MangaImpl : Manga {
 
     override var id: Long? = null
 
@@ -32,12 +32,6 @@ class MangaImpl : Manga {
 
     override var chapter_flags: Int = 0
 
-    @Transient override var unread: Int = 0
-
-    @Transient override var downloadTotal: Int = 0
-
-    @Transient override var category: Int = 0
-
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (other == null || javaClass != other.javaClass) return false

app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt

@@ -4,6 +4,7 @@ import com.pushtorefresh.storio.sqlite.queries.DeleteQuery
 import com.pushtorefresh.storio.sqlite.queries.Query
 import com.pushtorefresh.storio.sqlite.queries.RawQuery
 import eu.kanade.tachiyomi.data.database.DbProvider
+import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.resolvers.LibraryMangaGetResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaFlagsPutResolver
@@ -23,7 +24,7 @@ interface MangaQueries : DbProvider {
             .prepare()
 
     fun getLibraryMangas() = db.get()
-            .listOfObjects(Manga::class.java)
+            .listOfObjects(LibraryManga::class.java)
             .withQuery(RawQuery.builder()
                     .query(libraryQuery)
                     .observesTables(MangaTable.TABLE, ChapterTable.TABLE, MangaCategoryTable.TABLE, CategoryTable.TABLE)

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/LibraryMangaGetResolver.kt

@@ -1,24 +1,23 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
 import android.database.Cursor
-import eu.kanade.tachiyomi.data.database.mappers.MangaGetResolver
-import eu.kanade.tachiyomi.data.database.models.Manga
+import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
+import eu.kanade.tachiyomi.data.database.mappers.BaseMangaGetResolver
+import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.data.database.tables.MangaTable
 
-class LibraryMangaGetResolver : MangaGetResolver() {
+class LibraryMangaGetResolver : DefaultGetResolver<LibraryManga>(), BaseMangaGetResolver {
 
     companion object {
         val INSTANCE = LibraryMangaGetResolver()
     }
 
-    override fun mapFromCursor(cursor: Cursor): Manga {
-        val manga = super.mapFromCursor(cursor)
+    override fun mapFromCursor(cursor: Cursor): LibraryManga {
+        val manga = LibraryManga()
 
-        val unreadColumn = cursor.getColumnIndex(MangaTable.COL_UNREAD)
-        manga.unread = cursor.getInt(unreadColumn)
-
-        val categoryColumn = cursor.getColumnIndex(MangaTable.COL_CATEGORY)
-        manga.category = cursor.getInt(categoryColumn)
+        mapBaseFromCursor(manga, cursor)
+        manga.unread = cursor.getInt(cursor.getColumnIndex(MangaTable.COL_UNREAD))
+        manga.category = cursor.getInt(cursor.getColumnIndex(MangaTable.COL_CATEGORY))
 
         return manga
     }

app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt

@@ -14,6 +14,7 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Category
 import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.data.download.DownloadService
@@ -231,7 +232,7 @@ class LibraryUpdateService(
      * @param target the target to update.
      * @return a list of manga to update
      */
-    fun getMangaToUpdate(intent: Intent, target: Target): List<Manga> {
+    fun getMangaToUpdate(intent: Intent, target: Target): List<LibraryManga> {
         val categoryId = intent.getIntExtra(KEY_CATEGORY, -1)
 
         var listToUpdate = if (categoryId != -1)
@@ -262,7 +263,7 @@ class LibraryUpdateService(
      * @param mangaToUpdate the list to update
      * @return an observable delivering the progress of each update.
      */
-    fun updateChapterList(mangaToUpdate: List<Manga>): Observable<Manga> {
+    fun updateChapterList(mangaToUpdate: List<LibraryManga>): Observable<LibraryManga> {
         // Initialize the variables holding the progress of the updates.
         val count = AtomicInteger(0)
         // List containing new updates
@@ -286,7 +287,7 @@ class LibraryUpdateService(
                             // If there's any error, return empty update and continue.
                             .onErrorReturn {
                                 failedUpdates.add(manga)
-                                Pair(emptyList<Chapter>(), emptyList<Chapter>())
+                                Pair(emptyList(), emptyList())
                             }
                             // Filter out mangas without new chapters (or failed).
                             .filter { pair -> pair.first.isNotEmpty() }
@@ -354,7 +355,7 @@ class LibraryUpdateService(
      * @param mangaToUpdate the list to update
      * @return an observable delivering the progress of each update.
      */
-    fun updateDetails(mangaToUpdate: List<Manga>): Observable<Manga> {
+    fun updateDetails(mangaToUpdate: List<LibraryManga>): Observable<LibraryManga> {
         // Initialize the variables holding the progress of the updates.
         val count = AtomicInteger(0)
 
@@ -365,7 +366,7 @@ class LibraryUpdateService(
                 // Update the details of the manga.
                 .concatMap { manga ->
                     val source = sourceManager.get(manga.source) as? HttpSource
-                            ?: return@concatMap Observable.empty<Manga>()
+                            ?: return@concatMap Observable.empty<LibraryManga>()
 
                     source.fetchMangaDetails(manga)
                             .map { networkManga ->
@@ -384,7 +385,7 @@ class LibraryUpdateService(
      * Method that updates the metadata of the connected tracking services. It's called in a
      * background thread, so it's safe to do heavy operations or network calls here.
      */
-    private fun updateTrackings(mangaToUpdate: List<Manga>): Observable<Manga> {
+    private fun updateTrackings(mangaToUpdate: List<LibraryManga>): Observable<LibraryManga> {
         // Initialize the variables holding the progress of the updates.
         var count = 0