javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

More domain model usage

Browse Source
This commit is contained in:
arkon
2022-07-03 16:12:31 -04:00
parent 069bd90c0f
commit a3ab8746bf
10 changed files with 52 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
+4 -4
View File
@@ -13,9 +13,9 @@ import androidx.core.app.NotificationManagerCompat
import coil.imageLoader
import coil.request.ImageRequest
import coil.transform.CircleCropTransformation
import eu.kanade.domain.chapter.model.Chapter
import eu.kanade.domain.manga.model.Manga
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.database.models.Chapter
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.download.Downloader
import eu.kanade.tachiyomi.data.notification.NotificationHandler
import eu.kanade.tachiyomi.data.notification.NotificationReceiver
@@ -294,8 +294,8 @@ class LibraryUpdateNotifier(private val context: Context) {
val displayableChapterNumbers = chapters
.filter { it.isRecognizedNumber }
.sortedBy { it.chapter_number }
.map { formatter.format(it.chapter_number) }
.sortedBy { it.chapterNumber }
.map { formatter.format(it.chapterNumber) }
.toSet()
return when (displayableChapterNumbers.size) {
app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
+10 -6
View File
@@ -27,6 +27,7 @@ import eu.kanade.tachiyomi.data.cache.CoverCache
import eu.kanade.tachiyomi.data.database.models.Chapter
import eu.kanade.tachiyomi.data.database.models.LibraryManga
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.database.models.toDomainChapter
import eu.kanade.tachiyomi.data.database.models.toDomainManga
import eu.kanade.tachiyomi.data.database.models.toMangaInfo
import eu.kanade.tachiyomi.data.download.DownloadManager
@@ -305,7 +306,7 @@ class LibraryUpdateService(
val semaphore = Semaphore(5)
val progressCount = AtomicInteger(0)
val currentlyUpdatingManga = CopyOnWriteArrayList<LibraryManga>()
val newUpdates = CopyOnWriteArrayList<Pair<LibraryManga, Array<Chapter>>>()
val newUpdates = CopyOnWriteArrayList<Pair<DomainManga, Array<DomainChapter>>>()
val skippedUpdates = CopyOnWriteArrayList<Pair<Manga, String?>>()
val failedUpdates = CopyOnWriteArrayList<Pair<Manga, String?>>()
val hasDownloads = AtomicBoolean(false)
@@ -358,8 +359,11 @@ class LibraryUpdateService(
// Convert to the manga that contains new chapters
newUpdates.add(
mangaWithNotif to newDbChapters.sortedByDescending { ch -> ch.source_order }
.toTypedArray(),
mangaWithNotif.toDomainManga()!! to
newDbChapters
.map { it.toDomainChapter()!! }
.sortedByDescending { it.sourceOrder }
.toTypedArray(),
)
}
}
@@ -511,7 +515,7 @@ class LibraryUpdateService(
return
}
notifier.showProgressNotification(listOf(manga), progressCount++, mangaToUpdate.size)
notifier.showProgressNotification(listOf(manga.toDomainManga()!!), progressCount++, mangaToUpdate.size)
// Update the tracking details.
updateTrackings(manga, loggedServices)
@@ -558,7 +562,7 @@ class LibraryUpdateService(
updatingManga.add(manga)
notifier.showProgressNotification(
updatingManga,
updatingManga.map { it.toDomainManga()!! },
completed.get(),
mangaToUpdate.size,
)
@@ -572,7 +576,7 @@ class LibraryUpdateService(
updatingManga.remove(manga)
completed.andIncrement
notifier.showProgressNotification(
updatingManga,
updatingManga.map { it.toDomainManga()!! },
completed.get(),
mangaToUpdate.size,
)