mirror of
https://github.com/mihonapp/mihon.git
synced 2024-12-25 02:18:24 +01:00
Temporarily revert concurrent manga updates
This commit is contained in:
parent
6b71264482
commit
e208fa4020
@ -263,13 +263,9 @@ class LibraryUpdateService(
|
|||||||
|
|
||||||
// Emit each manga and update it sequentially.
|
// Emit each manga and update it sequentially.
|
||||||
return Observable.from(mangaToUpdate)
|
return Observable.from(mangaToUpdate)
|
||||||
// Update the chapters of the manga concurrently from 5 different sources
|
|
||||||
.groupBy { it.source }
|
|
||||||
.flatMap(
|
|
||||||
{ bySource ->
|
|
||||||
bySource
|
|
||||||
// Notify manga that will update.
|
// Notify manga that will update.
|
||||||
.doOnNext { notifier.showProgressNotification(it, count.andIncrement, mangaToUpdate.size) }
|
.doOnNext { notifier.showProgressNotification(it, count.andIncrement, mangaToUpdate.size) }
|
||||||
|
// Update the chapters of the manga
|
||||||
.concatMap { manga ->
|
.concatMap { manga ->
|
||||||
updateManga(manga)
|
updateManga(manga)
|
||||||
// If there's any error, return empty update and continue.
|
// If there's any error, return empty update and continue.
|
||||||
@ -300,9 +296,6 @@ class LibraryUpdateService(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
|
||||||
5
|
|
||||||
)
|
|
||||||
// Add manga with new chapters to the list.
|
// Add manga with new chapters to the list.
|
||||||
.doOnNext { manga ->
|
.doOnNext { manga ->
|
||||||
// Add to the list
|
// Add to the list
|
||||||
@ -326,7 +319,7 @@ class LibraryUpdateService(
|
|||||||
.map { manga -> manga.first }
|
.map { manga -> manga.first }
|
||||||
}
|
}
|
||||||
|
|
||||||
fun downloadChapters(manga: Manga, chapters: List<Chapter>) {
|
private fun downloadChapters(manga: Manga, chapters: List<Chapter>) {
|
||||||
// we need to get the chapters from the db so we have chapter ids
|
// we need to get the chapters from the db so we have chapter ids
|
||||||
val mangaChapters = db.getChapters(manga).executeAsBlocking()
|
val mangaChapters = db.getChapters(manga).executeAsBlocking()
|
||||||
val dbChapters = chapters.map {
|
val dbChapters = chapters.map {
|
||||||
|
@ -19,7 +19,7 @@ import eu.kanade.tachiyomi.util.preference.preferenceCategory
|
|||||||
import eu.kanade.tachiyomi.util.preference.switchPreference
|
import eu.kanade.tachiyomi.util.preference.switchPreference
|
||||||
import eu.kanade.tachiyomi.util.preference.titleRes
|
import eu.kanade.tachiyomi.util.preference.titleRes
|
||||||
import eu.kanade.tachiyomi.util.system.LocaleHelper
|
import eu.kanade.tachiyomi.util.system.LocaleHelper
|
||||||
import java.util.Calendar
|
import java.util.Date
|
||||||
import kotlinx.coroutines.flow.launchIn
|
import kotlinx.coroutines.flow.launchIn
|
||||||
|
|
||||||
class SettingsGeneralController : SettingsController() {
|
class SettingsGeneralController : SettingsController() {
|
||||||
@ -94,9 +94,9 @@ class SettingsGeneralController : SettingsController() {
|
|||||||
titleRes = R.string.pref_date_format
|
titleRes = R.string.pref_date_format
|
||||||
entryValues = arrayOf("", "MM/dd/yy", "dd/MM/yy", "yyyy-MM-dd")
|
entryValues = arrayOf("", "MM/dd/yy", "dd/MM/yy", "yyyy-MM-dd")
|
||||||
|
|
||||||
val currentDate = Calendar.getInstance().time
|
val now = Date().time
|
||||||
entries = entryValues.map { value ->
|
entries = entryValues.map { value ->
|
||||||
val formattedDate = preferences.dateFormat(value.toString()).format(currentDate)
|
val formattedDate = preferences.dateFormat(value.toString()).format(now)
|
||||||
if (value == "") {
|
if (value == "") {
|
||||||
"${context.getString(R.string.system_default)} ($formattedDate)"
|
"${context.getString(R.string.system_default)} ($formattedDate)"
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user