Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use semaphores instead of channels where possible

Browse Source 
Use correct starting title in auto-migrator
This commit is contained in:
NerdNumber9 2019-08-02 22:54:06 -04:00
parent d04ffb7ea9
commit 7ec18861bf
1 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
app/src/main/java/exh/ui/migration/manga/process/MigrationProcedureController.kt
View File

@ -16,14 +16,16 @@ import exh.ui.base.BaseExhController
import exh.util.await import exh.util.await
import kotlinx.android.synthetic.main.eh_migration_process.* import kotlinx.android.synthetic.main.eh_migration_process.*
import kotlinx.coroutines.* import kotlinx.coroutines.*
import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.sync.Semaphore
import kotlinx.coroutines.sync.withPermit
import rx.schedulers.Schedulers import rx.schedulers.Schedulers
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
import java.util.concurrent.atomic.AtomicInteger
class MigrationProcedureController(bundle: Bundle? = null) : BaseExhController(bundle), CoroutineScope { class MigrationProcedureController(bundle: Bundle? = null) : BaseExhController(bundle), CoroutineScope {
override val layoutId = R.layout.eh_migration_process override val layoutId = R.layout.eh_migration_process
private var titleText = "Migrate manga (1/300)" private var titleText = "Migrate manga"
private var adapter: MigrationProcedureAdapter? = null private var adapter: MigrationProcedureAdapter? = null
@ -108,42 +110,36 @@ class MigrationProcedureController(bundle: Bundle? = null) : BaseExhController(b
it.id != mangaSource.id it.id != mangaSource.id
} }
if(config.useSourceWithMostChapters) { if(config.useSourceWithMostChapters) {
val sourceQueue = Channel<CatalogueSource>(Channel.RENDEZVOUS) val sourceSemaphore = Semaphore(3)
launch { val processedSources = AtomicInteger()
validSources.forEachIndexed { index, catalogueSource ->
sourceQueue.send(catalogueSource) validSources.map { source ->
manga.progress.send(validSources.size to index) async {
sourceSemaphore.withPermit {
try {
supervisorScope {
val searchResult = if (config.enableLenientSearch) {
smartSearchEngine.smartSearch(source, mangaObj.title)
} else {
smartSearchEngine.normalSearch(source, mangaObj.title)
}
if(searchResult != null) {
val localManga = smartSearchEngine.networkToLocalManga(searchResult, source.id)
val chapters = source.fetchChapterList(localManga).toSingle().await(Schedulers.io())
manga.progress.send(validSources.size to processedSources.incrementAndGet())
localManga to chapters.size
} else {
null
}
}
} catch(e: Exception) {
logger.e("Failed to search in source: ${source.id}!", e)
null
}
}
} }
sourceQueue.close() }.mapNotNull { it.await() }.maxBy { it.second }?.first
}
val results = mutableListOf<Pair<Manga, Int>>()
(1 .. 3).map {
launch {
for(source in sourceQueue) {
try {
supervisorScope {
val searchResult = if (config.enableLenientSearch) {
smartSearchEngine.smartSearch(source, mangaObj.title)
} else {
smartSearchEngine.normalSearch(source, mangaObj.title)
}
if(searchResult != null) {
val localManga = smartSearchEngine.networkToLocalManga(searchResult, source.id)
val chapters = source.fetchChapterList(localManga).toSingle().await(Schedulers.io())
results += localManga to chapters.size
}
}
} catch(e: Exception) {
logger.e("Failed to search in source: ${source.id}!", e)
}
}
}
}.forEach { it.join() }
results.maxBy { it.second }?.first
} else { } else {
validSources.forEachIndexed { index, source -> validSources.forEachIndexed { index, source ->
val searchResult = try { val searchResult = try {