github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Filter library by non tracked services

Browse source
This commit is contained in:
Jay 2020-03-28 14:10:35 -04:00
parent 6a7762212b
commit 5e45c29f58
2 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View file

@ -169,7 +169,7 @@ class LibraryPresenter(
filterTracked == 0 && filterTracked == 0 &&
filterMangaType == 0 filterMangaType == 0
} }
// Filter when there isn't unread chapters. // Filter for unread chapters
if (filterUnread == STATE_INCLUDE && if (filterUnread == STATE_INCLUDE &&
(item.manga.unread == 0 || db.getChapters(item.manga).executeAsBlocking() (item.manga.unread == 0 || db.getChapters(item.manga).executeAsBlocking()
.size != item.manga.unread)) return@f false .size != item.manga.unread)) return@f false
@ -186,28 +186,42 @@ class LibraryPresenter(
else filterMangaType != item.manga.mangaType()) return@f false else filterMangaType != item.manga.mangaType()) return@f false
} }
// Filter for completed status of manga
if (filterCompleted == STATE_INCLUDE && item.manga.status != SManga.COMPLETED) if (filterCompleted == STATE_INCLUDE && item.manga.status != SManga.COMPLETED)
return@f false return@f false
if (filterCompleted == STATE_EXCLUDE && item.manga.status == SManga.COMPLETED) if (filterCompleted == STATE_EXCLUDE && item.manga.status == SManga.COMPLETED)
return@f false return@f false
// Filter for tracked (or per tracked service)
if (filterTracked != STATE_IGNORE) { if (filterTracked != STATE_IGNORE) {
val tracks = db.getTracks(item.manga).executeAsBlocking() val tracks = db.getTracks(item.manga).executeAsBlocking()
val trackCount = loggedServices.any { service -> val hasTrack = loggedServices.any { service ->
tracks.any { it.sync_id == service.id } tracks.any { it.sync_id == service.id }
} }
if (filterTracked == STATE_INCLUDE && !trackCount) return@f false val service = if (filterTrackers.isNotEmpty()) loggedServices.find {
if (filterTracked == STATE_EXCLUDE && trackCount) return@f false it.name == filterTrackers
} else null
if (filterTrackers.isNotEmpty()) { if (filterTracked == STATE_INCLUDE) {
val service = loggedServices.find { it.name == filterTrackers } if (!hasTrack) return@f false
if (service != null) { if (filterTrackers.isNotEmpty()) {
if (tracks.none { it.sync_id == service.id }) return@f false if (service != null) {
val hasServiceTrack = tracks.any { it.sync_id == service.id }
if (!hasServiceTrack) return@f false
if (filterTracked == STATE_EXCLUDE && hasServiceTrack) return@f false
}
}
} else if (filterTracked == STATE_EXCLUDE) {
if (!hasTrack && filterTrackers.isEmpty()) return@f false
if (filterTrackers.isNotEmpty()) {
if (service != null) {
val hasServiceTrack = tracks.any { it.sync_id == service.id }
if (hasServiceTrack) return@f false
}
} }
} }
} }
// Filter when there are no downloads. // Filter for downloaded manga
if (filterDownloaded != STATE_IGNORE) { if (filterDownloaded != STATE_IGNORE) {
val isDownloaded = when { val isDownloaded = when {
item.manga.source == LocalSource.ID -> true item.manga.source == LocalSource.ID -> true

6
app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt
View file

@ -271,12 +271,10 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri
} }
onGroupClicked(ACTION_FILTER) onGroupClicked(ACTION_FILTER)
} }
if (preferences.filterTracked().getOrDefault() == 1 && if (tracked.isActivated && trackers != null && trackers?.parent == null) {
trackers != null && trackers?.parent == null) {
filter_layout.addView(trackers) filter_layout.addView(trackers)
filterItems.add(trackers!!) filterItems.add(trackers!!)
} else if (preferences.filterTracked().getOrDefault() != 1 && } else if (!tracked.isActivated && trackers?.parent != null) {
trackers?.parent != null) {
filter_layout.removeView(trackers) filter_layout.removeView(trackers)
trackers?.reset() trackers?.reset()
FILTER_TRACKER = "" FILTER_TRACKER = ""