diff --git a/data/src/main/sqldelight/tachiyomi/migrations/2.sqm b/data/src/main/sqldelight/tachiyomi/migrations/4.sqm similarity index 100% rename from data/src/main/sqldelight/tachiyomi/migrations/2.sqm rename to data/src/main/sqldelight/tachiyomi/migrations/4.sqm diff --git a/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt b/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt index 1bb9149f2..de7391347 100644 --- a/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt +++ b/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt @@ -134,9 +134,9 @@ actual class LocalSource( private fun loadMangaForPage(page: Int) { if (page != loadedPages + 1 || page == currentlyLoadingPage) return - currentlyLoadingPage = loadedPages + 1 + currentlyLoadingPage = page - val mangaDirPage = mangaDirChunks[page - 1] + val mangaDirPage = mangaDirChunks[page - 1] val dbManga = runBlocking { getDbManga(mangaDirPage) } val mangaPage = mangaDirPage.map { mangaDir -> SManga.create().apply manga@{ diff --git a/source-local/src/androidMain/kotlin/tachiyomi/source/local/filter/filter.kt b/source-local/src/androidMain/kotlin/tachiyomi/source/local/filter/filter.kt index f8b984db5..76d634417 100644 --- a/source-local/src/androidMain/kotlin/tachiyomi/source/local/filter/filter.kt +++ b/source-local/src/androidMain/kotlin/tachiyomi/source/local/filter/filter.kt @@ -7,14 +7,18 @@ import tachiyomi.source.local.R class GenreFilter(genre: String) : Filter.TriState(genre) class GenreGroup(context: Context, genres: List) : Filter.Group(context.getString(R.string.genres), genres) class GenreTextSearch(context: Context) : Filter.Text(context.getString(R.string.genres)) + class AuthorFilter(author: String) : Filter.TriState(author) class AuthorGroup(context: Context, authors: List) : Filter.Group(context.getString(R.string.authors), authors) class AuthorTextSearch(context: Context) : Filter.Text(context.getString(R.string.authors)) + class ArtistFilter(genre: String) : Filter.TriState(genre) class ArtistGroup(context: Context, artists: List) : Filter.Group(context.getString(R.string.artists), artists) class ArtistTextSearch(context: Context) : Filter.Text(context.getString(R.string.artists)) + class StatusFilter(name: String) : Filter.TriState(name) class StatusGroup(context: Context, filters: List) : Filter.Group(context.getString(R.string.status), filters) + class TextSearchHeader(context: Context) : Filter.Header(context.getString(R.string.local_filter_text_search_header)) class LocalSourceInfoHeader(context: Context) : Filter.Header(context.getString(R.string.local_filter_info_header)) class Separator : Filter.Separator()