copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

feat(library): Rework categories filter

Browse source
This commit is contained in:
Cuong-Tran 2025-08-15 16:36:30 +07:00
parent f635fc209b
commit ea06631670
6 changed files with 41 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/domain/DomainModule.kt
View file

@ -48,7 +48,6 @@ import tachiyomi.data.updates.UpdatesRepositoryImpl
import tachiyomi.domain.category.interactor.CreateCategoryWithName
import tachiyomi.domain.category.interactor.DeleteCategory
import tachiyomi.domain.category.interactor.GetCategories
import tachiyomi.domain.category.interactor.GetCategoriesPerLibraryManga
import tachiyomi.domain.category.interactor.HideCategory
import tachiyomi.domain.category.interactor.RenameCategory
import tachiyomi.domain.category.interactor.ReorderCategory
@ -117,7 +116,6 @@ class DomainModule : InjektModule {
addFactory { DeleteCategory(get(), get(), get()) }
// KMK -->
addFactory { HideCategory(get()) }
addFactory { GetCategoriesPerLibraryManga(get()) }
// KMK <--
addSingletonFactory<MangaRepository> { MangaRepositoryImpl(get()) }

77
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
View file

@ -92,7 +92,6 @@ import tachiyomi.core.common.util.lang.launchNonCancellable
import tachiyomi.core.common.util.lang.withIOContext
import tachiyomi.domain.UnsortedPreferences
import tachiyomi.domain.category.interactor.GetCategories
import tachiyomi.domain.category.interactor.GetCategoriesPerLibraryManga
import tachiyomi.domain.category.interactor.SetMangaCategories
import tachiyomi.domain.category.model.Category
import tachiyomi.domain.chapter.interactor.GetChaptersByMangaId
@ -160,7 +159,6 @@ class LibraryScreenModel(
// SY <--
// KMK -->
private val smartSearchMerge: SmartSearchMerge = Injekt.get(),
private val getCategoriesPerLibraryManga: GetCategoriesPerLibraryManga = Injekt.get(),
// KMK <--
) : StateScreenModel<LibraryScreenModel.State>(State()) {
@ -185,17 +183,22 @@ class LibraryScreenModel(
),
combine(getTracksPerManga.subscribe(), getTrackingFiltersFlow(), ::Pair),
// KMK -->
getCategoriesPerLibraryManga.subscribe(),
combine(
state.map { it.includedCategories }.distinctUntilChanged(),
state.map { it.excludedCategories }.distinctUntilChanged(),
::Pair,
),
// KMK <--
getLibraryItemPreferencesFlow(),
) { (searchQuery, categories, favorites), (tracksMap, trackingFilters), categoriesPerManga, itemPreferences ->
) { (searchQuery, categories, favorites), (tracksMap, trackingFilters), (includedCategories, excludedCategories), itemPreferences ->
val filteredFavorites = favorites
.applyFilters(
tracksMap,
trackingFilters,
itemPreferences,
// KMK -->
categoriesPerManga,
includedCategories,
excludedCategories,
// KMK <--
)
.let {
@ -422,7 +425,8 @@ class LibraryScreenModel(
trackingFilter: Map<Long, TriState>,
preferences: ItemPreferences,
// KMK -->
categoriesPerManga: Map<Long, Set<Long>>,
includedCategories: ImmutableSet<Long>,
excludedCategories: ImmutableSet<Long>,
// KMK <--
): List<LibraryItem> {
val downloadedOnly = preferences.globalFilterDownloaded
@ -433,6 +437,7 @@ class LibraryScreenModel(
val filterBookmarked = preferences.filterBookmarked
val filterCompleted = preferences.filterCompleted
val filterIntervalCustom = preferences.filterIntervalCustom
val filterCategories = preferences.filterCategories
val isNotLoggedInAnyTrack = trackingFilter.isEmpty()
@ -497,12 +502,12 @@ class LibraryScreenModel(
// KMK -->
val filterFnCategories: (LibraryItem) -> Boolean = categories@{ item ->
if (!state.value.filterCategory) return@categories true
if (!filterCategories) return@categories true
val mangaCategories = categoriesPerManga[item.libraryManga.id].orEmpty()
val mangaCategories = item.libraryManga.categories.filterNot { it == 0L }.toSet()
val isExcluded = state.value.excludedCategories.any { it in mangaCategories }
val isIncluded = state.value.includedCategories.isEmpty() || state.value.includedCategories.all { it in mangaCategories }
val isExcluded = excludedCategories.any { it in mangaCategories }
val isIncluded = includedCategories.isEmpty() || includedCategories.all { it in mangaCategories }
!isExcluded && isIncluded
}
@ -1445,32 +1450,32 @@ class LibraryScreenModel(
groupBy { item ->
item.libraryManga.manga.status
}.mapKeys {
Category(
id = it.key + 1,
name = when (it.key) {
SManga.ONGOING.toLong() -> context.stringResource(MR.strings.ongoing)
SManga.LICENSED.toLong() -> context.stringResource(MR.strings.licensed)
SManga.CANCELLED.toLong() -> context.stringResource(MR.strings.cancelled)
SManga.ON_HIATUS.toLong() -> context.stringResource(MR.strings.on_hiatus)
SManga.PUBLISHING_FINISHED.toLong() -> context.stringResource(MR.strings.publishing_finished)
SManga.COMPLETED.toLong() -> context.stringResource(MR.strings.completed)
else -> context.stringResource(MR.strings.unknown)
},
order = when (it.key) {
SManga.ONGOING.toLong() -> 1
SManga.LICENSED.toLong() -> 2
SManga.CANCELLED.toLong() -> 3
SManga.ON_HIATUS.toLong() -> 4
SManga.PUBLISHING_FINISHED.toLong() -> 5
SManga.COMPLETED.toLong() -> 6
else -> 7
},
flags = 0,
// KMK -->
hidden = false,
// KMK <--
)
}
Category(
id = it.key + 1,
name = when (it.key) {
SManga.ONGOING.toLong() -> context.stringResource(MR.strings.ongoing)
SManga.LICENSED.toLong() -> context.stringResource(MR.strings.licensed)
SManga.CANCELLED.toLong() -> context.stringResource(MR.strings.cancelled)
SManga.ON_HIATUS.toLong() -> context.stringResource(MR.strings.on_hiatus)
SManga.PUBLISHING_FINISHED.toLong() -> context.stringResource(MR.strings.publishing_finished)
SManga.COMPLETED.toLong() -> context.stringResource(MR.strings.completed)
else -> context.stringResource(MR.strings.unknown)
},
order = when (it.key) {
SManga.ONGOING.toLong() -> 1
SManga.LICENSED.toLong() -> 2
SManga.CANCELLED.toLong() -> 3
SManga.ON_HIATUS.toLong() -> 4
SManga.PUBLISHING_FINISHED.toLong() -> 5
SManga.COMPLETED.toLong() -> 6
else -> 7
},
flags = 0,
// KMK -->
hidden = false,
// KMK <--
)
}
}
else -> emptyMap()
}.toSortedMap(compareBy { it.order })

13
data/src/main/java/tachiyomi/data/category/CategoryRepositoryImpl.kt
View file

@ -1,7 +1,6 @@
package tachiyomi.data.category
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map
import tachiyomi.data.Database
import tachiyomi.data.DatabaseHandler
import tachiyomi.domain.category.model.Category
@ -36,18 +35,6 @@ class CategoryRepositoryImpl(
}
}
// KMK -->
override fun getCategoriesPerLibraryMangaAsFlow(): Flow<Map<Long, Set<Long>>> {
return handler.subscribeToList {
mangas_categoriesQueries.getCategoriesPerLibraryManga { mangaId, categoryId ->
mangaId to categoryId
}
}.map { list ->
list.groupBy({ it.first }, { it.second }).mapValues { it.value.toSet() }
}
}
// KMK <--
// SY -->
override suspend fun insert(category: Category): Long {
return handler.awaitOneExecutable(true) {

9
data/src/main/sqldelight/tachiyomi/data/mangas_categories.sq
View file

@ -22,12 +22,3 @@ VALUES (:mangaId, :categoryId);
deleteMangaCategoryByMangaId:
DELETE FROM mangas_categories
WHERE manga_id = :mangaId;
-- KMK -->
getCategoriesPerLibraryManga:
SELECT MC.manga_id, MC.category_id
FROM mangas_categories MC
JOIN mangas M
ON MC.manga_id = M._id
WHERE M.favorite = 1;
-- KMK <--

13
domain/src/main/java/tachiyomi/domain/category/interactor/GetCategoriesPerLibraryManga.kt
View file

@ -1,13 +0,0 @@
package tachiyomi.domain.category.interactor
import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.category.repository.CategoryRepository
class GetCategoriesPerLibraryManga(
private val categoryRepository: CategoryRepository,
) {
fun subscribe(): Flow<Map<Long, Set<Long>>> {
return categoryRepository.getCategoriesPerLibraryMangaAsFlow()
}
}

4
domain/src/main/java/tachiyomi/domain/category/repository/CategoryRepository.kt
View file

@ -16,10 +16,6 @@ interface CategoryRepository {
fun getCategoriesByMangaIdAsFlow(mangaId: Long): Flow<List<Category>>
// KMK -->
fun getCategoriesPerLibraryMangaAsFlow(): Flow<Map<Long, Set<Long>>>
// KMK <--
// SY -->
suspend fun insert(category: Category): Long
// SY <--