Initial support for recent updates. #20

2025-11-01 22:58:57 +01:00 · 2016-01-18 18:04:07 +01:00
parent b9bb41164f
commit 522e900b5a
21 changed files with 466 additions and 55 deletions
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.java
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.java
@@ -27,10 +27,12 @@ import eu.kanade.tachiyomi.data.database.models.ChapterSQLiteTypeMapping;
 import eu.kanade.tachiyomi.data.database.models.Manga;
 import eu.kanade.tachiyomi.data.database.models.MangaCategory;
 import eu.kanade.tachiyomi.data.database.models.MangaCategorySQLiteTypeMapping;
+import eu.kanade.tachiyomi.data.database.models.MangaChapter;
 import eu.kanade.tachiyomi.data.database.models.MangaSQLiteTypeMapping;
 import eu.kanade.tachiyomi.data.database.models.MangaSync;
 import eu.kanade.tachiyomi.data.database.models.MangaSyncSQLiteTypeMapping;
 import eu.kanade.tachiyomi.data.database.resolvers.LibraryMangaGetResolver;
+import eu.kanade.tachiyomi.data.database.resolvers.MangaChapterGetResolver;
 import eu.kanade.tachiyomi.data.database.tables.CategoryTable;
 import eu.kanade.tachiyomi.data.database.tables.ChapterTable;
 import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable;
@@ -160,23 +162,14 @@ public class DatabaseHelper {
                .prepare();
    }

