mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-11-15 15:02:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: ktlint

Browse Source 
Signed-off-by: KaiserBh <kaiserbh@proton.me>
This commit is contained in:
KaiserBh 2024-01-08 07:00:41 +11:00
parent db4ec11262
commit edfc61a4a6
No known key found for this signature in database
GPG Key ID: 14D73B142042BBA9
3 changed files with 89 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt
View File

@ -263,7 +263,10 @@ class SyncManager(
val minutes = elapsedTimeMillis / 60000 val minutes = elapsedTimeMillis / 60000
val seconds = (elapsedTimeMillis % 60000) / 1000 val seconds = (elapsedTimeMillis % 60000) / 1000
logcat(LogPriority.DEBUG) { "Filtering completed in ${minutes}m ${seconds}s. Favorites found: ${favorites.size}, Non-favorites found: ${nonFavorites.size}" } logcat(LogPriority.DEBUG) {
"Filtering completed in ${minutes}m ${seconds}s. Favorites found: ${favorites.size}, " +
"Non-favorites found: ${nonFavorites.size}"
}
return Pair(favorites, nonFavorites) return Pair(favorites, nonFavorites)
} }
@ -281,11 +284,13 @@ class SyncManager(
if (mangaLastUpdatedStatus || chaptersUpdatedStatus) { if (mangaLastUpdatedStatus || chaptersUpdatedStatus) {
mangas.add(manga) mangas.add(manga)
logcat(LogPriority.DEBUG) { logcat(LogPriority.DEBUG) {
"Added ${manga.title} to the process list. Manga Last Updated: ${mangaLastUpdatedStatus}, Chapters Updated: ${chaptersUpdatedStatus}." "Added ${manga.title} to the process list. Manga Last Updated: $mangaLastUpdatedStatus, " +
"Chapters Updated: $chaptersUpdatedStatus."
} }
} else { } else {
logcat(LogPriority.DEBUG) { logcat(LogPriority.DEBUG) {
"Skipped ${manga.title} as it has not been updated since the last sync (Last Modified: ${manga.lastModifiedAt * 1000L}, Last Sync: $lastSyncTimeStamp)." "Skipped ${manga.title} as it has not been updated since the last sync " +
"(Last Modified: ${manga.lastModifiedAt * 1000L}, Last Sync: $lastSyncTimeStamp)."
} }
} }
} }
@ -301,16 +306,16 @@ class SyncManager(
private fun chaptersUpdatedAfterSync(manga: BackupManga, lastSyncTimeStamp: Long): Boolean { private fun chaptersUpdatedAfterSync(manga: BackupManga, lastSyncTimeStamp: Long): Boolean {
return manga.chapters.any { chapter -> return manga.chapters.any { chapter ->
val updated = chapter.lastModifiedAt * 1000L > lastSyncTimeStamp val updated = chapter.lastModifiedAt * 1000L > lastSyncTimeStamp
if(updated) { if (updated) {
logcat(LogPriority.DEBUG) { logcat(LogPriority.DEBUG) {
"Chapter ${chapter.name} of ${manga.title} updated after last sync (Chapter Last Modified: ${chapter.lastModifiedAt}, Last Sync: $lastSyncTimeStamp)." "Chapter ${chapter.name} of ${manga.title} updated after last sync " +
"(Chapter Last Modified: ${chapter.lastModifiedAt}, Last Sync: $lastSyncTimeStamp)."
} }
} }
updated updated
} }
} }
/** /**
* Updates the non-favorite manga in the local database with their favorite status from the backup. * Updates the non-favorite manga in the local database with their favorite status from the backup.
* @param nonFavorites the list of non-favorite BackupManga objects from the backup. * @param nonFavorites the list of non-favorite BackupManga objects from the backup.

134
app/src/main/java/eu/kanade/tachiyomi/data/sync/service/SyncService.kt
View File

@ -100,19 +100,22 @@ abstract class SyncService(
val localMangaListSafe = localMangaList.orEmpty() val localMangaListSafe = localMangaList.orEmpty()
val remoteMangaListSafe = remoteMangaList.orEmpty() val remoteMangaListSafe = remoteMangaList.orEmpty()
logcat(logTag, LogPriority.DEBUG) { "Starting merge. Local list size: ${localMangaListSafe.size}, Remote list size: ${remoteMangaListSafe.size}" } logcat(logTag, LogPriority.DEBUG) {
"Starting merge. Local list size: ${localMangaListSafe.size}, Remote list size: ${remoteMangaListSafe.size}"
}
// Define a function to create a composite key from manga // Define a function to create a composite key from manga
fun mangaCompositeKey(manga: BackupManga): String { fun mangaCompositeKey(manga: BackupManga): String {
return "${manga.source}|${manga.url}|${manga.title.lowercase().trim()}|${manga.author?.lowercase()?.trim()}" return "${manga.source}|${manga.url}|${manga.title.lowercase().trim()}|${manga.author?.lowercase()?.trim()}"
} }
// Create maps using composite keys // Create maps using composite keys
val localMangaMap = localMangaListSafe.associateBy { mangaCompositeKey(it) } val localMangaMap = localMangaListSafe.associateBy { mangaCompositeKey(it) }
val remoteMangaMap = remoteMangaListSafe.associateBy { mangaCompositeKey(it) } val remoteMangaMap = remoteMangaListSafe.associateBy { mangaCompositeKey(it) }
logcat(LogPriority.DEBUG, logTag) { "Starting merge. Local list size: ${localMangaListSafe.size}, Remote list size: ${remoteMangaListSafe.size}" } logcat(LogPriority.DEBUG, logTag) {
"Starting merge. Local list size: ${localMangaListSafe.size}, Remote list size: ${remoteMangaListSafe.size}"
}
// Prepare to merge both sets of manga // Prepare to merge both sets of manga
val mergedList = (localMangaMap.keys + remoteMangaMap.keys).distinct().mapNotNull { compositeKey -> val mergedList = (localMangaMap.keys + remoteMangaMap.keys).distinct().mapNotNull { compositeKey ->
@ -120,25 +123,29 @@ abstract class SyncService(
val remote = remoteMangaMap[compositeKey] val remote = remoteMangaMap[compositeKey]
logcat(LogPriority.DEBUG, logTag) { logcat(LogPriority.DEBUG, logTag) {
"Processing key: $compositeKey. Local favorite: ${local?.favorite}, Remote favorite: ${remote?.favorite}" "Processing key: $compositeKey. Local favorite: ${local?.favorite}, " +
"Remote favorite: ${remote?.favorite}"
} }
when { when {
local != null && remote == null -> { local != null && remote == null -> {
logcat(LogPriority.DEBUG, logTag) { logcat(LogPriority.DEBUG, logTag) {
"Taking local manga: ${local.title} as it is not present remotely. Favorite status: ${local.favorite}" "Taking local manga: ${local.title} as it is not present remotely. " +
"Favorite status: ${local.favorite}"
} }
local local
} }
local == null && remote != null -> { local == null && remote != null -> {
logcat(LogPriority.DEBUG, logTag) { logcat(LogPriority.DEBUG, logTag) {
"Taking remote manga: ${remote.title} as it is not present locally. Favorite status: ${remote.favorite}" "Taking remote manga: ${remote.title} as it is not present locally. " +
"Favorite status: ${remote.favorite}"
} }
remote remote
} }
local != null && remote != null -> { local != null && remote != null -> {
logcat(LogPriority.DEBUG, logTag) { logcat(LogPriority.DEBUG, logTag) {
"Inspecting timestamps for ${local.title}. Local lastModifiedAt: ${local.lastModifiedAt}, Remote lastModifiedAt: ${remote.lastModifiedAt}" "Inspecting timestamps for ${local.title}. Local lastModifiedAt: ${local.lastModifiedAt}, " +
"Remote lastModifiedAt: ${remote.lastModifiedAt}"
} }
// Convert seconds to milliseconds for accurate time comparison // Convert seconds to milliseconds for accurate time comparison
val localTime = Instant.ofEpochMilli(local.lastModifiedAt * 1000L) val localTime = Instant.ofEpochMilli(local.lastModifiedAt * 1000L)
@ -146,14 +153,21 @@ abstract class SyncService(
val mergedChapters = mergeChapters(local.chapters, remote.chapters) val mergedChapters = mergeChapters(local.chapters, remote.chapters)
logcat(LogPriority.DEBUG, logTag) { logcat(LogPriority.DEBUG, logTag) {
"Merging manga: ${local.title}. Local time: $localTime, Remote time: $remoteTime, Local favorite: ${local.favorite}, Remote favorite: ${remote.favorite}" "Merging manga: ${local.title}. Local time: $localTime, Remote time: $remoteTime, " +
"Local favorite: ${local.favorite}, Remote favorite: ${remote.favorite}"
} }
if (localTime >= remoteTime) { if (localTime >= remoteTime) {
logcat(LogPriority.DEBUG, logTag) { "Keeping local version of ${local.title} with merged chapters." } logcat(
LogPriority.DEBUG,
logTag,
) { "Keeping local version of ${local.title} with merged chapters." }
local.copy(chapters = mergedChapters) local.copy(chapters = mergedChapters)
} else { } else {
logcat(LogPriority.DEBUG, logTag) { "Keeping remote version of ${remote.title} with merged chapters." } logcat(
LogPriority.DEBUG,
logTag,
) { "Keeping remote version of ${remote.title} with merged chapters." }
remote.copy(chapters = mergedChapters) remote.copy(chapters = mergedChapters)
} }
} }
@ -168,7 +182,8 @@ abstract class SyncService(
val (favorites, nonFavorites) = mergedList.partition { it.favorite } val (favorites, nonFavorites) = mergedList.partition { it.favorite }
logcat(LogPriority.DEBUG, logTag) { logcat(LogPriority.DEBUG, logTag) {
"Merge completed. Total merged manga: ${mergedList.size}, Favorites: ${favorites.size}, Non-Favorites: ${nonFavorites.size}" "Merge completed. Total merged manga: ${mergedList.size}, Favorites: ${favorites.size}, " +
"Non-Favorites: ${nonFavorites.size}"
} }
return mergedList return mergedList
@ -191,63 +206,70 @@ abstract class SyncService(
* - If lastModifiedAt is null or missing, the chapter is considered the oldest for safety, ensuring that any chapter with a valid timestamp is preferred. * - If lastModifiedAt is null or missing, the chapter is considered the oldest for safety, ensuring that any chapter with a valid timestamp is preferred.
* - The resulting list contains the most recent chapters from the combined set of local and remote chapters. * - The resulting list contains the most recent chapters from the combined set of local and remote chapters.
*/ */
private fun mergeChapters( private fun mergeChapters(
localChapters: List<BackupChapter>, localChapters: List<BackupChapter>,
remoteChapters: List<BackupChapter>, remoteChapters: List<BackupChapter>,
): List<BackupChapter> { ): List<BackupChapter> {
val logTag = "MergeChapters" val logTag = "MergeChapters"
// Define a function to create a composite key from a chapter // Define a function to create a composite key from a chapter
fun chapterCompositeKey(chapter: BackupChapter): String { fun chapterCompositeKey(chapter: BackupChapter): String {
return "${chapter.url}|${chapter.name}|${chapter.chapterNumber}" return "${chapter.url}|${chapter.name}|${chapter.chapterNumber}"
} }
// Create maps using composite keys // Create maps using composite keys
val localChapterMap = localChapters.associateBy { chapterCompositeKey(it) } val localChapterMap = localChapters.associateBy { chapterCompositeKey(it) }
val remoteChapterMap = remoteChapters.associateBy { chapterCompositeKey(it) } val remoteChapterMap = remoteChapters.associateBy { chapterCompositeKey(it) }
logcat(LogPriority.DEBUG, logTag) { "Starting chapter merge. Local chapters: ${localChapters.size}, Remote chapters: ${remoteChapters.size}" }
// Merge both chapter maps
val mergedChapters = (localChapterMap.keys + remoteChapterMap.keys).distinct().mapNotNull { compositeKey ->
val localChapter = localChapterMap[compositeKey]
val remoteChapter = remoteChapterMap[compositeKey]
logcat(LogPriority.DEBUG, logTag) { logcat(LogPriority.DEBUG, logTag) {
"Processing chapter key: $compositeKey. Local chapter: ${localChapter != null}, Remote chapter: ${remoteChapter != null}" "Starting chapter merge. Local chapters: ${localChapters.size}, Remote chapters: ${remoteChapters.size}"
} }
when { // Merge both chapter maps
localChapter != null && remoteChapter == null -> { val mergedChapters = (localChapterMap.keys + remoteChapterMap.keys).distinct().mapNotNull { compositeKey ->
logcat(LogPriority.DEBUG, logTag) { "Keeping local chapter: ${localChapter.name}." } val localChapter = localChapterMap[compositeKey]
localChapter val remoteChapter = remoteChapterMap[compositeKey]
}
localChapter == null && remoteChapter != null -> {
logcat(LogPriority.DEBUG, logTag) { "Taking remote chapter: ${remoteChapter.name}." }
remoteChapter
}
localChapter != null && remoteChapter != null -> {
val localInstant = Instant.ofEpochMilli(localChapter.lastModifiedAt * 1000L)
val remoteInstant = Instant.ofEpochMilli(remoteChapter.lastModifiedAt * 1000L)
val chosenChapter = if (localInstant >= remoteInstant) localChapter else remoteChapter logcat(LogPriority.DEBUG, logTag) {
logcat(LogPriority.DEBUG, logTag) { "Processing chapter key: $compositeKey. Local chapter: ${localChapter != null}, " +
"Merging chapter: ${chosenChapter.name}. Chosen from: ${if (localInstant >= remoteInstant) "Local" else "Remote"}." "Remote chapter: ${remoteChapter != null}"
}
when {
localChapter != null && remoteChapter == null -> {
logcat(LogPriority.DEBUG, logTag) { "Keeping local chapter: ${localChapter.name}." }
localChapter
}
localChapter == null && remoteChapter != null -> {
logcat(LogPriority.DEBUG, logTag) { "Taking remote chapter: ${remoteChapter.name}." }
remoteChapter
}
localChapter != null && remoteChapter != null -> {
val localInstant = Instant.ofEpochMilli(localChapter.lastModifiedAt * 1000L)
val remoteInstant = Instant.ofEpochMilli(remoteChapter.lastModifiedAt * 1000L)
val chosenChapter = if (localInstant >= remoteInstant) localChapter else remoteChapter
logcat(LogPriority.DEBUG, logTag) {
"Merging chapter: ${chosenChapter.name}. Chosen from: ${if (localInstant >= remoteInstant) {
"Local"
} else {
"Remote"
}}."
}
chosenChapter
}
else -> {
logcat(LogPriority.DEBUG, logTag) { "No chapter found for composite key: $compositeKey. Skipping." }
null
} }
chosenChapter
}
else -> {
logcat(LogPriority.DEBUG, logTag) { "No chapter found for composite key: $compositeKey. Skipping." }
null
} }
} }
logcat(LogPriority.DEBUG, logTag) { "Chapter merge completed. Total merged chapters: ${mergedChapters.size}" }
return mergedChapters
} }
logcat(LogPriority.DEBUG, logTag) { "Chapter merge completed. Total merged chapters: ${mergedChapters.size}" }
return mergedChapters
}
/** /**
* Merges two lists of SyncCategory objects, prioritizing the category with the most recent order value. * Merges two lists of SyncCategory objects, prioritizing the category with the most recent order value.
* *

1
core/src/main/java/tachiyomi/core/util/system/LogcatExtensions.kt
View File

@ -26,4 +26,3 @@ inline fun Any.logcat(
logMessage.toString() logMessage.toString()
} }