null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support 1.3 UnmeteredSource

Browse source
This commit is contained in:
Jays2Kings 2022-04-03 17:04:40 -04:00
parent 9ae22b06b2
commit c545578840
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
View file

@ -19,6 +19,7 @@ import eu.kanade.tachiyomi.data.download.model.DownloadQueue
import eu.kanade.tachiyomi.data.library.LibraryUpdateService import eu.kanade.tachiyomi.data.library.LibraryUpdateService
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.UnmeteredSource
import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.source.online.fetchAllImageUrlsFromPageList import eu.kanade.tachiyomi.source.online.fetchAllImageUrlsFromPageList
@ -289,7 +290,10 @@ class Downloader(
// Start downloader if needed // Start downloader if needed
if (autoStart && wasEmpty) { if (autoStart && wasEmpty) {
val largestSourceSize = queue.groupBy { it.source }.maxOfOrNull { it.value.size } ?: 0 val largestSourceSize = queue
.groupBy { it.source }
.filterKeys { it !is UnmeteredSource }
.maxOfOrNull { it.value.size } ?: 0
if (largestSourceSize > CHAPTERS_PER_SOURCE_QUEUE_WARNING_THRESHOLD) { if (largestSourceSize > CHAPTERS_PER_SOURCE_QUEUE_WARNING_THRESHOLD) {
notifier.onWarning(context.getString(R.string.download_queue_size_warning)) notifier.onWarning(context.getString(R.string.download_queue_size_warning))
} }

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

@ -29,6 +29,7 @@ import eu.kanade.tachiyomi.data.track.TrackManager
import eu.kanade.tachiyomi.data.track.UnattendedTrackService import eu.kanade.tachiyomi.data.track.UnattendedTrackService
import eu.kanade.tachiyomi.extension.ExtensionUpdateJob import eu.kanade.tachiyomi.extension.ExtensionUpdateJob
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.UnmeteredSource
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.toSChapter import eu.kanade.tachiyomi.source.model.toSChapter
import eu.kanade.tachiyomi.source.model.toSManga import eu.kanade.tachiyomi.source.model.toSManga
@ -307,8 +308,11 @@ class LibraryUpdateService(
} }
private fun checkIfMassiveUpdate() { private fun checkIfMassiveUpdate() {
val largestSourceSize = mangaToUpdate.groupBy { it.source }.maxOfOrNull { it.value.size } ?: 0 val largestSourceSize = mangaToUpdate
if (largestSourceSize > PER_SOURCE_QUEUE_WARNING_THRESHOLD) { .groupBy { it.source }
.filterKeys { sourceManager.get(it) !is UnmeteredSource }
.maxOfOrNull { it.value.size } ?: 0
if (largestSourceSize > MANGA_PER_SOURCE_QUEUE_WARNING_THRESHOLD) {
notifier.showQueueSizeWarningNotification() notifier.showQueueSizeWarningNotification()
} }
} }
@ -669,4 +673,4 @@ interface LibraryServiceListener {
fun onUpdateManga(manga: Manga? = null) fun onUpdateManga(manga: Manga? = null)
} }
const val PER_SOURCE_QUEUE_WARNING_THRESHOLD = 60 const val MANGA_PER_SOURCE_QUEUE_WARNING_THRESHOLD = 60