-    public PreparedGetListOfObjects<Chapter> getChapters(long manga_id, boolean sortAToZ, boolean onlyUnread) {
-        Query.CompleteBuilder query = Query.builder()
-                .table(ChapterTable.TABLE)
-
-                .orderBy(ChapterTable.COLUMN_CHAPTER_NUMBER + (sortAToZ ? " ASC" : " DESC"));
-
-        if (onlyUnread) {
-            query = query.where(ChapterTable.COLUMN_MANGA_ID + "=? AND " + ChapterTable.COLUMN_READ + "=?")
-                    .whereArgs(manga_id, 0);
-        } else {
-            query = query.where(ChapterTable.COLUMN_MANGA_ID + "=?")
-                    .whereArgs(manga_id);
-        }
-
+    public PreparedGetListOfObjects<MangaChapter> getRecentChapters() {
        return db.get()
-                .listOfObjects(Chapter.class)
-                .withQuery(query.build())
+                .listOfObjects(MangaChapter.class)
+                .withQuery(RawQuery.builder()
+                        .query(MangaChapterGetResolver.RECENT_CHAPTERS_QUERY)
+                        .observesTables(ChapterTable.TABLE)
+                        .build())
+                .withGetResolver(MangaChapterGetResolver.INSTANCE)
                .prepare();
    }

--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenHelper.java
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenHelper.java
@@ -6,9 +6,9 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.support.annotation.NonNull;

 import eu.kanade.tachiyomi.data.database.tables.CategoryTable;
+import eu.kanade.tachiyomi.data.database.tables.ChapterTable;
 import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable;
 import eu.kanade.tachiyomi.data.database.tables.MangaSyncTable;
-import eu.kanade.tachiyomi.data.database.tables.ChapterTable;
 import eu.kanade.tachiyomi.data.database.tables.MangaTable;

 public class DbOpenHelper extends SQLiteOpenHelper {
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaChapter.java
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaChapter.java
@@ -0,0 +1,12 @@
+package eu.kanade.tachiyomi.data.database.models;
+
+public class MangaChapter {
+
+    public Manga manga;
+    public Chapter chapter;
+
+    public MangaChapter(Manga manga, Chapter chapter) {
+        this.manga = manga;
+        this.chapter = chapter;
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaSync.java
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaSync.java
@@ -5,8 +5,8 @@ import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType;

 import java.io.Serializable;

-import eu.kanade.tachiyomi.data.mangasync.base.MangaSyncService;
 import eu.kanade.tachiyomi.data.database.tables.MangaSyncTable;
+import eu.kanade.tachiyomi.data.mangasync.base.MangaSyncService;

@StorIOSQLiteType(table = MangaSyncTable.TABLE)
 public class MangaSync implements Serializable {
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaChapterGetResolver.java
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaChapterGetResolver.java
@@ -0,0 +1,49 @@
+package eu.kanade.tachiyomi.data.database.resolvers;
+
+import android.database.Cursor;
+import android.support.annotation.NonNull;
+
+import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver;
+
+import eu.kanade.tachiyomi.data.database.models.Chapter;
+import eu.kanade.tachiyomi.data.database.models.ChapterStorIOSQLiteGetResolver;
+import eu.kanade.tachiyomi.data.database.models.Manga;
+import eu.kanade.tachiyomi.data.database.models.MangaChapter;
+import eu.kanade.tachiyomi.data.database.models.MangaStorIOSQLiteGetResolver;
+import eu.kanade.tachiyomi.data.database.tables.ChapterTable;
+import eu.kanade.tachiyomi.data.database.tables.MangaTable;
+
+public class MangaChapterGetResolver extends DefaultGetResolver<MangaChapter> {
+
+    public static final MangaChapterGetResolver INSTANCE = new MangaChapterGetResolver();
+
+    public static final String QUERY = String.format(
+            "SELECT * FROM %1$s JOIN %2$s on %1$s.%3$s = %2$s.%4$s",
+            MangaTable.TABLE,
+            ChapterTable.TABLE,
+            MangaTable.COLUMN_ID,
+            ChapterTable.COLUMN_MANGA_ID);
+
+    public static final String RECENT_CHAPTERS_QUERY = String.format(
+            QUERY + " ORDER BY %1$s DESC LIMIT 100", ChapterTable.COLUMN_DATE_UPLOAD);
+
+    @NonNull
+    private final MangaStorIOSQLiteGetResolver mangaGetResolver;
+
+    @NonNull
+    private final ChapterStorIOSQLiteGetResolver chapterGetResolver;
+
+    public MangaChapterGetResolver() {
+        this.mangaGetResolver = new MangaStorIOSQLiteGetResolver();
+        this.chapterGetResolver = new ChapterStorIOSQLiteGetResolver();
+    }
+
+    @NonNull
+    @Override
+    public MangaChapter mapFromCursor(@NonNull Cursor cursor) {
+        final Manga manga = mangaGetResolver.mapFromCursor(cursor);
+        final Chapter chapter = chapterGetResolver.mapFromCursor(cursor);
+
+        return new MangaChapter(manga, chapter);
+    }
+}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaWithUnreadGetResolver.java
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaWithUnreadGetResolver.java
@@ -1,23 +0,0 @@
-package eu.kanade.tachiyomi.data.database.resolvers;
-
-import android.database.Cursor;
-import android.support.annotation.NonNull;
-
-import eu.kanade.tachiyomi.data.database.models.Manga;
-import eu.kanade.tachiyomi.data.database.models.MangaStorIOSQLiteGetResolver;
-import eu.kanade.tachiyomi.data.database.tables.MangaTable;
-
-public class MangaWithUnreadGetResolver extends MangaStorIOSQLiteGetResolver {
-
-    public static final MangaWithUnreadGetResolver INSTANCE = new MangaWithUnreadGetResolver();
-
-    @Override
-    @NonNull
-    public Manga mapFromCursor(@NonNull Cursor cursor) {
-        Manga manga = super.mapFromCursor(cursor);
-        int unreadColumn = cursor.getColumnIndex(MangaTable.COLUMN_UNREAD);
-        manga.unread = cursor.getInt(unreadColumn);
-        return manga;
-    }
-
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.java
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.java
@@ -26,7 +26,6 @@ import eu.kanade.tachiyomi.data.source.base.Source;
 import eu.kanade.tachiyomi.data.source.model.Page;
 import eu.kanade.tachiyomi.event.DownloadChaptersEvent;
 import eu.kanade.tachiyomi.util.DiskUtils;
-import eu.kanade.tachiyomi.util.DynamicConcurrentMergeOperator;
 import rx.Observable;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;